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

Unified Diff: content/renderer/pepper/pepper_platform_video_capture.cc

Issue 23587018: Replace media::VideoCapture::VideoFrameBuffer with media::VideoFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn
Patch Set: 6ccf4fd6 Final. Created 7 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/pepper_platform_video_capture.cc
diff --git a/content/renderer/pepper/pepper_platform_video_capture.cc b/content/renderer/pepper/pepper_platform_video_capture.cc
index 1727ae1ea8057b75d1d2ce958ad8aa4e9241430e..86ce45d845350c6df53532657cb9fd8425a6bbc4 100644
--- a/content/renderer/pepper/pepper_platform_video_capture.cc
+++ b/content/renderer/pepper/pepper_platform_video_capture.cc
@@ -71,12 +71,6 @@ void PepperPlatformVideoCapture::StopCapture(
}
}
-void PepperPlatformVideoCapture::FeedBuffer(
- scoped_refptr<VideoFrameBuffer> buffer) {
- if (video_capture_)
- video_capture_->FeedBuffer(buffer);
-}
-
bool PepperPlatformVideoCapture::CaptureStarted() {
return handler_proxy_->state().started;
}
@@ -145,16 +139,11 @@ void PepperPlatformVideoCapture::OnRemoved(VideoCapture* capture) {
Release(); // Balance the AddRef() in StartCapture().
}
-void PepperPlatformVideoCapture::OnBufferReady(
+void PepperPlatformVideoCapture::OnFrameReady(
VideoCapture* capture,
- scoped_refptr<VideoFrameBuffer> buffer) {
- if (handler_) {
- handler_->OnBufferReady(capture, buffer);
- } else {
- // Even after handler_ is detached, we have to return buffers that are in
- // flight to us. Otherwise VideoCaptureController will not tear down.
- FeedBuffer(buffer);
- }
+ const scoped_refptr<media::VideoFrame>& frame) {
+ if (handler_)
+ handler_->OnFrameReady(capture, frame);
}
void PepperPlatformVideoCapture::OnDeviceInfoReceived(
« no previous file with comments | « content/renderer/pepper/pepper_platform_video_capture.h ('k') | content/renderer/pepper/pepper_video_capture_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698