diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2013-02-28 14:34:27 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-02-28 14:34:27 -0800 |
| commit | 72b146690a148b8eca13f6e07946cee62fd03b0b (patch) | |
| tree | b70ed9fbb7b960d8c7bb2dd4359f8bae5c21a777 /vp9/common | |
| parent | aa8fb070b85e29f23d16fc204c10927aa97ed34a (diff) | |
| parent | 6193bc3ba849667ff0c3320b0edeb128969ab465 (diff) | |
| download | libvpx-72b146690a148b8eca13f6e07946cee62fd03b0b.tar libvpx-72b146690a148b8eca13f6e07946cee62fd03b0b.tar.gz libvpx-72b146690a148b8eca13f6e07946cee62fd03b0b.tar.bz2 libvpx-72b146690a148b8eca13f6e07946cee62fd03b0b.zip | |
Merge "Refactor vp9_dequant_idct_add function" into experimental
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 4 | ||||
| -rw-r--r-- | vp9/common/vp9_rtcd_defs.sh | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index c7429d553..b35c1c246 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -380,9 +380,7 @@ typedef struct macroblockd { void (*inv_txm4x4_1)(int16_t *input, int16_t *output, int pitch); void (*inv_txm4x4)(int16_t *input, int16_t *output, int pitch); void (*itxm_add)(int16_t *input, const int16_t *dq, - uint8_t *pred, uint8_t *output, int pitch, int stride); - void (*dc_only_itxm_add)(int input_dc, uint8_t *pred_ptr, - uint8_t *dst_ptr, int pitch, int stride); + uint8_t *pred, uint8_t *output, int pitch, int stride, int eob); void (*itxm_add_y_block)(int16_t *q, const int16_t *dq, uint8_t *pre, uint8_t *dst, int stride, struct macroblockd *xd); void (*itxm_add_uv_block)(int16_t *q, const int16_t *dq, diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh index 3e4e25114..2bd26c83e 100644 --- a/vp9/common/vp9_rtcd_defs.sh +++ b/vp9/common/vp9_rtcd_defs.sh @@ -38,7 +38,7 @@ specialize vp9_dequant_idct_add_16x16 prototype void vp9_dequant_idct_add_8x8 "int16_t *input, const int16_t *dq, uint8_t *pred, uint8_t *dest, int pitch, int stride, int eob" specialize vp9_dequant_idct_add_8x8 -prototype void vp9_dequant_idct_add "int16_t *input, const int16_t *dq, uint8_t *pred, uint8_t *dest, int pitch, int stride" +prototype void vp9_dequant_idct_add "int16_t *input, const int16_t *dq, uint8_t *pred, uint8_t *dest, int pitch, int stride, int eob" specialize vp9_dequant_idct_add prototype void vp9_dequant_idct_add_y_block "int16_t *q, const int16_t *dq, uint8_t *pre, uint8_t *dst, int stride, struct macroblockd *xd" |