videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-14 21:35:06 +02:00
Code Releases Activity

Fix mquant selection for ALL_MBS mode

Browse Source 
Originally committed as revision 5686 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2006-07-09 02:51:13 +00:00
parent 65c7bb9ec4
commit 3a3f1cf3f8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/vc1.c
View File

@ -704,7 +704,7 @@ static int vop_dquant_decoding(VC1Context *v)
v->dqbilevel = get_bits(gb, 1);
default: break; //Forbidden ?
}
if (!v->dqbilevel || v->dqprofile != DQPROFILE_ALL_MBS)
if (v->dqbilevel || v->dqprofile != DQPROFILE_ALL_MBS)
{
pqdiff = get_bits(gb, 3);
if (pqdiff == 7) v->altpq = get_bits(gb, 5);
@ -1449,7 +1449,7 @@ static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
{ \
if (v->dqbilevel) \
{ \
mquant = (get_bits(gb, 1)) ? v->pq : v->altpq; \
mquant = (get_bits(gb, 1)) ? v->altpq : v->pq; \
} \
else \
{ \
@ -1464,10 +1464,9 @@ static int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
edges = (3 << v->dqsbedge) % 15; \
else if(v->dqprofile == DQPROFILE_FOUR_EDGES) \
edges = 15; \
mquant = v->pq; \
if((edges&1) && !s->mb_x) \
mquant = v->altpq; \
if((edges&2) && !s->mb_y) \
if((edges&2) && s->first_slice_line) \
mquant = v->altpq; \
if((edges&4) && s->mb_x == (s->mb_width - 1)) \
mquant = v->altpq; \