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

Unified Diff: media/video/capture/mac/video_capture_device_mac.mm

Issue 83793004: Implement IPCs and VideoCapture::Client interfaces for texture capture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: e296ac98 Win32 bits. Created 6 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 side-by-side diff with in-line comments
Download patch
Index: media/video/capture/mac/video_capture_device_mac.mm
diff --git a/media/video/capture/mac/video_capture_device_mac.mm b/media/video/capture/mac/video_capture_device_mac.mm
index c76af1534f19a8816e6da1740412c060c593e27b..1c69bdb2ebba15eb950d67126e4b033c54a0b68c 100644
--- a/media/video/capture/mac/video_capture_device_mac.mm
+++ b/media/video/capture/mac/video_capture_device_mac.mm
@@ -300,7 +300,7 @@ void VideoCaptureDeviceMac::ReceiveFrame(
sent_frame_info_ = true;
} else {
UpdateCaptureResolution();
- // OnFrameInfo has not yet been called. OnIncomingCapturedFrame must
+ // OnFrameInfo has not yet been called. OnIncomingCapturedData must
// not be called until after OnFrameInfo, so we return early.
return;
}
@@ -311,11 +311,11 @@ void VideoCaptureDeviceMac::ReceiveFrame(
DCHECK_EQ(capture_format_.frame_size.height(),
frame_format.frame_size.height());
- client_->OnIncomingCapturedFrame(video_frame,
- video_frame_length,
- base::TimeTicks::Now(),
- 0,
- capture_format_);
+ client_->OnIncomingCapturedData(video_frame,
+ video_frame_length,
+ capture_format_,
+ 0,
+ base::TimeTicks::Now());
}
void VideoCaptureDeviceMac::ReceiveError(const std::string& reason) {
« no previous file with comments | « media/video/capture/linux/video_capture_device_linux.cc ('k') | media/video/capture/mac/video_capture_device_qtkit_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698