diff options
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 8 | ||||
| -rw-r--r-- | vp9/decoder/vp9_onyxd_if.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 58fe52c33..66ca50770 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -599,7 +599,7 @@ static void decode_tile(VP9D_COMP *pbi, vp9_reader *r) { lf_data->xd = pbi->mb; lf_data->y_only = 0; } - vp9_loop_filter_frame_init(pc, &pbi->mb, pbi->mb.lf.filter_level); + vp9_loop_filter_frame_init(pc, &pbi->mb, pc->lf.filter_level); } for (mi_row = pc->cur_tile_mi_row_start; mi_row < pc->cur_tile_mi_row_end; @@ -813,7 +813,7 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi, int frame_to_show = cm->ref_frame_map[vp9_rb_read_literal(rb, 3)]; ref_cnt_fb(cm->fb_idx_ref_cnt, &cm->new_fb_idx, frame_to_show); pbi->refresh_frame_flags = 0; - xd->lf.filter_level = 0; + cm->lf.filter_level = 0; return 0; } @@ -897,7 +897,7 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi, if (cm->frame_type == KEY_FRAME || cm->error_resilient_mode || cm->intra_only) vp9_setup_past_independence(cm, xd); - setup_loopfilter(&xd->lf, rb); + setup_loopfilter(&cm->lf, rb); setup_quantization(pbi, rb); setup_segmentation(&xd->seg, rb); @@ -961,7 +961,7 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) { xd->corrupted = 0; new_fb->corrupted = 0; pbi->do_loopfilter_inline = - (pc->log2_tile_rows | pc->log2_tile_cols) == 0 && pbi->mb.lf.filter_level; + (pc->log2_tile_rows | pc->log2_tile_cols) == 0 && pc->lf.filter_level; if (!pbi->decoded_key_frame && !keyframe) return -1; diff --git a/vp9/decoder/vp9_onyxd_if.c b/vp9/decoder/vp9_onyxd_if.c index 91e26ec3e..db4a5bb28 100644 --- a/vp9/decoder/vp9_onyxd_if.c +++ b/vp9/decoder/vp9_onyxd_if.c @@ -136,7 +136,7 @@ VP9D_PTR vp9_create_decompressor(VP9D_CONFIG *oxcf) { // vp9_init_dequantizer() for every frame. vp9_init_dequantizer(&pbi->common); - vp9_loop_filter_init(&pbi->common, &pbi->mb.lf); + vp9_loop_filter_init(&pbi->common, &pbi->common.lf); pbi->common.error.setjmp = 0; pbi->decoded_key_frame = 0; @@ -359,7 +359,7 @@ int vp9_receive_compressed_data(VP9D_PTR ptr, if (!pbi->do_loopfilter_inline) { /* Apply the loop filter if appropriate. */ - vp9_loop_filter_frame(cm, &pbi->mb, pbi->mb.lf.filter_level, 0, 0); + vp9_loop_filter_frame(cm, &pbi->mb, pbi->common.lf.filter_level, 0, 0); } #if WRITE_RECON_BUFFER == 2 @@ -424,7 +424,7 @@ int vp9_get_raw_frame(VP9D_PTR ptr, YV12_BUFFER_CONFIG *sd, *time_end_stamp = 0; #if CONFIG_POSTPROC - ret = vp9_post_proc_frame(&pbi->common, &pbi->mb.lf, sd, flags); + ret = vp9_post_proc_frame(&pbi->common, &pbi->common.lf, sd, flags); #else if (pbi->common.frame_to_show) { |