libvpx: Pull from upstream

source/libvpx/vpx_dsp/mips/itrans32_cols_dspr2.c

 /*
  *  Copyright (c) 2013 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 <assert.h>
-
 #include "./vpx_config.h"
-#include "./vp9_rtcd.h"
-#include "vp9/common/vp9_common.h"
-#include "vp9/common/vp9_blockd.h"
-#include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
+#include "vpx_dsp/mips/inv_txfm_dspr2.h"
 #include "vpx_dsp/txfm_common.h"
-#include "vpx_ports/mem.h"
 
 #if HAVE_DSPR2
-void vp9_idct32_cols_add_blk_dspr2(int16_t *input, uint8_t *dest,
+void vpx_idct32_cols_add_blk_dspr2(int16_t *input, uint8_t *dest,
                                    int dest_stride) {
   int16_t step1_0, step1_1, step1_2, step1_3, step1_4, step1_5, step1_6;
   int16_t step1_7, step1_8, step1_9, step1_10, step1_11, step1_12, step1_13;
   int16_t step1_14, step1_15, step1_16, step1_17, step1_18, step1_19;
   int16_t step1_20, step1_21, step1_22, step1_23, step1_24, step1_25, step1_26;
   int16_t step1_27, step1_28, step1_29, step1_30, step1_31;
   int16_t step2_0, step2_1, step2_2, step2_3, step2_4, step2_5, step2_6;
   int16_t step2_7, step2_8, step2_9, step2_10, step2_11, step2_12, step2_13;
   int16_t step2_14, step2_15, step2_16, step2_17, step2_18, step2_19, step2_20;
   int16_t step2_21, step2_22, step2_23, step2_24, step2_25, step2_26, step2_27;
@@ skipping 1032 matching lines @@
           [temp3] "=&r" (temp3), [dest_pix1] "+r" (dest_pix1)
         : [cm] "r" (cm), [dest_stride] "r" (dest_stride),
           [step3_12] "r" (step3_12), [step3_13] "r" (step3_13),
           [step3_14] "r" (step3_14), [step3_15] "r" (step3_15)
     );
 
     input += 32;
   }
 }
 #endif  // #if HAVE_DSPR2