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

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

Issue 2684103005: Allow media track switching. (Closed)
Patch Set: Restore CreateRenderer in pipeline_integration_test.cc Created 3 years, 9 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
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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 std::unique_ptr<Renderer> DefaultRendererFactory::CreateRenderer( 97 std::unique_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
98 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 98 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
99 const scoped_refptr<base::TaskRunner>& worker_task_runner, 99 const scoped_refptr<base::TaskRunner>& worker_task_runner,
100 AudioRendererSink* audio_renderer_sink, 100 AudioRendererSink* audio_renderer_sink,
101 VideoRendererSink* video_renderer_sink, 101 VideoRendererSink* video_renderer_sink,
102 const RequestSurfaceCB& request_surface_cb) { 102 const RequestSurfaceCB& request_surface_cb) {
103 DCHECK(audio_renderer_sink); 103 DCHECK(audio_renderer_sink);
104 104
105 std::unique_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( 105 std::unique_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
106 media_task_runner, audio_renderer_sink, 106 media_task_runner, audio_renderer_sink,
107 CreateAudioDecoders(media_task_runner), media_log_)); 107 // Unretained is safe, since RendererFactory is owned by WMPI, which also
108 // owns RendererImpl and thus AudioRendererImpl.
xhwang 2017/03/22 22:31:12 Checked WMPI, |renderer_factory_| will be destroye
servolk 2017/03/23 17:08:10 Done.
109 base::Bind(&DefaultRendererFactory::CreateAudioDecoders,
110 base::Unretained(this), media_task_runner),
111 media_log_));
108 112
109 GpuVideoAcceleratorFactories* gpu_factories = nullptr; 113 GpuVideoAcceleratorFactories* gpu_factories = nullptr;
110 if (!get_gpu_factories_cb_.is_null()) 114 if (!get_gpu_factories_cb_.is_null())
111 gpu_factories = get_gpu_factories_cb_.Run(); 115 gpu_factories = get_gpu_factories_cb_.Run();
112 116
113 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( 117 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
114 media_task_runner, worker_task_runner, video_renderer_sink, 118 media_task_runner, worker_task_runner, video_renderer_sink,
115 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), 119 // Unretained is safe, since RendererFactory is owned by WMPI, which also
120 // owns RendererImpl and thus VideoRendererImpl.
121 base::Bind(&DefaultRendererFactory::CreateVideoDecoders,
122 base::Unretained(this), media_task_runner, request_surface_cb,
123 gpu_factories),
116 true, gpu_factories, media_log_)); 124 true, gpu_factories, media_log_));
117 125
118 return base::MakeUnique<RendererImpl>( 126 return base::MakeUnique<RendererImpl>(
119 media_task_runner, std::move(audio_renderer), std::move(video_renderer)); 127 media_task_runner, std::move(audio_renderer), std::move(video_renderer));
120 } 128 }
121 129
122 } // namespace media 130 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698