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..2142d4849fd60749815fdc7035aa9bcd8b41da8c 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"
@@ -21,7 +22,7 @@
 #include "media/media_features.h"
 
 #if defined(OS_ANDROID)
-#include "base/android/build_info.h"
+#include "media/base/android/media_codec_util.h"
 #endif
 
 #if defined(USE_PROPRIETARY_CODECS)
@@ -330,14 +331,14 @@ static bool VerifyCodec(
       return true;

[ddorwin, 2016/02/16 20:34:37]

Should we add a comment that in the unified pipeline, all audio codecs are
software?

Really, though, that is an assumption that only holds for Chrome browser.
Perhaps MSE should be validating all the codecs here just like the EME path.
Perhaps we should just file a bug to consider since this is a larger issue than
this CL.

[DaleCurtis, 2016/02/17 03:01:06]

filed http://crbug.com/587303

     case CodecInfo::VIDEO:
 #if defined(OS_ANDROID)

[ddorwin, 2016/02/16 20:34:37]

Given the MediaCodec not available path in
IsUnifiedMediaPipelineEnabledForMse(), do we need to add an H264 check too? I
think it would be "if (!MediaCodecUtil::IsMediaCodecAvailable()), return false;"

[DaleCurtis, 2016/02/17 03:01:06]

Good catch, done.

-      // VP9 is only supported on KitKat+ (API Level 19).
       if (codec_info->tag == CodecInfo::HISTOGRAM_VP9 &&
-          base::android::BuildInfo::GetInstance()->sdk_int() < 19) {
+          !media::MediaCodecUtil::PlatformHasVp9Support() &&
+          !media::IsUnifiedMediaPipelineEnabledForMse()) {
         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) {
+          !media::MediaCodecUtil::PlatformHasOpusSupport() &&
+          !media::IsUnifiedMediaPipelineEnabledForMse()) {
         return false;
       }
 #endif