Merge pull request #5216 from mseroczynski:dev-v2

PiperOrigin-RevId: 225966289
This commit is contained in:
Oliver Woodman 2018-12-18 19:46:21 +00:00
parent abdb58485f
commit 78cdd5fee1

View file

@ -318,7 +318,20 @@ public final class MediaCodecUtil {
}
// Work around https://github.com/google/ExoPlayer/issues/4519.
if ("OMX.SEC.mp3.dec".equals(name) && "SM-T530".equals(Util.MODEL)) {
if ("OMX.SEC.mp3.dec".equals(name)
&& ("GT-I9152".equals(Util.MODEL)
|| "GT-I9515".equals(Util.MODEL)
|| "GT-P5220".equals(Util.MODEL)
|| "GT-S7580".equals(Util.MODEL)
|| "SM-G350".equals(Util.MODEL)
|| "SM-T231".equals(Util.MODEL)
|| "SM-T530".equals(Util.MODEL))) {
return false;
}
if ("OMX.brcm.audio.mp3.decoder".equals(name)
&& ("GT-I9152".equals(Util.MODEL)
|| "GT-S7580".equals(Util.MODEL)
|| "SM-G350".equals(Util.MODEL))) {
return false;
}