media: Disable the unified media pipeline for API levels 16 & 17

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 85 matching lines @@
   // we have enough data to support the primacy of the unified media pipeline;
   // see http://crbug.com/533190 for details.
   //
   // Note: It's important to query the field trial state first, to ensure that
   // 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);
+  // TODO(watk, dalecurtis): AVDA has bugs on API level 16 and 17 so it's
+  // disabled for now. http://crbug.com/597467
+  const bool api_level_supported =
+      base::android::BuildInfo::GetInstance()->sdk_int() >= 18;
+
+  if (enabled_via_cli)

[DaleCurtis, 2016/03/24 03:16:44]

Seems cleaner as return "enabled_via_cli || api_level_supported || startswith" ?

+    return true;
+  if (!api_level_supported)
+    return false;
+  return 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