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

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

Issue 1655083002: Enable SurfaceView fullscreen video on Android with WebMediaPlayerImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@avda-sv
Patch Set: Created 4 years, 10 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/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 27 matching lines...) Expand all
38 gpu_factories_(gpu_factories), 38 gpu_factories_(gpu_factories),
39 audio_hardware_config_(audio_hardware_config) {} 39 audio_hardware_config_(audio_hardware_config) {}
40 40
41 DefaultRendererFactory::~DefaultRendererFactory() { 41 DefaultRendererFactory::~DefaultRendererFactory() {
42 } 42 }
43 43
44 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer( 44 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
45 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 45 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
46 const scoped_refptr<base::TaskRunner>& worker_task_runner, 46 const scoped_refptr<base::TaskRunner>& worker_task_runner,
47 AudioRendererSink* audio_renderer_sink, 47 AudioRendererSink* audio_renderer_sink,
48 VideoRendererSink* video_renderer_sink) { 48 VideoRendererSink* video_renderer_sink,
49 const RequestSurfaceCB& request_surface_cb) {
49 DCHECK(audio_renderer_sink); 50 DCHECK(audio_renderer_sink);
50 51
51 // Create our audio decoders and renderer. 52 // Create our audio decoders and renderer.
52 ScopedVector<AudioDecoder> audio_decoders; 53 ScopedVector<AudioDecoder> audio_decoders;
53 54
54 #if !defined(MEDIA_DISABLE_FFMPEG) 55 #if !defined(MEDIA_DISABLE_FFMPEG)
55 audio_decoders.push_back( 56 audio_decoders.push_back(
56 new FFmpegAudioDecoder(media_task_runner, media_log_)); 57 new FFmpegAudioDecoder(media_task_runner, media_log_));
57 #endif 58 #endif
58 59
59 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner)); 60 audio_decoders.push_back(new OpusAudioDecoder(media_task_runner));
60 61
61 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl( 62 scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
62 media_task_runner, audio_renderer_sink, std::move(audio_decoders), 63 media_task_runner, audio_renderer_sink, std::move(audio_decoders),
63 audio_hardware_config_, media_log_)); 64 audio_hardware_config_, media_log_));
64 65
65 // Create our video decoders and renderer. 66 // Create our video decoders and renderer.
66 ScopedVector<VideoDecoder> video_decoders; 67 ScopedVector<VideoDecoder> video_decoders;
67 68
68 // |gpu_factories_| requires that its entry points be called on its 69 // |gpu_factories_| requires that its entry points be called on its
69 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the 70 // |GetTaskRunner()|. Since |pipeline_| will own decoders created from the
70 // factories, require that their message loops are identical. 71 // factories, require that their message loops are identical.
71 DCHECK(!gpu_factories_ || 72 DCHECK(!gpu_factories_ ||
72 (gpu_factories_->GetTaskRunner() == media_task_runner.get())); 73 (gpu_factories_->GetTaskRunner() == media_task_runner.get()));
73 74
74 if (gpu_factories_) 75 if (gpu_factories_)
75 video_decoders.push_back(new GpuVideoDecoder(gpu_factories_)); 76 video_decoders.push_back(
77 new GpuVideoDecoder(gpu_factories_, request_surface_cb));
76 78
77 #if !defined(MEDIA_DISABLE_LIBVPX) 79 #if !defined(MEDIA_DISABLE_LIBVPX)
78 video_decoders.push_back(new VpxVideoDecoder()); 80 video_decoders.push_back(new VpxVideoDecoder());
79 #endif 81 #endif
80 82
81 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS) 83 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
82 video_decoders.push_back(new FFmpegVideoDecoder()); 84 video_decoders.push_back(new FFmpegVideoDecoder());
83 #endif 85 #endif
84 86
85 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( 87 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
86 media_task_runner, worker_task_runner, video_renderer_sink, 88 media_task_runner, worker_task_runner, video_renderer_sink,
87 std::move(video_decoders), true, gpu_factories_, media_log_)); 89 std::move(video_decoders), true, gpu_factories_, media_log_));
88 90
89 // Create renderer. 91 // Create renderer.
90 return scoped_ptr<Renderer>(new RendererImpl( 92 return scoped_ptr<Renderer>(new RendererImpl(
91 media_task_runner, std::move(audio_renderer), std::move(video_renderer))); 93 media_task_runner, std::move(audio_renderer), std::move(video_renderer)));
92 } 94 }
93 95
94 } // namespace media 96 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698