Fix mime type mappings when the unified media pipeline is enabled.

media/filters/stream_parser_factory.cc

Index: media/filters/stream_parser_factory.cc
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
index 87b84540bc758053eee8b927e84f07321cfd39b3..c9b3fa9ade987f018f55fed4c86867e36057d489 100644
--- a/media/filters/stream_parser_factory.cc
+++ b/media/filters/stream_parser_factory.cc
@@ -14,6 +14,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
+#include "media/base/media.h"
 #include "media/base/media_switches.h"
 #include "media/formats/mpeg/adts_stream_parser.h"
 #include "media/formats/mpeg/mpeg1_audio_stream_parser.h"
@@ -332,12 +333,14 @@ static bool VerifyCodec(
 #if defined(OS_ANDROID)
       // VP9 is only supported on KitKat+ (API Level 19).

[ddorwin, 2016/02/11 21:08:24]

Should we wrap this comment and logic up in a media.h function and use it in
both places rather than spreading the Android version logic in multiple
locations?

[DaleCurtis, 2016/02/11 22:04:53]

WDYT about exposing IsCodecSupportedAndroid() on MimeUtil and calling it here
with IsCodecSupportedAndroid(MimeUtil::(OPUS|VP9)) ?

[ddorwin, 2016/02/12 18:45:12]

It seems strange to expose that, but it's better than duplicated logic.

Ideally, we'd call it for every codec here, but then we'd have to convert the
HISTOGRAM_ enums to Codec. Absent that, we already have logic here about _which_
codecs are special, so maybe we should just expose Is{Vp9|Opus}Supported() to
avoid future use of IsCodecSupportedAndroid() by other code.

[DaleCurtis, 2016/02/13 02:01:42]

Done using your suggestion of Is(Vp9|Opus)Supported.

       if (codec_info->tag == CodecInfo::HISTOGRAM_VP9 &&
-          base::android::BuildInfo::GetInstance()->sdk_int() < 19) {
+          base::android::BuildInfo::GetInstance()->sdk_int() < 19 &&
+          !media::IsUnifiedMediaPipelineEnabled()) {
         return false;
       }
       // Opus is only supported on Lollipop+ (API Level 21).
       if (codec_info->tag == CodecInfo::HISTOGRAM_OPUS &&
-          base::android::BuildInfo::GetInstance()->sdk_int() < 21) {
+          base::android::BuildInfo::GetInstance()->sdk_int() < 21 &&
+          !media::IsUnifiedMediaPipelineEnabled()) {
         return false;
       }
 #endif