loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove deprecated format changed methods

Browse Source 
Use the overloads with an additional `@Nullable DecoderReuseEvaluation`
parameter instead.

PiperOrigin-RevId: 637851937
This commit is contained in:
ibaker 2024-05-28 04:28:29 -07:00 committed by Copybara-Service
parent aadcbe332b
commit c87b7d86cc
6 changed files with 22 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELEASENOTES.md
View File

@ -218,6 +218,11 @@
boolean)`. Use `MediaCodecInfo.canReuseCodec(Format, Format)` instead.
* Remove `DrmSessionManager.DUMMY` and `getDummyDrmSessionManager()`
method. Use `DrmSessionManager.DRM_UNSUPPORTED` instead.
* Remove `AnalyticsListener.onAudioInputFormatChanged(EventTime, Format)`,
`AnalyticsListener.onVideoInputFormatChanged(EventTime, Format)`,
`AudioRendererEventListener.onAudioInputFormatChanged(Format)`,
`VideoRendererEventListener.onVideoInputFormatChanged(Format)`. Use the
overloads that take a `DecoderReuseEvaluation` instead.
## 1.4

14
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsListener.java
View File

@ -996,13 +996,6 @@ public interface AnalyticsListener {
default void onAudioDecoderInitialized(
EventTime eventTime, String decoderName, long initializationDurationMs) {}
/**
* @deprecated Use {@link #onAudioInputFormatChanged(EventTime, Format, DecoderReuseEvaluation)}.
*/
@UnstableApi
@Deprecated
default void onAudioInputFormatChanged(EventTime eventTime, Format format) {}
/**
* Called when the format of the media being consumed by an audio renderer changes.
*
@ -1206,13 +1199,6 @@ public interface AnalyticsListener {
default void onVideoDecoderInitialized(
EventTime eventTime, String decoderName, long initializationDurationMs) {}
/**
* @deprecated Use {@link #onVideoInputFormatChanged(EventTime, Format, DecoderReuseEvaluation)}.
*/
@UnstableApi
@Deprecated
default void onVideoInputFormatChanged(EventTime eventTime, Format format) {}
/**
* Called when the format of the media being consumed by a video renderer changes.
*

12
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/DefaultAnalyticsCollector.java
View File

@ -192,7 +192,6 @@ public class DefaultAnalyticsCollector implements AnalyticsCollector {
});
}
@SuppressWarnings("deprecation") // Calling deprecated listener method.
@Override
public final void onAudioInputFormatChanged(
Format format, @Nullable DecoderReuseEvaluation decoderReuseEvaluation) {
@ -200,10 +199,7 @@ public class DefaultAnalyticsCollector implements AnalyticsCollector {
sendEvent(
eventTime,
AnalyticsListener.EVENT_AUDIO_INPUT_FORMAT_CHANGED,
listener -> {
listener.onAudioInputFormatChanged(eventTime, format);
listener.onAudioInputFormatChanged(eventTime, format, decoderReuseEvaluation);
});
listener -> listener.onAudioInputFormatChanged(eventTime, format, decoderReuseEvaluation));
}
@Override
@ -320,17 +316,13 @@ public class DefaultAnalyticsCollector implements AnalyticsCollector {
}
@Override
@SuppressWarnings("deprecation") // Calling deprecated listener method.
public final void onVideoInputFormatChanged(
Format format, @Nullable DecoderReuseEvaluation decoderReuseEvaluation) {
EventTime eventTime = generateReadingMediaPeriodEventTime();
sendEvent(
eventTime,
AnalyticsListener.EVENT_VIDEO_INPUT_FORMAT_CHANGED,
listener -> {
listener.onVideoInputFormatChanged(eventTime, format);
listener.onVideoInputFormatChanged(eventTime, format, decoderReuseEvaluation);
});
listener -> listener.onVideoInputFormatChanged(eventTime, format, decoderReuseEvaluation));
}
@Override

17
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioRendererEventListener.java
View File

@ -59,12 +59,6 @@ public interface AudioRendererEventListener {
default void onAudioDecoderInitialized(
String decoderName, long initializedTimestampMs, long initializationDurationMs) {}
/**
* @deprecated Use {@link #onAudioInputFormatChanged(Format, DecoderReuseEvaluation)}.
*/
@Deprecated
default void onAudioInputFormatChanged(Format format) {}
/**
* Called when the format of the media being consumed by the renderer changes.
*
@ -202,16 +196,15 @@ public interface AudioRendererEventListener {
}
}
/** Invokes {@link AudioRendererEventListener#onAudioInputFormatChanged(Format)}. */
@SuppressWarnings("deprecation") // Calling deprecated listener method.
/**
* Invokes {@link AudioRendererEventListener#onAudioInputFormatChanged(Format,
* DecoderReuseEvaluation)}.
*/
public void inputFormatChanged(
Format format, @Nullable DecoderReuseEvaluation decoderReuseEvaluation) {
if (handler != null) {
handler.post(
() -> {
castNonNull(listener).onAudioInputFormatChanged(format);
castNonNull(listener).onAudioInputFormatChanged(format, decoderReuseEvaluation);
});
() -> castNonNull(listener).onAudioInputFormatChanged(format, decoderReuseEvaluation));
}
}

11
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoRendererEventListener.java
View File

@ -59,12 +59,6 @@ public interface VideoRendererEventListener {
default void onVideoDecoderInitialized(
String decoderName, long initializedTimestampMs, long initializationDurationMs) {}
/**
* @deprecated Use {@link #onVideoInputFormatChanged(Format, DecoderReuseEvaluation)}.
*/
@Deprecated
default void onVideoInputFormatChanged(Format format) {}
/**
* Called when the format of the media being consumed by the renderer changes.
*
@ -200,10 +194,7 @@ public interface VideoRendererEventListener {
Format format, @Nullable DecoderReuseEvaluation decoderReuseEvaluation) {
if (handler != null) {
handler.post(
() -> {
castNonNull(listener).onVideoInputFormatChanged(format);
castNonNull(listener).onVideoInputFormatChanged(format, decoderReuseEvaluation);
});
() -> castNonNull(listener).onVideoInputFormatChanged(format, decoderReuseEvaluation));
}
}

11
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/analytics/DefaultAnalyticsCollectorTest.java
View File

@ -96,6 +96,7 @@ import androidx.media3.common.util.ConditionVariable;
import androidx.media3.common.util.HandlerWrapper;
import androidx.media3.common.util.Util;
import androidx.media3.exoplayer.DecoderCounters;
import androidx.media3.exoplayer.DecoderReuseEvaluation;
import androidx.media3.exoplayer.ExoPlaybackException;
import androidx.media3.exoplayer.ExoPlayer;
import androidx.media3.exoplayer.Renderer;
@ -2212,7 +2213,10 @@ public final class DefaultAnalyticsCollectorTest {
}
@Override
public void onAudioInputFormatChanged(EventTime eventTime, Format format) {
public void onAudioInputFormatChanged(
EventTime eventTime,
Format format,
@Nullable DecoderReuseEvaluation decoderReuseEvaluation) {
reportedEvents.add(new ReportedEvent(EVENT_AUDIO_INPUT_FORMAT_CHANGED, eventTime));
}
@ -2252,7 +2256,10 @@ public final class DefaultAnalyticsCollectorTest {
}
@Override
public void onVideoInputFormatChanged(EventTime eventTime, Format format) {
public void onVideoInputFormatChanged(
EventTime eventTime,
Format format,
@Nullable DecoderReuseEvaluation decoderReuseEvaluation) {
reportedEvents.add(new ReportedEvent(EVENT_VIDEO_INPUT_FORMAT_CHANGED, eventTime));
}