diff --git a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump
index 536f76adad..8e2c5125a3 100644
--- a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump
@@ -9,7 +9,7 @@ track 0:
     id = null
     containerMimeType = null
     sampleMimeType = audio/vorbis
-    maxInputSize = 65025
+    maxInputSize = -1
     width = -1
     height = -1
     frameRate = -1.0
diff --git a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump
index 7490773bd5..aa25303ac3 100644
--- a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump
@@ -9,7 +9,7 @@ track 0:
     id = null
     containerMimeType = null
     sampleMimeType = audio/vorbis
-    maxInputSize = 65025
+    maxInputSize = -1
     width = -1
     height = -1
     frameRate = -1.0
diff --git a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump
index 82ad16e701..58969058fa 100644
--- a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump
@@ -9,7 +9,7 @@ track 0:
     id = null
     containerMimeType = null
     sampleMimeType = audio/vorbis
-    maxInputSize = 65025
+    maxInputSize = -1
     width = -1
     height = -1
     frameRate = -1.0
diff --git a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump
index 810b66901c..4c789a8431 100644
--- a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump
@@ -9,7 +9,7 @@ track 0:
     id = null
     containerMimeType = null
     sampleMimeType = audio/vorbis
-    maxInputSize = 65025
+    maxInputSize = -1
     width = -1
     height = -1
     frameRate = -1.0
diff --git a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump
index 8e86ca340d..2f163572bf 100644
--- a/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump
+++ b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump
@@ -9,7 +9,7 @@ track 0:
     id = null
     containerMimeType = null
     sampleMimeType = audio/vorbis
-    maxInputSize = 65025
+    maxInputSize = -1
     width = -1
     height = -1
     frameRate = -1.0
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
index 892f0a68af..c7f4e9489b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
@@ -20,6 +20,7 @@ import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.io.IOException;
+import java.util.Arrays;
 
 /**
  * OGG packet class.
@@ -27,8 +28,8 @@ import java.io.IOException;
 /* package */ final class OggPacket {
 
   private final OggPageHeader pageHeader = new OggPageHeader();
-  private final ParsableByteArray packetArray =
-      new ParsableByteArray(new byte[OggPageHeader.MAX_PAGE_PAYLOAD], 0);
+  private final ParsableByteArray packetArray = new ParsableByteArray(
+      new byte[OggPageHeader.MAX_PAGE_PAYLOAD], 0);
 
   private int currentSegmentIndex = C.INDEX_UNSET;
   private int segmentCount;
@@ -85,6 +86,9 @@ import java.io.IOException;
       int size = calculatePacketSize(currentSegmentIndex);
       int segmentIndex = currentSegmentIndex + segmentCount;
       if (size > 0) {
+        if (packetArray.capacity() < packetArray.limit() + size) {
+          packetArray.data = Arrays.copyOf(packetArray.data, packetArray.limit() + size);
+        }
         input.readFully(packetArray.data, packetArray.limit(), size);
         packetArray.setLimit(packetArray.limit() + size);
         populated = pageHeader.laces[segmentIndex - 1] != 255;
@@ -118,6 +122,17 @@ import java.io.IOException;
     return packetArray;
   }
 
+  /**
+   * Trims the packet data array.
+   */
+  public void trimPayload() {
+    if (packetArray.data.length == OggPageHeader.MAX_PAGE_PAYLOAD) {
+      return;
+    }
+    packetArray.data = Arrays.copyOf(packetArray.data, Math.max(OggPageHeader.MAX_PAGE_PAYLOAD,
+        packetArray.limit()));
+  }
+
   /**
    * Calculates the size of the packet starting from {@code startSegmentIndex}.
    *
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
index 6424155bd9..c203b0c6bd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
@@ -103,15 +103,12 @@ import java.io.IOException;
     switch (state) {
       case STATE_READ_HEADERS:
         return readHeaders(input);
-
       case STATE_SKIP_HEADERS:
         input.skipFully((int) payloadStartPosition);
         state = STATE_READ_PAYLOAD;
         return Extractor.RESULT_CONTINUE;
-
       case STATE_READ_PAYLOAD:
         return readPayload(input, seekPosition);
-
       default:
         // Never happens.
         throw new IllegalStateException();
@@ -152,6 +149,8 @@ import java.io.IOException;
 
     setupData = null;
     state = STATE_READ_PAYLOAD;
+    // First payload packet. Trim the payload array of the ogg packet after headers have been read.
+    oggPacket.trimPayload();
     return Extractor.RESULT_CONTINUE;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
index ae0a69ef7d..31ac6858be 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
@@ -101,7 +101,7 @@ import java.util.ArrayList;
     codecInitialisationData.add(vorbisSetup.setupHeaderData);
 
     setupData.format = Format.createAudioSampleFormat(null, MimeTypes.AUDIO_VORBIS, null,
-        this.vorbisSetup.idHeader.bitrateNominal, OggPageHeader.MAX_PAGE_PAYLOAD,
+        this.vorbisSetup.idHeader.bitrateNominal, Format.NO_VALUE,
         this.vorbisSetup.idHeader.channels, (int) this.vorbisSetup.idHeader.sampleRate,
         codecInitialisationData, null, 0, null);
     return true;