RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vc1: Fix ordering of loop filter for I/B frames 

All horizontal edges must be filtered before all vertical edges

Originally committed as revision 24206 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-07-11 22:52:51 +00:00
parent 3683b7e570
commit fca58a815a
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/vc1dec.c
View File

@ -162,17 +162,27 @@ enum Imode {
static void vc1_loop_filter_iblk(MpegEncContext *s, int pq)
{
int i, j;
if(!s->first_slice_line)
int j;
if (!s->first_slice_line) {
s->dsp.vc1_v_loop_filter16(s->dest[0], s->linesize, pq);
s->dsp.vc1_v_loop_filter16(s->dest[0] + 8*s->linesize, s->linesize, pq);
for(i = !s->mb_x*8; i < 16; i += 8)
s->dsp.vc1_h_loop_filter16(s->dest[0] + i, s->linesize, pq);
for(j = 0; j < 2; j++){
if(!s->first_slice_line)
if (s->mb_x)
s->dsp.vc1_h_loop_filter16(s->dest[0] - 16*s->linesize, s->linesize, pq);
s->dsp.vc1_h_loop_filter16(s->dest[0] - 16*s->linesize+8, s->linesize, pq);
for(j = 0; j < 2; j++){
s->dsp.vc1_v_loop_filter8(s->dest[j+1], s->uvlinesize, pq);
if(s->mb_x)
s->dsp.vc1_h_loop_filter8(s->dest[j+1], s->uvlinesize, pq);
if (s->mb_x)
s->dsp.vc1_h_loop_filter8(s->dest[j+1]-8*s->uvlinesize, s->uvlinesize, pq);
}
}
s->dsp.vc1_v_loop_filter16(s->dest[0] + 8*s->linesize, s->linesize, pq);
if (s->mb_y == s->mb_height-1) {
if (s->mb_x) {
s->dsp.vc1_h_loop_filter16(s->dest[0], s->linesize, pq);
s->dsp.vc1_h_loop_filter8(s->dest[1], s->uvlinesize, pq);
s->dsp.vc1_h_loop_filter8(s->dest[2], s->uvlinesize, pq);
}
s->dsp.vc1_h_loop_filter16(s->dest[0] + 8, s->linesize, pq);
}
}