diff options
Diffstat (limited to 'third_party/aom/av1/common/mips')
6 files changed, 12 insertions, 8 deletions
diff --git a/third_party/aom/av1/common/mips/dspr2/av1_itrans16_dspr2.c b/third_party/aom/av1/common/mips/dspr2/av1_itrans16_dspr2.c index 79f9338bd..1b3343155 100644 --- a/third_party/aom/av1/common/mips/dspr2/av1_itrans16_dspr2.c +++ b/third_party/aom/av1/common/mips/dspr2/av1_itrans16_dspr2.c @@ -16,19 +16,19 @@ #include "./av1_rtcd.h" #include "av1/common/common.h" #include "av1/common/blockd.h" -#include "av1/common/idct.h" #include "aom_dsp/mips/inv_txfm_dspr2.h" #include "aom_dsp/txfm_common.h" #include "aom_ports/mem.h" #if HAVE_DSPR2 void av1_iht16x16_256_add_dspr2(const int16_t *input, uint8_t *dest, int pitch, - int tx_type) { + TxfmParam *txfm_param) { int i, j; DECLARE_ALIGNED(32, int16_t, out[16 * 16]); int16_t *outptr = out; int16_t temp_out[16]; uint32_t pos = 45; + int tx_type = txfm_param->tx_type; /* bit positon for extract from acc */ __asm__ __volatile__("wrdsp %[pos], 1 \n\t" : : [pos] "r"(pos)); diff --git a/third_party/aom/av1/common/mips/dspr2/av1_itrans4_dspr2.c b/third_party/aom/av1/common/mips/dspr2/av1_itrans4_dspr2.c index 0a9552376..d9da3a1e7 100644 --- a/third_party/aom/av1/common/mips/dspr2/av1_itrans4_dspr2.c +++ b/third_party/aom/av1/common/mips/dspr2/av1_itrans4_dspr2.c @@ -16,19 +16,19 @@ #include "./av1_rtcd.h" #include "av1/common/common.h" #include "av1/common/blockd.h" -#include "av1/common/idct.h" #include "aom_dsp/mips/inv_txfm_dspr2.h" #include "aom_dsp/txfm_common.h" #include "aom_ports/mem.h" #if HAVE_DSPR2 void av1_iht4x4_16_add_dspr2(const int16_t *input, uint8_t *dest, - int dest_stride, int tx_type) { + int dest_stride, TxfmParam *txfm_param) { int i, j; DECLARE_ALIGNED(32, int16_t, out[4 * 4]); int16_t *outptr = out; int16_t temp_in[4 * 4], temp_out[4]; uint32_t pos = 45; + int tx_type = txfm_param->tx_type; /* bit positon for extract from acc */ __asm__ __volatile__("wrdsp %[pos], 1 \n\t" diff --git a/third_party/aom/av1/common/mips/dspr2/av1_itrans8_dspr2.c b/third_party/aom/av1/common/mips/dspr2/av1_itrans8_dspr2.c index 8bf5b4f0e..f62d5faef 100644 --- a/third_party/aom/av1/common/mips/dspr2/av1_itrans8_dspr2.c +++ b/third_party/aom/av1/common/mips/dspr2/av1_itrans8_dspr2.c @@ -22,12 +22,13 @@ #if HAVE_DSPR2 void av1_iht8x8_64_add_dspr2(const int16_t *input, uint8_t *dest, - int dest_stride, int tx_type) { + int dest_stride, TxfmParam *txfm_param) { int i, j; DECLARE_ALIGNED(32, int16_t, out[8 * 8]); int16_t *outptr = out; int16_t temp_in[8 * 8], temp_out[8]; uint32_t pos = 45; + int tx_type = txfm_param->tx_type; /* bit positon for extract from acc */ __asm__ __volatile__("wrdsp %[pos], 1 \n\t" : : [pos] "r"(pos)); diff --git a/third_party/aom/av1/common/mips/msa/av1_idct16x16_msa.c b/third_party/aom/av1/common/mips/msa/av1_idct16x16_msa.c index 4bd0a1635..522cce0f4 100644 --- a/third_party/aom/av1/common/mips/msa/av1_idct16x16_msa.c +++ b/third_party/aom/av1/common/mips/msa/av1_idct16x16_msa.c @@ -15,10 +15,11 @@ #include "aom_dsp/mips/inv_txfm_msa.h" void av1_iht16x16_256_add_msa(const int16_t *input, uint8_t *dst, - int32_t dst_stride, int32_t tx_type) { + int32_t dst_stride, TxfmParam *txfm_param) { int32_t i; DECLARE_ALIGNED(32, int16_t, out[16 * 16]); int16_t *out_ptr = &out[0]; + int32_t tx_type = txfm_param->tx_type; switch (tx_type) { case DCT_DCT: diff --git a/third_party/aom/av1/common/mips/msa/av1_idct4x4_msa.c b/third_party/aom/av1/common/mips/msa/av1_idct4x4_msa.c index 8364f8dc4..7a68dbbe6 100644 --- a/third_party/aom/av1/common/mips/msa/av1_idct4x4_msa.c +++ b/third_party/aom/av1/common/mips/msa/av1_idct4x4_msa.c @@ -15,8 +15,9 @@ #include "aom_dsp/mips/inv_txfm_msa.h" void av1_iht4x4_16_add_msa(const int16_t *input, uint8_t *dst, - int32_t dst_stride, int32_t tx_type) { + int32_t dst_stride, TxfmParam *txfm_param) { v8i16 in0, in1, in2, in3; + int32_t tx_type = txfm_param->tx_type; /* load vector elements of 4x4 block */ LD4x4_SH(input, in0, in1, in2, in3); diff --git a/third_party/aom/av1/common/mips/msa/av1_idct8x8_msa.c b/third_party/aom/av1/common/mips/msa/av1_idct8x8_msa.c index 71117051b..c6ef61e1a 100644 --- a/third_party/aom/av1/common/mips/msa/av1_idct8x8_msa.c +++ b/third_party/aom/av1/common/mips/msa/av1_idct8x8_msa.c @@ -15,8 +15,9 @@ #include "aom_dsp/mips/inv_txfm_msa.h" void av1_iht8x8_64_add_msa(const int16_t *input, uint8_t *dst, - int32_t dst_stride, int32_t tx_type) { + int32_t dst_stride, TxfmParam *txfm_param) { v8i16 in0, in1, in2, in3, in4, in5, in6, in7; + int32_t tx_type = txfm_param->tx_type; /* load vector elements of 8x8 block */ LD_SH8(input, 8, in0, in1, in2, in3, in4, in5, in6, in7); |