Commit 9021d09f authored by Steinar Midtskogen's avatar Steinar Midtskogen Committed by Yaowu Xu

Remove some dead code in CLPF.

av1_clpf_frame() was always called with the same src and dst,
so we only need one argument and the code supporting different
src and dst was removed.

Change-Id: I70919f50e5cfb19c22eb4dff9ee7c0fa2697fad3
parent ee54e5f3
This diff is collapsed.
......@@ -17,7 +17,7 @@
int av1_clpf_maxbits(const AV1_COMMON *cm);
int av1_clpf_sample(int X, int A, int B, int C, int D, int E, int F, int b);
int av1_clpf_frame(const YV12_BUFFER_CONFIG *dst, const YV12_BUFFER_CONFIG *rec,
int av1_clpf_frame(const YV12_BUFFER_CONFIG *frame,
const YV12_BUFFER_CONFIG *org, AV1_COMMON *cm,
int enable_fb_flag, unsigned int strength,
unsigned int fb_size_log2, uint8_t *blocks,
......
......@@ -3929,8 +3929,7 @@ void av1_decode_frame(AV1Decoder *pbi, const uint8_t *data,
#if CONFIG_CLPF
if (cm->clpf_strength && !cm->skip_loop_filter) {
const YV12_BUFFER_CONFIG *const frame = &pbi->cur_buf->buf;
av1_clpf_frame(frame, frame, 0, cm, !!cm->clpf_size,
av1_clpf_frame(&pbi->cur_buf->buf, 0, cm, !!cm->clpf_size,
cm->clpf_strength + (cm->clpf_strength == 3),
4 + cm->clpf_size, cm->clpf_blocks, clpf_bit);
}
......
......@@ -3442,10 +3442,9 @@ static void loopfilter_frame(AV1_COMP *cpi, AV1_COMMON *cm) {
cm->clpf_strength = strength - (strength == 4);
cm->clpf_size =
fb_size_log2 ? fb_size_log2 - get_msb(MAX_FB_SIZE) + 3 : 0;
cm->clpf_numblocks =
av1_clpf_frame(cm->frame_to_show, cm->frame_to_show, cpi->Source, cm,
!!cm->clpf_size, strength, 4 + cm->clpf_size,
cm->clpf_blocks, av1_clpf_decision);
cm->clpf_numblocks = av1_clpf_frame(
cm->frame_to_show, cpi->Source, cm, !!cm->clpf_size, strength,
4 + cm->clpf_size, cm->clpf_blocks, av1_clpf_decision);
}
}
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment