diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-02 07:11:36 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-02 07:11:36 -0700 |
| commit | dd1e6b8e6fb32af3692f9605ef5e1b4a3ca751b3 (patch) | |
| tree | 71534869c4e3e5f25618cffb0d64461efad5b143 | |
| parent | a4279138642f80fc906d5e2705d1caa0d97046a0 (diff) | |
| parent | ff37688a916c5e55aa36ace2e48a096c70a9413e (diff) | |
| download | libvpx-dd1e6b8e6fb32af3692f9605ef5e1b4a3ca751b3.tar libvpx-dd1e6b8e6fb32af3692f9605ef5e1b4a3ca751b3.tar.gz libvpx-dd1e6b8e6fb32af3692f9605ef5e1b4a3ca751b3.tar.bz2 libvpx-dd1e6b8e6fb32af3692f9605ef5e1b4a3ca751b3.zip | |
Merge "Fix block reconstruction with sb8x8 enabled." into experimental
| -rw-r--r-- | vp9/common/vp9_recon.c | 4 | ||||
| -rw-r--r-- | vp9/common/vp9_rtcd_defs.sh | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/vp9/common/vp9_recon.c b/vp9/common/vp9_recon.c index 41194504b..4ab4f394b 100644 --- a/vp9/common/vp9_recon.c +++ b/vp9/common/vp9_recon.c @@ -31,9 +31,10 @@ static INLINE void recon(int rows, int cols, void vp9_recon_b_c(uint8_t *pred_ptr, int16_t *diff_ptr, uint8_t *dst_ptr, int stride) { assert(pred_ptr == dst_ptr); - recon(4, 4, diff_ptr, 16, dst_ptr, stride); + recon(4, 4, diff_ptr, 16 >> CONFIG_SB8X8, dst_ptr, stride); } +#if !CONFIG_SB8X8 void vp9_recon_uv_b_c(uint8_t *pred_ptr, int16_t *diff_ptr, uint8_t *dst_ptr, int stride) { assert(pred_ptr == dst_ptr); @@ -51,6 +52,7 @@ void vp9_recon2b_c(uint8_t *pred_ptr, int16_t *diff_ptr, uint8_t *dst_ptr, assert(pred_ptr == dst_ptr); recon(4, 8, diff_ptr, 8, dst_ptr, stride); } +#endif static void recon_plane(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize, int plane) { const int bw = 4 << (b_width_log2(bsize) - xd->plane[plane].subsampling_x); diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh index 78cb786c2..6725cdf48 100644 --- a/vp9/common/vp9_rtcd_defs.sh +++ b/vp9/common/vp9_rtcd_defs.sh @@ -63,6 +63,8 @@ specialize vp9_copy_mem8x4 mmx prototype void vp9_recon_b "uint8_t *pred_ptr, int16_t *diff_ptr, uint8_t *dst_ptr, int stride" specialize vp9_recon_b +if [ "$CONFIG_SB8X8" != "yes" ]; then + prototype void vp9_recon_uv_b "uint8_t *pred_ptr, int16_t *diff_ptr, uint8_t *dst_ptr, int stride" specialize vp9_recon_uv_b @@ -76,6 +78,8 @@ prototype void vp9_recon4b "uint8_t *pred_ptr, int16_t *diff_ptr, uint8_t *dst_p specialize vp9_recon4b # specialize vp9_recon4b sse2 +fi + prototype void vp9_recon_sb "struct macroblockd *x, enum BLOCK_SIZE_TYPE bsize" specialize vp9_recon_sb |