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

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

Issue 2684103005: Allow media track switching. (Closed)
Patch Set: Fixed comments Created 3 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 | « media/renderers/default_renderer_factory.h ('k') | media/renderers/renderer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 here, because the RendererFactory is guaranteed to
108 // outlive the RendererImpl. The RendererImpl is destroyed when WMPI
109 // destructor calls pipeline_controller_.Stop() -> PipelineImpl::Stop() ->
110 // RendererWrapper::Stop -> RendererWrapper::DestroyRenderer(). And the
111 // RendererFactory is owned by WMPI and gets called after WMPI destructor
112 // finishes.
113 base::Bind(&DefaultRendererFactory::CreateAudioDecoders,
114 base::Unretained(this), media_task_runner),
115 media_log_));
108 116
109 GpuVideoAcceleratorFactories* gpu_factories = nullptr; 117 GpuVideoAcceleratorFactories* gpu_factories = nullptr;
110 if (!get_gpu_factories_cb_.is_null()) 118 if (!get_gpu_factories_cb_.is_null())
111 gpu_factories = get_gpu_factories_cb_.Run(); 119 gpu_factories = get_gpu_factories_cb_.Run();
112 120
113 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( 121 std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
114 media_task_runner, worker_task_runner, video_renderer_sink, 122 media_task_runner, worker_task_runner, video_renderer_sink,
115 CreateVideoDecoders(media_task_runner, request_surface_cb, gpu_factories), 123 // Unretained is safe here, because the RendererFactory is guaranteed to
124 // outlive the RendererImpl. The RendererImpl is destroyed when WMPI
125 // destructor calls pipeline_controller_.Stop() -> PipelineImpl::Stop() ->
126 // RendererWrapper::Stop -> RendererWrapper::DestroyRenderer(). And the
127 // RendererFactory is owned by WMPI and gets called after WMPI destructor
128 // finishes.
129 base::Bind(&DefaultRendererFactory::CreateVideoDecoders,
130 base::Unretained(this), media_task_runner, request_surface_cb,
131 gpu_factories),
116 true, gpu_factories, media_log_)); 132 true, gpu_factories, media_log_));
117 133
118 return base::MakeUnique<RendererImpl>( 134 return base::MakeUnique<RendererImpl>(
119 media_task_runner, std::move(audio_renderer), std::move(video_renderer)); 135 media_task_runner, std::move(audio_renderer), std::move(video_renderer));
120 } 136 }
121 137
122 } // namespace media 138 } // namespace media
OLDNEW
« no previous file with comments | « media/renderers/default_renderer_factory.h ('k') | media/renderers/renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698