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

fixed SO_SNDBUF to use bytes instead of bits, woops. also version changes

Browse Source
This commit is contained in:
jim 2012-11-23 14:40:25 -07:00
parent 0ae4377fcc
commit d453668ca7
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OBS.rc
View File

@ -617,8 +617,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,4,4,6 FILEVERSION 0,4,4,7
PRODUCTVERSION 0,4,4,6 PRODUCTVERSION 0,4,4,7
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -634,12 +634,12 @@ BEGIN
BLOCK "041104b0" BLOCK "041104b0"
BEGIN BEGIN
VALUE "FileDescription", "Open Broadcaster Software" VALUE "FileDescription", "Open Broadcaster Software"
VALUE "FileVersion", "0, 4, 4, 6" VALUE "FileVersion", "0, 4, 4, 7"
VALUE "InternalName", "OBS" VALUE "InternalName", "OBS"
VALUE "LegalCopyright", "Copyright (C) 2012" VALUE "LegalCopyright", "Copyright (C) 2012"
VALUE "OriginalFilename", "OBS.exe" VALUE "OriginalFilename", "OBS.exe"
VALUE "ProductName", "Open Broadcaster Software" VALUE "ProductName", "Open Broadcaster Software"
VALUE "ProductVersion", "0, 4, 4, 6" VALUE "ProductVersion", "0, 4, 4, 7"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

3
Source/CrashDumpHandler.cpp
View File

@ -89,7 +89,8 @@ LONG CALLBACK OBSExceptionHandler (PEXCEPTION_POINTERS exceptionInfo)
//exception codes < 0x80000000 are typically informative only and not crash worthy //exception codes < 0x80000000 are typically informative only and not crash worthy
//0xe06d7363 indicates a c++ exception was thrown, let's just hope it was caught. //0xe06d7363 indicates a c++ exception was thrown, let's just hope it was caught.
if (exceptionInfo->ExceptionRecord->ExceptionCode < 0x80000000 || exceptionInfo->ExceptionRecord->ExceptionCode == 0xe06d7363) if (exceptionInfo->ExceptionRecord->ExceptionCode < 0x80000000 || exceptionInfo->ExceptionRecord->ExceptionCode == 0xe06d7363 ||
exceptionInfo->ExceptionRecord->ExceptionCode == 0x800706b5)
return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;
//uh oh, we're crashing inside ourselves... this is really bad! //uh oh, we're crashing inside ourselves... this is really bad!

4
Source/D3D10Texture.cpp
View File

@ -403,6 +403,10 @@ Texture* D3D10Texture::CreateGDITexture(unsigned int width, unsigned int height)
td.Usage = D3D10_USAGE_DEFAULT; td.Usage = D3D10_USAGE_DEFAULT;
td.MiscFlags = D3D10_RESOURCE_MISC_GDI_COMPATIBLE; td.MiscFlags = D3D10_RESOURCE_MISC_GDI_COMPATIBLE;
LPBYTE lpData = NULL;
D3D10_SUBRESOURCE_DATA srd;
zero(&srd, sizeof(srd));
ID3D10Texture2D *texVal; ID3D10Texture2D *texVal;
if(FAILED(err = GetD3D()->CreateTexture2D(&td, NULL, &texVal))) if(FAILED(err = GetD3D()->CreateTexture2D(&td, NULL, &texVal)))
{ {

4
Source/Main.h
View File

@ -61,8 +61,8 @@ extern ConfigFile *AppConfig;
extern OBS *App; extern OBS *App;
extern TCHAR lpAppDataPath[MAX_PATH]; extern TCHAR lpAppDataPath[MAX_PATH];
#define OBS_VERSION 0x000445 #define OBS_VERSION 0x000447
#define OBS_VERSION_STRING_ANSI "Open Broadcaster Software v0.446a" #define OBS_VERSION_STRING_ANSI "Open Broadcaster Software v0.447a"
#define OBS_VERSION_STRING TEXT(OBS_VERSION_STRING_ANSI) #define OBS_VERSION_STRING TEXT(OBS_VERSION_STRING_ANSI)
#define OBS_WINDOW_CLASS TEXT("OBSWindowClass") #define OBS_WINDOW_CLASS TEXT("OBSWindowClass")

1
Source/RTMPPublisher.cpp
View File

@ -55,6 +55,7 @@ RTMPPublisher::RTMPPublisher(RTMP *rtmpIn, BOOL bUseSendBuffer, UINT sendBufferS
int sndBufSize = AppConfig->GetInt(TEXT("Video Encoding"), TEXT("MaxBitrate"), 1000); int sndBufSize = AppConfig->GetInt(TEXT("Video Encoding"), TEXT("MaxBitrate"), 1000);
sndBufSize += AppConfig->GetInt(TEXT("Audio Encoding"), TEXT("Bitrate"), 96); sndBufSize += AppConfig->GetInt(TEXT("Audio Encoding"), TEXT("Bitrate"), 96);
sndBufSize *= 2; sndBufSize *= 2;
sndBufSize /= 8;
setsockopt(rtmp->m_sb.sb_socket, SOL_SOCKET, SO_SNDBUF, (char*)&sndBufSize, sizeof(sndBufSize)); setsockopt(rtmp->m_sb.sb_socket, SOL_SOCKET, SO_SNDBUF, (char*)&sndBufSize, sizeof(sndBufSize));
} }