Spitzer: Report Opus in Ogg as supported by unified pipeline

media/base/mime_util_internal.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 "media/base/mime_util_internal.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"
@@ skipping 39 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,vp9"},
     {"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
+#if !defined(OS_ANDROID)
+    // Note: Android does not support Theora and thus video/ogg.
     {"video/ogg", COMMON, "opus,theora,vorbis"},
+#endif
     {"audio/ogg", COMMON, "opus,vorbis"},
+    // Note: Theora is not supported on Android and will be rejected during the
+    // call to IsCodecSupportedOnPlatform().
     {"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 547 matching lines @@
     const std::string& mime_type_lower_case,
     bool is_encrypted) const {
   Codec default_codec = Codec::INVALID_CODEC;
   if (!GetDefaultCodecLowerCase(mime_type_lower_case, &default_codec))
     return false;
   return IsCodecSupported(default_codec, mime_type_lower_case, is_encrypted);
 }
 
 }  // namespace internal
 }  // namespace media