Add support for audio/{x-}mpegurl mime type for HLS.

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/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 342 matching lines @@
   DCHECK(!mp4_video_codecs.empty());
   AddContainerWithCodecs("video/mp2t", mp4_codecs, true);
 #endif  // BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
 #if defined(OS_ANDROID)
   // HTTP Live Streaming (HLS).
   // TODO(ddorwin): Is any MP3 codec string variant included in real queries?
   CodecSet hls_codecs(avc_and_aac);
   hls_codecs.insert(MP3);
   AddContainerWithCodecs("application/x-mpegurl", hls_codecs, true);
   AddContainerWithCodecs("application/vnd.apple.mpegurl", hls_codecs, true);
+  AddContainerWithCodecs("audio/mpegurl", hls_codecs, true);
+  // Not documented by Apple, but unfortunately used extensively by Apple and
+  // others for both audio-only and audio+video playlists. See
+  // http://crbug.com/67552 for details and examples.

[ddorwin, 2017/01/19 21:18:25]

The ID is missing a '5'. Also, nit: httpS.

[DaleCurtis, 2017/01/19 22:32:19]

Done.

+  AddContainerWithCodecs("audio/x-mpegurl", hls_codecs, true);
 #endif  // defined(OS_ANDROID)
 #endif  // defined(USE_PROPRIETARY_CODECS)
 }
 
 void MimeUtil::AddContainerWithCodecs(const std::string& mime_type,
                                       const CodecSet& codecs,
                                       bool is_proprietary_mime_type) {
 #if !defined(USE_PROPRIETARY_CODECS)
   DCHECK(!is_proprietary_mime_type);
 #endif
@@ skipping 122 matching lines @@
     case VORBIS:
       // These codecs are always supported; via a platform decoder (when used
       // with MSE/EME), a software decoder (the unified pipeline), or with
       // MediaPlayer.
       DCHECK(!is_encrypted || platform_info.has_platform_decoders);
       return true;
 
     case MPEG2_AAC:
       // MPEG-2 variants of AAC are not supported on Android unless the unified
       // media pipeline can be used and the container is not HLS. These codecs
-      // will be decoded in software. See https:crbug.com/544268 for details.
-      if (mime_type_lower_case == "application/x-mpegurl" ||
-          mime_type_lower_case == "application/vnd.apple.mpegurl") {
+      // will be decoded in software. See https://crbug.com/544268 for details.
+      if (base::EndsWith(mime_type_lower_case, "mpegurl",

[ddorwin, 2017/01/19 21:18:25]

It might be better to wrap this in IsHlsMimeType().

[DaleCurtis, 2017/01/19 22:32:19]

It's not used anywhere else and technically doesn't fully check the mime type
since it relies on previous verification, so I think it makes more sense to keep
it inline.

+                         base::CompareCase::SENSITIVE)) {
         return false;
       }
       return !is_encrypted && platform_info.is_unified_media_pipeline_enabled;
 
     case OPUS:
       // If clear, the unified pipeline can always decode Opus in software.
       if (!is_encrypted && platform_info.is_unified_media_pipeline_enabled)
         return true;
 
       // Otherwise, platform support is required.
@@ skipping 215 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