sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-14 12:45:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure single-frame videos are correctly exported

Browse source 
Add a wait in DefaultCodec.signalEndOfInputStream when no
video encoder output has been seen. This avoids a thread synchronization problem
between writing frames to video surface, and signaling end of stream,
which was hit for video input of only one frame on some devices.

PiperOrigin-RevId: 637844690
This commit is contained in:
dancho 2024-05-28 03:57:19 -07:00 committed by Copybara-Service
parent 67b799c714
commit aadcbe332b
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
View file

@ -52,6 +52,7 @@ import androidx.media3.effect.DebugTraceUtil;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import org.checkerframework.checker.initialization.qual.UnknownInitialization;
import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@ -76,6 +77,9 @@ public final class DefaultCodec implements Codec {
private final int maxPendingFrameCount;
private final boolean isDecoder;
private final boolean isVideo;
// Accessed concurrently by playback thread when reading output, and video effects thread
// when signaling end of stream.
private final AtomicBoolean videoOutputStarted;
private @MonotonicNonNull Format outputFormat;
@Nullable private ByteBuffer outputBuffer;
@ -112,6 +116,7 @@ public final class DefaultCodec implements Codec {
outputBufferInfo = new BufferInfo();
inputBufferIndex = C.INDEX_UNSET;
outputBufferIndex = C.INDEX_UNSET;
videoOutputStarted = new AtomicBoolean();
DebugTraceUtil.logCodecEvent(
isDecoder, isVideo, EVENT_INPUT_FORMAT, C.TIME_UNSET, "%s", configurationFormat);
@ -248,6 +253,17 @@ public final class DefaultCodec implements Codec {
@Override
public void signalEndOfInputStream() throws ExportException {
if (!videoOutputStarted.get()) {
// When encoding a 1-frame video, there is a synchronization problem between feeding the frame
// to the encoder input surface and signaling end of stream. On some devices, sometimes,
// the frame gets lost and an empty output is produced. Waiting before signaling end of stream
// seems to resolve this issue. See b/301603935.
try {
Thread.sleep(10);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
debugTraceLogEvent(EVENT_INPUT_ENDED, C.TIME_END_OF_SOURCE);
try {
mediaCodec.signalEndOfInputStream();
@ -387,6 +403,9 @@ public final class DefaultCodec implements Codec {
.setPcmEncoding(configurationFormat.pcmEncoding)
.build();
}
if (!isDecoder && isVideo) {
videoOutputStarted.set(true);
}
debugTraceLogEvent(
EVENT_OUTPUT_FORMAT, outputBufferInfo.presentationTimeUs, "%s", outputFormat);
}