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

Compare commits

base: jp9000:4f43d2f201379351a400632bdc36c25605fd44a4
Branches Tags
jp9000:master
...
compare: jp9000:88eee7aafcb2d3ff1d401a87953fe7c1131ce41a
Branches Tags
jp9000:master

5 Commits
4f43d2f201 ... 88eee7aafc

Author SHA1 Message Date
jp9000 88eee7aafc Update to version 0.659b 2016-08-29 19:00:56 -07:00
jp9000 7aebf07142 GraphicsCapture: Add D3D9 offset workaround 
This adds a technique so we don't have to update the program every time
microsoft changes the D3D9 dlls (finally).
 2016-08-29 18:57:11 -07:00
jp9000 abdfe23252 GraphicsCapture: Add new win 10 D3D9 patch 2016-08-29 18:55:32 -07:00
jp9000 98bf425474 Revert "Merge pull request #459 from BtbN/nvenc_delay_perf" 
This reverts commit e4e06afc0a, reversing
changes made to 388701bd26.
 2016-08-29 12:45:08 -07:00
jp9000 116b214be7 Update version to 0.658 2016-07-18 04:19:54 -07:00
5 changed files with 112 additions and 18 deletions
Show Stats Expand all files Collapse all files

106
GraphicsCapture/GraphicsCaptureHook/D3D9Capture.cpp
View File

