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.
  */
 
@@ skipping 35 matching lines @@
   { RGB_TO_YUV(0x228B22) },   /* ForestGreen */
   { RGB_TO_YUV(0x006400) },   /* DarkGreen */
   { RGB_TO_YUV(0x98F5FF) },   /* Cadet Blue */
   { RGB_TO_YUV(0x6CA6CD) },   /* Sky Blue */
   { RGB_TO_YUV(0x00008B) },   /* Dark blue */
   { RGB_TO_YUV(0x551A8B) },   /* Purple */
   { RGB_TO_YUV(0xFF0000) }    /* Red */
   { RGB_TO_YUV(0xCC33FF) },   /* Magenta */
 };
 
-static const unsigned char B_PREDICTION_MODE_colors[VP9_INTRA_MODES][3] = {
+static const unsigned char B_PREDICTION_MODE_colors[INTRA_MODES][3] = {
   { RGB_TO_YUV(0x6633ff) },   /* Purple */
   { RGB_TO_YUV(0xcc33ff) },   /* Magenta */
   { RGB_TO_YUV(0xff33cc) },   /* Pink */
   { RGB_TO_YUV(0xff3366) },   /* Coral */
   { RGB_TO_YUV(0x3366ff) },   /* Blue */
   { RGB_TO_YUV(0xed00f5) },   /* Dark Blue */
   { RGB_TO_YUV(0x2e00b8) },   /* Dark Purple */
   { RGB_TO_YUV(0xff6633) },   /* Orange */
   { RGB_TO_YUV(0x33ccff) },   /* Light Blue */
   { RGB_TO_YUV(0x8ab800) },   /* Green */
@@ skipping 557 matching lines @@
     dx = *x1 - x0;
     dy = *y1 - y0;
 
     *y1 = 0;
     if (dy)
       *x1 = ((0 - y0) * dx) / dy + x0;
   }
 }
 
 int vp9_post_proc_frame(struct VP9Common *oci,
-                        struct loopfilter *lf,
-                        YV12_BUFFER_CONFIG *dest,
-                        vp9_ppflags_t *ppflags) {
-  int q = lf->filter_level * 10 / 6;
+                        YV12_BUFFER_CONFIG *dest, vp9_ppflags_t *ppflags) {
+  int q = oci->lf.filter_level * 10 / 6;
   int flags = ppflags->post_proc_flag;
   int deblock_level = ppflags->deblocking_level;
   int noise_level = ppflags->noise_level;
 
   if (!oci->frame_to_show)
     return -1;
 
   if (q > 63)
     q = 63;
 
@@ skipping 84 matching lines @@
     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];
         int dc_diff = !(mi[mb_index].mbmi.mode != I4X4_PRED &&
                         mi[mb_index].mbmi.mode != SPLITMV &&
-                        mi[mb_index].mbmi.mb_skip_coeff);
+                        mi[mb_index].mbmi.skip_coeff);
 
         if (oci->frame_type == KEY_FRAME)
           sprintf(zz, "a");
         else
           sprintf(zz, "%c", dc_diff + '0');
 
         vp9_blit_text(zz, y_ptr, post->y_stride);
         mb_index++;
         y_ptr += 16;
       }
@@ skipping 122 matching lines @@
                   y1 = by0 + 2 + (mv->row >> 3);
 
                   constrain_line(bx0 + 2, &x1, by0 + 2, &y1, width, height);
                   vp9_blit_line(bx0 + 2,  x1, by0 + 2,  y1, y_buffer, y_stride);
 
                   bmi++;
                 }
               }
             }
           }
-        } else if (mi->mbmi.mode >= NEARESTMV) {
+        } else if (is_inter_mode(mi->mbmi.mode)) {
           MV *mv = &mi->mbmi.mv.as_mv;
           const int lx0 = x0 + 8;
           const int ly0 = y0 + 8;
 
           x1 = lx0 + (mv->col >> 3);
           y1 = ly0 + (mv->row >> 3);
 
           if (x1 != lx0 && y1 != ly0) {
             constrain_line(lx0, &x1, ly0 - 1, &y1, width, height);
             vp9_blit_line(lx0,  x1, ly0 - 1,  y1, y_buffer, y_stride);
@@ skipping 114 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;
 }