libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_postproc.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 
-#include "vpx_ports/config.h"
+#include "./vpx_config.h"
 #include "vpx_scale/yv12config.h"
 #include "vp9/common/vp9_postproc.h"
 #include "vp9/common/vp9_textblit.h"
-#include "vpx_scale/vpxscale.h"
+#include "vpx_scale/vpx_scale.h"
 #include "vp9/common/vp9_systemdependent.h"
 #include "./vp9_rtcd.h"
 #include "./vpx_scale_rtcd.h"
 
 
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 
 #define RGB_TO_YUV(t)                                            \
   ( (0.257*(float)(t >> 16))  + (0.504*(float)(t >> 8 & 0xff)) + \
     (0.098*(float)(t & 0xff)) + 16),                             \
   (-(0.148*(float)(t >> 16))  - (0.291*(float)(t >> 8 & 0xff)) + \
     (0.439*(float)(t & 0xff)) + 128),                            \
   ( (0.439*(float)(t >> 16))  - (0.368*(float)(t >> 8 & 0xff)) - \
     (0.071*(float)(t & 0xff)) + 128)
 
 /* global constants */
-#if CONFIG_POSTPROC_VISUALIZER
+#if 0 && CONFIG_POSTPROC_VISUALIZER
 static const unsigned char MB_PREDICTION_MODE_colors[MB_MODE_COUNT][3] = {
   { RGB_TO_YUV(0x98FB98) },   /* PaleGreen */
   { RGB_TO_YUV(0x00FF00) },   /* Green */
   { RGB_TO_YUV(0xADFF2F) },   /* GreenYellow */
   { RGB_TO_YUV(0x8F0000) },   /* Dark Red */
   { RGB_TO_YUV(0x008F8F) },   /* Dark Cyan */
   { RGB_TO_YUV(0x008F8F) },   /* Dark Cyan */
   { RGB_TO_YUV(0x008F8F) },   /* Dark Cyan */
   { RGB_TO_YUV(0x8F0000) },   /* Dark Red */
   { RGB_TO_YUV(0x8F0000) },   /* Dark Red */
@@ skipping 79 matching lines @@
   3, 8, 3, 7, 8, 5, 11, 4, 12, 3,
   11, 9, 14, 8, 14, 13, 4, 3, 1, 2,
   14, 6, 5, 4, 4, 11, 4, 6, 2, 1,
   5, 8, 8, 12, 13, 5, 14, 10, 12, 13,
   0, 9, 5, 5, 11, 10, 13, 9, 10, 13,
 };
 
 
 /****************************************************************************
  */
