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
26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
From: Dan Minor <dminor@mozilla.com>
|
|
Date: Tue, 11 Feb 2020 17:04:00 +0000
|
|
Subject: Bug 1578073 - Fix warning: [cast] redundant cast to int; r=ng
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D61852
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/82877c8a864072c03f45234c6649645ed609e098
|
|
---
|
|
sdk/android/api/org/webrtc/TextureBufferImpl.java | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sdk/android/api/org/webrtc/TextureBufferImpl.java b/sdk/android/api/org/webrtc/TextureBufferImpl.java
|
|
index 7e2bed84fc..43470d6e39 100644
|
|
--- a/sdk/android/api/org/webrtc/TextureBufferImpl.java
|
|
+++ b/sdk/android/api/org/webrtc/TextureBufferImpl.java
|
|
@@ -136,8 +136,8 @@ public class TextureBufferImpl implements VideoFrame.TextureBuffer {
|
|
cropAndScaleMatrix.preScale(cropWidth / (float) width, cropHeight / (float) height);
|
|
|
|
return applyTransformMatrix(cropAndScaleMatrix,
|
|
- (int) Math.round(unscaledWidth * cropWidth / (float) width),
|
|
- (int) Math.round(unscaledHeight * cropHeight / (float) height), scaleWidth, scaleHeight);
|
|
+ Math.round(unscaledWidth * cropWidth / (float) width),
|
|
+ Math.round(unscaledHeight * cropHeight / (float) height), scaleWidth, scaleHeight);
|
|
}
|
|
|
|
@Override
|