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

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

Issue 1304393004: Change VideoCaptureDeliverFrameCB's signature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/rtc_video_renderer.h" 5 #include "content/renderer/media/rtc_video_renderer.h"
6 6
7 #include "base/thread_task_runner_handle.h" 7 #include "base/thread_task_runner_handle.h"
8 #include "base/trace_event/trace_event.h" 8 #include "base/trace_event/trace_event.h"
9 #include "media/base/bind_to_current_loop.h" 9 #include "media/base/bind_to_current_loop.h"
10 #include "media/base/video_frame.h" 10 #include "media/base/video_frame.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 void RTCVideoRenderer::OnReadyStateChanged( 75 void RTCVideoRenderer::OnReadyStateChanged(
76 blink::WebMediaStreamSource::ReadyState state) { 76 blink::WebMediaStreamSource::ReadyState state) {
77 DCHECK(task_runner_->BelongsToCurrentThread()); 77 DCHECK(task_runner_->BelongsToCurrentThread());
78 if (state == blink::WebMediaStreamSource::ReadyStateEnded) 78 if (state == blink::WebMediaStreamSource::ReadyStateEnded)
79 RenderSignalingFrame(); 79 RenderSignalingFrame();
80 } 80 }
81 81
82 void RTCVideoRenderer::OnVideoFrame( 82 void RTCVideoRenderer::OnVideoFrame(
83 const scoped_refptr<media::VideoFrame>& frame, 83 const scoped_refptr<media::VideoFrame>& frame,
84 const base::TimeTicks& estimated_capture_time) { 84 base::TimeTicks estimated_capture_time) {
85 DCHECK(task_runner_->BelongsToCurrentThread()); 85 DCHECK(task_runner_->BelongsToCurrentThread());
86 if (state_ != STARTED) 86 if (state_ != STARTED)
87 return; 87 return;
88 88
89 frame_size_ = frame->natural_size(); 89 frame_size_ = frame->natural_size();
90 90
91 TRACE_EVENT_INSTANT1("rtc_video_renderer", 91 TRACE_EVENT_INSTANT1("rtc_video_renderer",
92 "OnVideoFrame", 92 "OnVideoFrame",
93 TRACE_EVENT_SCOPE_THREAD, 93 TRACE_EVENT_SCOPE_THREAD,
94 "timestamp", 94 "timestamp",
95 frame->timestamp().InMilliseconds()); 95 frame->timestamp().InMilliseconds());
96 repaint_cb_.Run(frame); 96 repaint_cb_.Run(frame);
97 } 97 }
98 98
99 void RTCVideoRenderer::RenderSignalingFrame() { 99 void RTCVideoRenderer::RenderSignalingFrame() {
100 // This is necessary to make sure audio can play if the video tag src is 100 // 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. 101 // 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 102 // 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 103 // frame if no more frames are provided. This is since there might be a
104 // finite number of available buffers. E.g, video that 104 // finite number of available buffers. E.g, video that
105 // originates from a video camera. 105 // originates from a video camera.
106 scoped_refptr<media::VideoFrame> video_frame = 106 scoped_refptr<media::VideoFrame> video_frame =
107 media::VideoFrame::CreateBlackFrame(frame_size_); 107 media::VideoFrame::CreateBlackFrame(frame_size_);
108 OnVideoFrame(video_frame, base::TimeTicks()); 108 OnVideoFrame(video_frame, base::TimeTicks());
109 } 109 }
110 110
111 } // namespace content 111 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698