From ea2d1f89b732af245225dd052a2ef889a99dc010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Seroczy=C5=84ski?= Date: Fri, 7 Dec 2018 15:49:19 +0100 Subject: [PATCH 1/4] Blacklist OMX.SEC.mp3.dec and OMX.brcm.audio.mp3.decoder on Samsung devices --- .../android/exoplayer2/mediacodec/MediaCodecUtil.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java index 893601a859..58604edccc 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java @@ -318,7 +318,14 @@ 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) || "OMX.brcm.audio.mp3.decoder".equals(name)) + && ("GT-I9515".equals(Util.MODEL) + || "GT-I9152".equals(Util.MODEL) + || "GT-P5220".equals(Util.MODEL) + || "SM-G350".equals(Util.MODEL) + || "SM-S7580".equals(Util.MODEL) + || "SM-T231".equals(Util.MODEL) + || "SM-T530".equals(Util.MODEL))) { return false; } From 66e8a32766af42ae6310f335d2096baa62ad1ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Seroczy=C5=84ski?= Date: Fri, 7 Dec 2018 15:59:44 +0100 Subject: [PATCH 2/4] Blacklist OMX.SEC.mp3.dec and OMX.brcm.audio.mp3.decoder on Samsung devices --- RELEASENOTES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index ec11b5b7ed..80d9badfb9 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -12,7 +12,8 @@ * Caching: Cache data with unknown length by default. The previous flag to opt in to this behavior (`DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH`) has been replaced with an opt out flag (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`). - +* MP3: Fix issue where streams would play twice on Samsung devices + ([#4519](https://github.com/google/ExoPlayer/issues/4519)). ### 2.9.2 ### * HLS: From 3390b21618d0ca17e3e983e878bb4f81b43d9ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Seroczy=C5=84ski?= Date: Mon, 17 Dec 2018 10:58:27 +0100 Subject: [PATCH 3/4] Blacklist OMX.SEC.mp3.dec and OMX.brcm.audio.mp3.decoder on Samsung devices --- .../exoplayer2/mediacodec/MediaCodecUtil.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java index 58604edccc..db7d1a8575 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java @@ -318,16 +318,18 @@ public final class MediaCodecUtil { } // Work around https://github.com/google/ExoPlayer/issues/4519. - if (("OMX.SEC.mp3.dec".equals(name) || "OMX.brcm.audio.mp3.decoder".equals(name)) - && ("GT-I9515".equals(Util.MODEL) - || "GT-I9152".equals(Util.MODEL) + if ("OMX.SEC.mp3.dec".equals(name) && ("GT-I9152".equals(Util.MODEL) || "GT-P5220".equals(Util.MODEL) - || "SM-G350".equals(Util.MODEL) - || "SM-S7580".equals(Util.MODEL) || "SM-T231".equals(Util.MODEL) || "SM-T530".equals(Util.MODEL))) { return false; } + if (("OMX.SEC.mp3.dec".equals(name) || "OMX.brcm.audio.mp3.decoder".equals(name)) + && ("GT-I9515".equals(Util.MODEL) + || "GT-S7580".equals(Util.MODEL) + || "SM-G350".equals(Util.MODEL))) { + return false; + } // Work around https://github.com/google/ExoPlayer/issues/1528 and // https://github.com/google/ExoPlayer/issues/3171. From 4aabff96342c29b4bfaa421965896ed84fb1e9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Seroczy=C5=84ski?= Date: Mon, 17 Dec 2018 12:50:11 +0100 Subject: [PATCH 4/4] Blacklist OMX.SEC.mp3.dec and OMX.brcm.audio.mp3.decoder on Samsung devices --- .../google/android/exoplayer2/mediacodec/MediaCodecUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java index db7d1a8575..8122bbe2fe 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java @@ -318,14 +318,14 @@ public final class MediaCodecUtil { } // Work around https://github.com/google/ExoPlayer/issues/4519. - if ("OMX.SEC.mp3.dec".equals(name) && ("GT-I9152".equals(Util.MODEL) + if ("OMX.SEC.mp3.dec".equals(name) && ("GT-I9515".equals(Util.MODEL) || "GT-P5220".equals(Util.MODEL) || "SM-T231".equals(Util.MODEL) || "SM-T530".equals(Util.MODEL))) { return false; } if (("OMX.SEC.mp3.dec".equals(name) || "OMX.brcm.audio.mp3.decoder".equals(name)) - && ("GT-I9515".equals(Util.MODEL) + && ("GT-I9152".equals(Util.MODEL) || "GT-S7580".equals(Util.MODEL) || "SM-G350".equals(Util.MODEL))) { return false;