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

Fix resolution issue for elgato 1.x.x filter

Browse Source 
If using the elgato 1.x.x filter it would not properly set resolution
changes due to intermediary filters.  Change to direct connect to
prevent that issue from occurring.
This commit is contained in:
jp9000 2014-09-16 13:10:54 -07:00
parent e30108ed6a
commit d99be83fb7
5 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DShowPlugin/DShowPlugin.rc
View File

@ -58,8 +58,8 @@ IDC_COLORPICKER CURSOR "cursor1.cur"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,6,3,0
PRODUCTVERSION 0,6,3,0
FILEVERSION 0,6,3,5
PRODUCTVERSION 0,6,3,5
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -75,12 +75,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "Open Broadcaster Software DirectShow Plugin"
VALUE "FileVersion", "0.6.3.0"
VALUE "FileVersion", "0.6.3.5"
VALUE "InternalName", "DShowPlugin.dll"
VALUE "LegalCopyright", "Copyright (C) 2013"
VALUE "OriginalFilename", "DShowPlugin.dll"
VALUE "ProductName", "Open Broadcaster Software DirectShow Plugin"
VALUE "ProductVersion", "0.6.3.0"
VALUE "ProductVersion", "0.6.3.5"
END
END
BLOCK "VarFileInfo"

16
DShowPlugin/DeviceSource.cpp
View File

@ -719,8 +719,19 @@ bool DeviceSource::LoadFilters()
//------------------------------------------------
// connect all pins and set up the whole capture thing
//THANK THE NINE DIVINES I FINALLY GOT IT WORKING
bool bConnected = SUCCEEDED(err = capture->RenderStream(&PIN_CATEGORY_CAPTURE, &MEDIATYPE_Video, deviceFilter, NULL, captureFilter));
bool bConnected = false;
if (elgato)
{
bConnected = SUCCEEDED(err = graph->ConnectDirect(devicePin, captureFilter->GetCapturePin(), nullptr));
if (!bConnected)
{
AppWarning(TEXT("DShowPlugin: Failed to connect the video device pin to the video capture pin, result = %08lX"), err);
goto cleanFinish;
}
}
else
{
bConnected = SUCCEEDED(err = capture->RenderStream(&PIN_CATEGORY_CAPTURE, &MEDIATYPE_Video, deviceFilter, NULL, captureFilter));
if(!bConnected)
{
if(FAILED(err = graph->Connect(devicePin, captureFilter->GetCapturePin())))
@ -729,6 +740,7 @@ bool DeviceSource::LoadFilters()
goto cleanFinish;
}
}
}
if(soundOutputType != 0)
{

8
OBS.rc
View File

@ -896,8 +896,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,6,3,1
PRODUCTVERSION 0,6,3,1
FILEVERSION 0,6,3,5
PRODUCTVERSION 0,6,3,5
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -913,12 +913,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "Open Broadcaster Software"
VALUE "FileVersion", "0.6.3.1"
VALUE "FileVersion", "0.6.3.5"
VALUE "InternalName", "OBS"
VALUE "LegalCopyright", "Copyright (C) 2013-2014"
VALUE "OriginalFilename", "OBS.exe"
VALUE "ProductName", "Open Broadcaster Software"
VALUE "ProductVersion", "0.6.3.1"
VALUE "ProductVersion", "0.6.3.5"
END
END
BLOCK "VarFileInfo"

4
Source/Main.h
View File

@ -81,8 +81,8 @@ extern TCHAR lpAppDataPath[MAX_PATH];
#define OBS_VERSION_SUFFIX ""
#endif
#define OBS_VERSION 0x006304 //version number is 0xMMmmtt (super-major.major.minor - hex)
#define OBS_VERSION_STRING_RAW "Open Broadcaster Software v0.634b"
#define OBS_VERSION 0x006305 //version number is 0xMMmmtt (super-major.major.minor - hex)
#define OBS_VERSION_STRING_RAW "Open Broadcaster Software v0.635b"
//#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

2
installer/installer.nsi
View File

@ -2,7 +2,7 @@
; Define your application name
!define APPNAME "Open Broadcaster Software"
!define APPNAMEANDVERSION "Open Broadcaster Software 0.633b"
!define APPNAMEANDVERSION "Open Broadcaster Software 0.635b"
; Additional script dependencies
!include WinVer.nsh