From ff594f81dfae66e28aec9ed7fd1606450d38d0c7 Mon Sep 17 00:00:00 2001
From: Ivan Schreter <schreter@gmx.net>
Date: Wed, 18 Feb 2009 00:36:07 +0000
Subject: [PATCH] Parse dpb_output_delay in SEI picture structure.
Patch by Ivan Schreter, schreter gmx net
Originally committed as revision 17412 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/h264.c | 5 ++++-
libavcodec/h264.h | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ca65c3401d1..7b1d0d86860 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2209,6 +2209,7 @@ static av_cold int decode_init(AVCodecContext *avctx){
h->outputed_poc = INT_MIN;
h->prev_poc_msb= 1<<16;
h->sei_recovery_frame_cnt = -1;
+ h->sei_dpb_output_delay = 0;
return 0;
}
@@ -3144,6 +3145,7 @@ static void flush_dpb(AVCodecContext *avctx){
h->s.current_picture_ptr->reference= 0;
h->s.first_field= 0;
h->sei_recovery_frame_cnt = -1;
+ h->sei_dpb_output_delay = 0;
ff_mpeg_flush(avctx);
}
@@ -6782,7 +6784,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 */
- skip_bits(&s->gb, h->sps.dpb_output_delay_length); /* dpb_output_delay */
+ h->sei_dpb_output_delay = get_bits(&s->gb, h->sps.dpb_output_delay_length);
}
if(h->sps.pic_struct_present_flag){
unsigned int i, num_clock_ts;
@@ -7691,6 +7693,7 @@ static int decode_frame(AVCodecContext *avctx,
MPV_frame_end(s);
h->sei_recovery_frame_cnt = -1;
+ h->sei_dpb_output_delay = 0;
if (cur->field_poc[0]==INT_MAX || cur->field_poc[1]==INT_MAX) {
/* Wait for second field. */
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 43c9a938994..bfeae32247c 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -501,6 +501,11 @@ typedef struct H264Context{
*/
SEI_PicStructType sei_pic_struct;
+ /**
+ * dpb_output_delay in picture timing SEI message, see H.264 C.2.2
+ */
+ int sei_dpb_output_delay;
+
/**
* recovery_frame_cnt from SEI message
*
--
GitLab