zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unused VideoType enum values

Browse Source 
Bug: None
Change-Id: I4294cdda93ebca44fa43de63e37d5d1fdeb2fa62
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/198120
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32975}
This commit is contained in:
Niels Möller
2020-12-17 13:22:20 +01:00
committed by Commit Bot
parent e61a40e4ef
commit a0bb2ef2dc
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common_video/libyuv/include/webrtc_libyuv.h
View File

@ -32,17 +32,12 @@ enum class VideoType {
kI420, kI420,
kIYUV, kIYUV,
kRGB24, kRGB24,
kABGR,
kARGB, kARGB,
kARGB4444,
kRGB565, kRGB565,
kARGB1555,
kYUY2, kYUY2,
kYV12, kYV12,
kUYVY, kUYVY,
kMJPEG, kMJPEG,
kNV21,
kNV12,
kBGRA, kBGRA,
}; };

14
common_video/libyuv/webrtc_libyuv.cc
View File

@ -25,8 +25,6 @@ size_t CalcBufferSize(VideoType type, int width, int height) {
size_t buffer_size = 0; size_t buffer_size = 0;
switch (type) { switch (type) {
case VideoType::kI420: case VideoType::kI420:
case VideoType::kNV12:
case VideoType::kNV21:
case VideoType::kIYUV: case VideoType::kIYUV:
case VideoType::kYV12: { case VideoType::kYV12: {
int half_width = (width + 1) >> 1; int half_width = (width + 1) >> 1;
@ -34,9 +32,7 @@ size_t CalcBufferSize(VideoType type, int width, int height) {
buffer_size = width * height + half_width * half_height * 2; buffer_size = width * height + half_width * half_height * 2;
break; break;
} }
case VideoType::kARGB4444:
case VideoType::kRGB565: case VideoType::kRGB565:
case VideoType::kARGB1555:
case VideoType::kYUY2: case VideoType::kYUY2:
case VideoType::kUYVY: case VideoType::kUYVY:
buffer_size = width * height * 2; buffer_size = width * height * 2;
@ -97,8 +93,6 @@ int ConvertVideoType(VideoType video_type) {
return libyuv::FOURCC_YV12; return libyuv::FOURCC_YV12;
case VideoType::kRGB24: case VideoType::kRGB24:
return libyuv::FOURCC_24BG; return libyuv::FOURCC_24BG;
case VideoType::kABGR:
return libyuv::FOURCC_ABGR;
case VideoType::kRGB565: case VideoType::kRGB565:
return libyuv::FOURCC_RGBP; return libyuv::FOURCC_RGBP;
case VideoType::kYUY2: case VideoType::kYUY2:
@ -107,18 +101,10 @@ int ConvertVideoType(VideoType video_type) {
return libyuv::FOURCC_UYVY; return libyuv::FOURCC_UYVY;
case VideoType::kMJPEG: case VideoType::kMJPEG:
return libyuv::FOURCC_MJPG; return libyuv::FOURCC_MJPG;
case VideoType::kNV21:
return libyuv::FOURCC_NV21;
case VideoType::kNV12:
return libyuv::FOURCC_NV12;
case VideoType::kARGB: case VideoType::kARGB:
return libyuv::FOURCC_ARGB; return libyuv::FOURCC_ARGB;
case VideoType::kBGRA: case VideoType::kBGRA:
return libyuv::FOURCC_BGRA; return libyuv::FOURCC_BGRA;
case VideoType::kARGB4444:
return libyuv::FOURCC_R444;
case VideoType::kARGB1555:
return libyuv::FOURCC_RGBO;
} }
RTC_NOTREACHED(); RTC_NOTREACHED();
return libyuv::FOURCC_ANY; return libyuv::FOURCC_ANY;