diff options
| author | Deb Mukherjee <debargha@google.com> | 2014-10-09 15:39:56 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-09 15:39:56 -0700 |
| commit | 9a29fdbae7fbeba8e021f6cbec6a81771b50fd57 (patch) | |
| tree | ec049f9c962015838b7a23db09e5795048073fdb /vp9/encoder/vp9_encodeframe.c | |
| parent | 112789d4f26ef7b8ec4cb216bfe79b59fbc4a022 (diff) | |
| parent | 1929c9b39198719c9b5a102385b56a0b909e1dfd (diff) | |
| download | libvpx-9a29fdbae7fbeba8e021f6cbec6a81771b50fd57.tar libvpx-9a29fdbae7fbeba8e021f6cbec6a81771b50fd57.tar.gz libvpx-9a29fdbae7fbeba8e021f6cbec6a81771b50fd57.tar.bz2 libvpx-9a29fdbae7fbeba8e021f6cbec6a81771b50fd57.zip | |
Merge "Rename highbitdepth functions to use highbd prefix"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 604503878..3bd1ee924 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3246,16 +3246,16 @@ static int set_var_thresh_from_histogram(VP9_COMP *cpi) { if (cm->use_highbitdepth) { switch (cm->bit_depth) { case VPX_BITS_8: - vp9_high_get16x16var(src, src_stride, last_src, last_stride, - &var16->sse, &var16->sum); + vp9_highbd_get16x16var(src, src_stride, last_src, last_stride, + &var16->sse, &var16->sum); break; case VPX_BITS_10: - vp9_high_10_get16x16var(src, src_stride, last_src, last_stride, + vp9_highbd_10_get16x16var(src, src_stride, last_src, last_stride, &var16->sse, &var16->sum); break; case VPX_BITS_12: - vp9_high_12_get16x16var(src, src_stride, last_src, last_stride, - &var16->sse, &var16->sum); + vp9_highbd_12_get16x16var(src, src_stride, last_src, last_stride, + &var16->sse, &var16->sum); break; default: assert(0 && "cm->bit_depth should be VPX_BITS_8, VPX_BITS_10" @@ -3415,8 +3415,9 @@ static void encode_frame_internal(VP9_COMP *cpi) { if (cm->use_highbitdepth) x->fwd_txm4x4 = xd->lossless ? vp9_fwht4x4 : vp9_fdct4x4; else - x->fwd_txm4x4 = xd->lossless ? vp9_high_fwht4x4 : vp9_high_fdct4x4; - x->high_itxm_add = xd->lossless ? vp9_high_iwht4x4_add : vp9_high_idct4x4_add; + x->fwd_txm4x4 = xd->lossless ? vp9_highbd_fwht4x4 : vp9_highbd_fdct4x4; + x->highbd_itxm_add = xd->lossless ? vp9_highbd_iwht4x4_add : + vp9_highbd_idct4x4_add; #else x->fwd_txm4x4 = xd->lossless ? vp9_fwht4x4 : vp9_fdct4x4; #endif // CONFIG_VP9_HIGHBITDEPTH |