Skip to content

Commit

Permalink
Work around broken AAC decoders on Galaxy S6
Browse files Browse the repository at this point in the history
Issue: #3249

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168844850
  • Loading branch information
andrewlewis authored and ojw28 committed Sep 19, 2017
1 parent 3fc9d34 commit 74b67d3
Showing 1 changed file with 16 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,22 @@ private static boolean isCodecUsableDecoder(android.media.MediaCodecInfo info, S
return false;
}

// Work around https://github.com/google/ExoPlayer/issues/548
// Work around https://github.com/google/ExoPlayer/issues/3249.
if (Util.SDK_INT < 24
&& ("OMX.SEC.aac.dec".equals(name) || "OMX.Exynos.AAC.Decoder".equals(name))
&& Util.MANUFACTURER.equals("samsung")
&& (Util.DEVICE.startsWith("zeroflte") // Galaxy S6
|| Util.DEVICE.startsWith("zerolte") // Galaxy S6 Edge
|| Util.DEVICE.startsWith("zenlte") // Galaxy S6 Edge+
|| Util.DEVICE.equals("SC-05G") // Galaxy S6
|| Util.DEVICE.equals("marinelteatt") // Galaxy S6 Active
|| Util.DEVICE.equals("404SC") // Galaxy S6 Edge
|| Util.DEVICE.equals("SC-04G")
|| Util.DEVICE.equals("SCV31"))) {
return false;
}

// Work around https://github.com/google/ExoPlayer/issues/548.
// VP8 decoder on Samsung Galaxy S3/S4/S4 Mini/Tab 3/Note 2 does not render video.
if (Util.SDK_INT <= 19
&& "OMX.SEC.vp8.dec".equals(name) && "samsung".equals(Util.MANUFACTURER)
Expand Down

0 comments on commit 74b67d3

Please sign in to comment.