Refactored the text.eia608 package to text.cea.

All of the classes in the text.eia608 package have been moved to
text.cea, and renamed with the "cea" prefix instead of "eia". All of
the buffering logic has been extracted from Cea608Decoder (formerly
Eia608Decoder) into the abstract CeaDecoder, which Cea608Decoder
extends. Cea608Decoder also now expects a 3-byte sample (i.e. the
entire cc_data_pkt instead of just the cc_data_1 and cc_data_2 bytes).
Classes like RawCcExtractor and SeiReader, responsible for creating
these samples, have also been updated accordingly.

This change is a necessary precursor to adding support for multi
-channel CEA-608 and CEA-708 captions.

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

library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java

@@ -644,7 +644,7 @@ import java.util.List;
             0 /* subsample timing is absolute */);
             0 /* subsample timing is absolute */);
       } else if (childAtomType == Atom.TYPE_c608) {
       } else if (childAtomType == Atom.TYPE_c608) {
         out.format = Format.createTextSampleFormat(Integer.toString(trackId),
         out.format = Format.createTextSampleFormat(Integer.toString(trackId),
-            MimeTypes.APPLICATION_EIA608, null, Format.NO_VALUE, 0, language, drmInitData);
+            MimeTypes.APPLICATION_CEA608, null, Format.NO_VALUE, 0, language, drmInitData);
         out.requiredSampleTransformation = Track.TRANSFORMATION_CEA608_CDAT;
         out.requiredSampleTransformation = Track.TRANSFORMATION_CEA608_CDAT;
       }
       }
       stsd.setPosition(childStartPosition + childAtomSize);
       stsd.setPosition(childStartPosition + childAtomSize);

library/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java

