generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vp10: remove MACROBLOCK.fwd_txm4x4 function pointer.

Browse Source 
This is preparatory work for allowing per-segment lossless coding.

See issue 1035.

Change-Id: Idd72e2a42d90fa7319c10122032d1a7c7a54dc05
This commit is contained in:
Ronald S. Bultje
2015-09-22 14:01:48 -04:00
parent 7602232642
commit c74b33a413
6 changed files with 87 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vp10/encoder/encoder.c
View File

@@ -4086,19 +4086,14 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags,
}
if (oxcf->pass == 1) {
const int lossless = is_lossless_requested(oxcf);
cpi->td.mb.e_mbd.lossless = is_lossless_requested(oxcf);
#if CONFIG_VP9_HIGHBITDEPTH
if (cpi->oxcf.use_highbitdepth)
cpi->td.mb.fwd_txm4x4 = lossless ?
vp10_highbd_fwht4x4 : vpx_highbd_fdct4x4;
else
cpi->td.mb.fwd_txm4x4 = lossless ? vp10_fwht4x4 : vpx_fdct4x4;
cpi->td.mb.highbd_itxm_add = lossless ? vp10_highbd_iwht4x4_add :
vp10_highbd_idct4x4_add;
#else
cpi->td.mb.fwd_txm4x4 = lossless ? vp10_fwht4x4 : vpx_fdct4x4;
cpi->td.mb.highbd_itxm_add =
cpi->td.mb.e_mbd.lossless ? vp10_highbd_iwht4x4_add
: vp10_highbd_idct4x4_add;
#endif // CONFIG_VP9_HIGHBITDEPTH
cpi->td.mb.itxm_add = lossless ? vp10_iwht4x4_add : vp10_idct4x4_add;
cpi->td.mb.itxm_add = cpi->td.mb.e_mbd.lossless ? vp10_iwht4x4_add
: vp10_idct4x4_add;
vp10_first_pass(cpi, source);
} else if (oxcf->pass == 2) {
Pass2Encode(cpi, size, dest, frame_flags);