X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvc1.h;h=556906d496189b8e48adf3bab5423ce269f9356f;hb=abb3cc46d595dcb186ae30ec7339a56cd9803f45;hp=eefb613ee8b469dede7548702dea54dda84bcd4d;hpb=0528410e04929d72ca29e5afddcc90d88de7208d;p=ffmpeg diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index eefb613ee8b..556906d4961 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -73,7 +73,7 @@ enum DQDoubleEdge { }; //@} -/** MV modes for P frames */ +/** MV modes for P-frames */ //@{ enum MVModes { MV_PMODE_1MV_HPEL_BILIN, @@ -96,7 +96,7 @@ enum MBModesIntfr { }; //@} -/** @name MV types for B frames */ +/** @name MV types for B-frames */ //@{ enum BMVTypes { BMV_TYPE_BACKWARD, @@ -106,7 +106,7 @@ enum BMVTypes { }; //@} -/** @name Block types for P/B frames */ +/** @name Block types for P/B-frames */ //@{ enum TransformTypes { TT_8X8, @@ -194,18 +194,18 @@ typedef struct VC1Context{ /** Advanced Profile */ //@{ - int level; ///< 3bits, for Advanced/Simple Profile, provided by TS layer - int chromaformat; ///< 2bits, 2=4:2:0, only defined + int level; ///< 3 bits, for Advanced/Simple Profile, provided by TS layer + int chromaformat; ///< 2 bits, 2=4:2:0, only defined int postprocflag; ///< Per-frame processing suggestion flag present int broadcast; ///< TFF/RFF present int interlace; ///< Progressive/interlaced (RPTFTM syntax element) int tfcntrflag; ///< TFCNTR 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 color_prim; ///< 8bits, chroma coordinates of the color primaries - int transfer_char; ///< 8bits, Opto-electronic transfer characteristics - int matrix_coef; ///< 8bits, Color primaries->YCbCr transform matrix + int extended_dmv; ///< Additional extended dmv range at P/B-frame-level + int color_prim; ///< 8 bits, chroma coordinates of the color primaries + int transfer_char; ///< 8 bits, Opto-electronic transfer characteristics + int matrix_coef; ///< 8 bits, Color primaries->YCbCr transform matrix int hrd_param_flag; ///< Presence of Hypothetical Reference ///< Decoder parameters int psf; ///< Progressive Segmented Frame @@ -215,23 +215,23 @@ typedef struct VC1Context{ * TODO: choose between ints, uint8_ts and monobit flags */ //@{ - int profile; ///< 2bits, Profile - int frmrtq_postproc; ///< 3bits, - int bitrtq_postproc; ///< 5bits, quantized framerate-based postprocessing strength + int profile; ///< 2 bits, Profile + int frmrtq_postproc; ///< 3 bits, + int bitrtq_postproc; ///< 5 bits, quantized framerate-based postprocessing strength int max_coded_width, max_coded_height; int fastuvmc; ///< Rounding of qpel vector to hpel ? (not in Simple) int extended_mv; ///< Ext MV in P/B (not in Simple) - int dquant; ///< How qscale varies with MBs, 2bits (not in Simple) + int dquant; ///< How qscale varies with MBs, 2 bits (not in Simple) int vstransform; ///< variable-size [48]x[48] transform type + info int overlap; ///< overlapped transforms in use - int quantizer_mode; ///< 2bits, quantizer mode used for sequence, see QUANT_* + int quantizer_mode; ///< 2 bits, quantizer mode used for sequence, see QUANT_* int finterpflag; ///< INTERPFRM present //@} /** Frame decoding info for all profiles */ //@{ - uint8_t mv_mode; ///< MV coding monde - uint8_t mv_mode2; ///< Secondary MV coding mode (B frames) + uint8_t mv_mode; ///< MV coding mode + uint8_t mv_mode2; ///< Secondary MV coding mode (B-frames) int k_x; ///< Number of bits for MVs (depends on MV range) int k_y; ///< Number of bits for MVs (depends on MV range) int range_x, range_y; ///< MV range