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

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.
pull/358/head
Jan Ekström 4 years ago
parent a66d1779bb
commit 8fbc139e61
  1. 2
      libavcodec/av1_parser.c
  2. 5
      libavcodec/av1dec.c

@ -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");
}

@ -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;

Loading…
Cancel
Save