Add a ChunkExtractor API to select codecs for sample dependency parsing

Deprecate BundledChunkExtractor.experimentalParseWithinGopSampleDependencies
in favour of
ChunkExtractor.experimentalSetCodecsToParseWithinGopSampleDependencies
which takes a VideoCodecFlags IntDef flags that represent a set of codecs.

Add a DASH test using the new API with an H.265 video.

PiperOrigin-RevId: 714901602

Author: ychaparov

libraries/common/src/main/java/androidx/media3/common/C.java

@@ -616,6 +616,28 @@ private C() {}
   /** See {@link android.media.AudioAttributes#ALLOW_CAPTURE_BY_SYSTEM}. */
   public static final int ALLOW_CAPTURE_BY_SYSTEM = AudioAttributes.ALLOW_CAPTURE_BY_SYSTEM;
 
+  /**
+   * Flags which represent a set of video codecs.
+   *
+   * Possible flag values are:
+   *
+   * 
+   *   {@link #VIDEO_CODEC_FLAG_H264}
+   *   {@link #VIDEO_CODEC_FLAG_H265}
+   * 
+   */
+  @UnstableApi
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @Target(TYPE_USE)
+  @IntDef(
+      flag = true,
+      value = {VIDEO_CODEC_FLAG_H264, VIDEO_CODEC_FLAG_H265})
+  public @interface VideoCodecFlags {}
+
+  @UnstableApi public static final int VIDEO_CODEC_FLAG_H264 = 1;
+  @UnstableApi public static final int VIDEO_CODEC_FLAG_H265 = 2;
+
   /**
    * Flags which can apply to a buffer containing a media sample.
    *

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/BundledChunkExtractor.java

@@ -61,7 +61,7 @@ public static final class Factory implements ChunkExtractor.Factory {
 
     private SubtitleParser.Factory subtitleParserFactory;
     private boolean parseSubtitlesDuringExtraction;
-    private boolean parseWithinGopSampleDependencies;
+    private @C.VideoCodecFlags int codecsToParseWithinGopSampleDependencies;
 
     public Factory() {
       subtitleParserFactory = new DefaultSubtitleParserFactory();
@@ -82,6 +82,14 @@ public Factory experimentalParseSubtitlesDuringExtraction(
       return this;
     }
 
+    @Override
+    @CanIgnoreReturnValue
+    public Factory experimentalSetCodecsToParseWithinGopSampleDependencies(
+        @C.VideoCodecFlags int codecsToParseWithinGopSampleDependencies) {
+      this.codecsToParseWithinGopSampleDependencies = codecsToParseWithinGopSampleDependencies;
+      return this;
+    }
+
     /**
      * {@inheritDoc}
      *
@@ -147,9 +155,12 @@ public ChunkExtractor createProgressiveMediaExtractor(
         if (!parseSubtitlesDuringExtraction) {
           flags |= FragmentedMp4Extractor.FLAG_EMIT_RAW_SUBTITLE_DATA;
         }
-        if (parseWithinGopSampleDependencies) {
+        if ((codecsToParseWithinGopSampleDependencies & C.VIDEO_CODEC_FLAG_H264) != 0) {
           flags |= FragmentedMp4Extractor.FLAG_READ_WITHIN_GOP_SAMPLE_DEPENDENCIES;
         }
+        if ((codecsToParseWithinGopSampleDependencies & C.VIDEO_CODEC_FLAG_H265) != 0) {
+          flags |= FragmentedMp4Extractor.FLAG_READ_WITHIN_GOP_SAMPLE_DEPENDENCIES_H265;
+        }
         extractor =
             new FragmentedMp4Extractor(
                 subtitleParserFactory,
@@ -171,15 +182,18 @@ public ChunkExtractor createProgressiveMediaExtractor(
      *
      * This method is experimental and will be renamed or removed in a future release.
      *
+     * @deprecated Use {@link #experimentalSetCodecsToParseWithinGopSampleDependencies(int)}
+     *     instead.
      * @param parseWithinGopSampleDependencies Whether to parse within GOP sample dependencies
      *     during extraction.
      * @return This factory, for convenience.
      */
     @CanIgnoreReturnValue
+    @Deprecated
     public Factory experimentalParseWithinGopSampleDependencies(
         boolean parseWithinGopSampleDependencies) {
-      this.parseWithinGopSampleDependencies = parseWithinGopSampleDependencies;
-      return this;
+      return experimentalSetCodecsToParseWithinGopSampleDependencies(
+          parseWithinGopSampleDependencies ? C.VIDEO_CODEC_FLAG_H264 : 0);
     }
   }
 

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/ChunkExtractor.java

@@ -25,6 +25,7 @@
 import androidx.media3.extractor.Extractor;
 import androidx.media3.extractor.ExtractorInput;
 import androidx.media3.extractor.TrackOutput;
+import androidx.media3.extractor.mp4.FragmentedMp4Extractor;
 import androidx.media3.extractor.text.SubtitleParser;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.IOException;
@@ -72,6 +73,25 @@ default Factory experimentalParseSubtitlesDuringExtraction(
       return this;
     }
 
+    /**
+     * Sets the set of video codecs for which within GOP sample dependency information should be
+     * parsed as part of extraction. Defaults to {@code 0} - empty set of codecs.
+     *
+     * Having access to additional sample dependency information can speed up seeking. See {@link
+     * FragmentedMp4Extractor#FLAG_READ_WITHIN_GOP_SAMPLE_DEPENDENCIES}.
+     *
+     * This method is experimental and will be renamed or removed in a future release.
+     *
+     * @param codecsToParseWithinGopSampleDependencies The set of codecs for which to parse within
+     *     GOP sample dependency information.
+     * @return This factory, for convenience.
+     */
+    @CanIgnoreReturnValue
+    default Factory experimentalSetCodecsToParseWithinGopSampleDependencies(
+        @C.VideoCodecFlags int codecsToParseWithinGopSampleDependencies) {
+      return this;
+    }
+
     /**
      * Returns the output {@link Format} of emitted {@linkplain C#TRACK_TYPE_TEXT text samples}
      * which were originally in {@code sourceFormat}.

libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/e2etest/DashPlaybackTest.java

@@ -29,6 +29,7 @@
 import android.net.Uri;
 import android.view.Surface;
 import androidx.annotation.Nullable;
+import androidx.media3.common.C;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.Player;
@@ -597,7 +598,8 @@ public void playVideo_usingWithinGopSampleDependencies_withSeek() throws Excepti
     CapturingRenderersFactory capturingRenderersFactory =
         new CapturingRenderersFactory(applicationContext);
     BundledChunkExtractor.Factory chunkExtractorFactory =
-        new BundledChunkExtractor.Factory().experimentalParseWithinGopSampleDependencies(true);
+        new BundledChunkExtractor.Factory()
+            .experimentalSetCodecsToParseWithinGopSampleDependencies(C.VIDEO_CODEC_FLAG_H264);
     DataSource.Factory defaultDataSourceFactory = new DefaultDataSource.Factory(applicationContext);
     DashMediaSource.Factory dashMediaSourceFactory =
         new DashMediaSource.Factory(
@@ -629,7 +631,8 @@ public void playVideo_usingWithinGopSampleDependencies_withSeek() throws Excepti
   public void playVideo_usingWithinGopSampleDependencies_withSeekAfterEoS() throws Exception {
     Context applicationContext = ApplicationProvider.getApplicationContext();
     BundledChunkExtractor.Factory chunkExtractorFactory =
-        new BundledChunkExtractor.Factory().experimentalParseWithinGopSampleDependencies(true);
+        new BundledChunkExtractor.Factory()
+            .experimentalSetCodecsToParseWithinGopSampleDependencies(C.VIDEO_CODEC_FLAG_H264);
     DataSource.Factory defaultDataSourceFactory = new DefaultDataSource.Factory(applicationContext);
     DashMediaSource.Factory dashMediaSourceFactory =
         new DashMediaSource.Factory(
@@ -656,6 +659,43 @@ public void playVideo_usingWithinGopSampleDependencies_withSeekAfterEoS() throws
     //  assert on the full playback dump.
   }
 
+  @Test
+  public void playVideo_usingWithinGopSampleDependenciesOnH265_withSeek() throws Exception {
+    Context applicationContext = ApplicationProvider.getApplicationContext();
+    CapturingRenderersFactory capturingRenderersFactory =
+        new CapturingRenderersFactory(applicationContext);
+    BundledChunkExtractor.Factory chunkExtractorFactory =
+        new BundledChunkExtractor.Factory()
+            .experimentalSetCodecsToParseWithinGopSampleDependencies(C.VIDEO_CODEC_FLAG_H265);
+    DataSource.Factory defaultDataSourceFactory = new DefaultDataSource.Factory(applicationContext);
+    DashMediaSource.Factory dashMediaSourceFactory =
+        new DashMediaSource.Factory(
+            /* chunkSourceFactory= */ new DefaultDashChunkSource.Factory(
+                chunkExtractorFactory, defaultDataSourceFactory, /* maxSegmentsPerLoad= */ 1),
+            /* manifestDataSourceFactory= */ defaultDataSourceFactory);
+    ExoPlayer player =
+        new ExoPlayer.Builder(applicationContext, capturingRenderersFactory)
+            .setMediaSourceFactory(dashMediaSourceFactory)
+            .setClock(new FakeClock(/* isAutoAdvancing= */ true))
+            .build();
+    player.setTrackSelectionParameters(
+        player.getTrackSelectionParameters().buildUpon().setPreferredTextLanguage("en").build());
+    Surface surface = new Surface(new SurfaceTexture(/* texName= */ 1));
+    player.setVideoSurface(surface);
+    PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
+
+    player.setMediaItem(MediaItem.fromUri("asset:///media/dash/captions_h265/manifest.mpd"));
+    player.seekTo(500L);
+    player.prepare();
+    player.play();
+    TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_ENDED);
+    player.release();
+    surface.release();
+
+    DumpFileAsserts.assertOutput(
+        applicationContext, playbackOutput, "playbackdumps/dash/optimized_seek_h265.dump");
+  }
+
   @Test
   public void multiPeriod_withOffsetInSegment() throws Exception {
     Context applicationContext = ApplicationProvider.getApplicationContext();

libraries/test_data/src/test/assets/media/dash/captions_h265/fragmented_captions_h265.mp4

@@ -0,0 +1,15 @@
+xml version="1.0" encoding="utf-8"?>
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" minBufferTime="PT1.500000S" type="static" xmlns:cenc="urn:mpeg:cenc:2013" mediaPresentationDuration="PT0H0M2.500S" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011">
+  <Period id="0" duration="PT2.000S">
+    <AdaptationSet mimeType="video/mp4">
+      <Accessibility schemeIdUri="urn:scte:dash:cc:cea-608:2015" value="CC1=eng"/>
+      <Representation codecs="hev1.1.6.L60.90" width="416" height="234" bandwidth="742564" id="sd-dash">
+        <BaseURL>fragmented_captions_h265.mp4BaseURL>
+        <SegmentList presentationTimeOffset="0" duration="20000" timescale="10000">
+          <Initialization range="0-3202"/>
+          <SegmentURL mediaRange="3203-27898"/>
+        SegmentList>
+      Representation>
+    AdaptationSet>
+  Period>
+MPD>