loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-10 00:59:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add some additional device specific workarounds

Browse Source 
Issue: #3355
Issue: #3257

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172587141
This commit is contained in:
olly 2017-10-18 04:46:05 -07:00 committed by Oliver Woodman
parent e54841436b
commit 5357726a8c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
View File

@ -1155,7 +1155,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
*/ */
private @AdaptationWorkaroundMode int codecAdaptationWorkaroundMode(String name) { private @AdaptationWorkaroundMode int codecAdaptationWorkaroundMode(String name) {
if (Util.SDK_INT <= 24 && "OMX.Exynos.avc.dec.secure".equals(name) if (Util.SDK_INT <= 24 && "OMX.Exynos.avc.dec.secure".equals(name)
&& Util.MODEL.startsWith("SM-T585")) { && (Util.MODEL.startsWith("SM-T585") || Util.MODEL.startsWith("SM-A520"))) {
return ADAPTATION_WORKAROUND_MODE_ALWAYS; return ADAPTATION_WORKAROUND_MODE_ALWAYS;
} else if (Util.SDK_INT < 24 } else if (Util.SDK_INT < 24
&& ("OMX.Nvidia.h264.decode".equals(name) || "OMX.Nvidia.h264.decode.secure".equals(name)) && ("OMX.Nvidia.h264.decode".equals(name) || "OMX.Nvidia.h264.decode.secure".equals(name))

8
library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
View File

@ -973,9 +973,11 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
* If true is returned then we fall back to releasing and re-instantiating the codec instead. * If true is returned then we fall back to releasing and re-instantiating the codec instead.
*/ */
private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) { private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) {
// Work around https://github.com/google/ExoPlayer/issues/3236 // Work around https://github.com/google/ExoPlayer/issues/3236 and
return ("deb".equals(Util.DEVICE) || "flo".equals(Util.DEVICE)) // https://github.com/google/ExoPlayer/issues/3355.
&& "OMX.qcom.video.decoder.avc".equals(name); return (("deb".equals(Util.DEVICE) || "flo".equals(Util.DEVICE))
&& "OMX.qcom.video.decoder.avc".equals(name))
|| ("tcl_eu".equals(Util.DEVICE) && "OMX.MTK.VIDEO.DECODER.AVC".equals(name));
} }
/** /**