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

media/base/mime_util.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #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/mime_util.h"
 #include "media/media_features.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #endif
 
 namespace media {
 
 // Singleton utility class for mime types.
@@ skipping 129 matching lines @@
 
     case MimeUtil::AC3:
     case MimeUtil::EAC3:
       // TODO(servolk): Revisit this for AC3/EAC3 support on AndroidTV
       return false;
 
     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;

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

return IsUnifiedMediaPipelineEnabled()?

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

Done.

 
     case MimeUtil::OPUS:
       // Opus is supported only in Lollipop+ (API Level 21).
-      return base::android::BuildInfo::GetInstance()->sdk_int() >= 21;
+      return base::android::BuildInfo::GetInstance()->sdk_int() >= 21 ||
+             IsUnifiedMediaPipelineEnabled();
 
     case MimeUtil::HEVC_MAIN:
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
       // HEVC/H.265 is supported in Lollipop+ (API Level 21), according to
       // http://developer.android.com/reference/android/media/MediaFormat.html
       return base::android::BuildInfo::GetInstance()->sdk_int() >= 21;
 #else
       return false;
 #endif
 
     case MimeUtil::VP9:
       // VP9 is supported only in KitKat+ (API Level 19).
-      return base::android::BuildInfo::GetInstance()->sdk_int() >= 19;
+      return base::android::BuildInfo::GetInstance()->sdk_int() >= 19 ||
+             IsUnifiedMediaPipelineEnabled();
 
     case MimeUtil::THEORA:
       return false;
   }
 
   return false;
 }
 #endif
 
 enum MediaFormatType { COMMON, PROPRIETARY };
@@ skipping 53 matching lines @@
 
 // A list of media types (https://en.wikipedia.org/wiki/Media_type) and
 // corresponding media codecs supported by these types/containers.
 // Media formats marked as PROPRIETARY are not supported by Chromium, only
 // Google Chrome browser supports them.
 static const MediaFormat kFormatCodecMappings[] = {
     {"video/webm", COMMON, "opus,vorbis,vp8,vp8.0,vp9,vp9.0"},
     {"audio/webm", COMMON, "opus,vorbis"},
     {"audio/wav", COMMON, "1"},
     {"audio/x-wav", COMMON, "1"},
-#if defined(OS_ANDROID)
-    // Android does not support Opus in Ogg container.
-    // Android does not support Theora and thus video/ogg.
-    {"audio/ogg", COMMON, "vorbis"},
-    {"application/ogg", COMMON, "vorbis"},
-#else
+    // Note: Theora is not supported on Android and will be rejected during the
+    // call to IsCodecSupportedOnAndroid().
     {"video/ogg", COMMON, "opus,theora,vorbis"},

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

Previously, "VIDEO/ogg" was not supported on Android (because there is no
supported video codec). Do we want to change this?

As is, this should also change the results of a canplaytype browser test.

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

Ah, yeah I missed that, it seems that restriction should remain.

     {"audio/ogg", COMMON, "opus,vorbis"},
     {"application/ogg", COMMON, "opus,theora,vorbis"},
-#endif
 #if defined(USE_PROPRIETARY_CODECS)
     {"audio/mpeg", PROPRIETARY, "mp3"},
     {"audio/mp3", PROPRIETARY, ""},
     {"audio/x-mp3", PROPRIETARY, ""},
     {"audio/aac", PROPRIETARY, ""},  // AAC / ADTS
     {"audio/mp4", PROPRIETARY, kMP4AudioCodecsExpression},
     {"audio/x-m4a", PROPRIETARY, kMP4AudioCodecsExpression},
     {"video/mp4", PROPRIETARY, kMP4VideoCodecsExpression},
     {"video/x-m4v", PROPRIETARY, kMP4VideoCodecsExpression},
 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
@@ skipping 170 matching lines @@
       bool is_ambiguous = true;
       CHECK(StringToCodec(mime_type_codecs[j], &codec, &is_ambiguous));
       DCHECK(!is_ambiguous);
       codecs.insert(codec);
     }
 
     media_format_map_[kFormatCodecMappings[i].mime_type] = codecs;
   }
 }
 
 bool MimeUtil::IsSupportedMediaMimeType(const std::string& mime_type) const {

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

"video/ogg" will now succeed here. This is called (via the wrapper) by non-media
code.

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

Done.

   return media_format_map_.find(base::ToLowerASCII(mime_type)) !=
          media_format_map_.end();
 }
 
 void MimeUtil::ParseCodecString(const std::string& codecs,
                                 std::vector<std::string>* codecs_out,
                                 bool strip) {
   *codecs_out = base::SplitString(
       base::TrimString(codecs, "\"", base::TRIM_ALL),
       ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
@@ skipping 266 matching lines @@
                       std::vector<std::string>* codecs_out,
                       const bool strip) {
   g_media_mime_util.Get().ParseCodecString(codecs, codecs_out, strip);
 }
 
 void RemoveProprietaryMediaTypesAndCodecsForTests() {
   g_media_mime_util.Get().RemoveProprietaryMediaTypesAndCodecsForTests();
 }
 
 }  // namespace media