diff options
| author | servolk <servolk@chromium.org> | 2016-01-07 15:55:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-07 23:56:19 +0000 |
| commit | f9133acc35cd3a1389eb60147a3e41e7233edd41 (patch) | |
| tree | d0dedd4a83387585b83e28e6a0def998c9c5abe1 /media/base | |
| parent | 84b219efbd2a2ecdbb079bf2d37504e259383afe (diff) | |
| download | chromium_src-f9133acc35cd3a1389eb60147a3e41e7233edd41.zip chromium_src-f9133acc35cd3a1389eb60147a3e41e7233edd41.tar.gz chromium_src-f9133acc35cd3a1389eb60147a3e41e7233edd41.tar.bz2 | |
media: Fix case ordering of switch statements.
Rearranged case order in IsCodecSupportedOnAndroid and
AudioDecoderConfig::GetHumanReadableCodecName as suggested
in https://codereview.chromium.org/812643005
BUG=none
Review URL: https://codereview.chromium.org/1563893003
Cr-Commit-Position: refs/heads/master@{#368204}
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/audio_decoder_config.cc | 8 | ||||
| -rw-r--r-- | media/base/mime_util.cc | 23 |
2 files changed, 16 insertions, 15 deletions
diff --git a/media/base/audio_decoder_config.cc b/media/base/audio_decoder_config.cc index 213cb10..17f039f 100644 --- a/media/base/audio_decoder_config.cc +++ b/media/base/audio_decoder_config.cc @@ -114,14 +114,14 @@ std::string AudioDecoderConfig::GetHumanReadableCodecName() const { return "amr_nb"; case kCodecAMR_WB: return "amr_wb"; - case kCodecGSM_MS: - return "gsm_ms"; - case kCodecPCM_ALAW: - return "pcm_alaw"; case kCodecPCM_MULAW: return "pcm_mulaw"; + case kCodecGSM_MS: + return "gsm_ms"; case kCodecOpus: return "opus"; + case kCodecPCM_ALAW: + return "pcm_alaw"; case kCodecALAC: return "alac"; } diff --git a/media/base/mime_util.cc b/media/base/mime_util.cc index ba52704..01422b2 100644 --- a/media/base/mime_util.cc +++ b/media/base/mime_util.cc @@ -145,13 +145,23 @@ static bool IsCodecSupportedOnAndroid(MimeUtil::Codec codec) { case MimeUtil::MPEG4_AAC_LC: case MimeUtil::MPEG4_AAC_SBR_v1: case MimeUtil::MPEG4_AAC_SBR_PS_v2: + case MimeUtil::VORBIS: case MimeUtil::H264_BASELINE: case MimeUtil::H264_MAIN: case MimeUtil::H264_HIGH: case MimeUtil::VP8: - case MimeUtil::VORBIS: return true; + case MimeUtil::MPEG2_AAC_LC: + case MimeUtil::MPEG2_AAC_MAIN: + case MimeUtil::MPEG2_AAC_SSR: + // MPEG-2 variants of AAC are not supported on Android. + return false; + + case MimeUtil::OPUS: + // Opus is supported only in Lollipop+ (API Level 21). + return base::android::BuildInfo::GetInstance()->sdk_int() >= 21; + case MimeUtil::HEVC_MAIN: #if defined(ENABLE_HEVC_DEMUXING) // HEVC/H.265 is supported in Lollipop+ (API Level 21), according to @@ -161,20 +171,10 @@ static bool IsCodecSupportedOnAndroid(MimeUtil::Codec codec) { return false; #endif - case MimeUtil::MPEG2_AAC_LC: - case MimeUtil::MPEG2_AAC_MAIN: - case MimeUtil::MPEG2_AAC_SSR: - // MPEG-2 variants of AAC are not supported on Android. - return false; - case MimeUtil::VP9: // VP9 is supported only in KitKat+ (API Level 19). return base::android::BuildInfo::GetInstance()->sdk_int() >= 19; - case MimeUtil::OPUS: - // Opus is supported only in Lollipop+ (API Level 21). - return base::android::BuildInfo::GetInstance()->sdk_int() >= 21; - case MimeUtil::THEORA: return false; } @@ -279,6 +279,7 @@ struct CodecIDMappings { static const CodecIDMappings kUnambiguousCodecStringMap[] = { {"1", MimeUtil::PCM}, // We only allow this for WAV so it isn't ambiguous. // avc1/avc3.XXXXXX may be unambiguous; handled by ParseH264CodecID(). + // hev1/hvc1.XXXXXX may be unambiguous; handled by ParseHEVCCodecID(). {"mp3", MimeUtil::MP3}, {"mp4a.66", MimeUtil::MPEG2_AAC_MAIN}, {"mp4a.67", MimeUtil::MPEG2_AAC_LC}, |