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

Side by Side Diff: media/renderers/default_renderer_factory.cc

Issue 1456993004: media::FFmpegVideoDecoder: remove ctor param |task_runner| and use a ThreadChecker instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/renderers/default_renderer_factory.h" 5 #include "media/renderers/default_renderer_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "media/base/media_log.h" 10 #include "media/base/media_log.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 (gpu_factories_->GetTaskRunner() == media_task_runner.get())); 75 (gpu_factories_->GetTaskRunner() == media_task_runner.get()));
76 76
77 if (gpu_factories_) 77 if (gpu_factories_)
78 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); 78 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_));
79 79
80 #if !defined(MEDIA_DISABLE_LIBVPX) 80 #if !defined(MEDIA_DISABLE_LIBVPX)
81 video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); 81 video_decoders.push_back(new VpxVideoDecoder(media_task_runner));
82 #endif 82 #endif
83 83
84 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) 84 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
85 video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); 85 video_decoders.push_back(new FFmpegVideoDecoder());
86 #endif 86 #endif
87 87
88 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( 88 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
89 media_task_runner, worker_task_runner, video_renderer_sink, 89 media_task_runner, worker_task_runner, video_renderer_sink,
90 video_decoders.Pass(), true, gpu_factories_, media_log_)); 90 video_decoders.Pass(), true, gpu_factories_, media_log_));
91 91
92 // Create renderer. 92 // Create renderer.
93 return scoped_ptr<Renderer>(new RendererImpl( 93 return scoped_ptr<Renderer>(new RendererImpl(
94 media_task_runner, audio_renderer.Pass(), video_renderer.Pass())); 94 media_task_runner, audio_renderer.Pass(), video_renderer.Pass()));
95 } 95 }
96 96
97 } // namespace media 97 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/test/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698