RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mediacodecdec: do not abort when H264/HEVC extradata extraction fails 

Although rare, extradata can be present but empty and extraction will fail.
However Android also supports passing codec-specific data inline and
will likely play such a stream anyway. So there's no reason to abort
initialization before we know for sure.
This commit is contained in:
sfan5 2021-02-12 23:47:46 +01:00 committed by Jan Ekström
parent d5d6751a55
commit 6f80953554
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/mediacodecdec.c
View File

@ -167,8 +167,11 @@ static int h264_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format)
ff_AMediaFormat_setBuffer(format, "csd-1", (void*)data, data_size);
av_freep(&data);
} else {
av_log(avctx, AV_LOG_ERROR, "Could not extract PPS/SPS from extradata");
ret = AVERROR_INVALIDDATA;
const int warn = is_avc && (avctx->codec_tag == MKTAG('a','v','c','1') ||
avctx->codec_tag == MKTAG('a','v','c','2'));
av_log(avctx, warn ? AV_LOG_WARNING : AV_LOG_DEBUG,
"Could not extract PPS/SPS from extradata\n");
ret = 0;
}
done:
@ -254,8 +257,10 @@ static int hevc_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format)
av_freep(&data);
} else {
av_log(avctx, AV_LOG_ERROR, "Could not extract VPS/PPS/SPS from extradata");
ret = AVERROR_INVALIDDATA;
const int warn = is_nalff && avctx->codec_tag == MKTAG('h','v','c','1');
av_log(avctx, warn ? AV_LOG_WARNING : AV_LOG_DEBUG,
"Could not extract VPS/PPS/SPS from extradata\n");
ret = 0;
}
done: