Add support for PATs spread across multiple packets

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=131946543

library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java

@@ -253,9 +253,15 @@ public final class TsExtractor implements Extractor {
    */
    */
   private class PatReader extends TsPayloadReader {
   private class PatReader extends TsPayloadReader {
 
 
+    private final ParsableByteArray sectionData;
     private final ParsableBitArray patScratch;
     private final ParsableBitArray patScratch;
 
 
+    private int sectionLength;
+    private int sectionBytesRead;
+    private int crc;
+
     public PatReader() {
     public PatReader() {
+      sectionData = new ParsableByteArray();
       patScratch = new ParsableBitArray(new byte[4]);
       patScratch = new ParsableBitArray(new byte[4]);
     }
     }
 
 
@@ -271,25 +277,38 @@ public final class TsExtractor implements Extractor {
       if (payloadUnitStartIndicator) {
       if (payloadUnitStartIndicator) {
         int pointerField = data.readUnsignedByte();
         int pointerField = data.readUnsignedByte();
         data.skipBytes(pointerField);
         data.skipBytes(pointerField);
+
+        // Note: see ISO/IEC 13818-1, section 2.4.4.3 for detailed information on the format of
+        // the header.
+        data.readBytes(patScratch, 3);
+        patScratch.skipBits(12); // table_id (8), section_syntax_indicator (1), 0 (1), reserved (2)
+        sectionLength = patScratch.readBits(12);
+        sectionBytesRead = 0;
+        crc = Util.crc(patScratch.data, 0, 3, 0xFFFFFFFF);
+
+        sectionData.reset(sectionLength);
+      }
+
+      int bytesToRead = Math.min(data.bytesLeft(), sectionLength - sectionBytesRead);
+      data.readBytes(sectionData.data, sectionBytesRead, bytesToRead);
+      sectionBytesRead += bytesToRead;
+      if (sectionBytesRead < sectionLength) {
+        // Not yet fully read.
+        return;
       }
       }
-      data.readBytes(patScratch, 3);
-      patScratch.skipBits(12); // table_id (8), section_syntax_indicator (1), '0' (1), reserved (2)
-      int sectionLength = patScratch.readBits(12);
 
 
-      int crcStart = data.getPosition() - 3;
-      int crcEnd = data.getPosition() + sectionLength;
-      if (Util.crc(data.data, crcStart, crcEnd, 0xFFFFFFFF) != 0) {
+      if (Util.crc(sectionData.data, 0, sectionLength, crc) != 0) {
         // CRC Invalid. The section gets discarded.
         // CRC Invalid. The section gets discarded.
         return;
         return;
       }
       }
 
 
       // transport_stream_id (16), reserved (2), version_number (5), current_next_indicator (1),
       // transport_stream_id (16), reserved (2), version_number (5), current_next_indicator (1),
       // section_number (8), last_section_number (8)
       // section_number (8), last_section_number (8)
-      data.skipBytes(5);
+      sectionData.skipBytes(5);
 
 
       int programCount = (sectionLength - 9) / 4;
       int programCount = (sectionLength - 9) / 4;
       for (int i = 0; i < programCount; i++) {
       for (int i = 0; i < programCount; i++) {
-        data.readBytes(patScratch, 4);
+        sectionData.readBytes(patScratch, 4);
         int programNumber = patScratch.readBits(16);
         int programNumber = patScratch.readBits(16);
         patScratch.skipBits(3); // reserved (3)
         patScratch.skipBits(3); // reserved (3)
         if (programNumber == 0) {
         if (programNumber == 0) {
@@ -338,14 +357,10 @@ public final class TsExtractor implements Extractor {
         data.readBytes(pmtScratch, 3);
         data.readBytes(pmtScratch, 3);
         pmtScratch.skipBits(12); // table_id (8), section_syntax_indicator (1), 0 (1), reserved (2)
         pmtScratch.skipBits(12); // table_id (8), section_syntax_indicator (1), 0 (1), reserved (2)
         sectionLength = pmtScratch.readBits(12);
         sectionLength = pmtScratch.readBits(12);
+        sectionBytesRead = 0;
         crc = Util.crc(pmtScratch.data, 0, 3, 0xFFFFFFFF);
         crc = Util.crc(pmtScratch.data, 0, 3, 0xFFFFFFFF);
 
 
-        if (sectionData.capacity() < sectionLength) {
-          sectionData.reset(new byte[sectionLength], sectionLength);
-        } else {
-          sectionData.reset();
-          sectionData.setLimit(sectionLength);
-        }
+        sectionData.reset(sectionLength);
       }
       }
 
 
       int bytesToRead = Math.min(data.bytesLeft(), sectionLength - sectionBytesRead);
       int bytesToRead = Math.min(data.bytesLeft(), sectionLength - sectionBytesRead);

library/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java

@@ -66,6 +66,16 @@ public final class ParsableByteArray {
   }
   }
 
 
   /**
   /**
+   * Resets the position to zero and the limit to the specified value. If the limit exceeds the
+   * capacity, {@code data} is replaced with a new array of sufficient size.
+   *
+   * @param limit The limit to set.
+   */
+  public void reset(int limit) {
+    reset(capacity() < limit ? new byte[limit] : data, limit);
+  }
+
+  /**
    * Updates the instance to wrap {@code data}, and resets the position to zero.
    * Updates the instance to wrap {@code data}, and resets the position to zero.
    *
    *
    * @param data The array to wrap.
    * @param data The array to wrap.