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

Side by Side Diff: content/renderer/pepper/pepper_platform_video_capture.cc

Issue 1315993003: Reland: Change VideoCaptureDeliverFrameCB's signature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address new changes Created 5 years, 4 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/pepper/pepper_platform_video_capture.h" 5 #include "content/renderer/pepper/pepper_platform_video_capture.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "content/renderer/media/video_capture_impl_manager.h" 9 #include "content/renderer/media/video_capture_impl_manager.h"
10 #include "content/renderer/pepper/pepper_media_device_manager.h" 10 #include "content/renderer/pepper/pepper_media_device_manager.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 case VIDEO_CAPTURE_STATE_ERROR: 134 case VIDEO_CAPTURE_STATE_ERROR:
135 handler_->OnError(); 135 handler_->OnError();
136 break; 136 break;
137 default: 137 default:
138 NOTREACHED() << "Unexpected state: " << state << "."; 138 NOTREACHED() << "Unexpected state: " << state << ".";
139 } 139 }
140 } 140 }
141 141
142 void PepperPlatformVideoCapture::OnFrameReady( 142 void PepperPlatformVideoCapture::OnFrameReady(
143 const scoped_refptr<media::VideoFrame>& frame, 143 const scoped_refptr<media::VideoFrame>& frame,
144 const base::TimeTicks& estimated_capture_time) { 144 base::TimeTicks estimated_capture_time) {
145 if (handler_ && !stop_capture_cb_.is_null()) 145 if (handler_ && !stop_capture_cb_.is_null())
146 handler_->OnFrameReady(frame); 146 handler_->OnFrameReady(frame);
147 } 147 }
148 148
149 PepperMediaDeviceManager* PepperPlatformVideoCapture::GetMediaDeviceManager() { 149 PepperMediaDeviceManager* PepperPlatformVideoCapture::GetMediaDeviceManager() {
150 RenderFrameImpl* const render_frame = 150 RenderFrameImpl* const render_frame =
151 RenderFrameImpl::FromRoutingID(render_frame_id_); 151 RenderFrameImpl::FromRoutingID(render_frame_id_);
152 return render_frame ? 152 return render_frame ?
153 PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL; 153 PepperMediaDeviceManager::GetForRenderFrame(render_frame).get() : NULL;
154 } 154 }
155 155
156 } // namespace content 156 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_platform_video_capture.h ('k') | media/base/video_capturer_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698