@@ -30,7 +30,7 @@ import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.io.IOException;
 
 
 /**
 /**
- * Extracts EIA-608 data from a RawCC file
+ * Extracts CEA data from a RawCC file.
  */
  */
 public final class RawCcExtractor implements Extractor {
 public final class RawCcExtractor implements Extractor {
 
 
@@ -68,7 +68,7 @@ public final class RawCcExtractor implements Extractor {
     trackOutput = extractorOutput.track(0);
     trackOutput = extractorOutput.track(0);
     extractorOutput.endTracks();
     extractorOutput.endTracks();
 
 
-    trackOutput.format(Format.createTextSampleFormat(null, MimeTypes.APPLICATION_EIA608,
+    trackOutput.format(Format.createTextSampleFormat(null, MimeTypes.APPLICATION_CEA608,
         null, Format.NO_VALUE, 0, null, null));
         null, Format.NO_VALUE, 0, null, null));
   }
   }
 
 
@@ -154,13 +154,8 @@ public final class RawCcExtractor implements Extractor {
       dataScratch.reset();
       dataScratch.reset();
       input.readFully(dataScratch.data, 0, 3);
       input.readFully(dataScratch.data, 0, 3);
 
 
-      // only accept EIA-608 packets which have validity (6th bit) == 1 and
-      // type (7-8th bits) == 0; i.e. ccDataPkt[0] == 0bXXXXX100
-      int ccValidityAndType = dataScratch.readUnsignedByte() & 0x07;
-      if (ccValidityAndType == 0x04) {
-        trackOutput.sampleData(dataScratch, 2);
-        sampleBytesWritten += 2;
-      }
+      trackOutput.sampleData(dataScratch, 3);
+      sampleBytesWritten += 3;
     }
     }
 
 
     if (sampleBytesWritten > 0) {
     if (sampleBytesWritten > 0) {

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

@@ -57,7 +57,7 @@ import java.util.List;
 
 
   /**
   /**
    * @param output A {@link TrackOutput} to which H.264 samples should be written.
    * @param output A {@link TrackOutput} to which H.264 samples should be written.
-   * @param seiReader A reader for EIA-608 samples in SEI NAL units.
+   * @param seiReader A reader for CEA-608 samples in SEI NAL units.
    * @param allowNonIdrKeyframes Whether to treat samples consisting of non-IDR I slices as
    * @param allowNonIdrKeyframes Whether to treat samples consisting of non-IDR I slices as
    *     synchronization samples (key-frames).
    *     synchronization samples (key-frames).
    * @param detectAccessUnits Whether to split the input stream into access units (samples) based on
    * @param detectAccessUnits Whether to split the input stream into access units (samples) based on

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

@@ -64,7 +64,7 @@ import java.util.Collections;
 
 
   /**
   /**
    * @param output A {@link TrackOutput} to which H.265 samples should be written.
    * @param output A {@link TrackOutput} to which H.265 samples should be written.
-   * @param seiReader A reader for EIA-608 samples in SEI NAL units.
+   * @param seiReader A reader for CEA-608 samples in SEI NAL units.
    */
    */
   public H265Reader(TrackOutput output, SeiReader seiReader) {
   public H265Reader(TrackOutput output, SeiReader seiReader) {
     super(output);
     super(output);

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

@@ -18,12 +18,12 @@ package com.google.android.exoplayer2.extractor.ts;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
-import com.google.android.exoplayer2.text.eia608.Eia608Decoder;
+import com.google.android.exoplayer2.text.cea.Cea608Decoder;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 
 
 /**
 /**
- * Consumes SEI buffers, outputting contained EIA608 messages to a {@link TrackOutput}.
+ * Consumes SEI buffers, outputting contained CEA-608 messages to a {@link TrackOutput}.
  */
  */
 /* package */ final class SeiReader {
 /* package */ final class SeiReader {
 
 
@@ -31,7 +31,7 @@ import com.google.android.exoplayer2.util.ParsableByteArray;
 
 
   public SeiReader(TrackOutput output) {
   public SeiReader(TrackOutput output) {
     this.output = output;
     this.output = output;
-    output.format(Format.createTextSampleFormat(null, MimeTypes.APPLICATION_EIA608, null,
+    output.format(Format.createTextSampleFormat(null, MimeTypes.APPLICATION_CEA608, null,
         Format.NO_VALUE, 0, null, null));
         Format.NO_VALUE, 0, null, null));
   }
   }
 
 
@@ -51,7 +51,7 @@ import com.google.android.exoplayer2.util.ParsableByteArray;
         payloadSize += b;
         payloadSize += b;
       } while (b == 0xFF);
       } while (b == 0xFF);
       // Process the payload.
       // Process the payload.
-      if (Eia608Decoder.isSeiMessageEia608(payloadType, payloadSize, seiBuffer)) {
+      if (Cea608Decoder.isSeiMessageCea608(payloadType, payloadSize, seiBuffer)) {
         // Ignore country_code (1) + provider_code (2) + user_identifier (4)
         // Ignore country_code (1) + provider_code (2) + user_identifier (4)
         // + user_data_type_code (1).
         // + user_data_type_code (1).
         seiBuffer.skipBytes(8);
         seiBuffer.skipBytes(8);
@@ -60,13 +60,13 @@ import com.google.android.exoplayer2.util.ParsableByteArray;
         seiBuffer.skipBytes(1);
         seiBuffer.skipBytes(1);
         int sampleBytes = 0;
         int sampleBytes = 0;
         for (int i = 0; i < ccCount; i++) {
         for (int i = 0; i < ccCount; i++) {
-          int ccValidityAndType = seiBuffer.readUnsignedByte() & 0x07;
-          // Check that validity == 1 and type == 0.
+          int ccValidityAndType = seiBuffer.peekUnsignedByte() & 0x07;
+          // Check that validity == 1 and type == 0 (i.e. NTSC_CC_FIELD_1).
           if (ccValidityAndType != 0x04) {
           if (ccValidityAndType != 0x04) {
-            seiBuffer.skipBytes(2);
+            seiBuffer.skipBytes(3);
           } else {
           } else {
-            sampleBytes += 2;
-            output.sampleData(seiBuffer, 2);
+            sampleBytes += 3;
+            output.sampleData(seiBuffer, 3);
           }
           }
         }
         }
         output.sampleMetadata(pesTimeUs, C.BUFFER_FLAG_KEY_FRAME, sampleBytes, 0, null);
         output.sampleMetadata(pesTimeUs, C.BUFFER_FLAG_KEY_FRAME, sampleBytes, 0, null);

library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java

@@ -654,9 +654,10 @@ public class DashManifestParser extends DefaultHandler
     } else if (MimeTypes.isVideo(containerMimeType)) {
     } else if (MimeTypes.isVideo(containerMimeType)) {
       return MimeTypes.getVideoMediaMimeType(codecs);
       return MimeTypes.getVideoMediaMimeType(codecs);
     } else if (MimeTypes.APPLICATION_RAWCC.equals(containerMimeType)) {
     } else if (MimeTypes.APPLICATION_RAWCC.equals(containerMimeType)) {
-      // We currently only support EIA-608 through RawCC
-      if (codecs != null && codecs.contains("eia608")) {
-        return MimeTypes.APPLICATION_EIA608;
+      // We currently only support CEA-608 through RawCC
+      if (codecs != null
+          && (codecs.contains("eia608") || codecs.contains("cea608"))) {
+        return MimeTypes.APPLICATION_CEA608;
       }
       }
       return null;
       return null;
     } else if (mimeTypeIsRawText(containerMimeType)) {
     } else if (mimeTypeIsRawText(containerMimeType)) {

library/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java

@@ -589,7 +589,7 @@ import java.util.LinkedList;
         if (primaryExtractorTrackType == PRIMARY_TYPE_VIDEO) {
         if (primaryExtractorTrackType == PRIMARY_TYPE_VIDEO) {
           if (MimeTypes.isAudio(sampleFormat.sampleMimeType)) {
           if (MimeTypes.isAudio(sampleFormat.sampleMimeType)) {
             trackFormat = muxedAudioFormat;
             trackFormat = muxedAudioFormat;
-          } else if (MimeTypes.APPLICATION_EIA608.equals(sampleFormat.sampleMimeType)) {
+          } else if (MimeTypes.APPLICATION_CEA608.equals(sampleFormat.sampleMimeType)) {
             trackFormat = muxedCaptionFormat;
             trackFormat = muxedCaptionFormat;
           }
           }
         }
         }

library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java

@@ -161,7 +161,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
           case TYPE_CLOSED_CAPTIONS:
           case TYPE_CLOSED_CAPTIONS:
             if ("CC1".equals(parseOptionalStringAttr(line, REGEX_INSTREAM_ID))) {
             if ("CC1".equals(parseOptionalStringAttr(line, REGEX_INSTREAM_ID))) {
               muxedCaptionFormat = Format.createTextContainerFormat(name,
               muxedCaptionFormat = Format.createTextContainerFormat(name,
-                  MimeTypes.APPLICATION_M3U8, MimeTypes.APPLICATION_EIA608, null, Format.NO_VALUE,
+                  MimeTypes.APPLICATION_M3U8, MimeTypes.APPLICATION_CEA608, null, Format.NO_VALUE,
                   selectionFlags, language);
                   selectionFlags, language);
             }
             }
             break;
             break;

library/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java

@@ -16,7 +16,7 @@
 package com.google.android.exoplayer2.text;
 package com.google.android.exoplayer2.text;
 
 
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.text.eia608.Eia608Decoder;
+import com.google.android.exoplayer2.text.cea.Cea608Decoder;
 import com.google.android.exoplayer2.text.subrip.SubripDecoder;
 import com.google.android.exoplayer2.text.subrip.SubripDecoder;
 import com.google.android.exoplayer2.text.ttml.TtmlDecoder;
 import com.google.android.exoplayer2.text.ttml.TtmlDecoder;
 import com.google.android.exoplayer2.text.tx3g.Tx3gDecoder;
 import com.google.android.exoplayer2.text.tx3g.Tx3gDecoder;
@@ -57,7 +57,7 @@ public interface SubtitleDecoderFactory {
    * <li>TTML ({@link TtmlDecoder})</li>
    * <li>TTML ({@link TtmlDecoder})</li>
    * <li>SubRip ({@link SubripDecoder})</li>
    * <li>SubRip ({@link SubripDecoder})</li>
    * <li>TX3G ({@link Tx3gDecoder})</li>
    * <li>TX3G ({@link Tx3gDecoder})</li>
-   * <li>Eia608 ({@link Eia608Decoder})</li>
+   * <li>Cea608 ({@link Cea608Decoder})</li>
    * </ul>
    * </ul>
    */
    */
   SubtitleDecoderFactory DEFAULT = new SubtitleDecoderFactory() {
   SubtitleDecoderFactory DEFAULT = new SubtitleDecoderFactory() {
@@ -93,8 +93,8 @@ public interface SubtitleDecoderFactory {
             return Class.forName("com.google.android.exoplayer2.text.subrip.SubripDecoder");
             return Class.forName("com.google.android.exoplayer2.text.subrip.SubripDecoder");
           case MimeTypes.APPLICATION_TX3G:
           case MimeTypes.APPLICATION_TX3G:
             return Class.forName("com.google.android.exoplayer2.text.tx3g.Tx3gDecoder");
             return Class.forName("com.google.android.exoplayer2.text.tx3g.Tx3gDecoder");
-          case MimeTypes.APPLICATION_EIA608:
-            return Class.forName("com.google.android.exoplayer2.text.eia608.Eia608Decoder");
+          case MimeTypes.APPLICATION_CEA608:
+            return Class.forName("com.google.android.exoplayer2.text.cea.Cea608Decoder");
           default:
           default:
             return null;
             return null;
         }
         }

library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Decoder.java → library/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java

@@ -13,28 +13,23 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.google.android.exoplayer2.text.eia608;
+package com.google.android.exoplayer2.text.cea;
 
 
 import android.text.Layout.Alignment;
 import android.text.Layout.Alignment;
 import android.text.TextUtils;
 import android.text.TextUtils;
-import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.Cue;
+import com.google.android.exoplayer2.text.Subtitle;
 import com.google.android.exoplayer2.text.SubtitleDecoder;
 import com.google.android.exoplayer2.text.SubtitleDecoder;
-import com.google.android.exoplayer2.text.SubtitleDecoderException;
 import com.google.android.exoplayer2.text.SubtitleInputBuffer;
 import com.google.android.exoplayer2.text.SubtitleInputBuffer;
-import com.google.android.exoplayer2.text.SubtitleOutputBuffer;
-import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-import java.util.LinkedList;
-import java.util.TreeSet;
 
 
 /**
 /**
- * A {@link SubtitleDecoder} for EIA-608 (also known as "line 21 captions" and "CEA-608").
+ * A {@link SubtitleDecoder} for CEA-608 (also known as "line 21 captions" and "EIA-608").
  */
  */
-public final class Eia608Decoder implements SubtitleDecoder {
+public final class Cea608Decoder extends CeaDecoder {
 
 
-  private static final int NUM_INPUT_BUFFERS = 10;
-  private static final int NUM_OUTPUT_BUFFERS = 2;
+  private static final int NTSC_CC_FIELD_1 = 0x00;
+  private static final int CC_VALID_FLAG = 0x04;
 
 
   private static final int PAYLOAD_TYPE_CC = 4;
   private static final int PAYLOAD_TYPE_CC = 4;
   private static final int COUNTRY_CODE = 0xB5;
   private static final int COUNTRY_CODE = 0xB5;
@@ -169,18 +164,10 @@ public final class Eia608Decoder implements SubtitleDecoder {
   private static final int CUE_POSITION_ANCHOR = Cue.TYPE_UNSET;
   private static final int CUE_POSITION_ANCHOR = Cue.TYPE_UNSET;
   private static final float CUE_SIZE = 0.8f;
   private static final float CUE_SIZE = 0.8f;
 
 
-  private final LinkedList<SubtitleInputBuffer> availableInputBuffers;
-  private final LinkedList<SubtitleOutputBuffer> availableOutputBuffers;
-  private final TreeSet<SubtitleInputBuffer> queuedInputBuffers;
-
   private final ParsableByteArray ccData;
   private final ParsableByteArray ccData;
 
 
   private final StringBuilder captionStringBuilder;
   private final StringBuilder captionStringBuilder;
 
 
-  private long playbackPositionUs;
-
-  private SubtitleInputBuffer dequeuedInputBuffer;
-
   private int captionMode;
   private int captionMode;
   private int captionRowCount;
   private int captionRowCount;
   private String captionString;
   private String captionString;
@@ -191,17 +178,7 @@ public final class Eia608Decoder implements SubtitleDecoder {
   private byte repeatableControlCc1;
   private byte repeatableControlCc1;
   private byte repeatableControlCc2;
   private byte repeatableControlCc2;
 
 
-  public Eia608Decoder() {
-    availableInputBuffers = new LinkedList<>();
-    for (int i = 0; i < NUM_INPUT_BUFFERS; i++) {
-      availableInputBuffers.add(new SubtitleInputBuffer());
-    }
-    availableOutputBuffers = new LinkedList<>();
-    for (int i = 0; i < NUM_OUTPUT_BUFFERS; i++) {
-      availableOutputBuffers.add(new Eia608SubtitleOutputBuffer(this));
-    }
-    queuedInputBuffers = new TreeSet<>();
-
+  public Cea608Decoder() {
     ccData = new ParsableByteArray();
     ccData = new ParsableByteArray();
 
 
     captionStringBuilder = new StringBuilder();
     captionStringBuilder = new StringBuilder();
@@ -212,106 +189,20 @@ public final class Eia608Decoder implements SubtitleDecoder {
 
 
   @Override
   @Override
   public String getName() {
   public String getName() {
-    return "Eia608Decoder";
-  }
-
-  @Override
-  public void setPositionUs(long positionUs) {
-    playbackPositionUs = positionUs;
-  }
-
-  @Override
-  public SubtitleInputBuffer dequeueInputBuffer() throws SubtitleDecoderException {
-    Assertions.checkState(dequeuedInputBuffer == null);
-    if (availableInputBuffers.isEmpty()) {
-      return null;
-    }
-    dequeuedInputBuffer = availableInputBuffers.pollFirst();
-    return dequeuedInputBuffer;
-  }
-
-  @Override
-  public void queueInputBuffer(SubtitleInputBuffer inputBuffer) throws SubtitleDecoderException {
-    Assertions.checkArgument(inputBuffer != null);
-    Assertions.checkArgument(inputBuffer == dequeuedInputBuffer);
-    queuedInputBuffers.add(inputBuffer);
-    dequeuedInputBuffer = null;
-  }
-
-  @Override
-  public SubtitleOutputBuffer dequeueOutputBuffer() throws SubtitleDecoderException {
-    if (availableOutputBuffers.isEmpty()) {
-      return null;
-    }
-
-    // iterate through all available input buffers whose timestamps are less than or equal
-    // to the current playback position; processing input buffers for future content should
-    // be deferred until they would be applicable
-    while (!queuedInputBuffers.isEmpty()
-        && queuedInputBuffers.first().timeUs <= playbackPositionUs) {
-      SubtitleInputBuffer inputBuffer = queuedInputBuffers.pollFirst();
-
-      // If the input buffer indicates we've reached the end of the stream, we can
-      // return immediately with an output buffer propagating that
-      if (inputBuffer.isEndOfStream()) {
-        SubtitleOutputBuffer outputBuffer = availableOutputBuffers.pollFirst();
-        outputBuffer.addFlag(C.BUFFER_FLAG_END_OF_STREAM);
-        releaseInputBuffer(inputBuffer);
-        return outputBuffer;
-      }
-
-      decode(inputBuffer);
-
-      // check if we have any caption updates to report
-      if (!TextUtils.equals(captionString, lastCaptionString)) {
-        lastCaptionString = captionString;
-        if (!inputBuffer.isDecodeOnly()) {
-          Cue cue = null;
-          if (!TextUtils.isEmpty(captionString)) {
-            cue = new Cue(captionString, CUE_TEXT_ALIGNMENT, CUE_LINE, CUE_LINE_TYPE,
-                CUE_LINE_ANCHOR, CUE_POSITION, CUE_POSITION_ANCHOR, CUE_SIZE);
-          }
-          SubtitleOutputBuffer outputBuffer = availableOutputBuffers.pollFirst();
-          outputBuffer.setContent(inputBuffer.timeUs, new Eia608Subtitle(cue), 0);
-          releaseInputBuffer(inputBuffer);
-          return outputBuffer;
-        }
-      }
-
-      releaseInputBuffer(inputBuffer);
-    }
-
-    return null;
-  }
-
-  private void releaseInputBuffer(SubtitleInputBuffer inputBuffer) {
-    inputBuffer.clear();
-    availableInputBuffers.add(inputBuffer);
-  }
-
-  protected void releaseOutputBuffer(SubtitleOutputBuffer outputBuffer) {
-    outputBuffer.clear();
-    availableOutputBuffers.add(outputBuffer);
+    return "Cea608Decoder";
   }
   }
 
 
   @Override
   @Override
   public void flush() {
   public void flush() {
+    super.flush();
     setCaptionMode(CC_MODE_UNKNOWN);
     setCaptionMode(CC_MODE_UNKNOWN);
     captionRowCount = DEFAULT_CAPTIONS_ROW_COUNT;
     captionRowCount = DEFAULT_CAPTIONS_ROW_COUNT;
-    playbackPositionUs = 0;
     captionStringBuilder.setLength(0);
     captionStringBuilder.setLength(0);
     captionString = null;
     captionString = null;
     lastCaptionString = null;
     lastCaptionString = null;
     repeatableControlSet = false;
     repeatableControlSet = false;
     repeatableControlCc1 = 0;
     repeatableControlCc1 = 0;
     repeatableControlCc2 = 0;
     repeatableControlCc2 = 0;
-    while (!queuedInputBuffers.isEmpty()) {
-      releaseInputBuffer(queuedInputBuffers.pollFirst());
-    }
-    if (dequeuedInputBuffer != null) {
-      releaseInputBuffer(dequeuedInputBuffer);
-      dequeuedInputBuffer = null;
-    }
   }
   }
 
 
   @Override
   @Override
@@ -319,14 +210,34 @@ public final class Eia608Decoder implements SubtitleDecoder {
     // Do nothing
     // Do nothing
   }
   }
 
 
-  private void decode(SubtitleInputBuffer inputBuffer) {
+  @Override
+  protected boolean isNewSubtitleDataAvailable() {
+    return !TextUtils.equals(captionString, lastCaptionString);
+  }
+
+  @Override
+  protected Subtitle createSubtitle() {
+    lastCaptionString = captionString;
+    return new CeaSubtitle(new Cue(captionString, CUE_TEXT_ALIGNMENT, CUE_LINE, CUE_LINE_TYPE,
+        CUE_LINE_ANCHOR, CUE_POSITION, CUE_POSITION_ANCHOR, CUE_SIZE));
+  }
+
+  @Override
+  protected void decode(SubtitleInputBuffer inputBuffer) {
     ccData.reset(inputBuffer.data.array(), inputBuffer.data.limit());
     ccData.reset(inputBuffer.data.array(), inputBuffer.data.limit());
     boolean captionDataProcessed = false;
     boolean captionDataProcessed = false;
     boolean isRepeatableControl = false;
     boolean isRepeatableControl = false;
     while (ccData.bytesLeft() > 0) {
     while (ccData.bytesLeft() > 0) {
+      byte ccTypeAndValid = (byte) (ccData.readUnsignedByte() & 0x07);
       byte ccData1 = (byte) (ccData.readUnsignedByte() & 0x7F);
       byte ccData1 = (byte) (ccData.readUnsignedByte() & 0x7F);
       byte ccData2 = (byte) (ccData.readUnsignedByte() & 0x7F);
       byte ccData2 = (byte) (ccData.readUnsignedByte() & 0x7F);
 
 
+      // Only examine valid NTSC_CC_FIELD_1 packets
+      if (ccTypeAndValid != (CC_VALID_FLAG | NTSC_CC_FIELD_1)) {
+        // TODO: Add support for NTSC_CC_FIELD_2 packets
+        continue;
+      }
+
       // Ignore empty captions.
       // Ignore empty captions.
       if (ccData1 == 0 && ccData2 == 0) {
       if (ccData1 == 0 && ccData2 == 0) {
         continue;
         continue;
@@ -550,16 +461,16 @@ public final class Eia608Decoder implements SubtitleDecoder {
   }
   }
 
 
   /**
   /**
-   * Inspects an sei message to determine whether it contains EIA-608.
+   * Inspects an sei message to determine whether it contains CEA-608.
    * <p>
    * <p>
    * The position of {@code payload} is left unchanged.
    * The position of {@code payload} is left unchanged.
    *
    *
    * @param payloadType The payload type of the message.
    * @param payloadType The payload type of the message.
    * @param payloadLength The length of the payload.
    * @param payloadLength The length of the payload.
    * @param payload A {@link ParsableByteArray} containing the payload.
    * @param payload A {@link ParsableByteArray} containing the payload.
-   * @return Whether the sei message contains EIA-608.
+   * @return Whether the sei message contains CEA-608.
    */
    */
-  public static boolean isSeiMessageEia608(int payloadType, int payloadLength,
+  public static boolean isSeiMessageCea608(int payloadType, int payloadLength,
       ParsableByteArray payload) {
       ParsableByteArray payload) {
     if (payloadType != PAYLOAD_TYPE_CC || payloadLength < 8) {
     if (payloadType != PAYLOAD_TYPE_CC || payloadLength < 8) {
       return false;
       return false;

library/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java

+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2.text.cea;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.text.Subtitle;
+import com.google.android.exoplayer2.text.SubtitleDecoder;
+import com.google.android.exoplayer2.text.SubtitleDecoderException;
+import com.google.android.exoplayer2.text.SubtitleInputBuffer;
+import com.google.android.exoplayer2.text.SubtitleOutputBuffer;
+import com.google.android.exoplayer2.util.Assertions;
+import java.util.LinkedList;
+import java.util.TreeSet;
+
+/**
+ * Base class for subtitle parsers for CEA captions.
+ */
+/* package */ abstract class CeaDecoder implements SubtitleDecoder {
+
+  private static final int NUM_INPUT_BUFFERS = 10;
+  private static final int NUM_OUTPUT_BUFFERS = 2;
+
+  private final LinkedList<SubtitleInputBuffer> availableInputBuffers;
+  private final LinkedList<SubtitleOutputBuffer> availableOutputBuffers;
+  private final TreeSet<SubtitleInputBuffer> queuedInputBuffers;
+
+  private SubtitleInputBuffer dequeuedInputBuffer;
+  private long playbackPositionUs;
+
+  public CeaDecoder() {
+    availableInputBuffers = new LinkedList<>();
+    for (int i = 0; i < NUM_INPUT_BUFFERS; i++) {
+      availableInputBuffers.add(new SubtitleInputBuffer());
+    }
+    availableOutputBuffers = new LinkedList<>();
+    for (int i = 0; i < NUM_OUTPUT_BUFFERS; i++) {
+      availableOutputBuffers.add(new CeaOutputBuffer(this));
+    }
+    queuedInputBuffers = new TreeSet<>();
+  }
+
+  @Override
+  public abstract String getName();
+
+  @Override
+  public void setPositionUs(long positionUs) {
+    playbackPositionUs = positionUs;
+  }
+
+  @Override
+  public SubtitleInputBuffer dequeueInputBuffer() throws SubtitleDecoderException {
+    Assertions.checkState(dequeuedInputBuffer == null);
+    if (availableInputBuffers.isEmpty()) {
+      return null;
+    }
+    dequeuedInputBuffer = availableInputBuffers.pollFirst();
+    return dequeuedInputBuffer;
+  }
+
+  @Override
+  public void queueInputBuffer(SubtitleInputBuffer inputBuffer) throws SubtitleDecoderException {
+    Assertions.checkArgument(inputBuffer != null);
+    Assertions.checkArgument(inputBuffer == dequeuedInputBuffer);
+    queuedInputBuffers.add(inputBuffer);
+    dequeuedInputBuffer = null;
+  }
+
+  @Override
+  public SubtitleOutputBuffer dequeueOutputBuffer() throws SubtitleDecoderException {
+    if (availableOutputBuffers.isEmpty()) {
+      return null;
+    }
+
+    // iterate through all available input buffers whose timestamps are less than or equal
+    // to the current playback position; processing input buffers for future content should
+    // be deferred until they would be applicable
+    while (!queuedInputBuffers.isEmpty()
+        && queuedInputBuffers.first().timeUs <= playbackPositionUs) {
+      SubtitleInputBuffer inputBuffer = queuedInputBuffers.pollFirst();
+
+      // If the input buffer indicates we've reached the end of the stream, we can
+      // return immediately with an output buffer propagating that
+      if (inputBuffer.isEndOfStream()) {
+        SubtitleOutputBuffer outputBuffer = availableOutputBuffers.pollFirst();
+        outputBuffer.addFlag(C.BUFFER_FLAG_END_OF_STREAM);
+        releaseInputBuffer(inputBuffer);
+        return outputBuffer;
+      }
+
+      decode(inputBuffer);
+
+      // check if we have any caption updates to report
+      if (isNewSubtitleDataAvailable()) {
+        // Even if the subtitle is decode-only; we need to generate it to consume the data so it
+        // isn't accidentally prepended to the next subtitle
+        Subtitle subtitle = createSubtitle();
+        if (!inputBuffer.isDecodeOnly()) {
+          SubtitleOutputBuffer outputBuffer = availableOutputBuffers.pollFirst();
+          outputBuffer.setContent(inputBuffer.timeUs, subtitle, 0);
+          releaseInputBuffer(inputBuffer);
+          return outputBuffer;
+        }
+      }
+
+      releaseInputBuffer(inputBuffer);
+    }
+
+    return null;
+  }
+
+  private void releaseInputBuffer(SubtitleInputBuffer inputBuffer) {
+    inputBuffer.clear();
+    availableInputBuffers.add(inputBuffer);
+  }
+
+  protected void releaseOutputBuffer(SubtitleOutputBuffer outputBuffer) {
+    outputBuffer.clear();
+    availableOutputBuffers.add(outputBuffer);
+  }
+
+  @Override
+  public void flush() {
+    playbackPositionUs = 0;
+    while (!queuedInputBuffers.isEmpty()) {
+      releaseInputBuffer(queuedInputBuffers.pollFirst());
+    }
+    if (dequeuedInputBuffer != null) {
+      releaseInputBuffer(dequeuedInputBuffer);
+      dequeuedInputBuffer = null;
+    }
+  }
+
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
+  /**
+   * Returns whether there is data available to create a new {@link Subtitle}.
+   */
+  protected abstract boolean isNewSubtitleDataAvailable();
+
+  /**
+   * Creates a {@link Subtitle} from the available data.
+   */
+  protected abstract Subtitle createSubtitle();
+
+  /**
+   * Filters and processes the raw data, providing {@link Subtitle}s via {@link #createSubtitle()}
+   * when sufficient data has been processed.
+   */
+  protected abstract void decode(SubtitleInputBuffer inputBuffer);
+
+}

library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608SubtitleOutputBuffer.java → library/src/main/java/com/google/android/exoplayer2/text/cea/CeaOutputBuffer.java

@@ -13,22 +13,21 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.google.android.exoplayer2.text.eia608;
+package com.google.android.exoplayer2.text.cea;
 
 
-import com.google.android.exoplayer2.text.Subtitle;
 import com.google.android.exoplayer2.text.SubtitleOutputBuffer;
 import com.google.android.exoplayer2.text.SubtitleOutputBuffer;
 
 
 /**
 /**
- * A {@link Subtitle} output from an {@link Eia608Decoder}.
+ * A {@link SubtitleOutputBuffer} for {@link CeaDecoder}s.
  */
  */
-/* package */ final class Eia608SubtitleOutputBuffer extends SubtitleOutputBuffer {
+public final class CeaOutputBuffer extends SubtitleOutputBuffer {
 
 
-  private Eia608Decoder owner;
+  private final CeaDecoder owner;
 
 
   /**
   /**
    * @param owner The decoder that owns this buffer.
    * @param owner The decoder that owns this buffer.
    */
    */
-  public Eia608SubtitleOutputBuffer(Eia608Decoder owner) {
+  public CeaOutputBuffer(CeaDecoder owner) {
     super();
     super();
     this.owner = owner;
     this.owner = owner;
   }
   }

library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Subtitle.java → library/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package com.google.android.exoplayer2.text.eia608;
+package com.google.android.exoplayer2.text.cea;
 
 
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.Subtitle;
 import com.google.android.exoplayer2.text.Subtitle;
@@ -21,16 +21,16 @@ import java.util.Collections;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
- * A representation of an EIA-608 subtitle.
+ * A representation of a CEA subtitle.
  */
  */
-/* package */ final class Eia608Subtitle implements Subtitle {
+/* package */ final class CeaSubtitle implements Subtitle {
 
 
   private final List<Cue> cues;
   private final List<Cue> cues;
 
 
   /**
   /**
    * @param cue The subtitle cue.
    * @param cue The subtitle cue.
    */
    */
-  public Eia608Subtitle(Cue cue) {
+  public CeaSubtitle(Cue cue) {
     if (cue == null) {
     if (cue == null) {
       cues = Collections.emptyList();
       cues = Collections.emptyList();
     } else {
     } else {

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

@@ -64,7 +64,7 @@ public final class MimeTypes {
   public static final String APPLICATION_MP4 = BASE_TYPE_APPLICATION + "/mp4";
   public static final String APPLICATION_MP4 = BASE_TYPE_APPLICATION + "/mp4";
   public static final String APPLICATION_WEBM = BASE_TYPE_APPLICATION + "/webm";
   public static final String APPLICATION_WEBM = BASE_TYPE_APPLICATION + "/webm";
   public static final String APPLICATION_ID3 = BASE_TYPE_APPLICATION + "/id3";
   public static final String APPLICATION_ID3 = BASE_TYPE_APPLICATION + "/id3";
-  public static final String APPLICATION_EIA608 = BASE_TYPE_APPLICATION + "/eia-608";
+  public static final String APPLICATION_CEA608 = BASE_TYPE_APPLICATION + "/cea-608";
   public static final String APPLICATION_SUBRIP = BASE_TYPE_APPLICATION + "/x-subrip";
   public static final String APPLICATION_SUBRIP = BASE_TYPE_APPLICATION + "/x-subrip";
   public static final String APPLICATION_TTML = BASE_TYPE_APPLICATION + "/ttml+xml";
   public static final String APPLICATION_TTML = BASE_TYPE_APPLICATION + "/ttml+xml";
   public static final String APPLICATION_M3U8 = BASE_TYPE_APPLICATION + "/x-mpegURL";
   public static final String APPLICATION_M3U8 = BASE_TYPE_APPLICATION + "/x-mpegURL";
@@ -209,7 +209,7 @@ public final class MimeTypes {
       return C.TRACK_TYPE_AUDIO;
       return C.TRACK_TYPE_AUDIO;
     } else if (isVideo(mimeType)) {
     } else if (isVideo(mimeType)) {
       return C.TRACK_TYPE_VIDEO;
       return C.TRACK_TYPE_VIDEO;
-    } else if (isText(mimeType) || APPLICATION_EIA608.equals(mimeType)
+    } else if (isText(mimeType) || APPLICATION_CEA608.equals(mimeType)
         || APPLICATION_SUBRIP.equals(mimeType) || APPLICATION_TTML.equals(mimeType)
         || APPLICATION_SUBRIP.equals(mimeType) || APPLICATION_TTML.equals(mimeType)
         || APPLICATION_TX3G.equals(mimeType) || APPLICATION_MP4VTT.equals(mimeType)
         || APPLICATION_TX3G.equals(mimeType) || APPLICATION_MP4VTT.equals(mimeType)
         || APPLICATION_RAWCC.equals(mimeType) || APPLICATION_VOBSUB.equals(mimeType)
         || APPLICATION_RAWCC.equals(mimeType) || APPLICATION_VOBSUB.equals(mimeType)

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

@@ -195,6 +195,13 @@ public final class ParsableByteArray {
   }
   }
 
 
   /**
   /**
+   * Peeks at the next byte as an unsigned value.
+   */
+  public int peekUnsignedByte() {
+    return (data[position] & 0xFF);
+  }
+
+  /**
    * Reads the next byte as an unsigned value.
    * Reads the next byte as an unsigned value.
    */
    */
   public int readUnsignedByte() {
   public int readUnsignedByte() {