From a58888d382b498ad32da8187b1666dd7bdc444db Mon Sep 17 00:00:00 2001 From: "mikhal@webrtc.org" Date: Wed, 4 Jan 2012 19:23:24 +0000 Subject: [PATCH] Updating capture module following latest libyuv api changes Review URL: http://webrtc-codereview.appspot.com/337009 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1338 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../source/Mac/QTKit/video_capture_qtkit_objc.mm | 3 ++- .../main/source/video_capture_impl.cc | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.mm b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.mm index 0e08f621ec..73322424a3 100644 --- a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.mm +++ b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.mm @@ -459,7 +459,8 @@ using namespace videocapturemodule; tempCaptureCapability.width = _frameWidth; tempCaptureCapability.height = _frameHeight; tempCaptureCapability.maxFPS = _frameRate; - tempCaptureCapability.rawType = kVideoARGB; + // TODO(wu) : Update actual type and not hard-coded value. + tempCaptureCapability.rawType = kVideoBGRA; _owner->IncomingFrame((unsigned char*)baseAddress, frameSize, diff --git a/src/modules/video_capture/main/source/video_capture_impl.cc b/src/modules/video_capture/main/source/video_capture_impl.cc index 48a36c8875..349153ddaf 100644 --- a/src/modules/video_capture/main/source/video_capture_impl.cc +++ b/src/modules/video_capture/main/source/video_capture_impl.cc @@ -294,11 +294,15 @@ WebRtc_Word32 VideoCaptureImpl::IncomingFrame(WebRtc_UWord8* videoFrame, } memset(_captureFrame.Buffer(), 0, _captureFrame.Size()); - const WebRtc_Word32 conversionResult = ConvertToI420(commonVideoType, videoFrame, - width, height, - _captureFrame.Buffer(), - _requestedCapability.interlaced, - _rotateFrame); + int dstStride = width; // Keeping stride = width for I420 destination. + const int conversionResult = ConvertToI420(commonVideoType, + videoFrame, + 0, 0, // No cropping + width, height, + 0, // Ignored for non-JPG. + width, height, dstStride, + _rotateFrame, + _captureFrame.Buffer()); if (conversionResult < 0) { WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideoCapture, _id,