virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/av1dec: add cur_frame.spatial_id and temporal_id to AV1Frame

Browse Source 
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>
This commit is contained in:
James Almer 2020-10-16 13:34:31 -03:00
parent af701196ec
commit 0ed455b84e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/av1dec.c
View File

@ -343,6 +343,7 @@ static void av1_frame_unref(AVCodecContext *avctx, AV1Frame *f)
ff_thread_release_buffer(avctx, &f->tf); ff_thread_release_buffer(avctx, &f->tf);
av_buffer_unref(&f->hwaccel_priv_buf); av_buffer_unref(&f->hwaccel_priv_buf);
f->hwaccel_picture_private = NULL; f->hwaccel_picture_private = NULL;
f->spatial_id = f->temporal_id = 0;
} }
static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *src) 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->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; dst->loop_filter_delta_enabled = src->loop_filter_delta_enabled;
memcpy(dst->loop_filter_ref_deltas, memcpy(dst->loop_filter_ref_deltas,
src->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++) { for (int i = 0; i < s->current_obu.nb_units; i++) {
CodedBitstreamUnit *unit = &s->current_obu.units[i]; CodedBitstreamUnit *unit = &s->current_obu.units[i];
AV1RawOBU *obu = unit->content; 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); av_log(avctx, AV_LOG_DEBUG, "Obu idx:%d, obu type:%d.\n", i, unit->type);
switch (unit->type) { switch (unit->type) {
@ -766,6 +770,9 @@ static int av1_decode_frame(AVCodecContext *avctx, void *frame,
goto end; goto end;
} }
s->cur_frame.spatial_id = header->spatial_id;
s->cur_frame.temporal_id = header->temporal_id;
if (avctx->hwaccel) { if (avctx->hwaccel) {
ret = avctx->hwaccel->start_frame(avctx, unit->data, ret = avctx->hwaccel->start_frame(avctx, unit->data,
unit->data_size); unit->data_size);

3
libavcodec/av1dec.h
View File

@ -36,6 +36,9 @@ typedef struct AV1Frame {
AVBufferRef *hwaccel_priv_buf; AVBufferRef *hwaccel_priv_buf;
void *hwaccel_picture_private; void *hwaccel_picture_private;
int temporal_id;
int spatial_id;
uint8_t loop_filter_delta_enabled; uint8_t loop_filter_delta_enabled;
int8_t loop_filter_ref_deltas[AV1_NUM_REF_FRAMES]; int8_t loop_filter_ref_deltas[AV1_NUM_REF_FRAMES];
int8_t loop_filter_mode_deltas[2]; int8_t loop_filter_mode_deltas[2];