Mercurial > libavcodec.hg
comparison ffv1.c @ 1908:e20fd60b215c libavcodec
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
| author | michael |
|---|---|
| date | Fri, 26 Mar 2004 19:35:53 +0000 |
| parents | b7340afa261a |
| children | 8d3540dddd1b |
comparison
equal
deleted
inserted
replaced
| 1907:7ff22288289e | 1908:e20fd60b215c |
|---|---|
| 648 return -1; | 648 return -1; |
| 649 } | 649 } |
| 650 | 650 |
| 651 ff_init_cabac_encoder(c, buf, buf_size); | 651 ff_init_cabac_encoder(c, buf, buf_size); |
| 652 ff_init_cabac_states(c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64); | 652 ff_init_cabac_states(c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64); |
| 653 c->lps_state[2] = 1; | |
| 654 c->lps_state[3] = 0; | |
| 653 | 655 |
| 654 *p = *pict; | 656 *p = *pict; |
| 655 p->pict_type= FF_I_TYPE; | 657 p->pict_type= FF_I_TYPE; |
| 656 | 658 |
| 657 if(avctx->gop_size==0 || f->picture_number % avctx->gop_size == 0){ | 659 if(avctx->gop_size==0 || f->picture_number % avctx->gop_size == 0){ |
| 952 if (buf_size == 0) | 954 if (buf_size == 0) |
| 953 return 0; | 955 return 0; |
| 954 | 956 |
| 955 ff_init_cabac_decoder(c, buf, buf_size); | 957 ff_init_cabac_decoder(c, buf, buf_size); |
| 956 ff_init_cabac_states(c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64); | 958 ff_init_cabac_states(c, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64); |
| 959 c->lps_state[2] = 1; | |
| 960 c->lps_state[3] = 0; | |
| 961 | |
| 957 | 962 |
| 958 p->pict_type= FF_I_TYPE; //FIXME I vs. P | 963 p->pict_type= FF_I_TYPE; //FIXME I vs. P |
| 959 if(get_cabac_bypass(c)){ | 964 if(get_cabac_bypass(c)){ |
| 960 p->key_frame= 1; | 965 p->key_frame= 1; |
| 961 read_header(f); | 966 read_header(f); |