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 unused param from VideoSink

Browse Source 
PiperOrigin-RevId: 740739740
This commit is contained in:
kimvde 2025-03-26 06:13:32 -07:00 committed by Copybara-Service
parent a24d1d41d9
commit 12b4c7d780
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java
View File

@ -220,7 +220,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@Override @Override
public boolean handleInputFrame( public boolean handleInputFrame(
long framePresentationTimeUs, boolean isLastFrame, VideoFrameHandler videoFrameHandler) { long framePresentationTimeUs, VideoFrameHandler videoFrameHandler) {
videoFrameHandlers.add(videoFrameHandler); videoFrameHandlers.add(videoFrameHandler);
long bufferPresentationTimeUs = framePresentationTimeUs - bufferTimestampAdjustmentUs; long bufferPresentationTimeUs = framePresentationTimeUs - bufferTimestampAdjustmentUs;
videoFrameRenderControl.onFrameAvailableForRendering(bufferPresentationTimeUs); videoFrameRenderControl.onFrameAvailableForRendering(bufferPresentationTimeUs);

1
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java
View File

@ -1741,7 +1741,6 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer
long framePresentationTimeUs = bufferPresentationTimeUs + getBufferTimestampAdjustmentUs(); long framePresentationTimeUs = bufferPresentationTimeUs + getBufferTimestampAdjustmentUs();
return videoSink.handleInputFrame( return videoSink.handleInputFrame(
framePresentationTimeUs, framePresentationTimeUs,
isLastBuffer,
new VideoSink.VideoFrameHandler() { new VideoSink.VideoFrameHandler() {
@Override @Override
public void render(long renderTimestampNs) { public void render(long renderTimestampNs) {

4
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java
View File

@ -457,10 +457,10 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
outputStreamFirstFrameReleaseInstruction = streamChangeInfo.firstFrameReleaseInstruction; outputStreamFirstFrameReleaseInstruction = streamChangeInfo.firstFrameReleaseInstruction;
onOutputStreamChanged(); onOutputStreamChanged();
} }
defaultVideoSink.handleInputFrame(framePresentationTimeUs, videoFrameHandler);
boolean isLastFrame = boolean isLastFrame =
finalBufferPresentationTimeUs != C.TIME_UNSET finalBufferPresentationTimeUs != C.TIME_UNSET
&& bufferPresentationTimeUs >= finalBufferPresentationTimeUs; && bufferPresentationTimeUs >= finalBufferPresentationTimeUs;
defaultVideoSink.handleInputFrame(framePresentationTimeUs, isLastFrame, videoFrameHandler);
if (isLastFrame) { if (isLastFrame) {
// TODO b/257464707 - Support extensively modified media. // TODO b/257464707 - Support extensively modified media.
defaultVideoSink.signalEndOfCurrentInputStream(); defaultVideoSink.signalEndOfCurrentInputStream();
@ -895,7 +895,7 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
@Override @Override
public boolean handleInputFrame( public boolean handleInputFrame(
long framePresentationTimeUs, boolean isLastFrame, VideoFrameHandler videoFrameHandler) { long framePresentationTimeUs, VideoFrameHandler videoFrameHandler) {
checkState(isInitialized()); checkState(isInitialized());
if (!shouldRenderToInputVideoSink()) { if (!shouldRenderToInputVideoSink()) {

6
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java
View File

@ -275,15 +275,11 @@ public interface VideoSink {
* Format, long, int, List) signaled}. * Format, long, int, List) signaled}.
* *
* @param framePresentationTimeUs The frame's presentation time, in microseconds. * @param framePresentationTimeUs The frame's presentation time, in microseconds.
* @param isLastFrame Whether this is the last frame of the video stream. This flag is set on a
* best effort basis, and any logic relying on it should degrade gracefully to handle cases
* where it's not set.
* @param videoFrameHandler The {@link VideoFrameHandler} used to handle the input frame. * @param videoFrameHandler The {@link VideoFrameHandler} used to handle the input frame.
* @return Whether the frame was handled successfully. If {@code false}, the caller can try again * @return Whether the frame was handled successfully. If {@code false}, the caller can try again
* later. * later.
*/ */
boolean handleInputFrame( boolean handleInputFrame(long framePresentationTimeUs, VideoFrameHandler videoFrameHandler);
long framePresentationTimeUs, boolean isLastFrame, VideoFrameHandler videoFrameHandler);
/** /**
* Handles an input {@link Bitmap}. * Handles an input {@link Bitmap}.

4
libraries/transformer/src/main/java/androidx/media3/transformer/BufferingVideoSink.java
View File

@ -234,9 +234,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
*/ */
@Override @Override
public boolean handleInputFrame( public boolean handleInputFrame(
long framePresentationTimeUs, boolean isLastFrame, VideoFrameHandler videoFrameHandler) { long framePresentationTimeUs, VideoFrameHandler videoFrameHandler) {
return videoSink != null return videoSink != null
&& videoSink.handleInputFrame(framePresentationTimeUs, isLastFrame, videoFrameHandler); && videoSink.handleInputFrame(framePresentationTimeUs, videoFrameHandler);
} }
/** /**