1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
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;
}
|
