virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/h264_mp4toannexb_bsf: fix issue when sps/pps are already in the bistream

Browse Source
This commit is contained in:
Chris \"Koying\" Browet
2014-07-26 09:15:57 +02:00
committed by Michael Niedermayer
parent e97f5bef95
commit ad91bf854b
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/h264_mp4toannexb_bsf.c
View File

@@ -28,6 +28,7 @@
typedef struct H264BSFContext { typedef struct H264BSFContext {
uint8_t length_size; uint8_t length_size;
uint8_t first_idr; uint8_t first_idr;
uint8_t idr_sps_pps_seen;
int extradata_parsed; int extradata_parsed;
} H264BSFContext; } H264BSFContext;
@@ -155,6 +156,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
return ret; return ret;
ctx->length_size = ret; ctx->length_size = ret;
ctx->first_idr = 1; ctx->first_idr = 1;
ctx->idr_sps_pps_seen = 0;
ctx->extradata_parsed = 1; ctx->extradata_parsed = 1;
} }
@@ -174,8 +176,12 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
if (buf + nal_size > buf_end || nal_size < 0) if (buf + nal_size > buf_end || nal_size < 0)
goto fail; goto fail;
/* prepend only to the first type 5 NAL unit of an IDR picture */ if (ctx->first_idr && (unit_type == 7 || unit_type == 8))
if (ctx->first_idr && (unit_type == 5 || 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, if ((ret=alloc_and_copy(poutbuf, poutbuf_size,
avctx->extradata, avctx->extradata_size, avctx->extradata, avctx->extradata_size,
buf, nal_size)) < 0) buf, nal_size)) < 0)
@@ -185,8 +191,10 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
if ((ret=alloc_and_copy(poutbuf, poutbuf_size, if ((ret=alloc_and_copy(poutbuf, poutbuf_size,
NULL, 0, buf, nal_size)) < 0) NULL, 0, buf, nal_size)) < 0)
goto fail; goto fail;
if (!ctx->first_idr && unit_type == 1) if (!ctx->first_idr && unit_type == 1) {
ctx->first_idr = 1; ctx->first_idr = 1;
ctx->idr_sps_pps_seen = 0;
}
} }
buf += nal_size; buf += nal_size;