Add refdist_flag to VC1Context.
Originally committed as revision 16504 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
6dde9f8c20
commit
49186206eb
@ -1059,13 +1059,13 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
|
|||||||
static int decode_entry_point(AVCodecContext *avctx, GetBitContext *gb)
|
static int decode_entry_point(AVCodecContext *avctx, GetBitContext *gb)
|
||||||
{
|
{
|
||||||
VC1Context *v = avctx->priv_data;
|
VC1Context *v = avctx->priv_data;
|
||||||
int i, blink, clentry, refdist;
|
int i, blink, clentry;
|
||||||
|
|
||||||
av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32));
|
av_log(avctx, AV_LOG_DEBUG, "Entry point: %08X\n", show_bits_long(gb, 32));
|
||||||
blink = get_bits1(gb); // broken link
|
blink = get_bits1(gb); // broken link
|
||||||
clentry = get_bits1(gb); // closed entry
|
clentry = get_bits1(gb); // closed entry
|
||||||
v->panscanflag = get_bits1(gb);
|
v->panscanflag = get_bits1(gb);
|
||||||
refdist = get_bits1(gb); // refdist flag
|
v->refdist_flag = get_bits1(gb);
|
||||||
v->s.loop_filter = get_bits1(gb);
|
v->s.loop_filter = get_bits1(gb);
|
||||||
v->fastuvmc = get_bits1(gb);
|
v->fastuvmc = get_bits1(gb);
|
||||||
v->extended_mv = get_bits1(gb);
|
v->extended_mv = get_bits1(gb);
|
||||||
@ -1099,7 +1099,7 @@ static int decode_entry_point(AVCodecContext *avctx, GetBitContext *gb)
|
|||||||
"BrokenLink=%i, ClosedEntry=%i, PanscanFlag=%i\n"
|
"BrokenLink=%i, ClosedEntry=%i, PanscanFlag=%i\n"
|
||||||
"RefDist=%i, Postproc=%i, FastUVMC=%i, ExtMV=%i\n"
|
"RefDist=%i, Postproc=%i, FastUVMC=%i, ExtMV=%i\n"
|
||||||
"DQuant=%i, VSTransform=%i, Overlap=%i, Qmode=%i\n",
|
"DQuant=%i, VSTransform=%i, Overlap=%i, Qmode=%i\n",
|
||||||
blink, clentry, v->panscanflag, refdist, v->s.loop_filter,
|
blink, clentry, v->panscanflag, v->refdist_flag, v->s.loop_filter,
|
||||||
v->fastuvmc, v->extended_mv, v->dquant, v->vstransform, v->overlap, v->quantizer_mode);
|
v->fastuvmc, v->extended_mv, v->dquant, v->vstransform, v->overlap, v->quantizer_mode);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -180,6 +180,7 @@ typedef struct VC1Context{
|
|||||||
int interlace; ///< Progressive/interlaced (RPTFTM syntax element)
|
int interlace; ///< Progressive/interlaced (RPTFTM syntax element)
|
||||||
int tfcntrflag; ///< TFCNTR present
|
int tfcntrflag; ///< TFCNTR present
|
||||||
int panscanflag; ///< NUMPANSCANWIN, TOPLEFT{X,Y}, BOTRIGHT{X,Y} present
|
int panscanflag; ///< NUMPANSCANWIN, TOPLEFT{X,Y}, BOTRIGHT{X,Y} present
|
||||||
|
int refdist_flag; ///< REFDIST syntax element present in II, IP, PI or PP field picture headers
|
||||||
int extended_dmv; ///< Additional extended dmv range at P/B frame-level
|
int extended_dmv; ///< Additional extended dmv range at P/B frame-level
|
||||||
int color_prim; ///< 8bits, chroma coordinates of the color primaries
|
int color_prim; ///< 8bits, chroma coordinates of the color primaries
|
||||||
int transfer_char; ///< 8bits, Opto-electronic transfer characteristics
|
int transfer_char; ///< 8bits, Opto-electronic transfer characteristics
|
||||||
|
Loading…
x
Reference in New Issue
Block a user