RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-25 04:19:05 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/av1{dec,parser}: move to ff_cbs_read_extradata_from_codec

Browse Source 
This lets us re-utilize the extradata-related checks in the CBS
to add support for passing the AV1CodecConfigurationRecord
as extradata as-is without further filtering.
This commit is contained in:
Jan Ekström 2020-11-23 17:36:20 +02:00
parent a66d1779bb
commit 8fbc139e61
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/av1_parser.c
View File

@ -73,7 +73,7 @@ static int av1_parser_parse(AVCodecParserContext *ctx,
if (avctx->extradata_size && !s->parsed_extradata) {
s->parsed_extradata = 1;
ret = ff_cbs_read(s->cbc, td, avctx->extradata, avctx->extradata_size);
ret = ff_cbs_read_extradata_from_codec(s->cbc, td, avctx);
if (ret < 0) {
av_log(avctx, AV_LOG_WARNING, "Failed to parse extradata.\n");
}

5
libavcodec/av1dec.c
View File

@ -616,8 +616,9 @@ static av_cold int av1_decode_init(AVCodecContext *avctx)
return ret;
if (avctx->extradata && avctx->extradata_size) {
ret = ff_cbs_read(s->cbc, &s->current_obu, avctx->extradata,
avctx->extradata_size);
ret = ff_cbs_read_extradata_from_codec(s->cbc,
&s->current_obu,
avctx);
if (ret < 0) {
av_log(avctx, AV_LOG_WARNING, "Failed to read extradata.\n");
return ret;