commit a0bb2ef2dce1e64efd40a1b98789664102f377f0
author Niels Möller <nisse@webrtc.org> Thu Dec 17 12:22:20 2020
committer Commit Bot <commit-bot@chromium.org> Thu Jan 14 11:45:37 2021
tree bd0ad4baefbf9dd89408c501afb3653b8dc01fe5
parent e61a40e4efb663e462611077e0fc7b1d182ef397

Delete unused VideoType enum values

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}

common_video/libyuv/include/webrtc_libyuv.h

diff --git a/common_video/libyuv/include/webrtc_libyuv.h b/common_video/libyuv/include/webrtc_libyuv.h
index d27250a..03c9ff4 100644
--- a/common_video/libyuv/include/webrtc_libyuv.h
+++ b/common_video/libyuv/include/webrtc_libyuv.h
@@ -32,17 +32,12 @@
   kI420,
   kIYUV,
   kRGB24,
-  kABGR,
   kARGB,
-  kARGB4444,
   kRGB565,
-  kARGB1555,
   kYUY2,
   kYV12,
   kUYVY,
   kMJPEG,
-  kNV21,
-  kNV12,
   kBGRA,
 };
 

common_video/libyuv/webrtc_libyuv.cc

diff --git a/common_video/libyuv/webrtc_libyuv.cc b/common_video/libyuv/webrtc_libyuv.cc
index f4fb15e..cc6a71a 100644
--- a/common_video/libyuv/webrtc_libyuv.cc
+++ b/common_video/libyuv/webrtc_libyuv.cc
@@ -25,8 +25,6 @@
   size_t buffer_size = 0;
   switch (type) {
     case VideoType::kI420:
-    case VideoType::kNV12:
-    case VideoType::kNV21:
     case VideoType::kIYUV:
     case VideoType::kYV12: {
       int half_width = (width + 1) >> 1;
@@ -34,9 +32,7 @@
       buffer_size = width * height + half_width * half_height * 2;
       break;
     }
-    case VideoType::kARGB4444:
     case VideoType::kRGB565:
-    case VideoType::kARGB1555:
     case VideoType::kYUY2:
     case VideoType::kUYVY:
       buffer_size = width * height * 2;
@@ -97,8 +93,6 @@
       return libyuv::FOURCC_YV12;
     case VideoType::kRGB24:
       return libyuv::FOURCC_24BG;
-    case VideoType::kABGR:
-      return libyuv::FOURCC_ABGR;
     case VideoType::kRGB565:
       return libyuv::FOURCC_RGBP;
     case VideoType::kYUY2:
@@ -107,18 +101,10 @@
       return libyuv::FOURCC_UYVY;
     case VideoType::kMJPEG:
       return libyuv::FOURCC_MJPG;
-    case VideoType::kNV21:
-      return libyuv::FOURCC_NV21;
-    case VideoType::kNV12:
-      return libyuv::FOURCC_NV12;
     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;
   }
   RTC_NOTREACHED();
   return libyuv::FOURCC_ANY;