jp9000
/
obs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NVENC: Remove obsolete Streaming-Preset

master
BtbN 2015-12-08 12:36:10 +01:00
parent 4570181394
commit e5ae04bd26
3 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ObsNvenc/inc/nvmain.h
View File

@ -66,12 +66,4 @@ inline bool dataEqual(const T& a, const T& b)
String guidToString(const GUID &guid);
bool stringToGuid(const String &string, GUID *guid);
// {7ADD423D-D035-4F6F-AEA5-50885658643C}
static const GUID NV_ENC_PRESET_STREAMING =
{0x7ADD423D, 0xD035, 0x4F6F, {0xAE, 0xA5, 0x50, 0x88, 0x56, 0x58, 0x64, 0x3C}};
// {C2DC0940-76C5-481B-A97E-B1582DDC7079}
static const GUID NV_ENC_KEY_STREAMING =
{0xC2DC0940, 0x76C5, 0x481B, {0xA9, 0x7E, 0xB1, 0x58, 0x2D, 0xDC, 0x70, 0x79}};
#endif

11
ObsNvenc/src/NVENCEncoder.cpp
View File

@ -217,15 +217,6 @@ void NVENCEncoder::init()
{
encoderPreset = NV_ENC_PRESET_DEFAULT_GUID;
}
else if (presetString == TEXT("Streaming"))
{
encoderPreset = NV_ENC_PRESET_STREAMING;
}
else if (presetString == TEXT("Streaming (2pass)"))
{
encoderPreset = NV_ENC_PRESET_STREAMING;
is2PassRC = true;
}
else
{
if (height > 1080 || (height == 1080 && fps > 30))
@ -989,8 +980,6 @@ String NVENCEncoder::GetInfoString() const
preset = "losslesshp";
else if (dataEqual(initEncodeParams.presetGUID, NV_ENC_PRESET_DEFAULT_GUID))
preset = "default";
else if (dataEqual(initEncodeParams.presetGUID, NV_ENC_PRESET_STREAMING))
preset = "streaming";
String profile = "unknown";
if (dataEqual(encodeConfig.profileGUID, NV_ENC_CODEC_PROFILE_AUTOSELECT_GUID))

2
Source/SettingsAdvanced.cpp
View File

@ -417,8 +417,6 @@ INT_PTR SettingsAdvanced::ProcMessage(UINT message, WPARAM wParam, LPARAM lParam
hwndTemp = GetDlgItem(hwnd, IDC_NVENCPRESET);
static const CTSTR nv_preset_names[16] = {
TEXT("Automatic"),
TEXT("Streaming"),
TEXT("Streaming (2pass)"),
TEXT("High Quality"),
TEXT("High Performance"),
TEXT("Bluray Disk"),