| 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) {
|
|
|