har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/wmv2: simplify cbp_table_index calculation

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
zhaoxiu.zeng 2015-02-13 00:05:36 +08:00 committed by Michael Niedermayer
parent b4b9a64bdb
commit e4ea84e12e
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/wmv2.h
View File

@ -56,4 +56,15 @@ typedef struct Wmv2Context {
void ff_wmv2_common_init(Wmv2Context *w); void ff_wmv2_common_init(Wmv2Context *w);
static av_always_inline int wmv2_get_cbp_table_index(MpegEncContext *s, int cbp_index)
{
static const uint8_t map[3][3] = {
{ 0, 2, 1 },
{ 1, 0, 2 },
{ 2, 1, 0 },
};
return map[(s->qscale > 10) + (s->qscale > 20)][cbp_index];
}
#endif /* AVCODEC_WMV2_H */ #endif /* AVCODEC_WMV2_H */

11
libavcodec/wmv2dec.c
View File

@ -173,16 +173,7 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext *s)
parse_mb_skip(w); parse_mb_skip(w);
cbp_index = decode012(&s->gb); cbp_index = decode012(&s->gb);
if (s->qscale <= 10) { w->cbp_table_index = wmv2_get_cbp_table_index(s, cbp_index);
int map[3] = { 0, 2, 1 };
w->cbp_table_index = map[cbp_index];
} else if (s->qscale <= 20) {
int map[3] = { 1, 0, 2 };
w->cbp_table_index = map[cbp_index];
} else {
int map[3] = {2,1,0};
w->cbp_table_index = map[cbp_index];
}
if (w->mspel_bit) if (w->mspel_bit)
s->mspel = get_bits1(&s->gb); s->mspel = get_bits1(&s->gb);

11
libavcodec/wmv2enc.c
View File

@ -111,16 +111,7 @@ int ff_wmv2_encode_picture_header(MpegEncContext *s, int picture_number)
put_bits(&s->pb, 2, SKIP_TYPE_NONE); put_bits(&s->pb, 2, SKIP_TYPE_NONE);
ff_msmpeg4_code012(&s->pb, cbp_index = 0); ff_msmpeg4_code012(&s->pb, cbp_index = 0);
if (s->qscale <= 10) { w->cbp_table_index = wmv2_get_cbp_table_index(s, cbp_index);
int map[3] = { 0, 2, 1 };
w->cbp_table_index = map[cbp_index];
} else if (s->qscale <= 20) {
int map[3] = { 1, 0, 2 };
w->cbp_table_index = map[cbp_index];
} else {
int map[3] = { 2, 1, 0 };
w->cbp_table_index = map[cbp_index];
}
if (w->mspel_bit) if (w->mspel_bit)
put_bits(&s->pb, 1, s->mspel); put_bits(&s->pb, 1, s->mspel);