sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix HDR tone mapping stuck on SM device

Browse source 
Tone-mapping an HDR video with MediaCodec on sm-s908u1 was timing out.
The reason for that is that the decoder was dropping frames, and the
ExternalTextureManager was therefore never propagating the end-of-stream
signal.

There was already a workaround for a similar issue but restricted to
sm-f936b. Removed the model check as the bug is probably present on more
devices.

PiperOrigin-RevId: 530639437
This commit is contained in:
kimvde 2023-05-09 16:59:29 +00:00 committed by Tofunmi Adigun-Hameed
parent 5e4421c2ba
commit dc4c6daf0b
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/common/src/main/java/androidx/media3/common/util/Util.java
View file

@ -2792,11 +2792,11 @@ public final class Util {
} }
/** /**
* Returns the number of maximum pending input frames that are allowed on a {@link MediaCodec} * Returns the number of maximum pending output frames that are allowed on a {@link MediaCodec}
* encoder. * decoder.
*/ */
@UnstableApi @UnstableApi
public static int getMaxPendingFramesCountForMediaCodecEncoders( public static int getMaxPendingFramesCountForMediaCodecDecoders(
Context context, String codecName, boolean requestedHdrToneMapping) { Context context, String codecName, boolean requestedHdrToneMapping) {
if (SDK_INT < 29 if (SDK_INT < 29
|| context.getApplicationContext().getApplicationInfo().targetSdkVersion < 29) { || context.getApplicationContext().getApplicationInfo().targetSdkVersion < 29) {
@ -2818,11 +2818,9 @@ public final class Util {
// OMX video codecs should no longer exist from android.os.Build.DEVICE_INITIAL_SDK_INT 31+. // OMX video codecs should no longer exist from android.os.Build.DEVICE_INITIAL_SDK_INT 31+.
return 5; return 5;
} }
if (requestedHdrToneMapping if (requestedHdrToneMapping && codecName.equals("c2.qti.hevc.decoder")) {
&& codecName.equals("c2.qti.hevc.decoder") // This decoder drops frames if too many frames are rendered without being processed when
&& MODEL.equals("SM-F936B")) { // tone-mapping HDR. This value is experimentally determined. See also b/260408846.
// This decoder gets stuck if too many frames are rendered without being processed when
// tone-mapping HDR10. This value is experimentally determined. See also b/260408846.
// TODO(b/260713009): Add API version check after bug is fixed on new API versions. // TODO(b/260713009): Add API version check after bug is fixed on new API versions.
return 12; return 12;
} }

2
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java
View file

@ -2181,7 +2181,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
*/ */
public void onCodecInitialized(String codecName) { public void onCodecInitialized(String codecName) {
videoFrameProcessorMaxPendingFrameCount = videoFrameProcessorMaxPendingFrameCount =
Util.getMaxPendingFramesCountForMediaCodecEncoders( Util.getMaxPendingFramesCountForMediaCodecDecoders(
renderer.context, codecName, /* requestedHdrToneMapping= */ false); renderer.context, codecName, /* requestedHdrToneMapping= */ false);
} }

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

@ -153,7 +153,7 @@ public final class DefaultCodec implements Codec {
this.mediaCodec = mediaCodec; this.mediaCodec = mediaCodec;
this.inputSurface = inputSurface; this.inputSurface = inputSurface;
maxPendingFrameCount = maxPendingFrameCount =
Util.getMaxPendingFramesCountForMediaCodecEncoders( Util.getMaxPendingFramesCountForMediaCodecDecoders(
context, mediaCodecName, requestedHdrToneMapping); context, mediaCodecName, requestedHdrToneMapping);
} }