06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
From: Dan Minor <dminor@mozilla.com>
|
|
Date: Wed, 19 Sep 2018 15:06:00 -0400
|
|
Subject: Bug 1376873 - Fix up rotation in video_capture_impl.cc; r=pehrsons
|
|
|
|
This fixes a bug in the upstream code introduced when they removed the
|
|
ConvertToI420 helper method from webrtc_libyuv.cc. The buffer size is
|
|
passed into libyuv::ConvertI420 incorrectly when rotation is applied, which
|
|
causes bad rendering and instabilities.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D7478
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/c56cb66f86518dfb046c642ebeb07cf51c23a3cb
|
|
---
|
|
modules/video_capture/video_capture_impl.cc | 11 ++++++++++-
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/modules/video_capture/video_capture_impl.cc b/modules/video_capture/video_capture_impl.cc
|
|
index 51282183f5..afd6ba4d0a 100644
|
|
--- a/modules/video_capture/video_capture_impl.cc
|
|
+++ b/modules/video_capture/video_capture_impl.cc
|
|
@@ -218,12 +218,21 @@ int32_t VideoCaptureImpl::IncomingFrame(uint8_t* videoFrame,
|
|
}
|
|
}
|
|
|
|
+ int dst_width = buffer->width();
|
|
+ int dst_height = buffer->height();
|
|
+
|
|
+ // LibYuv expects pre-rotation_mode values for dst.
|
|
+ // Stride values should correspond to the destination values.
|
|
+ if (rotation_mode == libyuv::kRotate90 || rotation_mode == libyuv::kRotate270) {
|
|
+ std::swap(dst_width, dst_height);
|
|
+ }
|
|
+
|
|
const int conversionResult = libyuv::ConvertToI420(
|
|
videoFrame, videoFrameLength, buffer.get()->MutableDataY(),
|
|
buffer.get()->StrideY(), buffer.get()->MutableDataU(),
|
|
buffer.get()->StrideU(), buffer.get()->MutableDataV(),
|
|
buffer.get()->StrideV(), 0, 0, // No Cropping
|
|
- width, height, target_width, target_height, rotation_mode,
|
|
+ width, height, dst_width, dst_height, rotation_mode,
|
|
ConvertVideoType(frameInfo.videoType));
|
|
if (conversionResult != 0) {
|
|
RTC_LOG(LS_ERROR) << "Failed to convert capture frame from type "
|