diff options
| author | James Almer <jamrial@gmail.com> | 2020-10-16 13:34:31 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-10-16 13:34:31 -0300 |
| commit | 0ed455b84e28f1c01b31390ae4b33cbd3e0f6ba4 (patch) | |
| tree | 75e09303fa5f62f9ad1775caafa7d643a253f006 | |
| parent | af701196ec04a2ad1032340ef8b04ed9890ff32c (diff) | |
avcodec/av1dec: add cur_frame.spatial_id and temporal_id to AV1Frame
Will be used by hwaccels, which have access to a frame's AV1RawFrameHeader but not
its AV1RawOBUHeader.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/av1dec.c | 7 | ||||
| -rw-r--r-- | libavcodec/av1dec.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 6d00754fcb..a0a279d65b 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -343,6 +343,7 @@ static void av1_frame_unref(AVCodecContext *avctx, AV1Frame *f) ff_thread_release_buffer(avctx, &f->tf); av_buffer_unref(&f->hwaccel_priv_buf); f->hwaccel_picture_private = NULL; + f->spatial_id = f->temporal_id = 0; } static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *src) @@ -360,6 +361,8 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s dst->hwaccel_picture_private = dst->hwaccel_priv_buf->data; } + dst->spatial_id = src->spatial_id; + dst->temporal_id = src->temporal_id; dst->loop_filter_delta_enabled = src->loop_filter_delta_enabled; memcpy(dst->loop_filter_ref_deltas, src->loop_filter_ref_deltas, @@ -670,6 +673,7 @@ static int av1_decode_frame(AVCodecContext *avctx, void *frame, for (int i = 0; i < s->current_obu.nb_units; i++) { CodedBitstreamUnit *unit = &s->current_obu.units[i]; AV1RawOBU *obu = unit->content; + const AV1RawOBUHeader *header = &obu->header; av_log(avctx, AV_LOG_DEBUG, "Obu idx:%d, obu type:%d.\n", i, unit->type); switch (unit->type) { @@ -766,6 +770,9 @@ static int av1_decode_frame(AVCodecContext *avctx, void *frame, goto end; } + s->cur_frame.spatial_id = header->spatial_id; + s->cur_frame.temporal_id = header->temporal_id; + if (avctx->hwaccel) { ret = avctx->hwaccel->start_frame(avctx, unit->data, unit->data_size); diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h index 3604870299..63c958ca53 100644 --- a/libavcodec/av1dec.h +++ b/libavcodec/av1dec.h @@ -36,6 +36,9 @@ typedef struct AV1Frame { AVBufferRef *hwaccel_priv_buf; void *hwaccel_picture_private; + int temporal_id; + int spatial_id; + uint8_t loop_filter_delta_enabled; int8_t loop_filter_ref_deltas[AV1_NUM_REF_FRAMES]; int8_t loop_filter_mode_deltas[2]; |