Skip to content

Commit ed05b14

Browse files
committed
Add MediaCodecInfo to MediaCodecRenderer::onReadyToInitializeCodec
1 parent 6689fee commit ed05b14

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,7 +1216,7 @@ private void initCodec(MediaCodecInfo codecInfo, @Nullable MediaCrypto crypto) t
12161216
if (codecOperatingRate <= assumedMinimumCodecOperatingRate) {
12171217
codecOperatingRate = CODEC_OPERATING_RATE_UNSET;
12181218
}
1219-
onReadyToInitializeCodec(inputFormat);
1219+
onReadyToInitializeCodec(codecInfo, inputFormat);
12201220
codecInitializingTimestamp = getClock().elapsedRealtime();
12211221
MediaCodecAdapter.Configuration configuration =
12221222
getMediaCodecConfiguration(codecInfo, inputFormat, crypto, codecOperatingRate);
@@ -1495,10 +1495,11 @@ private boolean feedInputBuffer() throws ExoPlaybackException {
14951495
*
14961496
* <p>The default implementation is a no-op.
14971497
*
1498+
* @param codecInfo The {@link MediaCodecInfo} the codec which is being configured.
14981499
* @param format The {@link Format} for which the codec is being configured.
14991500
* @throws ExoPlaybackException If an error occurs preparing for initializing the codec.
15001501
*/
1501-
protected void onReadyToInitializeCodec(Format format) throws ExoPlaybackException {
1502+
protected void onReadyToInitializeCodec(MediaCodecInfo codecInfo, Format format) throws ExoPlaybackException {
15021503
// Do nothing.
15031504
}
15041505

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ protected float getCodecOperatingRateV23(
12141214

12151215
@CallSuper
12161216
@Override
1217-
protected void onReadyToInitializeCodec(Format format) throws ExoPlaybackException {
1217+
protected void onReadyToInitializeCodec(MediaCodecInfo codecInfo, Format format) throws ExoPlaybackException {
12181218
if (videoSink != null && !videoSink.isInitialized()) {
12191219
try {
12201220
videoSink.initialize(format);

libraries/transformer/src/main/java/androidx/media3/transformer/ExperimentalFrameExtractor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
import androidx.media3.exoplayer.SeekParameters;
7979
import androidx.media3.exoplayer.analytics.AnalyticsListener;
8080
import androidx.media3.exoplayer.mediacodec.MediaCodecAdapter;
81+
import androidx.media3.exoplayer.mediacodec.MediaCodecInfo;
8182
import androidx.media3.exoplayer.mediacodec.MediaCodecSelector;
8283
import androidx.media3.exoplayer.source.MediaSource;
8384
import androidx.media3.exoplayer.video.MediaCodecVideoRenderer;
@@ -662,12 +663,12 @@ public void setVideoEffects(List<Effect> effects) {
662663

663664
@CallSuper
664665
@Override
665-
protected void onReadyToInitializeCodec(Format format) throws ExoPlaybackException {
666+
protected void onReadyToInitializeCodec(MediaCodecInfo codecInfo, Format format) throws ExoPlaybackException {
666667
if (isTransferHdr(format.colorInfo) && toneMapHdrToSdr) {
667668
// Setting the VideoSink format to SDR_BT709_LIMITED tone maps to SDR.
668669
format = format.buildUpon().setColorInfo(SDR_BT709_LIMITED).build();
669670
}
670-
super.onReadyToInitializeCodec(format);
671+
super.onReadyToInitializeCodec(codecInfo, format);
671672
}
672673

673674
@Override

0 commit comments

Comments
 (0)