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");
}
- ff_cbs_fragment_reset(s->cbc, td);
+ ff_cbs_fragment_reset(td);
}
ret = ff_cbs_read(s->cbc, td, data, size);
CodedBitstreamUnit *unit = &td->units[i];
AV1RawOBU *obu = unit->content;
AV1RawFrameHeader *frame;
- int frame_type;
if (unit->type == AV1_OBU_FRAME)
frame = &obu->obu.frame.header;
if (obu->header.spatial_id > 0)
continue;
- if (frame->show_existing_frame) {
- AV1ReferenceFrameState *ref = &av1->ref[frame->frame_to_show_map_idx];
-
- if (!ref->valid) {
- av_log(avctx, AV_LOG_ERROR, "Invalid reference frame\n");
- goto end;
- }
-
- ctx->width = ref->frame_width;
- ctx->height = ref->frame_height;
- frame_type = ref->frame_type;
-
- ctx->key_frame = 0;
- } else if (!frame->show_frame) {
+ if (!frame->show_frame && !frame->show_existing_frame)
continue;
- } else {
- ctx->width = av1->frame_width;
- ctx->height = av1->frame_height;
- frame_type = frame->frame_type;
- ctx->key_frame = frame_type == AV1_FRAME_KEY;
- }
+ ctx->width = frame->frame_width_minus_1 + 1;
+ ctx->height = frame->frame_height_minus_1 + 1;
- switch (frame_type) {
+ ctx->key_frame = frame->frame_type == AV1_FRAME_KEY && !frame->show_existing_frame;
+
+ switch (frame->frame_type) {
case AV1_FRAME_KEY:
case AV1_FRAME_INTRA_ONLY:
ctx->pict_type = AV_PICTURE_TYPE_I;
avctx->color_trc = (enum AVColorTransferCharacteristic) color->transfer_characteristics;
avctx->color_range = color->color_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
- if (ctx->width != avctx->width || ctx->height != avctx->height) {
- ret = ff_set_dimensions(avctx, ctx->width, ctx->height);
- if (ret < 0)
- goto end;
- }
-
if (avctx->framerate.num)
avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1}));
end:
- ff_cbs_fragment_reset(s->cbc, td);
+ ff_cbs_fragment_reset(td);
s->cbc->log_ctx = NULL;
if (ret < 0)
return ret;
- s->cbc->decompose_unit_types = (CodedBitstreamUnitType *)decompose_unit_types;
+ s->cbc->decompose_unit_types = decompose_unit_types;
s->cbc->nb_decompose_unit_types = FF_ARRAY_ELEMS(decompose_unit_types);
return 0;
{
AV1ParseContext *s = ctx->priv_data;
- ff_cbs_fragment_free(s->cbc, &s->temporal_unit);
+ ff_cbs_fragment_free(&s->temporal_unit);
ff_cbs_close(&s->cbc);
}
return 0;
}
-AVCodecParser ff_av1_parser = {
+const AVCodecParser ff_av1_parser = {
.codec_ids = { AV_CODEC_ID_AV1 },
.priv_data_size = sizeof(AV1ParseContext),
.parser_init = av1_parser_init,