diff --git a/Source/Core/Core/Config/GraphicsSettings.cpp b/Source/Core/Core/Config/GraphicsSettings.cpp index 708a4ebe0d..1d6d4def08 100644 --- a/Source/Core/Core/Config/GraphicsSettings.cpp +++ b/Source/Core/Core/Config/GraphicsSettings.cpp @@ -63,7 +63,7 @@ const Info GFX_CACHE_HIRES_TEXTURES{{System::GFX, "Settings", "CacheHiresT const Info GFX_DUMP_EFB_TARGET{{System::GFX, "Settings", "DumpEFBTarget"}, false}; const Info GFX_DUMP_XFB_TARGET{{System::GFX, "Settings", "DumpXFBTarget"}, false}; const Info GFX_DUMP_FRAMES_AS_IMAGES{{System::GFX, "Settings", "DumpFramesAsImages"}, false}; -const Info GFX_USE_FFV1{{System::GFX, "Settings", "UseFFV1"}, false}; +const Info GFX_USE_LOSSLESS{{System::GFX, "Settings", "UseLossless"}, false}; const Info GFX_DUMP_FORMAT{{System::GFX, "Settings", "DumpFormat"}, "avi"}; const Info GFX_DUMP_CODEC{{System::GFX, "Settings", "DumpCodec"}, ""}; const Info GFX_DUMP_PIXEL_FORMAT{{System::GFX, "Settings", "DumpPixelFormat"}, ""}; diff --git a/Source/Core/Core/Config/GraphicsSettings.h b/Source/Core/Core/Config/GraphicsSettings.h index 7bad7fefbb..49c7b10412 100644 --- a/Source/Core/Core/Config/GraphicsSettings.h +++ b/Source/Core/Core/Config/GraphicsSettings.h @@ -62,7 +62,7 @@ extern const Info GFX_CACHE_HIRES_TEXTURES; extern const Info GFX_DUMP_EFB_TARGET; extern const Info GFX_DUMP_XFB_TARGET; extern const Info GFX_DUMP_FRAMES_AS_IMAGES; -extern const Info GFX_USE_FFV1; +extern const Info GFX_USE_LOSSLESS; extern const Info GFX_DUMP_FORMAT; extern const Info GFX_DUMP_CODEC; extern const Info GFX_DUMP_PIXEL_FORMAT; diff --git a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp index c64c8fca40..5471a1bcb5 100644 --- a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp @@ -185,11 +185,13 @@ void AdvancedWidget::CreateWidgets() dump_layout->addWidget(m_frame_dumps_resolution_type, 0, 1); #if defined(HAVE_FFMPEG) - m_dump_use_ffv1 = - new ConfigBool(tr("Use Lossless Codec (FFV1)"), Config::GFX_USE_FFV1, m_game_layer); + m_dump_use_lossless = + new ConfigBool(tr("Use Lossless Codec (Ut Video)"), Config::GFX_USE_LOSSLESS, m_game_layer); + m_dump_bitrate = new ConfigInteger(0, 1000000, Config::GFX_BITRATE_KBPS, m_game_layer, 1000); - m_dump_bitrate->setEnabled(!m_dump_use_ffv1->isChecked()); - dump_layout->addWidget(m_dump_use_ffv1, 1, 0); + m_dump_bitrate->setEnabled(!m_dump_use_lossless->isChecked()); + + dump_layout->addWidget(m_dump_use_lossless, 1, 0); dump_layout->addWidget(new QLabel(tr("Bitrate (kbps):")), 2, 0); dump_layout->addWidget(m_dump_bitrate, 2, 1); #endif @@ -261,9 +263,8 @@ void AdvancedWidget::ConnectWidgets() }); connect(m_enable_graphics_mods, &QCheckBox::toggled, this, [this](bool checked) { emit Settings::Instance().EnableGfxModsChanged(checked); }); - #if defined(HAVE_FFMPEG) - connect(m_dump_use_ffv1, &QCheckBox::toggled, this, + connect(m_dump_use_lossless, &QCheckBox::toggled, this, [this](bool checked) { m_dump_bitrate->setEnabled(!checked); }); #endif } @@ -391,8 +392,9 @@ void AdvancedWidget::AddDescriptions() "possible input for external editing software.

If unsure, leave " "this at \"Aspect Ratio Corrected Internal Resolution\"."); #if defined(HAVE_FFMPEG) - static const char TR_USE_FFV1_DESCRIPTION[] = - QT_TR_NOOP("Encodes frame dumps using the FFV1 codec.

If " + static const char TR_USE_LOSSLESS_DESCRIPTION[] = + QT_TR_NOOP("Encodes frame dumps using the Ut Video codec. If this option is unchecked, a " + "lossy Xvid codec will be used.

If " "unsure, leave this unchecked."); #endif static const char TR_PNG_COMPRESSION_LEVEL_DESCRIPTION[] = @@ -483,7 +485,7 @@ void AdvancedWidget::AddDescriptions() m_enable_graphics_mods->SetDescription(tr(TR_LOAD_GRAPHICS_MODS_DESCRIPTION)); m_frame_dumps_resolution_type->SetDescription(tr(TR_FRAME_DUMPS_RESOLUTION_TYPE_DESCRIPTION)); #ifdef HAVE_FFMPEG - m_dump_use_ffv1->SetDescription(tr(TR_USE_FFV1_DESCRIPTION)); + m_dump_use_lossless->SetDescription(tr(TR_USE_LOSSLESS_DESCRIPTION)); #endif m_png_compression_level->SetDescription(tr(TR_PNG_COMPRESSION_LEVEL_DESCRIPTION)); m_enable_cropping->SetDescription(tr(TR_CROPPING_DESCRIPTION)); diff --git a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h index e3b3688571..d6cd8e975e 100644 --- a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h +++ b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h @@ -60,7 +60,7 @@ private: ConfigBool* m_dump_base_textures; // Frame dumping - ConfigBool* m_dump_use_ffv1; + ConfigBool* m_dump_use_lossless; ConfigChoice* m_frame_dumps_resolution_type; ConfigInteger* m_dump_bitrate; ConfigInteger* m_png_compression_level; diff --git a/Source/Core/VideoCommon/FrameDumpFFMpeg.cpp b/Source/Core/VideoCommon/FrameDumpFFMpeg.cpp index 760ae6f7e0..d698af8cd5 100644 --- a/Source/Core/VideoCommon/FrameDumpFFMpeg.cpp +++ b/Source/Core/VideoCommon/FrameDumpFFMpeg.cpp @@ -217,7 +217,7 @@ bool FFMpegFrameDump::CreateVideoFile() return false; } - const std::string& codec_name = g_Config.bUseFFV1 ? "ffv1" : g_Config.sDumpCodec; + const std::string& codec_name = g_Config.bUseLossless ? "utvideo" : g_Config.sDumpCodec; AVCodecID codec_id = output_format->video_codec; diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 9c73608b22..cc62d33959 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -122,7 +122,7 @@ void VideoConfig::Refresh() bDumpEFBTarget = Config::Get(Config::GFX_DUMP_EFB_TARGET); bDumpXFBTarget = Config::Get(Config::GFX_DUMP_XFB_TARGET); bDumpFramesAsImages = Config::Get(Config::GFX_DUMP_FRAMES_AS_IMAGES); - bUseFFV1 = Config::Get(Config::GFX_USE_FFV1); + bUseLossless = Config::Get(Config::GFX_USE_LOSSLESS); sDumpFormat = Config::Get(Config::GFX_DUMP_FORMAT); sDumpCodec = Config::Get(Config::GFX_DUMP_CODEC); sDumpPixelFormat = Config::Get(Config::GFX_DUMP_PIXEL_FORMAT); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 5cce23bfd2..d2f0d50cbd 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -193,7 +193,7 @@ struct VideoConfig final bool bDumpEFBTarget = false; bool bDumpXFBTarget = false; bool bDumpFramesAsImages = false; - bool bUseFFV1 = false; + bool bUseLossless = false; std::string sDumpCodec; std::string sDumpPixelFormat; std::string sDumpEncoder;