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
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From: Michael Froman <mjfroman@mac.com>
|
|
Date: Wed, 3 Aug 2022 20:21:25 -0500
|
|
Subject: Bug 1780582 - work around generating VideoFrameBufferType;r=mjf
|
|
|
|
---
|
|
.../api/org/webrtc/VideoFrameBufferType.java | 33 +++++++++++++++++++
|
|
1 file changed, 33 insertions(+)
|
|
create mode 100644 sdk/android/api/org/webrtc/VideoFrameBufferType.java
|
|
|
|
diff --git a/sdk/android/api/org/webrtc/VideoFrameBufferType.java b/sdk/android/api/org/webrtc/VideoFrameBufferType.java
|
|
new file mode 100644
|
|
index 0000000000..7b05b88cba
|
|
--- /dev/null
|
|
+++ b/sdk/android/api/org/webrtc/VideoFrameBufferType.java
|
|
@@ -0,0 +1,33 @@
|
|
+
|
|
+// Copyright 2022 The Chromium Authors. All rights reserved.
|
|
+// Use of this source code is governed by a BSD-style license that can be
|
|
+// found in the LICENSE file.
|
|
+
|
|
+// This file is autogenerated by
|
|
+// java_cpp_enum.py
|
|
+// From
|
|
+// ../../api/video/video_frame_buffer.h
|
|
+
|
|
+package org.webrtc;
|
|
+
|
|
+import androidx.annotation.IntDef;
|
|
+
|
|
+import java.lang.annotation.Retention;
|
|
+import java.lang.annotation.RetentionPolicy;
|
|
+
|
|
+@IntDef({
|
|
+ VideoFrameBufferType.NATIVE, VideoFrameBufferType.I420, VideoFrameBufferType.I420A,
|
|
+ VideoFrameBufferType.I422, VideoFrameBufferType.I444, VideoFrameBufferType.I010,
|
|
+ VideoFrameBufferType.I210, VideoFrameBufferType.NV12
|
|
+})
|
|
+@Retention(RetentionPolicy.SOURCE)
|
|
+public @interface VideoFrameBufferType {
|
|
+ int NATIVE = 0;
|
|
+ int I420 = 1;
|
|
+ int I420A = 2;
|
|
+ int I422 = 3;
|
|
+ int I444 = 4;
|
|
+ int I010 = 5;
|
|
+ int I210 = 6;
|
|
+ int NV12 = 7;
|
|
+}
|