PR #20912 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20912 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20912.patch
This reverts commit 62184be5486ec06d6976c20931b30738c8e83fd8. It includes a private header (lavu/mutex.h) in a public header (hwcontext_amf.h). >From 446aeebee3575ff4a605ac0d94f62094a5afef3f Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Thu, 13 Nov 2025 15:56:16 +0100 Subject: [PATCH] Revert "avutil/hwcontext_amf: Simplified blocking before frame submission" This reverts commit 62184be5486ec06d6976c20931b30738c8e83fd8. It includes a private header (lavu/mutex.h) in a public header (hwcontext_amf.h). Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/amfenc.c | 93 ++++++++++++++++++++++++++++++++++++--- libavutil/hwcontext_amf.c | 6 +-- libavutil/hwcontext_amf.h | 2 - 3 files changed, 90 insertions(+), 11 deletions(-) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 2174c5bdb2..f363192000 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -381,6 +381,89 @@ static AMF_RESULT amf_set_property_buffer(AMFSurface *object, const wchar_t *nam return res; } +static AMF_RESULT amf_lock_context(AVCodecContext *avctx) +{ + AMFEncoderContext *ctx = avctx->priv_data; + AVHWDeviceContext *hw_device_ctx = (AVHWDeviceContext*)ctx->device_ctx_ref->data; + AVAMFDeviceContext *amf_device_ctx = (AVAMFDeviceContext *)hw_device_ctx->hwctx; + AMF_RESULT res; + + switch(amf_device_ctx->memory_type) { + case AMF_MEMORY_DX11: + res = amf_device_ctx->context->pVtbl->LockDX11(amf_device_ctx->context); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "LockDX11() failed with error %d\n", res); + break; + case AMF_MEMORY_DX12: + { + AMFContext2 *context2 = NULL; + AMFGuid guid = IID_AMFContext2(); + res = amf_device_ctx->context->pVtbl->QueryInterface(amf_device_ctx->context, &guid, (void**)&context2); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "QueryInterface for AMFContext2 failed with error %d\n", res); + res = context2->pVtbl->LockDX12(context2); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "LockDX12() failed with error %d\n", res); + context2->pVtbl->Release(context2); + } + break; + case AMF_MEMORY_DX9: + res = amf_device_ctx->context->pVtbl->LockDX9(amf_device_ctx->context); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "LockDX9() failed with error %d\n", res); + + case AMF_MEMORY_VULKAN: + { + AMFContext2 *context2 = NULL; + AMFGuid guid = IID_AMFContext2(); + res = amf_device_ctx->context->pVtbl->QueryInterface(amf_device_ctx->context, &guid, (void**)&context2); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "QueryInterface for AMFContext2 failed with error %d\n", res); + res = context2->pVtbl->LockVulkan(context2); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "LockVulkan() failed with error %d\n", res); + context2->pVtbl->Release(context2); + } + break; + } + return AMF_OK; +} +static AMF_RESULT amf_unlock_context(AVCodecContext *avctx) +{ + AMFEncoderContext *ctx = avctx->priv_data; + AVHWDeviceContext *hw_device_ctx = (AVHWDeviceContext*)ctx->device_ctx_ref->data; + AVAMFDeviceContext *amf_device_ctx = (AVAMFDeviceContext *)hw_device_ctx->hwctx; + AMF_RESULT res; + + switch(amf_device_ctx->memory_type) { + case AMF_MEMORY_DX11: + res = amf_device_ctx->context->pVtbl->UnlockDX11(amf_device_ctx->context); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "LockDX11() failed with error %d\n", res); + break; + case AMF_MEMORY_DX12: + { + AMFContext2 *context2 = NULL; + AMFGuid guid = IID_AMFContext2(); + res = amf_device_ctx->context->pVtbl->QueryInterface(amf_device_ctx->context, &guid, (void**)&context2); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "QueryInterface for AMFContext2 failed with error %d\n", res); + res = context2->pVtbl->UnlockDX12(context2); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "LockDX12() failed with error %d\n", res); + context2->pVtbl->Release(context2); + } + break; + case AMF_MEMORY_DX9: + res = amf_device_ctx->context->pVtbl->UnlockDX9(amf_device_ctx->context); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "LockDX9() failed with error %d\n", res); + + case AMF_MEMORY_VULKAN: + { + AMFContext2 *context2 = NULL; + AMFGuid guid = IID_AMFContext2(); + res = amf_device_ctx->context->pVtbl->QueryInterface(amf_device_ctx->context, &guid, (void**)&context2); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "QueryInterface for AMFContext2 failed with error %d\n", res); + res = context2->pVtbl->UnlockVulkan(context2); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "LockVulkan() failed with error %d\n", res); + context2->pVtbl->Release(context2); + } + break; + } + return AMF_OK; +} + static AMF_RESULT amf_store_attached_frame_ref(AMFEncoderContext *ctx, const AVFrame *frame, AMFSurface *surface) { AMF_RESULT res = AMF_FAIL; @@ -560,14 +643,14 @@ static int amf_submit_frame(AVCodecContext *avctx, AVFrame *frame, AMFSurface static int amf_submit_frame_locked(AVCodecContext *avctx, AVFrame *frame, AMFSurface **surface_resubmit) { int ret; - AMFEncoderContext *ctx = avctx->priv_data; - AVHWDeviceContext *hw_device_ctx = (AVHWDeviceContext*)ctx->device_ctx_ref->data; - AVAMFDeviceContext *amf_device_ctx = (AVAMFDeviceContext *)hw_device_ctx->hwctx; + int locked = amf_lock_context(avctx); + if(locked != AMF_OK) + av_log(avctx, AV_LOG_WARNING, "amf_lock_context() failed with %d - should not happen\n", locked); - ff_mutex_lock(&amf_device_ctx->mutex); ret = amf_submit_frame(avctx, frame, surface_resubmit); - ff_mutex_unlock(&amf_device_ctx->mutex); + if(locked == AMF_OK) + amf_unlock_context(avctx); return ret; } static AMF_RESULT amf_query_output(AVCodecContext *avctx, AMFBuffer **buffer) diff --git a/libavutil/hwcontext_amf.c b/libavutil/hwcontext_amf.c index acd9627c68..20b9296e34 100644 --- a/libavutil/hwcontext_amf.c +++ b/libavutil/hwcontext_amf.c @@ -137,7 +137,7 @@ enum AVPixelFormat av_amf_to_av_format(enum AMF_SURFACE_FORMAT fmt) return format_map[i].av_format; } } - return AV_PIX_FMT_NONE; + return AMF_SURFACE_UNKNOWN; } static const enum AVPixelFormat supported_formats[] = { @@ -378,7 +378,6 @@ static void amf_device_uninit(AVHWDeviceContext *device_ctx) } amf_ctx->version = 0; - ff_mutex_destroy(&amf_ctx->mutex); } static int amf_device_init(AVHWDeviceContext *ctx) @@ -415,8 +414,7 @@ static int amf_device_init(AVHWDeviceContext *ctx) } } #endif - ff_mutex_init(&amf_ctx->mutex, NULL); - return 0; + return 0; } static int amf_load_library(AVAMFDeviceContext* amf_ctx, void* avcl) diff --git a/libavutil/hwcontext_amf.h b/libavutil/hwcontext_amf.h index 5b726e3b9e..8823190697 100644 --- a/libavutil/hwcontext_amf.h +++ b/libavutil/hwcontext_amf.h @@ -26,7 +26,6 @@ #include <AMF/core/Context.h> #include <AMF/core/Trace.h> #include <AMF/core/Debug.h> -#include "thread.h" /** * This struct is allocated as AVHWDeviceContext.hwctx @@ -39,7 +38,6 @@ typedef struct AVAMFDeviceContext { int64_t version; ///< version of AMF runtime AMFContext *context; AMF_MEMORY_TYPE memory_type; - AVMutex mutex; } AVAMFDeviceContext; enum AMF_SURFACE_FORMAT av_av_to_amf_format(enum AVPixelFormat fmt); -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
