Mercurial > libavcodec.hg
changeset 8967:f0abc5f9e726 libavcodec
Parse cbp_removal_delay in SEI picture structure.
Patch by Ivan Schreter, schreter gmx net
author | cehoyos |
---|---|
date | Wed, 18 Feb 2009 00:38:10 +0000 |
parents | 328b7d545d0b |
children | b123ed268953 |
files | h264.c h264.h |
diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Wed Feb 18 00:36:07 2009 +0000 +++ b/h264.c Wed Feb 18 00:38:10 2009 +0000 @@ -2210,6 +2210,7 @@ h->prev_poc_msb= 1<<16; h->sei_recovery_frame_cnt = -1; h->sei_dpb_output_delay = 0; + h->sei_cpb_removal_delay = -1; return 0; } @@ -3146,6 +3147,7 @@ h->s.first_field= 0; h->sei_recovery_frame_cnt = -1; h->sei_dpb_output_delay = 0; + h->sei_cpb_removal_delay = -1; ff_mpeg_flush(avctx); } @@ -6783,7 +6785,7 @@ static int decode_picture_timing(H264Context *h){ MpegEncContext * const s = &h->s; if(h->sps.nal_hrd_parameters_present_flag || h->sps.vcl_hrd_parameters_present_flag){ - skip_bits(&s->gb, h->sps.cpb_removal_delay_length); /* cpb_removal_delay */ + h->sei_cpb_removal_delay = get_bits(&s->gb, h->sps.cpb_removal_delay_length); h->sei_dpb_output_delay = get_bits(&s->gb, h->sps.dpb_output_delay_length); } if(h->sps.pic_struct_present_flag){ @@ -7694,6 +7696,7 @@ MPV_frame_end(s); h->sei_recovery_frame_cnt = -1; h->sei_dpb_output_delay = 0; + h->sei_cpb_removal_delay = -1; if (cur->field_poc[0]==INT_MAX || cur->field_poc[1]==INT_MAX) { /* Wait for second field. */
--- a/h264.h Wed Feb 18 00:36:07 2009 +0000 +++ b/h264.h Wed Feb 18 00:38:10 2009 +0000 @@ -507,6 +507,11 @@ int sei_dpb_output_delay; /** + * cpb_removal_delay in picture timing SEI message, see H.264 C.1.2 + */ + int sei_cpb_removal_delay; + + /** * recovery_frame_cnt from SEI message * * Set to -1 if no recovery point SEI message found or to number of frames