Flip unified media pipeline to default-on w/ disabled holdback.

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 437 matching lines @@
     case MPEG4_AAC:
     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. These codecs will be decoded in software.
-      // See https:crbug.com/544268 for details.
+      // 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") {
+        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.
       if (!platform_info.supports_opus)
         return false;
@@ skipping 155 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