Skip to content

Commit b550a71

Browse files
icbakercopybara-github
authored andcommitted
Run @InlineMe refactorings across the library, demos & tests
PiperOrigin-RevId: 832360077
1 parent 00c9a3b commit b550a71

File tree

17 files changed

+43
-51
lines changed

17 files changed

+43
-51
lines changed

demos/transformer/src/withMediaPipe/java/androidx/media3/demo/transformer/MediaPipeShaderProgram.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package androidx.media3.demo.transformer;
1717

18-
import static androidx.media3.common.util.Assertions.checkStateNotNull;
1918
import static com.google.common.base.Preconditions.checkArgument;
19+
import static com.google.common.base.Preconditions.checkNotNull;
2020
import static com.google.common.base.Preconditions.checkState;
2121
import static java.util.concurrent.TimeUnit.MILLISECONDS;
2222

@@ -206,7 +206,7 @@ private void queueInputFrameAsynchronous(
206206
AppTextureFrame appTextureFrame, GlTextureInfo inputTexture) {
207207
removeFinishedFutures();
208208
futures.add(
209-
checkStateNotNull(singleThreadExecutorService)
209+
checkNotNull(singleThreadExecutorService)
210210
.submit(
211211
() -> {
212212
while (!maybeQueueInputFrameSynchronous(appTextureFrame, inputTexture)) {
@@ -226,7 +226,7 @@ private void queueInputFrameAsynchronous(
226226

227227
@Override
228228
public void releaseOutputFrame(GlTextureInfo outputTexture) {
229-
checkStateNotNull(outputFrames.get(outputTexture)).release();
229+
checkNotNull(outputFrames.get(outputTexture)).release();
230230
if (isSingleFrameGraph) {
231231
inputListener.onReadyToAcceptInputFrame();
232232
}
@@ -245,12 +245,11 @@ public void release() {
245245
return;
246246
}
247247

248-
Queue<Future<?>> futures = checkStateNotNull(this.futures);
248+
Queue<Future<?>> futures = checkNotNull(this.futures);
249249
while (!futures.isEmpty()) {
250250
futures.remove().cancel(/* mayInterruptIfRunning= */ false);
251251
}
252-
ExecutorService singleThreadExecutorService =
253-
checkStateNotNull(this.singleThreadExecutorService);
252+
ExecutorService singleThreadExecutorService = checkNotNull(this.singleThreadExecutorService);
254253
singleThreadExecutorService.shutdown();
255254
try {
256255
if (!singleThreadExecutorService.awaitTermination(RELEASE_WAIT_TIME_MS, MILLISECONDS)) {
@@ -276,7 +275,7 @@ public final void signalEndOfCurrentInputStream() {
276275

277276
removeFinishedFutures();
278277
futures.add(
279-
checkStateNotNull(singleThreadExecutorService)
278+
checkNotNull(singleThreadExecutorService)
280279
.submit(
281280
() -> {
282281
frameProcessor.waitUntilIdle();

libraries/common/src/test/java/androidx/media3/common/ForwardingSimpleBasePlayerTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -753,9 +753,7 @@ protected ListenableFuture<?> handleSetTrackSelectionParameters(
753753
}));
754754
Player forwardingPlayer = new ForwardingSimpleBasePlayer(wrappedPlayer);
755755
TrackSelectionParameters parameters =
756-
new TrackSelectionParameters.Builder(ApplicationProvider.getApplicationContext())
757-
.setMaxVideoBitrate(1000)
758-
.build();
756+
new TrackSelectionParameters.Builder().setMaxVideoBitrate(1000).build();
759757

760758
forwardingPlayer.setTrackSelectionParameters(parameters);
761759

libraries/common/src/test/java/androidx/media3/common/SimpleBasePlayerTest.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import androidx.media3.test.utils.FakeMetadataEntry;
4545
import androidx.media3.test.utils.FakeTimeline;
4646
import androidx.media3.test.utils.TestUtil;
47-
import androidx.test.core.app.ApplicationProvider;
4847
import androidx.test.ext.junit.runners.AndroidJUnit4;
4948
import com.google.common.collect.ImmutableList;
5049
import com.google.common.util.concurrent.Futures;
@@ -3075,9 +3074,7 @@ public void setTrackSelectionParameters_immediateHandling_updatesStateAndInforms
30753074
.build();
30763075
// Set a different one to the one requested to ensure the updated state is used.
30773076
TrackSelectionParameters updatedParameters =
3078-
new TrackSelectionParameters.Builder(ApplicationProvider.getApplicationContext())
3079-
.setMaxVideoBitrate(3000)
3080-
.build();
3077+
new TrackSelectionParameters.Builder().setMaxVideoBitrate(3000).build();
30813078
State updatedState = state.buildUpon().setTrackSelectionParameters(updatedParameters).build();
30823079
SimpleBasePlayer player =
30833080
new SimpleBasePlayer(Looper.myLooper()) {
@@ -3099,9 +3096,7 @@ protected ListenableFuture<?> handleSetTrackSelectionParameters(
30993096
player.addListener(listener);
31003097

31013098
player.setTrackSelectionParameters(
3102-
new TrackSelectionParameters.Builder(ApplicationProvider.getApplicationContext())
3103-
.setMaxVideoBitrate(1000)
3104-
.build());
3099+
new TrackSelectionParameters.Builder().setMaxVideoBitrate(1000).build());
31053100

31063101
assertThat(player.getTrackSelectionParameters()).isEqualTo(updatedParameters);
31073102
verify(listener).onTrackSelectionParametersChanged(updatedParameters);
@@ -3116,9 +3111,7 @@ public void setTrackSelectionParameters_asyncHandling_usesPlaceholderStateAndInf
31163111
.build();
31173112
// Set new parameters to see a difference between the placeholder and new state.
31183113
TrackSelectionParameters updatedParameters =
3119-
new TrackSelectionParameters.Builder(ApplicationProvider.getApplicationContext())
3120-
.setMaxVideoBitrate(3000)
3121-
.build();
3114+
new TrackSelectionParameters.Builder().setMaxVideoBitrate(3000).build();
31223115
State updatedState = state.buildUpon().setTrackSelectionParameters(updatedParameters).build();
31233116
SettableFuture<?> future = SettableFuture.create();
31243117
SimpleBasePlayer player =
@@ -3138,9 +3131,7 @@ protected ListenableFuture<?> handleSetTrackSelectionParameters(
31383131
player.addListener(listener);
31393132

31403133
TrackSelectionParameters requestedParameters =
3141-
new TrackSelectionParameters.Builder(ApplicationProvider.getApplicationContext())
3142-
.setMaxVideoBitrate(3000)
3143-
.build();
3134+
new TrackSelectionParameters.Builder().setMaxVideoBitrate(3000).build();
31443135
player.setTrackSelectionParameters(requestedParameters);
31453136

31463137
// Verify placeholder state and listener calls.
@@ -3183,9 +3174,7 @@ protected ListenableFuture<?> handleSetTrackSelectionParameters(
31833174
};
31843175

31853176
player.setTrackSelectionParameters(
3186-
new TrackSelectionParameters.Builder(ApplicationProvider.getApplicationContext())
3187-
.setMaxVideoBitrate(1000)
3188-
.build());
3177+
new TrackSelectionParameters.Builder().setMaxVideoBitrate(1000).build());
31893178

31903179
assertThat(callForwarded.get()).isFalse();
31913180
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ private boolean isSampleMimeTypeSupported(Format format) {
312312

313313
private boolean isCodecProfileAndLevelSupported(
314314
Format format, boolean checkPerformanceCapabilities) {
315-
Pair<Integer, Integer> codecProfileAndLevel = MediaCodecUtil.getCodecProfileAndLevel(format);
315+
Pair<Integer, Integer> codecProfileAndLevel =
316+
CodecSpecificDataUtil.getCodecProfileAndLevel(format);
316317
if (format.sampleMimeType != null && format.sampleMimeType.equals(MimeTypes.VIDEO_MV_HEVC)) {
317318
String normalizedCodecMimeType = MimeTypes.normalizeMimeType(codecMimeType);
318319
if (normalizedCodecMimeType.equals(MimeTypes.VIDEO_MV_HEVC)) {
@@ -425,7 +426,7 @@ public boolean isSeamlessAdaptationSupported(Format format) {
425426
if (isVideo) {
426427
return adaptive;
427428
} else {
428-
Pair<Integer, Integer> profileLevel = MediaCodecUtil.getCodecProfileAndLevel(format);
429+
Pair<Integer, Integer> profileLevel = CodecSpecificDataUtil.getCodecProfileAndLevel(format);
429430
return profileLevel != null && profileLevel.first == CodecProfileLevel.AACObjectXHE;
430431
}
431432
}
@@ -522,10 +523,10 @@ public DecoderReuseEvaluation canReuseCodec(Format oldFormat, Format newFormat)
522523
&& (mimeType.equals(MimeTypes.AUDIO_AAC) || mimeType.equals(MimeTypes.AUDIO_AC4))) {
523524
@Nullable
524525
Pair<Integer, Integer> oldCodecProfileLevel =
525-
MediaCodecUtil.getCodecProfileAndLevel(oldFormat);
526+
CodecSpecificDataUtil.getCodecProfileAndLevel(oldFormat);
526527
@Nullable
527528
Pair<Integer, Integer> newCodecProfileLevel =
528-
MediaCodecUtil.getCodecProfileAndLevel(newFormat);
529+
CodecSpecificDataUtil.getCodecProfileAndLevel(newFormat);
529530
if (oldCodecProfileLevel != null && newCodecProfileLevel != null) {
530531
int oldProfile = oldCodecProfileLevel.first;
531532
int newProfile = newCodecProfileLevel.first;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,9 @@ public static String getAlternativeCodecMimeType(Format format) {
385385
// This can't be done for profile CodecProfileLevel.DolbyVisionProfileDvheStn and profile
386386
// CodecProfileLevel.DolbyVisionProfileDvheDtb because the first one is not backward
387387
// compatible and the second one is deprecated and is not always backward compatible.
388-
@Nullable Pair<Integer, Integer> codecProfileAndLevel = getCodecProfileAndLevel(format);
388+
@Nullable
389+
Pair<Integer, Integer> codecProfileAndLevel =
390+
CodecSpecificDataUtil.getCodecProfileAndLevel(format);
389391
if (codecProfileAndLevel != null) {
390392
int profile = codecProfileAndLevel.first;
391393
if (profile == CodecProfileLevel.DolbyVisionProfileDvheDtr

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public ParametersBuilder() {
153153
*/
154154
@SuppressWarnings({"deprecation"}) // Supporting deprecated builder pattern
155155
public ParametersBuilder(Context context) {
156-
delegate = new Parameters.Builder(context);
156+
delegate = new Parameters.Builder();
157157
}
158158

159159
@SuppressWarnings("deprecation") // Intentionally returning deprecated type

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import androidx.media3.common.Timeline;
6060
import androidx.media3.common.VideoFrameProcessor;
6161
import androidx.media3.common.VideoSize;
62+
import androidx.media3.common.util.CodecSpecificDataUtil;
6263
import androidx.media3.common.util.Log;
6364
import androidx.media3.common.util.MediaFormatUtil;
6465
import androidx.media3.common.util.Size;
@@ -1390,7 +1391,8 @@ public static int getCodecMaxInputSize(MediaCodecInfo codecInfo, Format format)
13901391
// unambiguously that it's a H.264/AV1 based profile.
13911392
sampleMimeType = MimeTypes.VIDEO_H265;
13921393
@Nullable
1393-
Pair<Integer, Integer> codecProfileAndLevel = MediaCodecUtil.getCodecProfileAndLevel(format);
1394+
Pair<Integer, Integer> codecProfileAndLevel =
1395+
CodecSpecificDataUtil.getCodecProfileAndLevel(format);
13941396
if (codecProfileAndLevel != null) {
13951397
int profile = codecProfileAndLevel.first;
13961398
if (profile == CodecProfileLevel.DolbyVisionProfileDvavSe
@@ -2405,7 +2407,8 @@ protected MediaFormat getMediaFormat(
24052407
if (MimeTypes.VIDEO_DOLBY_VISION.equals(format.sampleMimeType)) {
24062408
// Some phones require the profile to be set on the codec.
24072409
// See https://github.com/google/ExoPlayer/pull/5438.
2408-
Pair<Integer, Integer> codecProfileAndLevel = MediaCodecUtil.getCodecProfileAndLevel(format);
2410+
Pair<Integer, Integer> codecProfileAndLevel =
2411+
CodecSpecificDataUtil.getCodecProfileAndLevel(format);
24092412
if (codecProfileAndLevel != null) {
24102413
MediaFormatUtil.maybeSetInteger(
24112414
mediaFormat, MediaFormat.KEY_PROFILE, codecProfileAndLevel.first);

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15497,7 +15497,7 @@ public void seekToZeroAndTrackSelection_withNonZeroDefaultPosition_startsPlaybac
1549715497
// Manually seek back to zero and force to reselect tracks.
1549815498
player.seekTo(0);
1549915499
player.setTrackSelectionParameters(
15500-
new TrackSelectionParameters.Builder(context)
15500+
new TrackSelectionParameters.Builder()
1550115501
.setTrackTypeDisabled(C.TRACK_TYPE_AUDIO, /* disabled= */ true)
1550215502
.build());
1550315503
advance(player).untilPendingCommandsAreFullyHandled();

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerWithPrewarmingRenderersTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ public void prepare_withPeriodBetweenPlayingAndPrewarmingPeriods_playerSuccessfu
467467
ExoPlayerTestRunner.VIDEO_FORMAT.buildUpon().setAverageBitrate(500_000).build();
468468
Clock fakeClock = new FakeClock(/* isAutoAdvancing= */ true);
469469
DefaultTrackSelector.Parameters defaultTrackSelectorParameters =
470-
new DefaultTrackSelector.Parameters.Builder(context)
470+
new DefaultTrackSelector.Parameters.Builder()
471471
.setMaxVideoBitrate(videoFormat2.averageBitrate)
472472
.setExceedVideoConstraintsIfNecessary(false)
473473
.build();
@@ -632,7 +632,7 @@ public void prepare_withPeriodBetweenPlayingAndPrewarmingPeriods_playerSuccessfu
632632
AtomicReference<Pair<ExoTrackSelection.Definition, Integer>> selectedAudioTrack =
633633
new AtomicReference<>();
634634
DefaultTrackSelector.Parameters trackSelectionParameters =
635-
new DefaultTrackSelector.Parameters.Builder(context)
635+
new DefaultTrackSelector.Parameters.Builder()
636636
.setExceedAudioConstraintsIfNecessary(false)
637637
.build();
638638
DefaultTrackSelector trackSelector =

libraries/extractor/src/test/java/androidx/media3/extractor/Id3PeekerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ public void peekId3Data_returnId3TagAccordingToGivenPredicate_ifId3TagPresent()
154154
id3Peeker.peekId3Data(
155155
input,
156156
(majorVersion, id0, id1, id2, id3) ->
157-
id0 == 'C' && id1 == 'O' && id2 == 'M' && id3 == 'M');
157+
id0 == 'C' && id1 == 'O' && id2 == 'M' && id3 == 'M',
158+
/* maxTagPeekBytes= */ 0);
158159
assertThat(metadata).isNotNull();
159160
assertThat(metadata.length()).isEqualTo(1);
160161

0 commit comments

Comments
 (0)