-void vp9_post_proc_down_and_across_c(unsigned char *src_ptr,
-                                     unsigned char *dst_ptr,
+void vp9_post_proc_down_and_across_c(uint8_t *src_ptr,
+                                     uint8_t *dst_ptr,
                                      int src_pixels_per_line,
                                      int dst_pixels_per_line,
                                      int rows,
                                      int cols,
                                      int flimit) {
-  unsigned char *p_src, *p_dst;
+  uint8_t *p_src, *p_dst;
   int row;
   int col;
   int i;
   int v;
   int pitch = src_pixels_per_line;
-  unsigned char d[8];
+  uint8_t d[8];
   (void)dst_pixels_per_line;
 
   for (row = 0; row < rows; row++) {
     /* post_proc_down for one row */
     p_src = src_ptr;
     p_dst = dst_ptr;
 
     for (col = 0; col < cols; col++) {
 
       int kernel = 4;
@@ skipping 49 matching lines @@
   }
 }
 
 static int q2mbl(int x) {
   if (x < 20) x = 20;
 
   x = 50 + (x - 50) * 10 / 8;
   return x * x / 3;
 }
 
-void vp9_mbpost_proc_across_ip_c(unsigned char *src, int pitch,
+void vp9_mbpost_proc_across_ip_c(uint8_t *src, int pitch,
                                  int rows, int cols, int flimit) {
   int r, c, i;
 
-  unsigned char *s = src;
-  unsigned char d[16];
+  uint8_t *s = src;
+  uint8_t d[16];
 
 
   for (r = 0; r < rows; r++) {
     int sumsq = 0;
     int sum   = 0;
 
     for (i = -8; i <= 6; i++) {
       sumsq += s[i] * s[i];
       sum   += s[i];
       d[i + 8] = 0;
@@ skipping 12 matching lines @@
         d[c & 15] = (8 + sum + s[c]) >> 4;
       }
 
       s[c - 8] = d[(c - 8) & 15];
     }
 
     s += pitch;
   }
 }
 
-void vp9_mbpost_proc_down_c(unsigned char *dst, int pitch,
+void vp9_mbpost_proc_down_c(uint8_t *dst, int pitch,
                             int rows, int cols, int flimit) {
   int r, c, i;
   const short *rv3 = &vp9_rv[63 & rand()];
 
   for (c = 0; c < cols; c++) {
-    unsigned char *s = &dst[c];
+    uint8_t *s = &dst[c];
     int sumsq = 0;
     int sum   = 0;
-    unsigned char d[16];
+    uint8_t d[16];
     const short *rv2 = rv3 + ((c * 17) & 127);
 
     for (i = -8; i <= 6; i++) {
       sumsq += s[i * pitch] * s[i * pitch];
       sum   += s[i * pitch];
     }
 
     for (r = 0; r < rows + 8; r++) {
       sumsq += s[7 * pitch] * s[ 7 * pitch] - s[-8 * pitch] * s[-8 * pitch];
       sum  += s[7 * pitch] - s[-8 * pitch];
@@ skipping 156 matching lines @@
  *
  *  OUTPUTS       : None.
  *
  *  RETURNS       : void.
  *
  *  FUNCTION      : adds gaussian noise to a plane of pixels
  *
  *  SPECIAL NOTES : None.
  *
  ****************************************************************************/
-void vp9_plane_add_noise_c(unsigned char *Start, char *noise,
+void vp9_plane_add_noise_c(uint8_t *Start, char *noise,
                            char blackclamp[16],
                            char whiteclamp[16],
                            char bothclamp[16],
                            unsigned int Width, unsigned int Height, int Pitch) {
   unsigned int i, j;
 
   for (i = 0; i < Height; i++) {
-    unsigned char *Pos = Start + i * Pitch;
+    uint8_t *Pos = Start + i * Pitch;
     char  *Ref = (char *)(noise + (rand() & 0xff));
 
     for (j = 0; j < Width; j++) {
       if (Pos[j] < blackclamp[0])
         Pos[j] = blackclamp[0];
 
       if (Pos[j] > 255 + whiteclamp[0])
         Pos[j] = 255 + whiteclamp[0];
 
       Pos[j] += Ref[j];
     }
   }
 }
 
 /* Blend the macro block with a solid colored square.  Leave the
  * edges unblended to give distinction to macro blocks in areas
  * filled with the same color block.
  */
-void vp9_blend_mb_inner_c(unsigned char *y, unsigned char *u, unsigned char *v,
+void vp9_blend_mb_inner_c(uint8_t *y, uint8_t *u, uint8_t *v,
                           int y1, int u1, int v1, int alpha, int stride) {
   int i, j;
   int y1_const = y1 * ((1 << 16) - alpha);
   int u1_const = u1 * ((1 << 16) - alpha);
   int v1_const = v1 * ((1 << 16) - alpha);
 
   y += 2 * stride + 2;
   for (i = 0; i < 12; i++) {
     for (j = 0; j < 12; j++) {
       y[j] = (y[j] * alpha + y1_const) >> 16;
@@ skipping 12 matching lines @@
       v[j] = (v[j] * alpha + v1_const) >> 16;
     }
     u += stride;
     v += stride;
   }
 }
 
 /* Blend only the edge of the macro block.  Leave center
  * unblended to allow for other visualizations to be layered.
  */
-void vp9_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v,
+void vp9_blend_mb_outer_c(uint8_t *y, uint8_t *u, uint8_t *v,
                           int y1, int u1, int v1, int alpha, int stride) {
   int i, j;
   int y1_const = y1 * ((1 << 16) - alpha);
   int u1_const = u1 * ((1 << 16) - alpha);
   int v1_const = v1 * ((1 << 16) - alpha);
 
   for (i = 0; i < 2; i++) {
     for (j = 0; j < 16; j++) {
       y[j] = (y[j] * alpha + y1_const) >> 16;
     }
@@ skipping 34 matching lines @@
     u += stride;
     v += stride;
   }
 
   for (j = 0; j < 8; j++) {
     u[j] = (u[j] * alpha + u1_const) >> 16;
     v[j] = (v[j] * alpha + v1_const) >> 16;
   }
 }
 
-void vp9_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v,
+void vp9_blend_b_c(uint8_t *y, uint8_t *u, uint8_t *v,
                    int y1, int u1, int v1, int alpha, int stride) {
   int i, j;
   int y1_const = y1 * ((1 << 16) - alpha);
   int u1_const = u1 * ((1 << 16) - alpha);
   int v1_const = v1 * ((1 << 16) - alpha);
 
   for (i = 0; i < 4; i++) {
     for (j = 0; j < 4; j++) {
       y[j] = (y[j] * alpha + y1_const) >> 16;
     }
@@ skipping 97 matching lines @@
     vp9_plane_add_noise(oci->post_proc_buffer.y_buffer,
                         oci->postproc_state.noise,
                         oci->postproc_state.blackclamp,
                         oci->postproc_state.whiteclamp,
                         oci->postproc_state.bothclamp,
                         oci->post_proc_buffer.y_width,
                         oci->post_proc_buffer.y_height,
                         oci->post_proc_buffer.y_stride);
   }
 
-#if CONFIG_POSTPROC_VISUALIZER
+#if 0 && CONFIG_POSTPROC_VISUALIZER
   if (flags & VP9D_DEBUG_TXT_FRAME_INFO) {
     char message[512];
     sprintf(message, "F%1dG%1dQ%3dF%3dP%d_s%dx%d",
             (oci->frame_type == KEY_FRAME),
             oci->refresh_golden_frame,
             oci->base_qindex,
             oci->filter_level,
             flags,
             oci->mb_cols, oci->mb_rows);
     vp9_blit_text(message, oci->post_proc_buffer.y_buffer,
                   oci->post_proc_buffer.y_stride);
   }
 
   if (flags & VP9D_DEBUG_TXT_MBLK_MODES) {
     int i, j;
-    unsigned char *y_ptr;
+    uint8_t *y_ptr;
     YV12_BUFFER_CONFIG *post = &oci->post_proc_buffer;
     int mb_rows = post->y_height >> 4;
     int mb_cols = post->y_width  >> 4;
     int mb_index = 0;
     MODE_INFO *mi = oci->mi;
 
     y_ptr = post->y_buffer + 4 * post->y_stride + 4;
 
     /* vp9_filter each macro block */
     for (i = 0; i < mb_rows; i++) {
       for (j = 0; j < mb_cols; j++) {
         char zz[4];
 
         sprintf(zz, "%c", mi[mb_index].mbmi.mode + 'a');
 
         vp9_blit_text(zz, y_ptr, post->y_stride);
         mb_index++;
         y_ptr += 16;
       }
 
       mb_index++; /* border */
       y_ptr += post->y_stride  * 16 - post->y_width;
 
     }
   }
 
   if (flags & VP9D_DEBUG_TXT_DC_DIFF) {
     int i, j;
-    unsigned char *y_ptr;
+    uint8_t *y_ptr;
     YV12_BUFFER_CONFIG *post = &oci->post_proc_buffer;
     int mb_rows = post->y_height >> 4;
     int mb_cols = post->y_width  >> 4;
     int mb_index = 0;
     MODE_INFO *mi = oci->mi;
 
     y_ptr = post->y_buffer + 4 * post->y_stride + 4;
 
     /* vp9_filter each macro block */
     for (i = 0; i < mb_rows; i++) {
@@ skipping 26 matching lines @@
              oci->bitrate, oci->framerate);
     vp9_blit_text(message, oci->post_proc_buffer.y_buffer,
                   oci->post_proc_buffer.y_stride);
   }
 
   /* Draw motion vectors */
   if ((flags & VP9D_DEBUG_DRAW_MV) && ppflags->display_mv_flag) {
     YV12_BUFFER_CONFIG *post = &oci->post_proc_buffer;
     int width  = post->y_width;
     int height = post->y_height;
-    unsigned char *y_buffer = oci->post_proc_buffer.y_buffer;
+    uint8_t *y_buffer = oci->post_proc_buffer.y_buffer;
     int y_stride = oci->post_proc_buffer.y_stride;
     MODE_INFO *mi = oci->mi;
     int x0, y0;
 
     for (y0 = 0; y0 < height; y0 += 16) {
       for (x0 = 0; x0 < width; x0 += 16) {
         int x1, y1;
 
         if (!(ppflags->display_mv_flag & (1 << mi->mbmi.mode))) {
           mi++;
@@ skipping 121 matching lines @@
     }
   }
 
   /* Color in block modes */
   if ((flags & VP9D_DEBUG_CLR_BLK_MODES)
       && (ppflags->display_mb_modes_flag || ppflags->display_b_modes_flag)) {
     int y, x;
     YV12_BUFFER_CONFIG *post = &oci->post_proc_buffer;
     int width  = post->y_width;
     int height = post->y_height;
-    unsigned char *y_ptr = oci->post_proc_buffer.y_buffer;
-    unsigned char *u_ptr = oci->post_proc_buffer.u_buffer;
-    unsigned char *v_ptr = oci->post_proc_buffer.v_buffer;
+    uint8_t *y_ptr = oci->post_proc_buffer.y_buffer;
+    uint8_t *u_ptr = oci->post_proc_buffer.u_buffer;
+    uint8_t *v_ptr = oci->post_proc_buffer.v_buffer;
     int y_stride = oci->post_proc_buffer.y_stride;
     MODE_INFO *mi = oci->mi;
 
     for (y = 0; y < height; y += 16) {
       for (x = 0; x < width; x += 16) {
         int Y = 0, U = 0, V = 0;
 
         if (mi->mbmi.mode == B_PRED &&
             ((ppflags->display_mb_modes_flag & B_PRED) ||
              ppflags->display_b_modes_flag)) {
           int by, bx;
-          unsigned char *yl, *ul, *vl;
+          uint8_t *yl, *ul, *vl;
           union b_mode_info *bmi = mi->bmi;
 
           yl = y_ptr + x;
           ul = u_ptr + (x >> 1);
           vl = v_ptr + (x >> 1);
 
           for (by = 0; by < 16; by += 4) {
             for (bx = 0; bx < 16; bx += 4) {
               if ((ppflags->display_b_modes_flag & (1 << mi->mbmi.mode))
                   || (ppflags->display_mb_modes_flag & B_PRED)) {
@@ skipping 30 matching lines @@
     }
   }
 
   /* Color in frame reference blocks */
   if ((flags & VP9D_DEBUG_CLR_FRM_REF_BLKS) &&
       ppflags->display_ref_frame_flag) {
     int y, x;
     YV12_BUFFER_CONFIG *post = &oci->post_proc_buffer;
     int width  = post->y_width;
     int height = post->y_height;
-    unsigned char *y_ptr = oci->post_proc_buffer.y_buffer;
-    unsigned char *u_ptr = oci->post_proc_buffer.u_buffer;
-    unsigned char *v_ptr = oci->post_proc_buffer.v_buffer;
+    uint8_t *y_ptr = oci->post_proc_buffer.y_buffer;
+    uint8_t *u_ptr = oci->post_proc_buffer.u_buffer;
+    uint8_t *v_ptr = oci->post_proc_buffer.v_buffer;
     int y_stride = oci->post_proc_buffer.y_stride;
     MODE_INFO *mi = oci->mi;
 
     for (y = 0; y < height; y += 16) {
       for (x = 0; x < width; x += 16) {
         int Y = 0, U = 0, V = 0;
 
         if (ppflags->display_ref_frame_flag & (1 << mi->mbmi.ref_frame)) {
           Y = MV_REFERENCE_FRAME_colors[mi->mbmi.ref_frame][0];
           U = MV_REFERENCE_FRAME_colors[mi->mbmi.ref_frame][1];
@@ skipping 16 matching lines @@
 
   *dest = oci->post_proc_buffer;
 
   /* handle problem with extending borders */
   dest->y_width = oci->Width;
   dest->y_height = oci->Height;
   dest->uv_height = dest->y_height / 2;
 
   return 0;
 }