@ -111,15 +111,16 @@ struct PatchInfo {
#ifdef _WIN64
#define NUM_KNOWN_PATCHES 15
#define NUM_KNOWN_PATCHES 16
#define PATCH_COMPARE_SIZE 13
UPARAM patch_offsets[NUM_KNOWN_PATCHES] = {/*0x4B55F,*/ 0x54FE6, 0x55095, 0x550C5, 0x6FE18, 0x70050, 0x703F8, 0x7E48C, 0x7E49C, 0x8BDB5, 0x8E635, 0x90352, 0x9038A, 0x93AFA, 0x93B8A, 0x1841E5 };
UPARAM patch_offsets[NUM_KNOWN_PATCHES] = {/*0x4B55F,*/ 0x54FE6, 0x55095, 0x550C5, 0x6E2FC, 0x6FE18, 0x70050, 0x703F8, 0x7E48C, 0x7E49C, 0x8BDB5, 0x8E635, 0x90352, 0x9038A, 0x93AFA, 0x93B8A, 0x1841E5 };
BYTE patch_compare[NUM_KNOWN_PATCHES][PATCH_COMPARE_SIZE] =
{
//{0x48, 0x8b, 0x81, 0xc8, 0x38, 0x00, 0x00, 0x39, 0x98, 0x68, 0x50, 0x00, 0x00}, //winvis - 6.0.6002.18005
{0x48, 0x8b, 0x81, 0xb8, 0x3d, 0x00, 0x00, 0x39, 0x98, 0x68, 0x50, 0x00, 0x00}, //win7 - 6.1.7600.16385
{0x48, 0x8b, 0x81, 0xb8, 0x3d, 0x00, 0x00, 0x39, 0x98, 0x68, 0x50, 0x00, 0x00}, //win7 - 6.1.7601.16562
{0x48, 0x8b, 0x81, 0xb8, 0x3d, 0x00, 0x00, 0x39, 0x98, 0x68, 0x50, 0x00, 0x00}, //win7 - 6.1.7601.17514
{0x8b, 0x81, 0x18, 0x3e, 0x00, 0x00, 0x44, 0x39, 0x98, 0x90, 0x51, 0x00, 0x00}, //win10 - 10.0.14393.0
{0x8b, 0x81, 0xb8, 0x3d, 0x00, 0x00, 0x44, 0x39, 0x98, 0x88, 0x51, 0x00, 0x00}, //win10 - 10.0.10240.16412
{0x8b, 0x81, 0xb8, 0x3d, 0x00, 0x00, 0x44, 0x39, 0x98, 0x88, 0x51, 0x00, 0x00}, //win10 - 10.0.10240.16384
{0x8b, 0x81, 0xb8, 0x3d, 0x00, 0x00, 0x44, 0x39, 0x98, 0x88, 0x51, 0x00, 0x00}, //win10 - 10.0.10162.0
@ -148,6 +149,7 @@ PatchInfo patch[NUM_KNOWN_PATCHES] =
NewPatch(forceJump),
NewPatch(forceJump),
NewPatch(forceJump),
NewPatch(forceJump),
NewPatch(ignoreJump),
NewPatch(ignoreJump),
NewPatch(ignoreJump),
@ -159,9 +161,9 @@ PatchInfo patch[NUM_KNOWN_PATCHES] =
#else
#define NUM_KNOWN_PATCHES 15
#define NUM_KNOWN_PATCHES 16
#define PATCH_COMPARE_SIZE 12
UPARAM patch_offsets[NUM_KNOWN_PATCHES] = {/*0x4BDA1,*/ 0x79AA6, 0x79C9E, 0x79D96, 0x7F9BD, 0x8A3F4, 0x8B15F, 0x8B19F, 0x8B83F, 0x8E9F7, 0x8F00F, 0x8FBB1, 0x90264, 0x90C57, 0x90C3A, 0x166A08 };
UPARAM patch_offsets[NUM_KNOWN_PATCHES] = {/*0x4BDA1,*/ 0x79AA6, 0x79C9E, 0x79D96, 0x7F9BD, 0x8A3F4, 0x8B15F, 0x8B19F, 0x8B83F, 0x8E9F7, 0x8F00F, 0x8FBB1, 0x90264, 0x90C57, 0x90C3A, 0x96673, 0x166A08 };
BYTE patch_compare[NUM_KNOWN_PATCHES][PATCH_COMPARE_SIZE] =
{
//{0x8b, 0x89, 0x6c, 0x27, 0x00, 0x00, 0x39, 0xb9, 0x80, 0x4b, 0x00, 0x00}, //winvis - 6.0.6002.18005
@ -179,6 +181,7 @@ BYTE patch_compare[NUM_KNOWN_PATCHES][PATCH_COMPARE_SIZE] =
{0x87, 0xe8, 0x29, 0x00, 0x00, 0x83, 0xb8, 0x40, 0x4c, 0x00, 0x00, 0x00}, //win8.1 - 6.3.9600.17415
{0x81, 0x18, 0x2a, 0x00, 0x00, 0x83, 0xb8, 0xa0, 0x4c, 0x00, 0x00, 0x00}, //win10 - 10.0.10586.0
{0x81, 0x18, 0x2a, 0x00, 0x00, 0x83, 0xb8, 0xa0, 0x4c, 0x00, 0x00, 0x00}, //win10 - 10.0.10586.494
{0x81, 0x18, 0x2a, 0x00, 0x00, 0x83, 0xb8, 0xa8, 0x4c, 0x00, 0x00, 0x00}, //win10 - 10.0.14393.0
{0x8b, 0x80, 0xe8, 0x29, 0x00, 0x00, 0x39, 0x90, 0xb0, 0x4b, 0x00, 0x00}, //win8 - 6.2.9200.16384
};
@ -202,12 +205,12 @@ PatchInfo patch[NUM_KNOWN_PATCHES] =
NewPatch(ignoreJump),
NewPatch(ignoreJump),
NewPatch(ignoreJump),
NewPatch(ignoreJump),
NewPatch(forceJump),
};
#endif
int GetD3D9PatchType()
{
LPBYTE lpBaseAddress = (LPBYTE)hD3D9Dll;
@ -231,6 +234,76 @@ LPBYTE GetD3D9PatchAddress()
return NULL;
}
//-----------------------------------------------------------------
// new workaround for GPU copy stuff
static bool offsetWorkaround = false;
static UINT32 offset_D3D9 = 0;
static UINT32 offset_isD3D9Ex = 0;
#ifdef _WIN64
#define CMP_SIZE 21
static const BYTE mask[CMP_SIZE] = {0xF8, 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xF8, 0xF8, 0x00, 0x00, 0x00, 0x00};
static const BYTE mask_cmp[CMP_SIZE] = {0x48, 0x8B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x39, 0x80, 0x00, 0x00, 0x00, 0x00, 0x75, 0x00, 0x40, 0xB8, 0x00, 0x00, 0x00, 0x00};
#else
#define CMP_SIZE 19
static const BYTE mask[CMP_SIZE] = {0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xC0, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00};
static const BYTE mask_cmp[CMP_SIZE] = {0x8B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x39, 0x80, 0x00, 0x00, 0x00, 0x00, 0x75, 0x00, 0x68, 0x00, 0x00, 0x00, 0x00};
#endif
#define MAX_FUNC_SCAN_BYTES 200
static inline bool PatternMatches(BYTE *byte)
{
for (size_t i = 0; i < CMP_SIZE; i++) {
if ((byte[i] & mask[i]) != mask_cmp[i])
return false;
}
return true;
}
static void FindD3D9ExOffsets(IDirect3D9Ex *d3d9ex, IDirect3DDevice9Ex *dev)
{
BYTE **vt = *(BYTE***)dev;
BYTE *crr = vt[125];
for (size_t i = 0; i < MAX_FUNC_SCAN_BYTES; i++) {
if (PatternMatches(&crr[i])) {
#define GetOffset(x) *(UINT32*)(&crr[i + x])
#ifdef _WIN64
UINT32 off1 = GetOffset(3);
UINT32 off2 = GetOffset(9);
#else
UINT32 off1 = GetOffset(2);
UINT32 off2 = GetOffset(8);
#endif
if (off1 > 0xFFFF || off2 > 0xFFFF)
break;
__try {
BYTE *ptr = (BYTE*)(dev);
BYTE *d3d9_ptr = *(BYTE**)(ptr + off1);
BOOL &is_d3d9ex = *(BOOL*)(d3d9_ptr + off2);
if (is_d3d9ex != TRUE)
continue;
} __except(EXCEPTION_EXECUTE_HANDLER) {
break;
}
offset_D3D9 = off1;
offset_isD3D9Ex = off2;
offsetWorkaround = true;
break;
}
}
}
//-----------------------------------------------------------------
void ClearD3D9Data()
{
@ -449,9 +522,13 @@ void DoD3D9GPUHook(IDirect3DDevice9 *device)
LPBYTE patchAddress = (patchType != 0) ? GetD3D9PatchAddress() : NULL;
DWORD dwOldProtect;
size_t patch_size;
BOOL *pIsD3D9Ex = nullptr;
BOOL wasD3D9Ex = false;
if(patchAddress)
{
RUNEVERYRESET logOutput << CurrentTimeString() << "DoD3D9GPUHook: offset workaround appears unavailable" << endl;
patch_size = patch[patchType-1].patchSize;
savedData = (BYTE*)malloc(patch_size);
if(VirtualProtect(patchAddress, patch_size, PAGE_EXECUTE_READWRITE, &dwOldProtect))
@ -465,6 +542,17 @@ void DoD3D9GPUHook(IDirect3DDevice9 *device)
goto finishGPUHook;
}
}
else if (offsetWorkaround)
{
RUNEVERYRESET logOutput << CurrentTimeString() << "DoD3D9GPUHook: using offset workaround" << endl;
BYTE *devicePtr = (BYTE*)device;
BYTE *d3d9Ptr = *(BYTE**)(devicePtr + offset_D3D9);
pIsD3D9Ex = (BOOL*)(d3d9Ptr + offset_isD3D9Ex);
wasD3D9Ex = *pIsD3D9Ex;
*pIsD3D9Ex = true;
}
IDirect3DTexture9 *d3d9Tex;
if(FAILED(hErr = device->CreateTexture(d3d9CaptureInfo.cx, d3d9CaptureInfo.cy, 1, D3DUSAGE_RENDERTARGET, (D3DFORMAT)d3d9Format, D3DPOOL_DEFAULT, &d3d9Tex, &sharedHandle)))
@ -478,6 +566,10 @@ void DoD3D9GPUHook(IDirect3DDevice9 *device)
memcpy(patchAddress, savedData, patch_size);
VirtualProtect(patchAddress, patch_size, dwOldProtect, &dwOldProtect);
}
else if (offsetWorkaround)
{
*pIsD3D9Ex = wasD3D9Ex;
}
if(FAILED(hErr = d3d9Tex->GetSurfaceLevel(0, &copyD3D9TextureGame)))
{
@ -727,7 +819,7 @@ void DoD3D9DrawStuff(IDirect3DDevice9 *device)
if(bD3D9Ex)
bUseSharedTextures = true;
else
bUseSharedTextures = (patchType = GetD3D9PatchType()) != 0;
bUseSharedTextures = offsetWorkaround || (patchType = GetD3D9PatchType()) != 0;
//fix for when backbuffers aren't actually being properly used, instead get the
//size/format of the actual current render target at time of present
@ -1293,6 +1385,8 @@ bool InitD3D9Capture()
/*d3d9ResetEx.Hook((FARPROC)*(vtable+(528/4)), (FARPROC)D3D9ResetEx);
d3d9Reset.Hook((FARPROC)*(vtable+(64/4)), (FARPROC)D3D9Reset);*/
FindD3D9ExOffsets(d3d9ex, deviceEx);
deviceEx->Release();
d3d9EndScene.Rehook();

8
GraphicsCapture/GraphicsCaptureHook/GraphicsCaptureHook.rc
View File

@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,6,5,7
PRODUCTVERSION 0,6,5,7
FILEVERSION 0,6,5,9
PRODUCTVERSION 0,6,5,9
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -78,12 +78,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "Open Broadcaster Software Game Capture Hook"
VALUE "FileVersion", "0.6.5.7"
VALUE "FileVersion", "0.6.5.9"
VALUE "InternalName", "GraphicsCaptureHook.dll"
VALUE "LegalCopyright", "Copyright (C) 2013"
VALUE "OriginalFilename", "GraphicsCaptureHook.dll"
VALUE "ProductName", "Open Broadcaster Software Game Capture Hook"
VALUE "ProductVersion", "0.6.5.7"
VALUE "ProductVersion", "0.6.5.9"
END
END
BLOCK "VarFileInfo"

8
OBS.rc
View File

@ -906,8 +906,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,6,5,7
PRODUCTVERSION 0,6,5,7
FILEVERSION 0,6,5,9
PRODUCTVERSION 0,6,5,9
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -923,12 +923,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "Open Broadcaster Software"
VALUE "FileVersion", "0.6.5.7"
VALUE "FileVersion", "0.6.5.9"
VALUE "InternalName", "OBS"
VALUE "LegalCopyright", "Copyright (C) 2013-2015"
VALUE "OriginalFilename", "OBS.exe"
VALUE "ProductName", "Open Broadcaster Software"
VALUE "ProductVersion", "0.6.5.7"
VALUE "ProductVersion", "0.6.5.9"
END
END
BLOCK "VarFileInfo"

4
ObsNvenc/src/NVENCEncoder.cpp
View File

@ -209,7 +209,7 @@ void NVENCEncoder::init()
encoderPreset = NV_ENC_PRESET_HQ_GUID;
is2PassRC = false;
}
if (height > 720 || (height == 720 && fps > 60))
if (height > 720 || (height == 720 && fps > 30))
{
encoderPreset = NV_ENC_PRESET_LOW_LATENCY_HQ_GUID;
is2PassRC = false;
@ -590,7 +590,7 @@ bool NVENCEncoder::Encode(LPVOID picIn, List<DataPacket> &packets, List<PacketTy
}
}
if (!outputSurfaceQueueReady.empty() && (!picIn || outputSurfaceQueue.size() + outputSurfaceQueueReady.size() >= maxSurfaceCount - 1))
if (!outputSurfaceQueueReady.empty())
{
NVENCEncoderOutputSurface *qSurf = outputSurfaceQueueReady.front();
outputSurfaceQueueReady.pop();

4
Source/Main.h
View File

@ -81,8 +81,8 @@ extern TCHAR lpAppDataPath[MAX_PATH];
#define OBS_VERSION_SUFFIX ""
#endif
#define OBS_VERSION 0x006507 //version number is 0xMMmmtt (super-major.major.minor - hex)
#define OBS_VERSION_STRING_RAW "Open Broadcaster Software v0.657b"
#define OBS_VERSION 0x006509 //version number is 0xMMmmtt (super-major.major.minor - hex)
#define OBS_VERSION_STRING_RAW "Open Broadcaster Software v0.659b"
//#define OBS_TEST_BUILD 1 //define this if releasing a test build to disable the auto updater
#define OBS_VERSION_STRING_ANSI OBS_VERSION_STRING_RAW OBS_VERSION_SUFFIX