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
68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
From: Michael Froman <mjfroman@mac.com>
|
|
Date: Thu, 28 Apr 2022 10:53:43 -0500
|
|
Subject: Bug 1766646 - (fix-a0bb2ef2dc) add back VideoType enum values
|
|
|
|
---
|
|
common_video/libyuv/include/webrtc_libyuv.h | 3 +++
|
|
common_video/libyuv/webrtc_libyuv.cc | 9 +++++++++
|
|
2 files changed, 12 insertions(+)
|
|
|
|
diff --git a/common_video/libyuv/include/webrtc_libyuv.h b/common_video/libyuv/include/webrtc_libyuv.h
|
|
index 68831c70ab..253a33294d 100644
|
|
--- a/common_video/libyuv/include/webrtc_libyuv.h
|
|
+++ b/common_video/libyuv/include/webrtc_libyuv.h
|
|
@@ -35,11 +35,14 @@ enum class VideoType {
|
|
kBGR24,
|
|
kARGB,
|
|
kABGR,
|
|
+ kARGB4444,
|
|
kRGB565,
|
|
+ kARGB1555,
|
|
kYUY2,
|
|
kYV12,
|
|
kUYVY,
|
|
kMJPEG,
|
|
+ kNV21,
|
|
kBGRA,
|
|
kNV12,
|
|
};
|
|
diff --git a/common_video/libyuv/webrtc_libyuv.cc b/common_video/libyuv/webrtc_libyuv.cc
|
|
index 31ba1feca3..05a4b184c2 100644
|
|
--- a/common_video/libyuv/webrtc_libyuv.cc
|
|
+++ b/common_video/libyuv/webrtc_libyuv.cc
|
|
@@ -24,6 +24,7 @@ size_t CalcBufferSize(VideoType type, int width, int height) {
|
|
RTC_DCHECK_GE(height, 0);
|
|
switch (type) {
|
|
case VideoType::kI420:
|
|
+ case VideoType::kNV21:
|
|
case VideoType::kIYUV:
|
|
case VideoType::kYV12:
|
|
case VideoType::kNV12: {
|
|
@@ -31,7 +32,9 @@ size_t CalcBufferSize(VideoType type, int width, int height) {
|
|
int half_height = (height + 1) >> 1;
|
|
return width * height + half_width * half_height * 2;
|
|
}
|
|
+ case VideoType::kARGB4444:
|
|
case VideoType::kRGB565:
|
|
+ case VideoType::kARGB1555:
|
|
case VideoType::kYUY2:
|
|
case VideoType::kUYVY:
|
|
return width * height * 2;
|
|
@@ -104,10 +107,16 @@ int ConvertVideoType(VideoType video_type) {
|
|
return libyuv::FOURCC_UYVY;
|
|
case VideoType::kMJPEG:
|
|
return libyuv::FOURCC_MJPG;
|
|
+ case VideoType::kNV21:
|
|
+ return libyuv::FOURCC_NV21;
|
|
case VideoType::kARGB:
|
|
return libyuv::FOURCC_ARGB;
|
|
case VideoType::kBGRA:
|
|
return libyuv::FOURCC_BGRA;
|
|
+ case VideoType::kARGB4444:
|
|
+ return libyuv::FOURCC_R444;
|
|
+ case VideoType::kARGB1555:
|
|
+ return libyuv::FOURCC_RGBO;
|
|
case VideoType::kNV12:
|
|
return libyuv::FOURCC_NV12;
|
|
}
|