Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/av1dec: Use ProgressFrames

Browse Source 
AV1 can put a frame into multiple reference slots;
up until now, this involved creating a new reference
to the underlying AVFrame; therefore av1_frame_ref()
could fail.
This commit changes this by using the ProgressFrame API
to share the underlying AVFrames.

(Hint: vaapi_av1_surface_id() checked whether the AV1Frames
contained in the AV1DecContext were NULL or not (of course
they were not); this has been changed to actually check for
whether said AV1Frame is blank or not.)

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
release/7.1
Andreas Rheinhardt 9 months ago
parent 0ec886ddc7
commit 0f8763fbea
7 changed files with 47 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 92
      libavcodec/av1dec.c
  2. 8
      libavcodec/av1dec.h
  3. 8
      libavcodec/dxva2_av1.c
  4. 4
      libavcodec/nvdec_av1.c
  5. 6
      libavcodec/vaapi_av1.c
  6. 7
      libavcodec/vdpau_av1.c
  7. 4
      libavcodec/vulkan_av1.c

92
libavcodec/av1dec.c
Unescape View File

@ -38,8 +38,8 @@
#include "itut35.h" #include "itut35.h"
#include "hwconfig.h" #include "hwconfig.h"
#include "profiles.h" #include "profiles.h"
#include "progressframe.h"
#include "refstruct.h" #include "refstruct.h"
#include "thread.h"
/**< same with Div_Lut defined in spec 7.11.3.7 */ /**< same with Div_Lut defined in spec 7.11.3.7 */
static const uint16_t div_lut[AV1_DIV_LUT_NUM] = { static const uint16_t div_lut[AV1_DIV_LUT_NUM] = {
@ -672,7 +672,7 @@ static int get_pixel_format(AVCodecContext *avctx)
static void av1_frame_unref(AV1Frame *f) static void av1_frame_unref(AV1Frame *f)
{ {
av_frame_unref(f->f); ff_progress_frame_unref(&f->pf);
ff_refstruct_unref(&f->hwaccel_picture_private); ff_refstruct_unref(&f->hwaccel_picture_private);
ff_refstruct_unref(&f->header_ref); ff_refstruct_unref(&f->header_ref);
f->raw_frame_header = NULL; f->raw_frame_header = NULL;
@ -683,20 +683,16 @@ static void av1_frame_unref(AV1Frame *f)
f->coded_lossless = 0; f->coded_lossless = 0;
} }
static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *src) static void av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *src)
{ {
int ret;
ff_refstruct_replace(&dst->header_ref, src->header_ref); ff_refstruct_replace(&dst->header_ref, src->header_ref);
dst->raw_frame_header = src->raw_frame_header; dst->raw_frame_header = src->raw_frame_header;
if (!src->f->buf[0]) if (!src->f)
return 0; return;
ret = av_frame_ref(dst->f, src->f); ff_progress_frame_ref(&dst->pf, &src->pf);
if (ret < 0)
goto fail;
ff_refstruct_replace(&dst->hwaccel_picture_private, ff_refstruct_replace(&dst->hwaccel_picture_private,
src->hwaccel_picture_private); src->hwaccel_picture_private);
@ -725,12 +721,6 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s
sizeof(dst->ref_frame_sign_bias)); sizeof(dst->ref_frame_sign_bias));
memcpy(dst->order_hints, src->order_hints, memcpy(dst->order_hints, src->order_hints,
sizeof(dst->order_hints)); sizeof(dst->order_hints));
return 0;
fail:
av1_frame_unref(dst);
return AVERROR(ENOMEM);
} }
static av_cold int av1_decode_free(AVCodecContext *avctx) static av_cold int av1_decode_free(AVCodecContext *avctx)
@ -738,16 +728,9 @@ static av_cold int av1_decode_free(AVCodecContext *avctx)
AV1DecContext *s = avctx->priv_data; AV1DecContext *s = avctx->priv_data;
AV1RawMetadataITUTT35 itut_t35; AV1RawMetadataITUTT35 itut_t35;
for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) { for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++)
if (s->ref[i].f) { av1_frame_unref(&s->ref[i]);
av1_frame_unref(&s->ref[i]); av1_frame_unref(&s->cur_frame);
av_frame_free(&s->ref[i].f);
}
}
if (s->cur_frame.f) {
av1_frame_unref(&s->cur_frame);
av_frame_free(&s->cur_frame.f);
}
av_buffer_unref(&s->seq_data_ref); av_buffer_unref(&s->seq_data_ref);
ff_refstruct_unref(&s->seq_ref); ff_refstruct_unref(&s->seq_ref);
ff_refstruct_unref(&s->header_ref); ff_refstruct_unref(&s->header_ref);
@ -863,16 +846,6 @@ static av_cold int av1_decode_init(AVCodecContext *avctx)
s->pkt = avctx->internal->in_pkt; s->pkt = avctx->internal->in_pkt;
s->pix_fmt = AV_PIX_FMT_NONE; s->pix_fmt = AV_PIX_FMT_NONE;
for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) {
s->ref[i].f = av_frame_alloc();
if (!s->ref[i].f)
return AVERROR(ENOMEM);
}
s->cur_frame.f = av_frame_alloc();
if (!s->cur_frame.f)
return AVERROR(ENOMEM);
ret = ff_cbs_init(&s->cbc, AV_CODEC_ID_AV1, avctx); ret = ff_cbs_init(&s->cbc, AV_CODEC_ID_AV1, avctx);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -934,7 +907,8 @@ static int av1_frame_alloc(AVCodecContext *avctx, AV1Frame *f)
return ret; return ret;
} }
if ((ret = ff_thread_get_buffer(avctx, f->f, AV_GET_BUFFER_FLAG_REF)) < 0) ret = ff_progress_frame_get_buffer(avctx, &f->pf, AV_GET_BUFFER_FLAG_REF);
if (ret < 0)
goto fail; goto fail;
frame = f->f; frame = f->f;
@ -1211,23 +1185,17 @@ FF_ENABLE_DEPRECATION_WARNINGS
return 0; return 0;
} }
static int update_reference_list(AVCodecContext *avctx) static void update_reference_list(AVCodecContext *avctx)
{ {
AV1DecContext *s = avctx->priv_data; AV1DecContext *s = avctx->priv_data;
const AV1RawFrameHeader *header = s->raw_frame_header; const AV1RawFrameHeader *header = s->raw_frame_header;
int ret;
for (int i = 0; i < AV1_NUM_REF_FRAMES; i++) { for (int i = 0; i < AV1_NUM_REF_FRAMES; i++) {
if (header->refresh_frame_flags & (1 << i)) { if (header->refresh_frame_flags & (1 << i)) {
av1_frame_unref(&s->ref[i]); av1_frame_unref(&s->ref[i]);
if ((ret = av1_frame_ref(avctx, &s->ref[i], &s->cur_frame)) < 0) { av1_frame_ref(avctx, &s->ref[i], &s->cur_frame);
av_log(avctx, AV_LOG_ERROR,
"Failed to update frame %d in reference list\n", i);
return ret;
}
} }
} }
return 0;
} }
static int get_current_frame(AVCodecContext *avctx) static int get_current_frame(AVCodecContext *avctx)
@ -1358,20 +1326,12 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
if (s->raw_frame_header->show_existing_frame) { if (s->raw_frame_header->show_existing_frame) {
av1_frame_unref(&s->cur_frame); av1_frame_unref(&s->cur_frame);
ret = av1_frame_ref(avctx, &s->cur_frame, av1_frame_ref(avctx, &s->cur_frame,
&s->ref[s->raw_frame_header->frame_to_show_map_idx]); &s->ref[s->raw_frame_header->frame_to_show_map_idx]);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to get reference frame.\n");
goto end;
}
ret = update_reference_list(avctx); update_reference_list(avctx);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to update reference list.\n");
goto end;
}
if (s->cur_frame.f->buf[0]) { if (s->cur_frame.f) {
ret = set_output_frame(avctx, frame); ret = set_output_frame(avctx, frame);
if (ret < 0) if (ret < 0)
av_log(avctx, AV_LOG_ERROR, "Set output frame error.\n"); av_log(avctx, AV_LOG_ERROR, "Set output frame error.\n");
@ -1392,7 +1352,7 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
s->cur_frame.spatial_id = header->spatial_id; s->cur_frame.spatial_id = header->spatial_id;
s->cur_frame.temporal_id = header->temporal_id; s->cur_frame.temporal_id = header->temporal_id;
if (avctx->hwaccel && s->cur_frame.f->buf[0]) { if (avctx->hwaccel && s->cur_frame.f) {
ret = FF_HW_CALL(avctx, start_frame, unit->data, unit->data_size); ret = FF_HW_CALL(avctx, start_frame, unit->data, unit->data_size);
if (ret < 0) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "HW accel start frame fail.\n"); av_log(avctx, AV_LOG_ERROR, "HW accel start frame fail.\n");
@ -1418,7 +1378,7 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
if (ret < 0) if (ret < 0)
goto end; goto end;
if (avctx->hwaccel && s->cur_frame.f->buf[0]) { if (avctx->hwaccel && s->cur_frame.f) {
ret = FF_HW_CALL(avctx, decode_slice, raw_tile_group->tile_data.data, ret = FF_HW_CALL(avctx, decode_slice, raw_tile_group->tile_data.data,
raw_tile_group->tile_data.data_size); raw_tile_group->tile_data.data_size);
if (ret < 0) { if (ret < 0) {
@ -1469,7 +1429,7 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
if (raw_tile_group && (s->tile_num == raw_tile_group->tg_end + 1)) { if (raw_tile_group && (s->tile_num == raw_tile_group->tg_end + 1)) {
int show_frame = s->raw_frame_header->show_frame; int show_frame = s->raw_frame_header->show_frame;
if (avctx->hwaccel && s->cur_frame.f->buf[0]) { if (avctx->hwaccel && s->cur_frame.f) {
ret = FF_HW_SIMPLE_CALL(avctx, end_frame); ret = FF_HW_SIMPLE_CALL(avctx, end_frame);
if (ret < 0) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "HW accel end frame fail.\n"); av_log(avctx, AV_LOG_ERROR, "HW accel end frame fail.\n");
@ -1477,13 +1437,9 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
} }
} }
ret = update_reference_list(avctx); update_reference_list(avctx);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to update reference list.\n");
goto end;
}
if (s->raw_frame_header->show_frame && s->cur_frame.f->buf[0]) { if (s->raw_frame_header->show_frame && s->cur_frame.f) {
ret = set_output_frame(avctx, frame); ret = set_output_frame(avctx, frame);
if (ret < 0) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Set output frame error\n"); av_log(avctx, AV_LOG_ERROR, "Set output frame error\n");
@ -1597,7 +1553,9 @@ const FFCodec ff_av1_decoder = {
.close = av1_decode_free, .close = av1_decode_free,
FF_CODEC_RECEIVE_FRAME_CB(av1_receive_frame), FF_CODEC_RECEIVE_FRAME_CB(av1_receive_frame),
.p.capabilities = AV_CODEC_CAP_DR1, .p.capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP |
FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM |
FF_CODEC_CAP_USES_PROGRESSFRAMES,
.flush = av1_decode_flush, .flush = av1_decode_flush,
.p.profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles), .p.profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles),
.p.priv_class = &av1_class, .p.priv_class = &av1_class,

8
libavcodec/av1dec.h
Unescape View File

@ -32,9 +32,15 @@
#include "cbs.h" #include "cbs.h"
#include "cbs_av1.h" #include "cbs_av1.h"
#include "dovi_rpu.h" #include "dovi_rpu.h"
#include "progressframe.h"
typedef struct AV1Frame { typedef struct AV1Frame {
AVFrame *f; union {
struct {
struct AVFrame *f;
};
ProgressFrame pf;
};
void *hwaccel_picture_private; ///< RefStruct reference void *hwaccel_picture_private; ///< RefStruct reference

8
libavcodec/dxva2_av1.c
Unescape View File

@ -138,9 +138,9 @@ int ff_dxva2_av1_fill_picture_parameters(const AVCodecContext *avctx, AVDXVACont
int8_t ref_idx = frame_header->ref_frame_idx[i]; int8_t ref_idx = frame_header->ref_frame_idx[i];
AVFrame *ref_frame = h->ref[ref_idx].f; AVFrame *ref_frame = h->ref[ref_idx].f;
pp->frame_refs[i].width = ref_frame->width; pp->frame_refs[i].width = ref_frame ? ref_frame->width : 0;
pp->frame_refs[i].height = ref_frame->height; pp->frame_refs[i].height = ref_frame ? ref_frame->height : 0;
pp->frame_refs[i].Index = ref_frame->buf[0] ? ref_idx : 0xFF; pp->frame_refs[i].Index = ref_frame ? ref_idx : 0xFF;
/* Global Motion */ /* Global Motion */
pp->frame_refs[i].wminvalid = h->cur_frame.gm_invalid[AV1_REF_FRAME_LAST + i]; pp->frame_refs[i].wminvalid = h->cur_frame.gm_invalid[AV1_REF_FRAME_LAST + i];
@ -151,7 +151,7 @@ int ff_dxva2_av1_fill_picture_parameters(const AVCodecContext *avctx, AVDXVACont
} }
for (i = 0; i < AV1_NUM_REF_FRAMES; i++) { for (i = 0; i < AV1_NUM_REF_FRAMES; i++) {
AVFrame *ref_frame = h->ref[i].f; AVFrame *ref_frame = h->ref[i].f;
if (ref_frame->buf[0]) if (ref_frame)
pp->RefFrameMapTextureIndex[i] = ff_dxva2_get_surface_index(avctx, ctx, ref_frame, 0); pp->RefFrameMapTextureIndex[i] = ff_dxva2_get_surface_index(avctx, ctx, ref_frame, 0);
} }

4
libavcodec/nvdec_av1.c
Unescape View File

@ -251,8 +251,8 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u
AVFrame *ref_frame = s->ref[ref_idx].f; AVFrame *ref_frame = s->ref[ref_idx].f;
ppc->ref_frame[i].index = ppc->ref_frame_map[ref_idx]; ppc->ref_frame[i].index = ppc->ref_frame_map[ref_idx];
ppc->ref_frame[i].width = ref_frame->width; ppc->ref_frame[i].width = ref_frame ? ref_frame->width : 0;
ppc->ref_frame[i].height = ref_frame->height; ppc->ref_frame[i].height = ref_frame ? ref_frame->height : 0;
/* Global Motion */ /* Global Motion */
ppc->global_motion[i].invalid = !frame_header->is_global[AV1_REF_FRAME_LAST + i]; ppc->global_motion[i].invalid = !frame_header->is_global[AV1_REF_FRAME_LAST + i];

6
libavcodec/vaapi_av1.c
Unescape View File

@ -46,7 +46,7 @@ typedef struct VAAPIAV1DecContext {
static VASurfaceID vaapi_av1_surface_id(AV1Frame *vf) static VASurfaceID vaapi_av1_surface_id(AV1Frame *vf)
{ {
if (vf) if (vf->f)
return ff_vaapi_get_surface_id(vf->f); return ff_vaapi_get_surface_id(vf->f);
else else
return VA_INVALID_SURFACE; return VA_INVALID_SURFACE;
@ -132,7 +132,7 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx,
goto fail; goto fail;
pic->output_surface = ff_vaapi_get_surface_id(ctx->tmp_frame); pic->output_surface = ff_vaapi_get_surface_id(ctx->tmp_frame);
} else { } else {
pic->output_surface = vaapi_av1_surface_id(&s->cur_frame); pic->output_surface = ff_vaapi_get_surface_id(s->cur_frame.f);
} }
memset(&pic_param, 0, sizeof(VADecPictureParameterBufferAV1)); memset(&pic_param, 0, sizeof(VADecPictureParameterBufferAV1));
@ -142,7 +142,7 @@ static int vaapi_av1_start_frame(AVCodecContext *avctx,
.bit_depth_idx = bit_depth_idx, .bit_depth_idx = bit_depth_idx,
.matrix_coefficients = seq->color_config.matrix_coefficients, .matrix_coefficients = seq->color_config.matrix_coefficients,
.current_frame = pic->output_surface, .current_frame = pic->output_surface,
.current_display_picture = vaapi_av1_surface_id(&s->cur_frame), .current_display_picture = ff_vaapi_get_surface_id(s->cur_frame.f),
.frame_width_minus1 = frame_header->frame_width_minus_1, .frame_width_minus1 = frame_header->frame_width_minus_1,
.frame_height_minus1 = frame_header->frame_height_minus_1, .frame_height_minus1 = frame_header->frame_height_minus_1,
.primary_ref_frame = frame_header->primary_ref_frame, .primary_ref_frame = frame_header->primary_ref_frame,

7
libavcodec/vdpau_av1.c
Unescape View File

@ -219,7 +219,8 @@ static int vdpau_av1_start_frame(AVCodecContext *avctx,
info->loop_filter_ref_deltas[i] = frame_header->loop_filter_ref_deltas[i]; info->loop_filter_ref_deltas[i] = frame_header->loop_filter_ref_deltas[i];
/* Reference Frames */ /* Reference Frames */
info->ref_frame_map[i] = ff_vdpau_get_surface_id(s->ref[i].f) ? ff_vdpau_get_surface_id(s->ref[i].f) : VDP_INVALID_HANDLE; info->ref_frame_map[i] = s->ref[i].f && ff_vdpau_get_surface_id(s->ref[i].f) ?
ff_vdpau_get_surface_id(s->ref[i].f) : VDP_INVALID_HANDLE;
} }
if (frame_header->primary_ref_frame == AV1_PRIMARY_REF_NONE) { if (frame_header->primary_ref_frame == AV1_PRIMARY_REF_NONE) {
@ -235,8 +236,8 @@ static int vdpau_av1_start_frame(AVCodecContext *avctx,
AVFrame *ref_frame = s->ref[ref_idx].f; AVFrame *ref_frame = s->ref[ref_idx].f;
info->ref_frame[i].index = info->ref_frame_map[ref_idx]; info->ref_frame[i].index = info->ref_frame_map[ref_idx];
info->ref_frame[i].width = ref_frame->width; info->ref_frame[i].width = ref_frame ? ref_frame->width : 0;
info->ref_frame[i].height = ref_frame->height; info->ref_frame[i].height = ref_frame ? ref_frame->height : 0;
/* Global Motion */ /* Global Motion */
info->global_motion[i].invalid = !frame_header->is_global[AV1_REF_FRAME_LAST + i]; info->global_motion[i].invalid = !frame_header->is_global[AV1_REF_FRAME_LAST + i];

4
libavcodec/vulkan_av1.c
Unescape View File

@ -284,7 +284,7 @@ static int vk_av1_start_frame(AVCodecContext *avctx,
AV1VulkanDecodePicture *hp = ref_frame->hwaccel_picture_private; AV1VulkanDecodePicture *hp = ref_frame->hwaccel_picture_private;
int found = 0; int found = 0;
if (ref_frame->f->pict_type == AV_PICTURE_TYPE_NONE) if (!ref_frame->f)
continue; continue;
for (int j = 0; j < ref_count; j++) { for (int j = 0; j < ref_count; j++) {
@ -326,7 +326,7 @@ static int vk_av1_start_frame(AVCodecContext *avctx,
const AV1Frame *ref_frame = &s->ref[idx]; const AV1Frame *ref_frame = &s->ref[idx];
AV1VulkanDecodePicture *hp = ref_frame->hwaccel_picture_private; AV1VulkanDecodePicture *hp = ref_frame->hwaccel_picture_private;
if (ref_frame->f->pict_type == AV_PICTURE_TYPE_NONE) if (!ref_frame->f)
ap->av1_pic_info.referenceNameSlotIndices[i] = AV1_REF_FRAME_NONE; ap->av1_pic_info.referenceNameSlotIndices[i] = AV1_REF_FRAME_NONE;
else else
ap->av1_pic_info.referenceNameSlotIndices[i] = hp->frame_id; ap->av1_pic_info.referenceNameSlotIndices[i] = hp->frame_id;

Write Preview
Loading…
Cancel
Save