summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/base/media_switches.cc4
-rw-r--r--media/base/media_switches.h2
-rw-r--r--media/renderers/video_renderer_impl.cc4
-rw-r--r--media/renderers/video_renderer_impl.h4
-rw-r--r--media/renderers/video_renderer_impl_unittest.cc4
5 files changed, 9 insertions, 9 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index a6e5cde..b5b52ef 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -9,8 +9,8 @@ namespace switches {
// Allow users to specify a custom buffer size for debugging purpose.
const char kAudioBufferSize[] = "audio-buffer-size";
-// Enables the new vsync driven video renderering path.
-const char kEnableNewVideoRenderer[] = "enable-new-video-renderer";
+// Disables the new vsync driven video renderering path.
+const char kDisableNewVideoRenderer[] = "disable-new-video-renderer";
// Set number of threads to use for video decoding.
const char kVideoThreads[] = "video-threads";
diff --git a/media/base/media_switches.h b/media/base/media_switches.h
index d40c91f..b07ff5a 100644
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -14,7 +14,7 @@ namespace switches {
MEDIA_EXPORT extern const char kAudioBufferSize[];
-MEDIA_EXPORT extern const char kEnableNewVideoRenderer[];
+MEDIA_EXPORT extern const char kDisableNewVideoRenderer[];
MEDIA_EXPORT extern const char kVideoThreads[];
diff --git a/media/renderers/video_renderer_impl.cc b/media/renderers/video_renderer_impl.cc
index f493f45..3da6ad4 100644
--- a/media/renderers/video_renderer_impl.cc
+++ b/media/renderers/video_renderer_impl.cc
@@ -30,8 +30,8 @@ VideoRendererImpl::VideoRendererImpl(
const scoped_refptr<MediaLog>& media_log)
: task_runner_(task_runner),
use_new_video_renderering_path_(
- base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableNewVideoRenderer)),
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableNewVideoRenderer)),
sink_(sink),
sink_started_(false),
video_frame_stream_(
diff --git a/media/renderers/video_renderer_impl.h b/media/renderers/video_renderer_impl.h
index 43ffd86..8f765f6 100644
--- a/media/renderers/video_renderer_impl.h
+++ b/media/renderers/video_renderer_impl.h
@@ -82,8 +82,8 @@ class MEDIA_EXPORT VideoRendererImpl
bool background_rendering) override;
void OnFrameDropped() override;
- void enable_new_video_renderer_for_testing() {
- use_new_video_renderering_path_ = true;
+ void disable_new_video_renderer_for_testing() {
+ use_new_video_renderering_path_ = false;
}
private:
diff --git a/media/renderers/video_renderer_impl_unittest.cc b/media/renderers/video_renderer_impl_unittest.cc
index 32a1446..7f5c8d9 100644
--- a/media/renderers/video_renderer_impl_unittest.cc
+++ b/media/renderers/video_renderer_impl_unittest.cc
@@ -64,8 +64,8 @@ class VideoRendererImplTest : public testing::TestWithParam<bool> {
renderer_.reset(new VideoRendererImpl(
message_loop_.message_loop_proxy(), null_video_sink_.get(),
decoders.Pass(), true, new MediaLog()));
- if (GetParam())
- renderer_->enable_new_video_renderer_for_testing();
+ if (!GetParam())
+ renderer_->disable_new_video_renderer_for_testing();
renderer_->SetTickClockForTesting(scoped_ptr<base::TickClock>(tick_clock_));
null_video_sink_->set_tick_clock_for_testing(tick_clock_);