diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-12-09 18:22:44 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2015-12-10 11:45:26 -0800 |
| commit | 221ed5e47bf2861dab989f3aa0387db7088477a9 (patch) | |
| tree | 81928a769a0ce411792a6d285ab9caf990db954e /vp10/encoder/encodeframe.c | |
| parent | c7e557b82caa063409782c5f3977132fb4bb06bd (diff) | |
| download | libvpx-221ed5e47bf2861dab989f3aa0387db7088477a9.tar libvpx-221ed5e47bf2861dab989f3aa0387db7088477a9.tar.gz libvpx-221ed5e47bf2861dab989f3aa0387db7088477a9.tar.bz2 libvpx-221ed5e47bf2861dab989f3aa0387db7088477a9.zip | |
Fix enc/dec mismatches for aq-mode 1 and 2
Change-Id: Iefad9d8d96a08dcc788a5efdca2df6a815d1205f
Diffstat (limited to 'vp10/encoder/encodeframe.c')
| -rw-r--r-- | vp10/encoder/encodeframe.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c index f050905e7..f1814a929 100644 --- a/vp10/encoder/encodeframe.c +++ b/vp10/encoder/encodeframe.c @@ -1155,7 +1155,7 @@ static void rd_pick_sb_modes(VP10_COMP *cpi, if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) { x->source_variance = vp10_high_get_sby_perpixel_variance(cpi, &x->plane[0].src, - bsize, xd->bd); + bsize, xd->bd); } else { x->source_variance = vp10_get_sby_perpixel_variance(cpi, &x->plane[0].src, bsize); @@ -2579,7 +2579,7 @@ static MV_REFERENCE_FRAME get_frame_type(const VP10_COMP *cpi) { } static TX_MODE select_tx_mode(const VP10_COMP *cpi, MACROBLOCKD *const xd) { - if (!cpi->common.seg.enabled && xd->lossless[0]) + if (xd->lossless[0]) return ONLY_4X4; if (cpi->sf.tx_size_search_method == USE_LARGESTALL) return ALLOW_32X32; @@ -2696,16 +2696,12 @@ static void encode_frame_internal(VP10_COMP *cpi) { vp10_zero(rdc->comp_pred_diff); vp10_zero(rdc->filter_diff); - for (i = 0; i < (cm->seg.enabled ? MAX_SEGMENTS : 1); ++i) { -#if CONFIG_MISC_FIXES - const int qindex = vp10_get_qindex(&cm->seg, i, cm->base_qindex); -#endif - xd->lossless[i] = cm->y_dc_delta_q == 0 && -#if CONFIG_MISC_FIXES - qindex == 0 && -#else - cm->base_qindex == 0 && -#endif + for (i = 0; i < MAX_SEGMENTS; ++i) { + const int qindex = CONFIG_MISC_FIXES && cm->seg.enabled ? + vp10_get_qindex(&cm->seg, i, cm->base_qindex) : + cm->base_qindex; + xd->lossless[i] = qindex == 0 && + cm->y_dc_delta_q == 0 && cm->uv_dc_delta_q == 0 && cm->uv_ac_delta_q == 0; } |