diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2011-11-26 13:28:48 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2011-11-28 00:40:22 +0100 |
| commit | 1f948745c3cbe45c4ccd5d8996fc885d826bf3ff (patch) | |
| tree | 8b19bd91c0fd5b3399d61121a0cf01ac132722a5 /libavcodec/vc1.c | |
| parent | 9270b8a3d1dd5bc9adbf77ed67a00aa7426737bb (diff) | |
| download | ffmpeg-1f948745c3cbe45c4ccd5d8996fc885d826bf3ff.tar.gz | |
vc1: use an enum for Frame Coding Mode
Document it a little and possibly fix a bug in dxva2_vc1.
Diffstat (limited to 'libavcodec/vc1.c')
| -rw-r--r-- | libavcodec/vc1.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index cb228e6107..d728f9beb4 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -836,14 +836,14 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) if (v->interlace) { v->fcm = decode012(gb); if (v->fcm) { - if (v->fcm == 2) + if (v->fcm == ILACE_FIELD) v->field_mode = 1; if (!v->warn_interlaced++) av_log(v->s.avctx, AV_LOG_ERROR, "Interlaced frames/fields support is incomplete\n"); } } else { - v->fcm = 0; + v->fcm = PROGRESSIVE; } if (v->field_mode) { @@ -957,7 +957,7 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) switch (v->s.pict_type) { case AV_PICTURE_TYPE_I: case AV_PICTURE_TYPE_BI: - if (v->fcm == 1) { //interlace frame picture + if (v->fcm == ILACE_FRAME) { //interlace frame picture status = bitplane_decoding(v->fieldtx_plane, &v->fieldtx_is_raw, v); if (status < 0) return -1; @@ -998,7 +998,7 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) v->dmvrange = get_unary(gb, 0, 3); else v->dmvrange = 0; - if (v->fcm == 1) { // interlaced frame picture + if (v->fcm == ILACE_FRAME) { // interlaced frame picture v->fourmvswitch = get_bits1(gb); v->intcomp = get_bits1(gb); if (v->intcomp) { @@ -1038,7 +1038,7 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) v->tt_index = 1; else v->tt_index = 2; - if (v->fcm != 1) { + if (v->fcm != ILACE_FRAME) { int mvmode; mvmode = get_unary(gb, 1, 4); lowquant = (v->pq > 12) ? 0 : 1; @@ -1073,7 +1073,7 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) || (v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN)); } - if (v->fcm == 0) { // progressive + if (v->fcm == PROGRESSIVE) { // progressive if ((v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_MIXED_MV) || v->mv_mode == MV_PMODE_MIXED_MV) { @@ -1095,7 +1095,7 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) /* Hopefully this is correct for P frames */ v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)]; - } else if (v->fcm == 1) { // frame interlaced + } else if (v->fcm == ILACE_FRAME) { // frame interlaced v->qs_last = v->s.quarter_sample; v->s.quarter_sample = 1; v->s.mspel = 1; @@ -1135,7 +1135,7 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) break; case AV_PICTURE_TYPE_B: // TODO: implement interlaced frame B picture decoding - if (v->fcm == 1) + if (v->fcm == ILACE_FRAME) return -1; if (v->extended_mv) v->mvrange = get_unary(gb, 0, 3); |