sharpyuv: remove unnecessary rgb_bit_depth -> bit_depth

Change-Id: I1c57dd83720ee286636762f0dd5ac586930d7838

Author: skal65535

sharpyuv/sharpyuv.c

@@ -73,9 +73,8 @@ static int RGBToGray(int64_t r, int64_t g, int64_t b) {
 }
 
 static uint32_t ScaleDown(uint16_t a, uint16_t b, uint16_t c, uint16_t d,
-                          int rgb_bit_depth,
+                          int bit_depth,
                           SharpYuvTransferFunctionType transfer_type) {
-  const int bit_depth = rgb_bit_depth + GetPrecisionShift(rgb_bit_depth);
   const uint32_t A = SharpYuvGammaToLinear(a, bit_depth, transfer_type);
   const uint32_t B = SharpYuvGammaToLinear(b, bit_depth, transfer_type);
   const uint32_t C = SharpYuvGammaToLinear(c, bit_depth, transfer_type);
@@ -85,9 +84,8 @@ static uint32_t ScaleDown(uint16_t a, uint16_t b, uint16_t c, uint16_t d,
 }
 
 static WEBP_INLINE void UpdateW(const fixed_y_t* src, fixed_y_t* dst, int w,
-                                int rgb_bit_depth,
+                                int bit_depth,
                                 SharpYuvTransferFunctionType transfer_type) {
-  const int bit_depth = rgb_bit_depth + GetPrecisionShift(rgb_bit_depth);
   int i = 0;
   do {
     const uint32_t R =
@@ -102,19 +100,19 @@ static WEBP_INLINE void UpdateW(const fixed_y_t* src, fixed_y_t* dst, int w,
 }
 
 static void UpdateChroma(const fixed_y_t* src1, const fixed_y_t* src2,
-                         fixed_t* dst, int uv_w, int rgb_bit_depth,
+                         fixed_t* dst, int uv_w, int bit_depth,
                          SharpYuvTransferFunctionType transfer_type) {
   int i = 0;
   do {
     const int r =
         ScaleDown(src1[0 * uv_w + 0], src1[0 * uv_w + 1], src2[0 * uv_w + 0],
-                  src2[0 * uv_w + 1], rgb_bit_depth, transfer_type);
+                  src2[0 * uv_w + 1], bit_depth, transfer_type);
     const int g =
         ScaleDown(src1[2 * uv_w + 0], src1[2 * uv_w + 1], src2[2 * uv_w + 0],
-                  src2[2 * uv_w + 1], rgb_bit_depth, transfer_type);
+                  src2[2 * uv_w + 1], bit_depth, transfer_type);
     const int b =
         ScaleDown(src1[4 * uv_w + 0], src1[4 * uv_w + 1], src2[4 * uv_w + 0],
-                  src2[4 * uv_w + 1], rgb_bit_depth, transfer_type);
+                  src2[4 * uv_w + 1], bit_depth, transfer_type);
     const int W = RGBToGray(r, g, b);
     dst[0 * uv_w] = (fixed_t)(r - W);
     dst[1 * uv_w] = (fixed_t)(g - W);
@@ -178,11 +176,10 @@ static void ImportOneRow(const uint8_t* const r_ptr, const uint8_t* const g_ptr,
 static void InterpolateTwoRows(const fixed_y_t* const best_y,
                                const fixed_t* prev_uv, const fixed_t* cur_uv,
                                const fixed_t* next_uv, int w, fixed_y_t* out1,
-                               fixed_y_t* out2, int rgb_bit_depth) {
+                               fixed_y_t* out2, int bit_depth) {
   const int uv_w = w >> 1;
   const int len = (w - 1) >> 1;  // length to filter
   int k = 3;
-  const int bit_depth = rgb_bit_depth + GetPrecisionShift(rgb_bit_depth);
   while (k-- > 0) {  // process each R/G/B segments in turn
     // special boundary case for i==0
     out1[0] = Filter2(cur_uv[0], prev_uv[0], best_y[0], bit_depth);
@@ -360,9 +357,9 @@ static int DoSharpArgbToYuv(const uint8_t* r_ptr, const uint8_t* g_ptr,
     StoreGray(src1, best_y + 0, w);
     StoreGray(src2, best_y + w, w);
 
-    UpdateW(src1, target_y, w, rgb_bit_depth, transfer_type);
-    UpdateW(src2, target_y + w, w, rgb_bit_depth, transfer_type);
-    UpdateChroma(src1, src2, target_uv, uv_w, rgb_bit_depth, transfer_type);
+    UpdateW(src1, target_y, w, y_bit_depth, transfer_type);
+    UpdateW(src2, target_y + w, w, y_bit_depth, transfer_type);
+    UpdateChroma(src1, src2, target_uv, uv_w, y_bit_depth, transfer_type);
     memcpy(best_uv, target_uv, 3 * uv_w * sizeof(*best_uv));
     best_y += 2 * w;
     best_uv += 3 * uv_w;
@@ -390,14 +387,14 @@ static int DoSharpArgbToYuv(const uint8_t* r_ptr, const uint8_t* g_ptr,
       {
         const fixed_t* const next_uv = cur_uv + ((j < h - 2) ? 3 * uv_w : 0);
         InterpolateTwoRows(best_y, prev_uv, cur_uv, next_uv, w, src1, src2,
-                           rgb_bit_depth);
+                           y_bit_depth);
         prev_uv = cur_uv;
         cur_uv = next_uv;
       }
 
-      UpdateW(src1, best_rgb_y + 0 * w, w, rgb_bit_depth, transfer_type);
-      UpdateW(src2, best_rgb_y + 1 * w, w, rgb_bit_depth, transfer_type);
-      UpdateChroma(src1, src2, best_rgb_uv, uv_w, rgb_bit_depth, transfer_type);
+      UpdateW(src1, best_rgb_y + 0 * w, w, y_bit_depth, transfer_type);
+      UpdateW(src2, best_rgb_y + 1 * w, w, y_bit_depth, transfer_type);
+      UpdateChroma(src1, src2, best_rgb_uv, uv_w, y_bit_depth, transfer_type);
 
       // update two rows of Y and one row of RGB
       diff_y_sum +=