gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testffmpeg: removed redundant enumeration of hardware device types

Browse Source
This commit is contained in:
Sam Lantinga
2024-03-11 15:31:21 -07:00
parent bee8a95571
commit 7c5f79e7ea
1 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test/testffmpeg.c
View File

@@ -383,7 +383,6 @@ static AVCodecContext *OpenVideoStream(AVFormatContext *ic, int stream, const AV
AVCodecParameters *codecpar = st->codecpar; AVCodecParameters *codecpar = st->codecpar;
AVCodecContext *context; AVCodecContext *context;
const AVCodecHWConfig *config; const AVCodecHWConfig *config;
enum AVHWDeviceType type;
int i; int i;
int result; int result;
@@ -416,18 +415,11 @@ static AVCodecContext *OpenVideoStream(AVFormatContext *ic, int stream, const AV
continue; continue;
} }
type = AV_HWDEVICE_TYPE_NONE;
while (!context->hw_device_ctx &&
(type = av_hwdevice_iterate_types(type)) != AV_HWDEVICE_TYPE_NONE) {
if (type != config->device_type) {
continue;
}
#ifdef SDL_PLATFORM_WIN32 #ifdef SDL_PLATFORM_WIN32
if (d3d11_device && type == AV_HWDEVICE_TYPE_D3D11VA) { if (d3d11_device && config->device_type == AV_HWDEVICE_TYPE_D3D11VA) {
AVD3D11VADeviceContext *device_context; AVD3D11VADeviceContext *device_context;
context->hw_device_ctx = av_hwdevice_ctx_alloc(type); context->hw_device_ctx = av_hwdevice_ctx_alloc(config->device_type);
device_context = (AVD3D11VADeviceContext *)((AVHWDeviceContext *)context->hw_device_ctx->data)->hwctx; device_context = (AVD3D11VADeviceContext *)((AVHWDeviceContext *)context->hw_device_ctx->data)->hwctx;
device_context->device = d3d11_device; device_context->device = d3d11_device;
@@ -437,36 +429,35 @@ static AVCodecContext *OpenVideoStream(AVFormatContext *ic, int stream, const AV
result = av_hwdevice_ctx_init(context->hw_device_ctx); result = av_hwdevice_ctx_init(context->hw_device_ctx);
if (result < 0) { if (result < 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create hardware device context: %s", av_err2str(result)); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create %s hardware device context: %s", av_hwdevice_get_type_name(config->device_type), av_err2str(result));
} else { } else {
SDL_Log("Using %s hardware acceleration with pixel format %s\n", av_hwdevice_get_type_name(config->device_type), av_get_pix_fmt_name(config->pix_fmt)); SDL_Log("Using %s hardware acceleration with pixel format %s\n", av_hwdevice_get_type_name(config->device_type), av_get_pix_fmt_name(config->pix_fmt));
} }
} else } else
#endif #endif
if (vulkan_context && type == AV_HWDEVICE_TYPE_VULKAN) { if (vulkan_context && config->device_type == AV_HWDEVICE_TYPE_VULKAN) {
AVVulkanDeviceContext *device_context; AVVulkanDeviceContext *device_context;
context->hw_device_ctx = av_hwdevice_ctx_alloc(type); context->hw_device_ctx = av_hwdevice_ctx_alloc(config->device_type);
device_context = (AVVulkanDeviceContext *)((AVHWDeviceContext *)context->hw_device_ctx->data)->hwctx; device_context = (AVVulkanDeviceContext *)((AVHWDeviceContext *)context->hw_device_ctx->data)->hwctx;
SetupVulkanDeviceContextData(vulkan_context, device_context); SetupVulkanDeviceContextData(vulkan_context, device_context);
result = av_hwdevice_ctx_init(context->hw_device_ctx); result = av_hwdevice_ctx_init(context->hw_device_ctx);
if (result < 0) { if (result < 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create hardware device context: %s", av_err2str(result)); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create %s hardware device context: %s", av_hwdevice_get_type_name(config->device_type), av_err2str(result));
} else { } else {
SDL_Log("Using %s hardware acceleration with pixel format %s\n", av_hwdevice_get_type_name(config->device_type), av_get_pix_fmt_name(config->pix_fmt)); SDL_Log("Using %s hardware acceleration with pixel format %s\n", av_hwdevice_get_type_name(config->device_type), av_get_pix_fmt_name(config->pix_fmt));
} }
} else { } else {
result = av_hwdevice_ctx_create(&context->hw_device_ctx, type, NULL, NULL, 0); result = av_hwdevice_ctx_create(&context->hw_device_ctx, config->device_type, NULL, NULL, 0);
if (result < 0) { if (result < 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create hardware device context: %s", av_err2str(result)); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create %s hardware device context: %s", av_hwdevice_get_type_name(config->device_type), av_err2str(result));
} else { } else {
SDL_Log("Using %s hardware acceleration with pixel format %s\n", av_hwdevice_get_type_name(config->device_type), av_get_pix_fmt_name(config->pix_fmt)); SDL_Log("Using %s hardware acceleration with pixel format %s\n", av_hwdevice_get_type_name(config->device_type), av_get_pix_fmt_name(config->pix_fmt));
} }
} }
} }
}
/* Allow supported hardware accelerated pixel formats */ /* Allow supported hardware accelerated pixel formats */
context->get_format = GetSupportedPixelFormat; context->get_format = GetSupportedPixelFormat;
@@ -1077,7 +1068,6 @@ int main(int argc, char *argv[])
/* Enable standard application logging */ /* Enable standard application logging */
SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO); SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
/* Parse commandline */ /* Parse commandline */
for (i = 1; i < argc;) { for (i = 1; i < argc;) {
int consumed; int consumed;