Merge pull request #8397 from equeim:avc-codecs

PiperOrigin-RevId: 350105847

RELEASENOTES.md

@@ -39,6 +39,9 @@
         ([#8349](https://github.com/google/ExoPlayer/issues/8349))
     *   Add `DefaultHttpDataSource.Factory` and deprecate
         `DefaultHttpDataSourceFactory`.
+    *   Populate codecs string for H.264/AVC in MP4, Matroska and FLV streams to
+        allow decoder capability checks based on codec profile/level
+        ([#8393](https://github.com/google/ExoPlayer/issues/8393)).
 *   Track selection:
     *   Add option to specify multiple preferred audio or text languages.
     *   Forward `Timeline` and `MediaPeriodId` to `TrackSelection.Factory`.

library/common/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java

@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.video;
 
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.util.CodecSpecificDataUtil;
@@ -34,13 +35,14 @@ public final class AvcConfig {
   public final int width;
   public final int height;
   public final float pixelWidthAspectRatio;
+  @Nullable public final String codecs;
 
   /**
    * Parses AVC configuration data.
    *
    * @param data A {@link ParsableByteArray}, whose position is set to the start of the AVC
    *     configuration data to parse.
-   * @return A parsed representation of the HEVC configuration data.
+   * @return A parsed representation of the AVC configuration data.
    * @throws ParserException If an error occurred parsing the data.
    */
   public static AvcConfig parse(ParsableByteArray data) throws ParserException {
@@ -63,6 +65,7 @@ public final class AvcConfig {
       int width = Format.NO_VALUE;
       int height = Format.NO_VALUE;
       float pixelWidthAspectRatio = 1;
+      @Nullable String codecs = null;
       if (numSequenceParameterSets > 0) {
         byte[] sps = initializationData.get(0);
         SpsData spsData = NalUnitUtil.parseSpsNalUnit(initializationData.get(0),
@@ -70,21 +73,36 @@ public final class AvcConfig {
         width = spsData.width;
         height = spsData.height;
         pixelWidthAspectRatio = spsData.pixelWidthAspectRatio;
+        codecs =
+            CodecSpecificDataUtil.buildAvcCodecString(
+                spsData.profileIdc, spsData.constraintsFlagsAndReservedZero2Bits, spsData.levelIdc);
       }
-      return new AvcConfig(initializationData, nalUnitLengthFieldLength, width, height,
-          pixelWidthAspectRatio);
+
+      return new AvcConfig(
+          initializationData,
+          nalUnitLengthFieldLength,
+          width,
+          height,
+          pixelWidthAspectRatio,
+          codecs);
     } catch (ArrayIndexOutOfBoundsException e) {
       throw new ParserException("Error parsing AVC config", e);
     }
   }
 
-  private AvcConfig(List<byte[]> initializationData, int nalUnitLengthFieldLength,
-      int width, int height, float pixelWidthAspectRatio) {
+  private AvcConfig(
+      List<byte[]> initializationData,
+      int nalUnitLengthFieldLength,
+      int width,
+      int height,
+      float pixelWidthAspectRatio,
+      @Nullable String codecs) {
     this.initializationData = initializationData;
     this.nalUnitLengthFieldLength = nalUnitLengthFieldLength;
     this.width = width;
     this.height = height;
     this.pixelWidthAspectRatio = pixelWidthAspectRatio;
+    this.codecs = codecs;
   }
 
   private static byte[] buildNalUnitForChild(ParsableByteArray data) {

library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java

@@ -93,6 +93,7 @@ import com.google.android.exoplayer2.video.AvcConfig;
       Format format =
           new Format.Builder()
               .setSampleMimeType(MimeTypes.VIDEO_H264)
+              .setCodecs(avcConfig.codecs)
               .setWidth(avcConfig.width)
               .setHeight(avcConfig.height)
               .setPixelWidthHeightRatio(avcConfig.pixelWidthAspectRatio)

library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java

@@ -2086,6 +2086,7 @@ public class MatroskaExtractor implements Extractor {
           AvcConfig avcConfig = AvcConfig.parse(new ParsableByteArray(getCodecPrivate(codecId)));
           initializationData = avcConfig.initializationData;
           nalUnitLengthFieldLength = avcConfig.nalUnitLengthFieldLength;
+          codecs = avcConfig.codecs;
           break;
         case CODEC_ID_H265:
           mimeType = MimeTypes.VIDEO_H265;

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

@@ -1058,6 +1058,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
         if (!pixelWidthHeightRatioFromPasp) {
           pixelWidthHeightRatio = avcConfig.pixelWidthAspectRatio;
         }
+        codecs = avcConfig.codecs;
       } else if (childAtomType == Atom.TYPE_hvcC) {
         Assertions.checkState(mimeType == null);
         mimeType = MimeTypes.VIDEO_H265;

testdata/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.0.dump

@@ -11,6 +11,7 @@ track 9:
   sample count = 71
   format 0:
     sampleMimeType = video/avc
+    codecs = avc1.64000C
     width = 320
     height = 180
     initializationData:

testdata/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.1.dump

@@ -11,6 +11,7 @@ track 9:
   sample count = 47
   format 0:
     sampleMimeType = video/avc
+    codecs = avc1.64000C
     width = 320
     height = 180
     initializationData:

testdata/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.2.dump

@@ -11,6 +11,7 @@ track 9:
   sample count = 23
   format 0:
     sampleMimeType = video/avc
+    codecs = avc1.64000C
     width = 320
     height = 180
     initializationData:

testdata/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.3.dump

@@ -11,6 +11,7 @@ track 9:
   sample count = 23
   format 0:
     sampleMimeType = video/avc
+    codecs = avc1.64000C
     width = 320
     height = 180
     initializationData:

testdata/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.unknown_length.dump

@@ -11,6 +11,7 @@ track 9:
   sample count = 71
   format 0:
     sampleMimeType = video/avc
+    codecs = avc1.64000C
     width = 320
     height = 180
     initializationData:

testdata/src/test/assets/extractordumps/flv/sample.flv.0.dump

@@ -198,6 +198,7 @@ track 9:
   sample count = 30
   format 0:
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/flv/sample.flv.unknown_length.dump

@@ -198,6 +198,7 @@ track 9:
   sample count = 30
   format 0:
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/mkv/sample.mkv.0.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample.mkv.1.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample.mkv.2.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample.mkv.3.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample.mkv.unknown_length.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.0.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     rotationDegrees = 90

testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.1.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     rotationDegrees = 90

testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.2.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     rotationDegrees = 90

testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.3.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     rotationDegrees = 90

testdata/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     rotationDegrees = 90

testdata/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.0.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.1.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.2.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.3.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.0.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.1.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.2.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.3.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.unknown_length.dump

@@ -12,6 +12,7 @@ track 1:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640034
     width = 1080
     height = 720
     selectionFlags = 1

testdata/src/test/assets/extractordumps/mp4/sample.mp4.0.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     maxInputSize = 36722
     width = 1080
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample.mp4.1.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     maxInputSize = 36722
     width = 1080
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample.mp4.2.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     maxInputSize = 36722
     width = 1080
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample.mp4.3.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     maxInputSize = 36722
     width = 1080
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     maxInputSize = 36722
     width = 1080
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640033
     maxInputSize = 34686
     width = 1280
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640033
     maxInputSize = 34686
     width = 1280
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640033
     maxInputSize = 34686
     width = 1280
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640033
     maxInputSize = 34686
     width = 1280
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.640033
     maxInputSize = 34686
     width = 1280
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.0.dump

@@ -9,6 +9,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.unknown_length.dump

@@ -9,6 +9,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.0.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.1.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.2.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.3.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.0.dump

@@ -9,6 +9,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.unknown_length.dump

@@ -9,6 +9,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     maxInputSize = 36722
     width = 1080
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.1.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     maxInputSize = 36722
     width = 1080
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.2.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     maxInputSize = 36722
     width = 1080
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.3.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     maxInputSize = 36722
     width = 1080
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     maxInputSize = 36722
     width = 1080
     height = 720

testdata/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump

@@ -9,6 +9,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     width = 1080
     height = 720
     initializationData:

testdata/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.unknown_length.dump

@@ -9,6 +9,7 @@ track 0:
   format 0:
     id = 1
     sampleMimeType = video/avc
+    codecs = avc1.64001F
     width = 1080
     height = 720
     initializationData: