Mercurial > libavcodec.hg
comparison vc1.c @ 4487:0a0a9f0c9c2d libavcodec
Progressive frames disguised as interlaced are supported
author | kostya |
---|---|
date | Tue, 06 Feb 2007 07:16:52 +0000 |
parents | 1d2320afa864 |
children | e3c43b4aa9ac |
comparison
equal
deleted
inserted
replaced
4486:1d2320afa864 | 4487:0a0a9f0c9c2d |
---|---|
1280 v->s.avctx->coded_height = (get_bits(gb, 12) + 1) << 1; | 1280 v->s.avctx->coded_height = (get_bits(gb, 12) + 1) << 1; |
1281 v->s.avctx->width = v->s.avctx->coded_width; | 1281 v->s.avctx->width = v->s.avctx->coded_width; |
1282 v->s.avctx->height = v->s.avctx->coded_height; | 1282 v->s.avctx->height = v->s.avctx->coded_height; |
1283 v->broadcast = get_bits1(gb); | 1283 v->broadcast = get_bits1(gb); |
1284 v->interlace = get_bits1(gb); | 1284 v->interlace = get_bits1(gb); |
1285 if(v->interlace){ | |
1286 av_log(v->s.avctx, AV_LOG_ERROR, "Interlaced mode not supported (yet)\n"); | |
1287 return -1; | |
1288 } | |
1289 v->tfcntrflag = get_bits1(gb); | 1285 v->tfcntrflag = get_bits1(gb); |
1290 v->finterpflag = get_bits1(gb); | 1286 v->finterpflag = get_bits1(gb); |
1291 get_bits1(gb); // reserved | 1287 get_bits1(gb); // reserved |
1292 | 1288 |
1293 av_log(v->s.avctx, AV_LOG_DEBUG, | 1289 av_log(v->s.avctx, AV_LOG_DEBUG, |
1622 int pqindex, lowquant; | 1618 int pqindex, lowquant; |
1623 int status; | 1619 int status; |
1624 | 1620 |
1625 v->p_frame_skipped = 0; | 1621 v->p_frame_skipped = 0; |
1626 | 1622 |
1627 if(v->interlace) | 1623 if(v->interlace){ |
1628 v->fcm = decode012(gb); | 1624 v->fcm = decode012(gb); |
1625 if(v->fcm) return -1; // interlaced frames/fields are not implemented | |
1626 } | |
1629 switch(get_prefix(gb, 0, 4)) { | 1627 switch(get_prefix(gb, 0, 4)) { |
1630 case 0: | 1628 case 0: |
1631 v->s.pict_type = P_TYPE; | 1629 v->s.pict_type = P_TYPE; |
1632 break; | 1630 break; |
1633 case 1: | 1631 case 1: |