Jun 13, 2023, 18:56 by andreas.rheinha...@outlook.com:
> Lynne:
>
>> + dst->opaque = av_buffer_ref(src->opaque);
>> + if (!dst->opaque) {
>> + ret = AVERROR(ENOMEM);
>> + goto fail;
>> + }
>>
>
> According to the doxy, opaque can be left unset (and will be given that
> it is a new field), yet av_buffer_ref(NULL) will crash. We have
> av_buffer_replace() for something like that.
>
Fixed.
>From 02cd540d4cd10ad009e949f097bd3f0250a31fde Mon Sep 17 00:00:00 2001
From: Lynne <d...@lynne.ee>
Date: Tue, 13 Jun 2023 06:10:50 +0200
Subject: [PATCH 1/6] hwcontext: add a new AVHWFramesContext.opaque field
This is a public field, settable before frames context initialization,
and propagated to any derived contexts.
API users can use it to store state and determine which context
is one of theirs.
This also allows decoders which create their own contexts to store
some state which would be freed only at context destruction.
---
libavutil/hwcontext.c | 3 +++
libavutil/hwcontext.h | 9 +++++++++
2 files changed, 12 insertions(+)
diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c
index 3396598269..bbb824abfc 100644
--- a/libavutil/hwcontext.c
+++ b/libavutil/hwcontext.c
@@ -238,6 +238,7 @@ static void hwframe_ctx_free(void *opaque, uint8_t *data)
av_buffer_unref(&ctx->internal->source_frames);
av_buffer_unref(&ctx->device_ref);
+ av_buffer_unref(&ctx->opaque);
av_freep(&ctx->hwctx);
av_freep(&ctx->internal->priv);
@@ -913,6 +914,8 @@ int av_hwframe_ctx_create_derived(AVBufferRef **derived_frame_ctx,
dst->sw_format = src->sw_format;
dst->width = src->width;
dst->height = src->height;
+ if ((ret = av_buffer_replace(&dst->opaque, src->opaque)) < 0)
+ goto fail;
dst->internal->source_frames = av_buffer_ref(source_frame_ctx);
if (!dst->internal->source_frames) {
diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
index 7ff08c8608..7655bee33f 100644
--- a/libavutil/hwcontext.h
+++ b/libavutil/hwcontext.h
@@ -227,6 +227,15 @@ typedef struct AVHWFramesContext {
* Must be set by the user before calling av_hwframe_ctx_init().
*/
int width, height;
+
+ /**
+ * Opaque data. Can be set before calling av_hwframe_ctx_init().
+ * MUST NOT be set afterwards. Will be unref'd along with the
+ * main context at closure.
+ *
+ * Will be propagated to any derived contexts.
+ */
+ AVBufferRef *opaque;
} AVHWFramesContext;
/**
--
2.40.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
