Add I422 and I210 functions

Bug: webrtc:13826
Change-Id: I68235a668abecf76133f7b89472b192b1442bed4
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3557217
Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@chromium.org>

6 files changed, 295 insertions, 0 deletions

diff --git a/include/libyuv/convert.h b/include/libyuv/convert.h
index bcdefb5d..5c2954f4 100644
--- a/include/libyuv/convert.h
+++ b/include/libyuv/convert.h
@@ -106,6 +106,23 @@ int I422ToI444(const uint8_t* src_y,
                int width,
                int height);
 
+// Convert I422 to I210.
+LIBYUV_API
+int I422ToI210(const uint8_t* src_y,
+               int src_stride_y,
+               const uint8_t* src_u,
+               int src_stride_u,
+               const uint8_t* src_v,
+               int src_stride_v,
+               uint16_t* dst_y,
+               int dst_stride_y,
+               uint16_t* dst_u,
+               int dst_stride_u,
+               uint16_t* dst_v,
+               int dst_stride_v,
+               int width,
+               int height);
+
 // Convert MM21 to NV12.
 LIBYUV_API
 int MM21ToNV12(const uint8_t* src_y,
diff --git a/include/libyuv/planar_functions.h b/include/libyuv/planar_functions.h
index 1037d732..f2007c7d 100644
--- a/include/libyuv/planar_functions.h
+++ b/include/libyuv/planar_functions.h
@@ -352,6 +352,24 @@ int I444Copy(const uint8_t* src_y,
              int width,
              int height);
 
+// Copy I210 to I210.
+#define I210ToI210 I210opy
+LIBYUV_API
+int I210Copy(const uint16_t* src_y,
+             int src_stride_y,
+             const uint16_t* src_u,
+             int src_stride_u,
+             const uint16_t* src_v,
+             int src_stride_v,
+             uint16_t* dst_y,
+             int dst_stride_y,
+             uint16_t* dst_u,
+             int dst_stride_u,
+             uint16_t* dst_v,
+             int dst_stride_v,
+             int width,
+             int height);
+
 // Copy NV12. Supports inverting.
 int NV12Copy(const uint8_t* src_y,
              int src_stride_y,
diff --git a/include/libyuv/scale.h b/include/libyuv/scale.h
index 3d4b6005..f7fb530a 100644
--- a/include/libyuv/scale.h
+++ b/include/libyuv/scale.h
@@ -195,6 +195,72 @@ int I444Scale_12(const uint16_t* src_y,
                  int dst_height,
                  enum FilterMode filtering);
 
+// Scales a YUV 4:2:2 image from the src width and height to the
+// dst width and height.
+// If filtering is kFilterNone, a simple nearest-neighbor algorithm is
+// used. This produces basic (blocky) quality at the fastest speed.
+// If filtering is kFilterBilinear, interpolation is used to produce a better
+// quality image, at the expense of speed.
+// If filtering is kFilterBox, averaging is used to produce ever better
+// quality image, at further expense of speed.
+// Returns 0 if successful.
+LIBYUV_API
+int I422Scale(const uint8_t* src_y,
+              int src_stride_y,
+              const uint8_t* src_u,
+              int src_stride_u,
+              const uint8_t* src_v,
+              int src_stride_v,
+              int src_width,
+              int src_height,
+              uint8_t* dst_y,
+              int dst_stride_y,
+              uint8_t* dst_u,
+              int dst_stride_u,
+              uint8_t* dst_v,
+              int dst_stride_v,
+              int dst_width,
+              int dst_height,
+              enum libyuv::FilterMode filtering);
+
+LIBYUV_API
+int I422Scale_16(const uint16_t* src_y,
+                 int src_stride_y,
+                 const uint16_t* src_u,
+                 int src_stride_u,
+                 const uint16_t* src_v,
+                 int src_stride_v,
+                 int src_width,
+                 int src_height,
+                 uint16_t* dst_y,
+                 int dst_stride_y,
+                 uint16_t* dst_u,
+                 int dst_stride_u,
+                 uint16_t* dst_v,
+                 int dst_stride_v,
+                 int dst_width,
+                 int dst_height,
+                 enum libyuv::FilterMode filtering);
+
+LIBYUV_API
+int I422Scale_12(const uint16_t* src_y,
+                 int src_stride_y,
+                 const uint16_t* src_u,
+                 int src_stride_u,
+                 const uint16_t* src_v,
+                 int src_stride_v,
+                 int src_width,
+                 int src_height,
+                 uint16_t* dst_y,
+                 int dst_stride_y,
+                 uint16_t* dst_u,
+                 int dst_stride_u,
+                 uint16_t* dst_v,
+                 int dst_stride_v,
+                 int dst_width,
+                 int dst_height,
+                 enum libyuv::FilterMode filtering);
+
 // Scales an NV12 image from the src width and height to the
 // dst width and height.
 // If filtering is kFilterNone, a simple nearest-neighbor algorithm is
diff --git a/source/convert.cc b/source/convert.cc
index d0116503..5ce7826c 100644
--- a/source/convert.cc
+++ b/source/convert.cc
@@ -523,6 +523,47 @@ int I422ToI420(const uint8_t* src_y,
                     dst_v, dst_stride_v, width, height, src_uv_width, height);
 }
 
+LIBYUV_API
+int I422ToI210(const uint8_t* src_y,
+               int src_stride_y,
+               const uint8_t* src_u,
+               int src_stride_u,
+               const uint8_t* src_v,
+               int src_stride_v,
+               uint16_t* dst_y,
+               int dst_stride_y,
+               uint16_t* dst_u,
+               int dst_stride_u,
+               uint16_t* dst_v,
+               int dst_stride_v,
+               int width,
+               int height) {
+  int halfwidth = (width + 1) >> 1;
+  if (!src_u || !src_v || !dst_u || !dst_v || width <= 0 || height == 0) {
+    return -1;
+  }
+  // Negative height means invert the image.
+  if (height < 0) {
+    height = -height;
+    src_y = src_y + (height - 1) * src_stride_y;
+    src_u = src_u + (height - 1) * src_stride_u;
+    src_v = src_v + (height - 1) * src_stride_v;
+    src_stride_y = -src_stride_y;
+    src_stride_u = -src_stride_u;
+    src_stride_v = -src_stride_v;
+  }
+
+  // Convert Y plane.
+  libyuv::Convert8To16Plane(src_y, src_stride_y, dst_y, dst_stride_y, 1024,
+                            width, height);
+  // Convert UV planes.
+  libyuv::Convert8To16Plane(src_u, src_stride_u, dst_u, dst_stride_u, 1024,
+                            halfwidth, height);
+  libyuv::Convert8To16Plane(src_v, src_stride_v, dst_v, dst_stride_v, 1024,
+                            halfwidth, height);
+  return 0;
+}
+
 // TODO(fbarchard): Implement row conversion.
 LIBYUV_API
 int I422ToNV21(const uint8_t* src_y,
diff --git a/source/planar_functions.cc b/source/planar_functions.cc
index 43dc1892..9ff4afe0 100644
--- a/source/planar_functions.cc
+++ b/source/planar_functions.cc
@@ -299,6 +299,49 @@ int I444Copy(const uint8_t* src_y,
   return 0;
 }
 
+// Copy I210.
+LIBYUV_API
+int I210Copy(const uint16_t* src_y,
+             int src_stride_y,
+             const uint16_t* src_u,
+             int src_stride_u,
+             const uint16_t* src_v,
+             int src_stride_v,
+             uint16_t* dst_y,
+             int dst_stride_y,
+             uint16_t* dst_u,
+             int dst_stride_u,
+             uint16_t* dst_v,
+             int dst_stride_v,
+             int width,
+             int height) {
+  int halfwidth = (width + 1) >> 1;
+  if (!src_u || !src_v || !dst_u || !dst_v || width <= 0 || height == 0) {
+    return -1;
+  }
+  // Negative height means invert the image.
+  if (height < 0) {
+    height = -height;
+    src_y = src_y + (height - 1) * src_stride_y;
+    src_u = src_u + (height - 1) * src_stride_u;
+    src_v = src_v + (height - 1) * src_stride_v;
+    src_stride_y = -src_stride_y;
+    src_stride_u = -src_stride_u;
+    src_stride_v = -src_stride_v;
+  }
+
+  if (dst_y) {
+    libyuv::CopyPlane_16(src_y, src_stride_y, dst_y, dst_stride_y, width,
+                         height);
+  }
+  // Copy UV planes.
+  libyuv::CopyPlane_16(src_u, src_stride_u, dst_u, dst_stride_u, halfwidth,
+                       height);
+  libyuv::CopyPlane_16(src_v, src_stride_v, dst_v, dst_stride_v, halfwidth,
+                       height);
+  return 0;
+}
+
 // Copy I400.
 LIBYUV_API
 int I400ToI400(const uint8_t* src_y,
diff --git a/source/scale.cc b/source/scale.cc
index ec972db5..d5c782b8 100644
--- a/source/scale.cc
+++ b/source/scale.cc
@@ -2328,6 +2328,116 @@ int I444Scale_12(const uint16_t* src_y,
   return 0;
 }
 
+// Scale an I422 image.
+// This function in turn calls a scaling function for each plane.
+
+LIBYUV_API
+int I422Scale(const uint8_t* src_y,
+              int src_stride_y,
+              const uint8_t* src_u,
+              int src_stride_u,
+              const uint8_t* src_v,
+              int src_stride_v,
+              int src_width,
+              int src_height,
+              uint8_t* dst_y,
+              int dst_stride_y,
+              uint8_t* dst_u,
+              int dst_stride_u,
+              uint8_t* dst_v,
+              int dst_stride_v,
+              int dst_width,
+              int dst_height,
+              enum libyuv::FilterMode filtering) {
+  if (!src_y || !src_u || !src_v || src_width <= 0 || src_height == 0 ||
+      src_width > 32768 || src_height > 32768 || !dst_y || !dst_u || !dst_v ||
+      dst_width <= 0 || dst_height <= 0) {
+    return -1;
+  }
+  int src_halfwidth = SUBSAMPLE(src_width, 1, 1);
+  int dst_halfwidth = SUBSAMPLE(dst_width, 1, 1);
+
+  libyuv::ScalePlane(src_y, src_stride_y, src_width, src_height, dst_y,
+                     dst_stride_y, dst_width, dst_height, filtering);
+  libyuv::ScalePlane(src_u, src_stride_u, src_halfwidth, src_height, dst_u,
+                     dst_stride_u, dst_halfwidth, dst_height, filtering);
+  libyuv::ScalePlane(src_v, src_stride_v, src_halfwidth, src_height, dst_v,
+                     dst_stride_v, dst_halfwidth, dst_height, filtering);
+  return 0;
+}
+
+LIBYUV_API
+int I422Scale_16(const uint16_t* src_y,
+                 int src_stride_y,
+                 const uint16_t* src_u,
+                 int src_stride_u,
+                 const uint16_t* src_v,
+                 int src_stride_v,
+                 int src_width,
+                 int src_height,
+                 uint16_t* dst_y,
+                 int dst_stride_y,
+                 uint16_t* dst_u,
+                 int dst_stride_u,
+                 uint16_t* dst_v,
+                 int dst_stride_v,
+                 int dst_width,
+                 int dst_height,
+                 enum libyuv::FilterMode filtering) {
+  if (!src_y || !src_u || !src_v || src_width <= 0 || src_height == 0 ||
+      src_width > 32768 || src_height > 32768 || !dst_y || !dst_u || !dst_v ||
+      dst_width <= 0 || dst_height <= 0) {
+    return -1;
+  }
+
+  int src_halfwidth = SUBSAMPLE(src_width, 1, 1);
+  int dst_halfwidth = SUBSAMPLE(dst_width, 1, 1);
+
+  libyuv::ScalePlane_16(src_y, src_stride_y, src_width, src_height, dst_y,
+                        dst_stride_y, dst_width, dst_height, filtering);
+  libyuv::ScalePlane_16(src_u, src_stride_u, src_halfwidth, src_height, dst_u,
+                        dst_stride_u, dst_halfwidth, dst_height, filtering);
+  libyuv::ScalePlane_16(src_v, src_stride_v, src_halfwidth, src_height, dst_v,
+                        dst_stride_v, dst_halfwidth, dst_height, filtering);
+  return 0;
+}
+
+LIBYUV_API
+int I422Scale_12(const uint16_t* src_y,
+                 int src_stride_y,
+                 const uint16_t* src_u,
+                 int src_stride_u,
+                 const uint16_t* src_v,
+                 int src_stride_v,
+                 int src_width,
+                 int src_height,
+                 uint16_t* dst_y,
+                 int dst_stride_y,
+                 uint16_t* dst_u,
+                 int dst_stride_u,
+                 uint16_t* dst_v,
+                 int dst_stride_v,
+                 int dst_width,
+                 int dst_height,
+                 enum libyuv::FilterMode filtering) {
+  if (!src_y || !src_u || !src_v || src_width <= 0 || src_height == 0 ||
+      src_width > 32768 || src_height > 32768 || !dst_y || !dst_u || !dst_v ||
+      dst_width <= 0 || dst_height <= 0) {
+    return -1;
+  }
+
+  int src_halfwidth = SUBSAMPLE(src_width, 1, 1);
+  int dst_halfwidth = SUBSAMPLE(dst_width, 1, 1);
+
+  libyuv::ScalePlane_12(src_y, src_stride_y, src_width, src_height, dst_y,
+                        dst_stride_y, dst_width, dst_height, filtering);
+  libyuv::ScalePlane_12(src_u, src_stride_u, src_halfwidth, src_height, dst_u,
+                        dst_stride_u, dst_halfwidth, dst_height, filtering);
+  libyuv::ScalePlane_12(src_v, src_stride_v, src_halfwidth, src_height, dst_v,
+                        dst_stride_v, dst_halfwidth, dst_height, filtering);
+  return 0;
+}
+
 // Scale an NV12 image.
 // This function in turn calls a scaling function for each plane.