[FFmpeg-cvslog] h264_mp4toannexb_bsf: account for consecutive IDR pictures.

[Benoit Fouet]

ffmpeg | branch: release/2.3 | Benoit Fouet <benoit.fouet at free.fr> | Thu Jul 31 15:32:14 2014 +0200| [7a1262fca37d16b0de5dfc34937b193a2ede8872] | committer: Michael Niedermayer

h264_mp4toannexb_bsf: account for consecutive IDR pictures.

If there are consecutive IDR pictures, then SPS/PPS should be prepended
to all of them, not only the first one.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bf428bb3145c4f0eef32f8ef00de0ee222b3e414)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a1262fca37d16b0de5dfc34937b193a2ede8872
---

 libavcodec/h264_mp4toannexb_bsf.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c
index a7b4f41..a003a1d 100644
--- a/libavcodec/h264_mp4toannexb_bsf.c
+++ b/libavcodec/h264_mp4toannexb_bsf.c
@@ -179,6 +179,11 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
         if (ctx->first_idr && (unit_type == 7 || unit_type == 8))
             ctx->idr_sps_pps_seen = 1;
 
+        /* if this is a new IDR picture following an IDR picture, reset the idr flag.
+         * Just check first_mb_in_slice to be 0 as this is the simplest solution.
+         * This could be checking idr_pic_id instead, but would complexify the parsing. */
+        if (!ctx->first_idr && unit_type == 5 && (buf[1] & 0x80))
+            ctx->first_idr = 1;
 
         /* prepend only to the first type 5 NAL unit of an IDR picture, if no sps/pps are already present */
         if (ctx->first_idr && unit_type == 5 && !ctx->idr_sps_pps_seen) {