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

Side by Side Diff: content/renderer/media/media_stream_video_renderer_sink.cc

Issue 1358883003: Use GpuMemoryBufferVideoFramePool for WebMediaPlayerMS and MediaStreamVideoRendererSink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@send-gmbs
Patch Set: Created 5 years, 2 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/media/media_stream_video_renderer_sink.h" 5 #include "content/renderer/media/media_stream_video_renderer_sink.h"
6 6
7 #include "base/single_thread_task_runner.h"
7 #include "base/thread_task_runner_handle.h" 8 #include "base/thread_task_runner_handle.h"
8 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
9 #include "media/base/bind_to_current_loop.h" 10 #include "media/base/bind_to_current_loop.h"
10 #include "media/base/video_frame.h" 11 #include "media/base/video_frame.h"
11 #include "media/base/video_util.h" 12 #include "media/base/video_util.h"
13 #include "media/renderers/gpu_video_accelerator_factories.h"
12 14
13 const int kMinFrameSize = 2; 15 const int kMinFrameSize = 2;
14 16
15 namespace content { 17 namespace content {
16 18
17 MediaStreamVideoRendererSink::MediaStreamVideoRendererSink( 19 MediaStreamVideoRendererSink::MediaStreamVideoRendererSink(
18 const blink::WebMediaStreamTrack& video_track, 20 const blink::WebMediaStreamTrack& video_track,
19 const base::Closure& error_cb, 21 const base::Closure& error_cb,
20 const RepaintCB& repaint_cb) 22 const RepaintCB& repaint_cb,
23 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
24 const scoped_refptr<base::TaskRunner>& worker_task_runner,
25 const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories)
21 : error_cb_(error_cb), 26 : error_cb_(error_cb),
22 repaint_cb_(repaint_cb), 27 repaint_cb_(repaint_cb),
23 task_runner_(base::ThreadTaskRunnerHandle::Get()), 28 task_runner_(base::ThreadTaskRunnerHandle::Get()),
24 state_(STOPPED), 29 state_(STOPPED),
25 frame_size_(kMinFrameSize, kMinFrameSize), 30 frame_size_(kMinFrameSize, kMinFrameSize),
26 video_track_(video_track), 31 video_track_(video_track),
32 media_task_runner_(media_task_runner),
27 weak_factory_(this) { 33 weak_factory_(this) {
34 if (gpu_factories &&
35 gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) {
36 gpu_memory_buffer_pool_.reset(new media::GpuMemoryBufferVideoFramePool(
37 media_task_runner, worker_task_runner, gpu_factories));
38 }
28 } 39 }
29 40
30 MediaStreamVideoRendererSink::~MediaStreamVideoRendererSink() { 41 MediaStreamVideoRendererSink::~MediaStreamVideoRendererSink() {
31 } 42 }
32 43
33 void MediaStreamVideoRendererSink::Start() { 44 void MediaStreamVideoRendererSink::Start() {
34 DCHECK(task_runner_->BelongsToCurrentThread()); 45 DCHECK(task_runner_->BelongsToCurrentThread());
35 DCHECK_EQ(state_, STOPPED); 46 DCHECK_EQ(state_, STOPPED);
36 47
37 AddToVideoTrack( 48 AddToVideoTrack(
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 blink::WebMediaStreamSource::ReadyState state) { 87 blink::WebMediaStreamSource::ReadyState state) {
77 DCHECK(task_runner_->BelongsToCurrentThread()); 88 DCHECK(task_runner_->BelongsToCurrentThread());
78 if (state == blink::WebMediaStreamSource::ReadyStateEnded) 89 if (state == blink::WebMediaStreamSource::ReadyStateEnded)
79 RenderSignalingFrame(); 90 RenderSignalingFrame();
80 } 91 }
81 92
82 void MediaStreamVideoRendererSink::OnVideoFrame( 93 void MediaStreamVideoRendererSink::OnVideoFrame(
83 const scoped_refptr<media::VideoFrame>& frame, 94 const scoped_refptr<media::VideoFrame>& frame,
84 base::TimeTicks estimated_capture_time) { 95 base::TimeTicks estimated_capture_time) {
85 DCHECK(task_runner_->BelongsToCurrentThread()); 96 DCHECK(task_runner_->BelongsToCurrentThread());
97 DCHECK(frame);
86 if (state_ != STARTED) 98 if (state_ != STARTED)
87 return; 99 return;
88 100
101 if (!gpu_memory_buffer_pool_) {
102 FrameReady(frame);
103 return;
104 }
105
106 media_task_runner_->PostTask(
107 FROM_HERE,
108 base::Bind(
109 &media::GpuMemoryBufferVideoFramePool::MaybeCreateHardwareFrame,
110 base::Unretained(gpu_memory_buffer_pool_.get()), frame,
111 media::BindToCurrentLoop(
112 base::Bind(&MediaStreamVideoRendererSink::FrameReady, this))));
113 }
114
115 void MediaStreamVideoRendererSink::FrameReady(
116 const scoped_refptr<media::VideoFrame>& frame) {
117 DCHECK(task_runner_->BelongsToCurrentThread());
118 DCHECK(frame);
119
89 frame_size_ = frame->natural_size(); 120 frame_size_ = frame->natural_size();
90 121 TRACE_EVENT_INSTANT1("media_stream_video_renderer_sink", "FrameReady",
91 TRACE_EVENT_INSTANT1("media_stream_video_renderer_sink", 122 TRACE_EVENT_SCOPE_THREAD, "timestamp",
92 "OnVideoFrame",
93 TRACE_EVENT_SCOPE_THREAD,
94 "timestamp",
95 frame->timestamp().InMilliseconds()); 123 frame->timestamp().InMilliseconds());
96 repaint_cb_.Run(frame); 124 repaint_cb_.Run(frame);
97 } 125 }
98 126
99 void MediaStreamVideoRendererSink::RenderSignalingFrame() { 127 void MediaStreamVideoRendererSink::RenderSignalingFrame() {
100 // This is necessary to make sure audio can play if the video tag src is 128 // This is necessary to make sure audio can play if the video tag src is
101 // a MediaStream video track that has been rejected or ended. 129 // a MediaStream video track that has been rejected or ended.
102 // It also ensure that the renderer don't hold a reference to a real video 130 // It also ensure that the renderer don't hold a reference to a real video
103 // frame if no more frames are provided. This is since there might be a 131 // frame if no more frames are provided. This is since there might be a
104 // finite number of available buffers. E.g, video that 132 // finite number of available buffers. E.g, video that
105 // originates from a video camera. 133 // originates from a video camera.
106 scoped_refptr<media::VideoFrame> video_frame = 134 scoped_refptr<media::VideoFrame> video_frame =
107 media::VideoFrame::CreateBlackFrame(frame_size_); 135 media::VideoFrame::CreateBlackFrame(frame_size_);
108 OnVideoFrame(video_frame, base::TimeTicks()); 136 OnVideoFrame(video_frame, base::TimeTicks());
109 } 137 }
110 138
111 } // namespace content 139 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698