From 3382408b8e2f2b3d9fbd7fd0aad8be0dce3e3af7 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sat, 9 Apr 2022 00:45:49 +0200 Subject: VideoCommon/FrameDump: Allow user to specify a pixel format. --- Source/Core/VideoCommon/FrameDump.cpp | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'Source/Core/VideoCommon/FrameDump.cpp') diff --git a/Source/Core/VideoCommon/FrameDump.cpp b/Source/Core/VideoCommon/FrameDump.cpp index 7054ba11af..d79eec79f3 100644 --- a/Source/Core/VideoCommon/FrameDump.cpp +++ b/Source/Core/VideoCommon/FrameDump.cpp @@ -21,6 +21,7 @@ extern "C" { #include #include #include +#include #include } @@ -249,20 +250,31 @@ bool FrameDump::CreateVideoFile() m_context->codec->gop_size = 1; m_context->codec->level = 1; - if (m_context->codec->codec_id == AV_CODEC_ID_FFV1) + AVPixelFormat pix_fmt = AV_PIX_FMT_NONE; + + const std::string& pixel_format_string = g_Config.sDumpPixelFormat; + if (!pixel_format_string.empty()) { - m_context->codec->pix_fmt = AV_PIX_FMT_BGR0; + pix_fmt = av_get_pix_fmt(pixel_format_string.c_str()); + if (pix_fmt == AV_PIX_FMT_NONE) + WARN_LOG_FMT(FRAMEDUMP, "Invalid pixel format {}", pixel_format_string); } - else if (m_context->codec->codec_id == AV_CODEC_ID_UTVIDEO) - { - m_context->codec->pix_fmt = AV_PIX_FMT_GBRP; - av_opt_set_int(m_context->codec->priv_data, "pred", 3, 0); // median - } - else + + if (pix_fmt == AV_PIX_FMT_NONE) { - m_context->codec->pix_fmt = AV_PIX_FMT_YUV420P; + if (m_context->codec->codec_id == AV_CODEC_ID_FFV1) + pix_fmt = AV_PIX_FMT_BGR0; + else if (m_context->codec->codec_id == AV_CODEC_ID_UTVIDEO) + pix_fmt = AV_PIX_FMT_GBRP; + else + pix_fmt = AV_PIX_FMT_YUV420P; } + m_context->codec->pix_fmt = pix_fmt; + + if (m_context->codec->codec_id == AV_CODEC_ID_UTVIDEO) + av_opt_set_int(m_context->codec->priv_data, "pred", 3, 0); // median + if (output_format->flags & AVFMT_GLOBALHEADER) m_context->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; -- cgit v1.2.3