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

Synchronize calls to queueSecureInpuffer()

Browse source 
Parallel asynchronous calls to MediaCodec.queueSecureInputBuffer() may
produce garbled video on some platforms. This workaround synchronizes
calls to MediaCodec.queueSecureInputBuffer() so that only one call is
in flight.

PiperOrigin-RevId: 297601037
This commit is contained in:
christosts 2020-02-27 16:17:27 +00:00 committed by kim-vde
parent 88e356f214
commit 4c0ba12c40
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecBufferEnqueuer.java
View file

@ -49,11 +49,14 @@ class AsynchronousMediaCodecBufferEnqueuer implements MediaCodecInputBufferEnque
@GuardedBy("MESSAGE_PARAMS_INSTANCE_POOL")
private static final ArrayDeque<MessageParams> MESSAGE_PARAMS_INSTANCE_POOL = new ArrayDeque<>();
private static final Object QUEUE_SECURE_LOCK = new Object();
private final MediaCodec codec;
private final HandlerThread handlerThread;
private @MonotonicNonNull Handler handler;
private final AtomicReference<@NullableType RuntimeException> pendingRuntimeException;
private final ConditionVariable conditionVariable;
private final boolean needsSynchronizationWorkaround;
private boolean started;
/**
@ -76,6 +79,7 @@ class AsynchronousMediaCodecBufferEnqueuer implements MediaCodecInputBufferEnque
this.handlerThread = handlerThread;
this.conditionVariable = conditionVariable;
pendingRuntimeException = new AtomicReference<>();
needsSynchronizationWorkaround = needsSynchronizationWorkaround();
}
@Override
@ -207,7 +211,13 @@ class AsynchronousMediaCodecBufferEnqueuer implements MediaCodecInputBufferEnque
private void doQueueSecureInputBuffer(
int index, int offset, MediaCodec.CryptoInfo info, long presentationTimeUs, int flags) {
try {
codec.queueSecureInputBuffer(index, offset, info, presentationTimeUs, flags);
if (needsSynchronizationWorkaround) {
synchronized (QUEUE_SECURE_LOCK) {
codec.queueSecureInputBuffer(index, offset, info, presentationTimeUs, flags);
}
} else {
codec.queueSecureInputBuffer(index, offset, info, presentationTimeUs, flags);
}
} catch (RuntimeException e) {
setPendingRuntimeException(e);
}
@ -260,6 +270,15 @@ class AsynchronousMediaCodecBufferEnqueuer implements MediaCodecInputBufferEnque
}
}
/**
* Returns whether this device needs the synchronization workaround when queueing secure input
* buffers (see [Internal: b/149908061]).
*/
private static boolean needsSynchronizationWorkaround() {
String manufacturer = Util.toLowerInvariant(Util.MANUFACTURER);
return manufacturer.contains("samsung") || manufacturer.contains("motorola");
}
private static String createThreadLabel(int trackType) {
StringBuilder labelBuilder = new StringBuilder("MediaCodecInputBufferEnqueuer:");
if (trackType == C.TRACK_TYPE_AUDIO) {