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

h264_mp4toannexb_bsf: do not fail on annex B extradata

Browse Source 
Just pass through the bitstream as is. This is the same as what is done
for HEVC already.
This commit is contained in:
Anton Khirnov 2016-04-19 19:37:49 +02:00
parent 5fca95c8e5
commit f3ed484953
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/h264_mp4toannexb_bsf.c
View File

@ -131,10 +131,16 @@ static int h264_extradata_to_annexb(AVBSFContext *ctx, const int padding)
static int h264_mp4toannexb_init(AVBSFContext *ctx) static int h264_mp4toannexb_init(AVBSFContext *ctx)
{ {
H264BSFContext *s = ctx->priv_data; H264BSFContext *s = ctx->priv_data;
int extra_size = ctx->par_in->extradata_size;
int ret; int ret;
/* retrieve sps and pps NAL units from extradata */ /* retrieve sps and pps NAL units from extradata */
if (ctx->par_in->extradata_size >= 6) { if (!extra_size ||
(extra_size >= 3 && AV_RB24(ctx->par_in->extradata) == 1) ||
(extra_size >= 4 && AV_RB32(ctx->par_in->extradata) == 1)) {
av_log(ctx, AV_LOG_VERBOSE,
"The input looks like it is Annex B already\n");
} else if (extra_size >= 6) {
ret = h264_extradata_to_annexb(ctx, AV_INPUT_BUFFER_PADDING_SIZE); ret = h264_extradata_to_annexb(ctx, AV_INPUT_BUFFER_PADDING_SIZE);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -142,6 +148,9 @@ static int h264_mp4toannexb_init(AVBSFContext *ctx)
s->length_size = ret; s->length_size = ret;
s->first_idr = 1; s->first_idr = 1;
s->extradata_parsed = 1; s->extradata_parsed = 1;
} else {
av_log(ctx, AV_LOG_ERROR, "Invalid extradata size: %d\n", extra_size);
return AVERROR_INVALIDDATA;
} }
return 0; return 0;