Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(911)

Unified Diff: media/base/android/media_codec_util.cc

Issue 2895293002: Android: tidy up outdated version checks. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ||
« no previous file with comments | « media/base/android/java/src/org/chromium/media/MediaCodecUtil.java ('k') | media/gpu/android_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698