Index: media/base/android/media_codec_util.cc |
diff --git a/media/base/android/media_codec_util.cc b/media/base/android/media_codec_util.cc |
index 5b93fe2ba1e7ab8fbd5bec17c44e55f2544a1305..101d1696d873f328bf0064290f7f005fd563dfe6 100644 |
--- a/media/base/android/media_codec_util.cc |
+++ b/media/base/android/media_codec_util.cc |
@@ -372,10 +372,11 @@ bool MediaCodecUtil::IsPassthroughAudioFormat(AudioCodec codec) { |
bool MediaCodecUtil::CodecNeedsFlushWorkaround(MediaCodecBridge* codec) { |
int sdk_int = base::android::BuildInfo::GetInstance()->sdk_int(); |
std::string codec_name = codec->GetName(); |
- return sdk_int < 18 || |
- (sdk_int == 18 && ("OMX.SEC.avc.dec" == codec_name || |
- "OMX.SEC.avc.dec.secure" == codec_name)) || |
- (sdk_int == 19 && |
+ return sdk_int < SDK_VERSION_JELLY_BEAN_MR2 || |
+ (sdk_int == SDK_VERSION_JELLY_BEAN_MR2 && |
+ ("OMX.SEC.avc.dec" == codec_name || |
+ "OMX.SEC.avc.dec.secure" == codec_name)) || |
+ (sdk_int == SDK_VERSION_KITKAT && |
base::StartsWith(base::android::BuildInfo::GetInstance()->model(), |
"SM-G800", base::CompareCase::INSENSITIVE_ASCII) && |
("OMX.Exynos.avc.dec" == codec_name || |