virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

Merge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71'

Browse Source 
* commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71':
  vc1dec: Redesign the intensity compensation

Conflicts:
	libavcodec/vc1.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-29 02:59:04 +02:00
commit 28923f1923
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libavcodec/vc1.c
View File

@ -578,7 +578,7 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex
} }
/* fill lookup tables for intensity compensation */ /* fill lookup tables for intensity compensation */
#define INIT_LUT(lumscale, lumshift, luty, lutuv, chain) do { \ #define INIT_LUT(lumscale, lumshift, luty, lutuv, chain) do { \
int scale, shift, i; \ int scale, shift, i; \
if (!lumscale) { \ if (!lumscale) { \
scale = -64; \ scale = -64; \
@ -593,34 +593,33 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex
shift = lumshift << 6; \ shift = lumshift << 6; \
} \ } \
for (i = 0; i < 256; i++) { \ for (i = 0; i < 256; i++) { \
int iy = chain ? luty[i] : i; \ int iy = chain ? luty[i] : i; \
int iu = chain ? lutuv[i] : i; \ int iu = chain ? lutuv[i] : i; \
luty[i] = av_clip_uint8((scale * iy + shift + 32) >> 6); \ luty[i] = av_clip_uint8((scale * iy + shift + 32) >> 6); \
lutuv[i] = av_clip_uint8((scale * (iu - 128) + 128*64 + 32) >> 6);\ lutuv[i] = av_clip_uint8((scale * (iu - 128) + 128*64 + 32) >> 6);\
} \ } \
} while(0) } while(0)
static void rotate_luts(VC1Context *v) static void rotate_luts(VC1Context *v)
{ {
#define ROTATE(DEF, L, N, C, A) do {\ #define ROTATE(DEF, L, N, C, A) do { \
if (v->s.pict_type == AV_PICTURE_TYPE_BI || v->s.pict_type == AV_PICTURE_TYPE_B) {\ if (v->s.pict_type == AV_PICTURE_TYPE_BI || v->s.pict_type == AV_PICTURE_TYPE_B) { \
C = A;\ C = A; \
} else {\ } else { \
DEF;\ DEF; \
memcpy(&tmp, &L , sizeof(tmp));\ memcpy(&tmp, &L , sizeof(tmp)); \
memcpy(&L , &N , sizeof(tmp));\ memcpy(&L , &N , sizeof(tmp)); \
memcpy(&N , &tmp, sizeof(tmp));\ memcpy(&N , &tmp, sizeof(tmp)); \
C = N;\ C = N; \
}\ } \
}while(0) } while(0)
ROTATE(int tmp , v->last_use_ic, v->next_use_ic, v->curr_use_ic, v->aux_use_ic); ROTATE(int tmp, v->last_use_ic, v->next_use_ic, v->curr_use_ic, v->aux_use_ic);
ROTATE(uint8_t tmp[2][256], v->last_luty , v->next_luty , v->curr_luty , v->aux_luty); ROTATE(uint8_t tmp[2][256], v->last_luty, v->next_luty, v->curr_luty, v->aux_luty);
ROTATE(uint8_t tmp[2][256], v->last_lutuv, v->next_lutuv, v->curr_lutuv, v->aux_lutuv); ROTATE(uint8_t tmp[2][256], v->last_lutuv, v->next_lutuv, v->curr_lutuv, v->aux_lutuv);
INIT_LUT(32, 0 , v->curr_luty[0] , v->curr_lutuv[0] , 0); INIT_LUT(32, 0, v->curr_luty[0], v->curr_lutuv[0], 0);
INIT_LUT(32, 0 , v->curr_luty[1] , v->curr_lutuv[1] , 0); INIT_LUT(32, 0, v->curr_luty[1], v->curr_lutuv[1], 0);
v->curr_use_ic = 0; v->curr_use_ic = 0;
} }
@ -712,9 +711,8 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
(v->s.pict_type == AV_PICTURE_TYPE_P) ? 'P' : ((v->s.pict_type == AV_PICTURE_TYPE_I) ? 'I' : 'B'), (v->s.pict_type == AV_PICTURE_TYPE_P) ? 'P' : ((v->s.pict_type == AV_PICTURE_TYPE_I) ? 'I' : 'B'),
pqindex, v->pq, v->halfpq, v->rangeredfrm); pqindex, v->pq, v->halfpq, v->rangeredfrm);
if(v->first_pic_header_flag) { if (v->first_pic_header_flag)
rotate_luts(v); rotate_luts(v);
}
switch (v->s.pict_type) { switch (v->s.pict_type) {
case AV_PICTURE_TYPE_P: case AV_PICTURE_TYPE_P:
@ -728,10 +726,10 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][get_unary(gb, 1, 3)]; v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][get_unary(gb, 1, 3)];
v->lumscale = get_bits(gb, 6); v->lumscale = get_bits(gb, 6);
v->lumshift = get_bits(gb, 6); v->lumshift = get_bits(gb, 6);
v->last_use_ic = 1; v->last_use_ic = 1;
/* fill lookup tables for intensity compensation */ /* fill lookup tables for intensity compensation */
INIT_LUT(v->lumscale, v->lumshift , v->last_luty[0] , v->last_lutuv[0] , 1); INIT_LUT(v->lumscale, v->lumshift, v->last_luty[0], v->last_lutuv[0], 1);
INIT_LUT(v->lumscale, v->lumshift , v->last_luty[1] , v->last_lutuv[1] , 1); INIT_LUT(v->lumscale, v->lumshift, v->last_luty[1], v->last_lutuv[1], 1);
} }
v->qs_last = v->s.quarter_sample; v->qs_last = v->s.quarter_sample;
if (v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN) if (v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)
@ -986,9 +984,8 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
if (v->parse_only) if (v->parse_only)
return 0; return 0;
if(v->first_pic_header_flag) { if (v->first_pic_header_flag)
rotate_luts(v); rotate_luts(v);
}
switch (v->s.pict_type) { switch (v->s.pict_type) {
case AV_PICTURE_TYPE_I: case AV_PICTURE_TYPE_I:
@ -1086,7 +1083,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
mvmode2 = get_unary(gb, 1, 3); mvmode2 = get_unary(gb, 1, 3);
v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][mvmode2]; v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][mvmode2];
if (v->field_mode) { if (v->field_mode) {
v->intcompfield = decode210(gb)^3; v->intcompfield = decode210(gb) ^ 3;
} else } else
v->intcompfield = 3; v->intcompfield = 3;