Commit fa691035 by olly Committed by Oliver Woodman

Extend RK video_decoder workaround to newer API levels

Issue: #6184
PiperOrigin-RevId: 258527533
parent bba0a27c
...@@ -1806,9 +1806,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer { ...@@ -1806,9 +1806,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
*/ */
private static boolean codecNeedsEosPropagationWorkaround(MediaCodecInfo codecInfo) { private static boolean codecNeedsEosPropagationWorkaround(MediaCodecInfo codecInfo) {
String name = codecInfo.name; String name = codecInfo.name;
return (Util.SDK_INT <= 17 return (Util.SDK_INT <= 25 && "OMX.rk.video_decoder.avc".equals(name))
&& ("OMX.rk.video_decoder.avc".equals(name) || (Util.SDK_INT <= 17 && "OMX.allwinner.video.decoder.avc".equals(name))
|| "OMX.allwinner.video.decoder.avc".equals(name)))
|| ("Amazon".equals(Util.MANUFACTURER) && "AFTS".equals(Util.MODEL) && codecInfo.secure); || ("Amazon".equals(Util.MANUFACTURER) && "AFTS".equals(Util.MODEL) && codecInfo.secure);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment