zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AVFoundationVideoCapturer: Fix apply_rotation() logic

Browse Source 
When apply_rotation() returns true, rotation and captured width/heigh are not set correctly.

BUG=webrtc:6925

Review-Url: https://codereview.webrtc.org/2611113003
Cr-Commit-Position: refs/heads/master@{#15963}
This commit is contained in:
magjed
2017-01-09 07:09:23 -08:00
committed by Commit bot
parent 075c6d7f7e
commit 0b7bd75659
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm
View File

@ -131,8 +131,8 @@ void AVFoundationVideoCapturer::CaptureSampleBuffer(
return;
}
const int captured_width = CVPixelBufferGetWidth(image_buffer);
const int captured_height = CVPixelBufferGetHeight(image_buffer);
int captured_width = CVPixelBufferGetWidth(image_buffer);
int captured_height = CVPixelBufferGetHeight(image_buffer);
int adapted_width;
int adapted_height;
@ -161,10 +161,14 @@ void AVFoundationVideoCapturer::CaptureSampleBuffer(
// not critical here.
if (apply_rotation() && rotation != kVideoRotation_0) {
buffer = buffer->NativeToI420Buffer();
rtc::scoped_refptr<I420Buffer> rotated_buffer =
(rotation == kVideoRotation_180)
? I420Buffer::Create(adapted_width, adapted_height)
: I420Buffer::Create(adapted_height, adapted_width);
rtc::scoped_refptr<I420Buffer> rotated_buffer;
if (rotation == kVideoRotation_0 || rotation == kVideoRotation_180) {
rotated_buffer = I420Buffer::Create(adapted_width, adapted_height);
} else {
// Swap width and height.
rotated_buffer = I420Buffer::Create(adapted_height, adapted_width);
std::swap(captured_width, captured_height);
}
libyuv::I420Rotate(
buffer->DataY(), buffer->StrideY(),
buffer->DataU(), buffer->StrideU(),
@ -175,6 +179,7 @@ void AVFoundationVideoCapturer::CaptureSampleBuffer(
buffer->width(), buffer->height(),
static_cast<libyuv::RotationMode>(rotation));
buffer = rotated_buffer;
rotation = kVideoRotation_0;
}
OnFrame(webrtc::VideoFrame(buffer, rotation, translated_camera_time_us),