[FFmpeg-cvslog] avcodec/h264_mp4toannexb_bsf: fix issue when sps/ pps are already in the bistream
Chris "Koying" Browet
git at videolan.org
Sun Aug 10 23:33:03 CEST 2014
ffmpeg | branch: release/2.3 | Chris \"Koying\" Browet <cbro at semperpax.com> | Sat Jul 26 09:15:57 2014 +0200| [6d2219e9f950b96279fd8464cc11c4d02518b629] | committer: Michael Niedermayer
avcodec/h264_mp4toannexb_bsf: fix issue when sps/pps are already in the bistream
(cherry picked from commit ad91bf854b559f1afc42fc06f8a7dfbb75def5c8)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d2219e9f950b96279fd8464cc11c4d02518b629
---
libavcodec/h264_mp4toannexb_bsf.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c
index 0f142bb..a7b4f41 100644
--- a/libavcodec/h264_mp4toannexb_bsf.c
+++ b/libavcodec/h264_mp4toannexb_bsf.c
@@ -28,6 +28,7 @@
typedef struct H264BSFContext {
uint8_t length_size;
uint8_t first_idr;
+ uint8_t idr_sps_pps_seen;
int extradata_parsed;
} H264BSFContext;
@@ -155,6 +156,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
return ret;
ctx->length_size = ret;
ctx->first_idr = 1;
+ ctx->idr_sps_pps_seen = 0;
ctx->extradata_parsed = 1;
}
@@ -174,8 +176,12 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
if (buf + nal_size > buf_end || nal_size < 0)
goto fail;
- /* prepend only to the first type 5 NAL unit of an IDR picture */
- if (ctx->first_idr && (unit_type == 5 || unit_type == 7 || unit_type == 8)) {
+ if (ctx->first_idr && (unit_type == 7 || unit_type == 8))
+ ctx->idr_sps_pps_seen = 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) {
if ((ret=alloc_and_copy(poutbuf, poutbuf_size,
avctx->extradata, avctx->extradata_size,
buf, nal_size)) < 0)
@@ -185,8 +191,10 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
if ((ret=alloc_and_copy(poutbuf, poutbuf_size,
NULL, 0, buf, nal_size)) < 0)
goto fail;
- if (!ctx->first_idr && unit_type == 1)
+ if (!ctx->first_idr && unit_type == 1) {
ctx->first_idr = 1;
+ ctx->idr_sps_pps_seen = 0;
+ }
}
buf += nal_size;
More information about the ffmpeg-cvslog
mailing list