diff options
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 9 | ||||
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 4 | ||||
| -rw-r--r-- | vpx_scale/vpx_scale.mk | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index aee362ae4..a03131ca6 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -3179,6 +3179,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, cpi->rc.source_alt_ref_active = 0; cm->error_resilient_mode = oxcf->error_resilient_mode; + cm->frame_parallel_decoding_mode = oxcf->frame_parallel_decoding_mode; // By default, encoder assumes decoder can use prev_mi. if (cm->error_resilient_mode) { @@ -3186,7 +3187,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, cm->reset_frame_context = 0; cm->refresh_frame_context = 0; } else if (cm->intra_only) { - cm->frame_parallel_decoding_mode = oxcf->frame_parallel_decoding_mode; // Only reset the current context. cm->reset_frame_context = 2; } @@ -3846,7 +3846,8 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, #if CONFIG_VP9_HIGHBITDEPTH if (cm->use_highbitdepth) { - frame_ssim2 = vp9_highbd_calc_ssim(orig, recon, &weight, xd->bd); + frame_ssim2 = vp9_highbd_calc_ssim(orig, recon, &weight, + (int)cm->bit_depth); } else { frame_ssim2 = vp9_calc_ssim(orig, recon, &weight); } @@ -3860,7 +3861,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, #if CONFIG_VP9_HIGHBITDEPTH if (cm->use_highbitdepth) { frame_ssim2 = vp9_highbd_calc_ssim( - orig, &cm->post_proc_buffer, &weight, xd->bd); + orig, &cm->post_proc_buffer, &weight, (int)cm->bit_depth); } else { frame_ssim2 = vp9_calc_ssim(orig, &cm->post_proc_buffer, &weight); } @@ -3888,7 +3889,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, #if CONFIG_VP9_HIGHBITDEPTH if (cm->use_highbitdepth) { frame_all = vp9_highbd_calc_ssimg(cpi->Source, cm->frame_to_show, &y, - &u, &v, xd->bd); + &u, &v, (int)cm->bit_depth); } else { frame_all = vp9_calc_ssimg(cpi->Source, cm->frame_to_show, &y, &u, &v); diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 5f033fd20..1da5a83bd 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -599,9 +599,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, // initialize mode decisions vp9_rd_cost_reset(&best_rdc); - vp9_rd_cost_reset(&this_rdc); vp9_rd_cost_reset(rd_cost); - vpx_memset(mbmi, 0, sizeof(MB_MODE_INFO)); mbmi->sb_type = bsize; mbmi->ref_frame[0] = NONE; mbmi->ref_frame[1] = NONE; @@ -688,7 +686,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, if (ref_frame > LAST_FRAME) continue; if (cpi->sf.partition_search_type != VAR_BASED_PARTITION && - this_rdc.rdcost < (int64_t)(1 << num_pels_log2_lookup[bsize])) + best_rdc.rdcost < (int64_t)(1 << num_pels_log2_lookup[bsize])) continue; if (!combined_motion_search(cpi, x, bsize, mi_row, mi_col, &frame_mv[NEWMV][ref_frame], diff --git a/vpx_scale/vpx_scale.mk b/vpx_scale/vpx_scale.mk index 92d499175..a49abf3b4 100644 --- a/vpx_scale/vpx_scale.mk +++ b/vpx_scale/vpx_scale.mk @@ -1,7 +1,7 @@ SCALE_SRCS-yes += vpx_scale.mk SCALE_SRCS-yes += yv12config.h -SCALE_SRCS-yes += vpx_scale.h -SCALE_SRCS-yes += generic/vpx_scale.c +SCALE_SRCS-$(CONFIG_SPATIAL_RESAMPLING) += vpx_scale.h +SCALE_SRCS-$(CONFIG_SPATIAL_RESAMPLING) += generic/vpx_scale.c SCALE_SRCS-yes += generic/yv12config.c SCALE_SRCS-yes += generic/yv12extend.c SCALE_SRCS-$(CONFIG_SPATIAL_RESAMPLING) += generic/gen_scalers.c |