[FFmpeg-cvslog] r17413 - in trunk/libavcodec: h264.c h264.h
cehoyos
subversion
Wed Feb 18 01:38:11 CET 2009
Author: cehoyos
Date: Wed Feb 18 01:38:10 2009
New Revision: 17413
Log:
Parse cbp_removal_delay in SEI picture structure.
Patch by Ivan Schreter, schreter gmx net
Modified:
trunk/libavcodec/h264.c
trunk/libavcodec/h264.h
Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c Wed Feb 18 01:36:07 2009 (r17412)
+++ trunk/libavcodec/h264.c Wed Feb 18 01:38:10 2009 (r17413)
@@ -2210,6 +2210,7 @@ static av_cold int decode_init(AVCodecCo
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 @@ static void flush_dpb(AVCodecContext *av
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_slice(struct AVCodecCo
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 @@ static int decode_frame(AVCodecContext *
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. */
Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h Wed Feb 18 01:36:07 2009 (r17412)
+++ trunk/libavcodec/h264.h Wed Feb 18 01:38:10 2009 (r17413)
@@ -507,6 +507,11 @@ typedef struct H264Context{
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
More information about the ffmpeg-cvslog
mailing list