Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: media/base/media.cc

Issue 1825913003: media: Disable the unified media pipeline for API levels 16 & 17 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dale's coment Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/media.h" 5 #include "media/base/media.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 // we have enough data to support the primacy of the unified media pipeline; 96 // we have enough data to support the primacy of the unified media pipeline;
97 // see http://crbug.com/533190 for details. 97 // see http://crbug.com/533190 for details.
98 // 98 //
99 // Note: It's important to query the field trial state first, to ensure that 99 // Note: It's important to query the field trial state first, to ensure that
100 // UMA reports the correct group. 100 // UMA reports the correct group.
101 const std::string group_name = 101 const std::string group_name =
102 base::FieldTrialList::FindFullName("UnifiedMediaPipelineTrial"); 102 base::FieldTrialList::FindFullName("UnifiedMediaPipelineTrial");
103 const bool enabled_via_cli = 103 const bool enabled_via_cli =
104 base::CommandLine::ForCurrentProcess()->HasSwitch( 104 base::CommandLine::ForCurrentProcess()->HasSwitch(
105 switches::kEnableUnifiedMediaPipeline); 105 switches::kEnableUnifiedMediaPipeline);
106 return enabled_via_cli || 106 // TODO(watk, dalecurtis): AVDA has bugs on API level 16 and 17 so it's
107 base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE); 107 // disabled for now. http://crbug.com/597467
108 const bool api_level_supported =
109 base::android::BuildInfo::GetInstance()->sdk_int() >= 18;
110
111 return enabled_via_cli || (api_level_supported &&
112 base::StartsWith(group_name, "Enabled",
113 base::CompareCase::SENSITIVE));
108 } 114 }
109 115
110 bool IsUnifiedMediaPipelineEnabledForMse() { 116 bool IsUnifiedMediaPipelineEnabledForMse() {
111 // Don't check IsUnifiedMediaPipelineEnabled() here since we don't want MSE to 117 // Don't check IsUnifiedMediaPipelineEnabled() here since we don't want MSE to
112 // be enabled via experiment yet; only when the existing implementation can't 118 // be enabled via experiment yet; only when the existing implementation can't
113 // be used (i.e. MediaCodec unavailable). 119 // be used (i.e. MediaCodec unavailable).
114 return base::CommandLine::ForCurrentProcess()->HasSwitch( 120 return base::CommandLine::ForCurrentProcess()->HasSwitch(
115 switches::kEnableUnifiedMediaPipeline) || 121 switches::kEnableUnifiedMediaPipeline) ||
116 !MediaCodecUtil::IsMediaCodecAvailable(); 122 !MediaCodecUtil::IsMediaCodecAvailable();
117 } 123 }
118 124
119 bool ArePlatformDecodersAvailable() { 125 bool ArePlatformDecodersAvailable() {
120 return IsUnifiedMediaPipelineEnabled() 126 return IsUnifiedMediaPipelineEnabled()
121 ? HasPlatformDecoderSupport() 127 ? HasPlatformDecoderSupport()
122 : MediaCodecUtil::IsMediaCodecAvailable(); 128 : MediaCodecUtil::IsMediaCodecAvailable();
123 } 129 }
124 #endif 130 #endif
125 131
126 } // namespace media 132 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698