media: Enable Unified Media Pipeline for MSE and EME on Android

media/base/media.cc

 // Copyright 2013 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/media.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
@@ skipping 56 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MediaInitializer);
 };
 
 static base::LazyInstance<MediaInitializer>::Leaky g_media_library =
     LAZY_INSTANCE_INITIALIZER;
 
 void InitializeMediaLibrary() {
   g_media_library.Get();
 }
 
+bool IsMojoCdmEnabled() {

[ddorwin, 2016/03/24 18:05:11]

Should this be ifdef'd to ENABLE_MOJO_CDMS?

[xhwang, 2016/03/24 21:26:04]

Good point. Actually "media" should not know about "mojo media" at all. Also
ENABLE_MOJO_CDMS is defined in media/mojo so we can't use it here.

Since this is only used in RenderFrameImpl and there we have the best context,
moved this function to be a static function in RenderFrameImpl.

+#if defined(OS_ANDROID)
+  return IsUnifiedMediaPipelineEnabled();
+#else
+  return true;
+#endif
+}
+
 #if defined(OS_ANDROID)
 void EnablePlatformDecoderSupport() {
   g_media_library.Pointer()->enable_platform_decoder_support();
 }
 
 bool HasPlatformDecoderSupport() {
   return g_media_library.Pointer()->has_platform_decoder_support();
 }
 
 bool PlatformHasOpusSupport() {
@@ skipping 13 matching lines @@
   // UMA reports the correct group.
   const std::string group_name =
       base::FieldTrialList::FindFullName("UnifiedMediaPipelineTrial");
   const bool enabled_via_cli =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableUnifiedMediaPipeline);
   return enabled_via_cli ||
          base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
 }
 
-bool IsUnifiedMediaPipelineEnabledForMse() {
-  // Don't check IsUnifiedMediaPipelineEnabled() here since we don't want MSE to
-  // be enabled via experiment yet; only when the existing implementation can't
-  // be used (i.e. MediaCodec unavailable).
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-             switches::kEnableUnifiedMediaPipeline) ||
-         !MediaCodecUtil::IsMediaCodecAvailable();
-}
-
 bool ArePlatformDecodersAvailable() {
   return IsUnifiedMediaPipelineEnabled()
              ? HasPlatformDecoderSupport()
              : MediaCodecUtil::IsMediaCodecAvailable();
 }
 #endif
 
 }  // namespace media