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

update x264 to latest x264-devel build

Browse Source
This commit is contained in:
jp9000 2013-12-11 09:13:48 -07:00
parent d7c79c4ad7
commit d971553a78
16 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Main.h
View File

@ -80,8 +80,8 @@ extern TCHAR lpAppDataPath[MAX_PATH];
#endif
#define OBS_VERSION 0x005804 //version number is 0xMMmmtt (Major.minor.test - yes I know it's hex)
#define OBS_VERSION_STRING_RAW "Open Broadcaster Software v0.584b audio redirect"
#define OBS_TEST_BUILD 1 //define this if releasing a test build to disable the auto updater
#define OBS_VERSION_STRING_RAW "Open Broadcaster Software v0.59b"
//#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
#define OBS_VERSION_STRING TEXT(OBS_VERSION_STRING_RAW) TEXT(OBS_VERSION_SUFFIX)

8
installer/generate_binaries.bat
View File

@ -42,7 +42,7 @@ copy ..\graphicscapture\release\graphicscapture.dll .\32bit\plugins
copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\32bit\plugins\graphicscapture
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\32bit\plugins\graphicscapture
copy ..\injectHelper\x64\release\injectHelper64.exe .\32bit\plugins\graphicscapture
copy ..\x264\libs\32bit\libx264-136.dll .\32bit
copy ..\x264\libs\32bit\libx264-140.dll .\32bit
copy ..\QSVHelper\Release\QSVHelper.exe .\32bit
copy "%WindowsSDK80Path%Debuggers\x86\dbghelp.dll" .\32bit
@ -63,7 +63,7 @@ copy ..\graphicscapture\x64\release\graphicscapture.dll .\64bit\plugins
copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\64bit\plugins\graphicscapture
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\64bit\plugins\graphicscapture
copy ..\injectHelper\release\injectHelper.exe .\64bit\plugins\graphicscapture
copy ..\x264\libs\64bit\libx264-136.dll .\64bit
copy ..\x264\libs\64bit\libx264-140.dll .\64bit
copy ..\QSVHelper\Release\QSVHelper.exe .\64bit
copy "%WindowsSDK80Path%Debuggers\x64\dbghelp.dll" .\64bit
@ -129,7 +129,7 @@ copy ..\release\obs.exe .\upload\OBS\32bit\
copy ..\obsapi\release\obsapi.dll .\upload\OBS\32bit\
copy ..\OBSHelp\OBSHelp.chm .\upload\OBS\32bit\
copy ..\rundir\pdb32\stripped\*.pdb .\upload\OBS\32bit\
copy ..\x264\libs\32bit\libx264-136.dll .\upload\OBS\32bit
copy ..\x264\libs\32bit\libx264-140.dll .\upload\OBS\32bit
copy ..\QSVHelper\Release\QSVHelper.exe .\upload\OBS\32bit
copy "%WindowsSDK80Path%Debuggers\x86\dbghelp.dll" .\upload\OBS\32bit
@ -137,7 +137,7 @@ copy ..\x64\release\obs.exe .\upload\OBS\64bit\
copy ..\obsapi\x64\release\obsapi.dll .\upload\OBS\64bit\
copy ..\OBSHelp\OBSHelp.chm .\upload\OBS\64bit\
copy ..\rundir\pdb64\stripped\*.pdb .\upload\OBS\64bit\
copy ..\x264\libs\64bit\libx264-136.dll .\upload\OBS\64bit
copy ..\x264\libs\64bit\libx264-140.dll .\upload\OBS\64bit
copy ..\QSVHelper\Release\QSVHelper.exe .\upload\OBS\64bit
copy "%WindowsSDK80Path%Debuggers\x64\dbghelp.dll" .\upload\OBS\64bit

4
installer/generate_binaries_test.bat
View File

@ -43,7 +43,7 @@ copy ..\graphicscapture\release\graphicscapture.dll .\32bit\plugins
copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\32bit\plugins\graphicscapture
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\32bit\plugins\graphicscapture
copy ..\injectHelper\x64\release\injectHelper64.exe .\32bit\plugins\graphicscapture
copy ..\x264\libs\32bit\libx264-136.dll .\32bit
copy ..\x264\libs\32bit\libx264-140.dll .\32bit
copy ..\QSVHelper\Release\QSVHelper.exe .\32bit
copy "%WindowsSDK80Path%Debuggers\x86\dbghelp.dll" .\32bit
@ -69,6 +69,6 @@ copy ..\graphicscapture\x64\release\graphicscapture.dll .\64bit\plugins
copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\64bit\plugins\graphicscapture
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\64bit\plugins\graphicscapture
copy ..\injectHelper\release\injectHelper.exe .\64bit\plugins\graphicscapture
copy ..\x264\libs\64bit\libx264-136.dll .\64bit
copy ..\x264\libs\64bit\libx264-140.dll .\64bit
copy ..\QSVHelper\Release\QSVHelper.exe .\64bit
copy "%WindowsSDK80Path%Debuggers\x64\dbghelp.dll" .\64bit

8
installer/installer.nsi
View File

@ -115,7 +115,7 @@ Section "Open Broadcaster Software" Section1
; Set Section Files and Shortcuts
SetOutPath "$PROGRAMFILES32\OBS"
File "..\Release\OBS.exe"
File "..\x264\libs\32bit\libx264-136.dll"
File "..\x264\libs\32bit\libx264-140.dll"
File "..\QSVHelper\Release\QSVHelper.exe"
File "..\OBSAPI\Release\OBSApi.dll"
File "..\rundir\services.xconfig"
@ -145,7 +145,7 @@ Section "Open Broadcaster Software" Section1
${if} ${RunningX64}
SetOutPath "$PROGRAMFILES64\OBS"
File "..\x64\Release\OBS.exe"
File "..\x264\libs\64bit\libx264-136.dll"
File "..\x264\libs\64bit\libx264-140.dll"
File "..\QSVHelper\Release\QSVHelper.exe"
File "..\OBSAPI\x64\Release\OBSApi.dll"
File "..\rundir\services.xconfig"
@ -223,7 +223,7 @@ Section Uninstall
; Clean up Open Broadcaster Software
Delete "$PROGRAMFILES32\OBS\OBS.exe"
Delete "$PROGRAMFILES32\OBS\libx264-136.dll"
Delete "$PROGRAMFILES32\OBS\libx264-140.dll"
Delete "$PROGRAMFILES32\OBS\QSVHelper.exe"
Delete "$PROGRAMFILES32\OBS\OBSApi.dll"
Delete "$PROGRAMFILES32\OBS\services.xconfig"
@ -243,7 +243,7 @@ Section Uninstall
Delete "$PROGRAMFILES32\OBS\plugins\GraphicsCapture\*.exe"
${if} ${RunningX64}
Delete "$PROGRAMFILES64\OBS\OBS.exe"
Delete "$PROGRAMFILES64\OBS\libx264-136.dll"
Delete "$PROGRAMFILES64\OBS\libx264-140.dll"
Delete "$PROGRAMFILES64\OBS\QSVHelper.exe"
Delete "$PROGRAMFILES64\OBS\OBSApi.dll"
Delete "$PROGRAMFILES64\OBS\services.xconfig"

2
rundir/copydebug.bat
View File

@ -7,6 +7,6 @@ copy ..\graphicscapture\graphicscapturehook\debug\graphicscapturehook.dll .\plug
copy ..\graphicscapture\graphicscapturehook\x64\debug\graphicscapturehook64.dll .\plugins\graphicscapture
copy ..\noisegate\debug\noisegate.dll .\plugins
copy ..\psvplugin\debug\psvplugin.dll .\plugins
copy ..\x264\libs\32bit\libx264-136.dll .\
copy ..\x264\libs\32bit\libx264-140.dll .\
copy ..\injectHelper\Release\injectHelper.exe .\plugins\graphicscapture
copy ..\injectHelper\x64\Release\injectHelper64.exe .\plugins\graphicscapture

2
rundir/copydebug64.bat
View File

@ -7,6 +7,6 @@ copy ..\graphicscapture\graphicscapturehook\debug\graphicscapturehook.dll .\plug
copy ..\graphicscapture\graphicscapturehook\x64\debug\graphicscapturehook64.dll .\plugins\graphicscapture
copy ..\noisegate\x64\debug\noisegate.dll .\plugins
copy ..\psvplugin\x64\debug\psvplugin.dll .\plugins
copy ..\x264\libs\64bit\libx264-136.dll .\
copy ..\x264\libs\64bit\libx264-140.dll .\
copy ..\injectHelper\Release\injectHelper.exe .\plugins\graphicscapture
copy ..\injectHelper\x64\Release\injectHelper64.exe .\plugins\graphicscapture

2
rundir/copyrelease.bat
View File

@ -7,6 +7,6 @@ copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\pl
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\plugins\graphicscapture
copy ..\noisegate\release\noisegate.dll .\plugins
copy ..\psvplugin\release\psvplugin.dll .\plugins
copy ..\x264\libs\32bit\libx264-136.dll .\
copy ..\x264\libs\32bit\libx264-140.dll .\
copy ..\injectHelper\Release\injectHelper.exe .\plugins\graphicscapture
copy ..\injectHelper\x64\Release\injectHelper64.exe .\plugins\graphicscapture

2
rundir/copyrelease64.bat
View File

@ -7,6 +7,6 @@ copy ..\graphicscapture\graphicscapturehook\release\graphicscapturehook.dll .\pl
copy ..\graphicscapture\graphicscapturehook\x64\release\graphicscapturehook64.dll .\plugins\graphicscapture
copy ..\noisegate\x64\release\noisegate.dll .\plugins
copy ..\psvplugin\x64\release\psvplugin.dll .\plugins
copy ..\x264\libs\64bit\libx264-136.dll .\
copy ..\x264\libs\64bit\libx264-140.dll .\
copy ..\injectHelper\Release\injectHelper.exe .\plugins\graphicscapture
copy ..\injectHelper\x64\Release\injectHelper64.exe .\plugins\graphicscapture

4
x264/AUTHORS
View File

@ -99,7 +99,3 @@ N: Radek Czyz
E: radoslaw AT syskin DOT cjb DOT net
D: Cached motion compensation
N: Tuukka Toivonen
E: tuukkat AT ee DOT oulu DOT fi
D: Visualization

BIN
x264/libs/32bit/libx264-136.dll → x264/libs/32bit/libx264-140.dll
View File

Binary file not shown.

BIN
x264/libs/32bit/libx264.lib
View File

Binary file not shown.

BIN
x264/libs/64bit/libx264-136.dll → x264/libs/64bit/libx264-140.dll
View File

Binary file not shown.

BIN
x264/libs/64bit/libx264.lib
View File

Binary file not shown.

23
x264/x264.h
View File

@ -41,7 +41,7 @@
#include "x264_config.h"
#define X264_BUILD 136
#define X264_BUILD 140
/* Application developers planning to link against a shared library version of
* libx264 from a Microsoft Visual Studio or similar development environment
@ -98,12 +98,15 @@ typedef struct
int i_first_mb; /* If this NAL is a slice, the index of the first MB in the slice. */
int i_last_mb; /* If this NAL is a slice, the index of the last MB in the slice. */
/* Size of payload in bytes. */
/* Size of payload (including any padding) in bytes. */
int i_payload;
/* If param->b_annexb is set, Annex-B bytestream with startcode.
* Otherwise, startcode is replaced with a 4-byte size.
* This size is the size used in mp4/similar muxing; it is equal to i_payload-4 */
uint8_t *p_payload;
/* Size of padding in bytes. */
int i_padding;
} x264_nal_t;
/****************************************************************************
@ -318,6 +321,7 @@ typedef struct x264_param_t
int i_bframe_pyramid; /* Keep some B-frames as references: 0=off, 1=strict hierarchical, 2=normal */
int b_open_gop;
int b_bluray_compat;
int b_avcintra_compat;
int b_deblocking_filter;
int i_deblocking_filter_alphac0; /* [-6, 6] -6 light filter, 6 strong */
@ -330,7 +334,7 @@ typedef struct x264_param_t
int b_constrained_intra;
int i_cqm_preset;
char *psz_cqm_file; /* JM format */
char *psz_cqm_file; /* filename (in UTF-8) of CQM file, JM format */
uint8_t cqm_4iy[16]; /* used only if i_cqm_preset == X264_CQM_CUSTOM */
uint8_t cqm_4py[16];
uint8_t cqm_4ic[16];
@ -344,9 +348,8 @@ typedef struct x264_param_t
void (*pf_log)( void *, int i_level, const char *psz, va_list );
void *p_log_private;
int i_log_level;
int b_visualize;
int b_full_recon; /* fully reconstruct frames, even when not necessary for encoding. Implied by psz_dump_yuv */
char *psz_dump_yuv; /* filename for reconstructed frames */
char *psz_dump_yuv; /* filename (in UTF-8) for reconstructed frames */
/* Encoder analyser parameters */
struct
@ -405,6 +408,10 @@ typedef struct x264_param_t
float f_ip_factor;
float f_pb_factor;
/* VBV filler: force CBR VBV and use filler bytes to ensure hard-CBR.
* Implied by NAL-HRD CBR. */
int b_filler;
int i_aq_mode; /* psy adaptive QP. (X264_AQ_*) */
float f_aq_strength;
int b_mb_tree; /* Macroblock-tree ratecontrol. */
@ -412,9 +419,9 @@ typedef struct x264_param_t
/* 2pass */
int b_stat_write; /* Enable stat writing in psz_stat_out */
char *psz_stat_out;
char *psz_stat_out; /* output filename (in UTF-8) of the 2pass stats file */
int b_stat_read; /* Read stat from psz_stat_in and use it */
char *psz_stat_in;
char *psz_stat_in; /* input filename (in UTF-8) of the 2pass stats file */
/* 2pass params (same as ffmpeg ones) */
float f_qcompress; /* 0.0 => cbr, 1.0 => constant qp */
@ -482,7 +489,7 @@ typedef struct x264_param_t
int b_opencl; /* use OpenCL when available */
int i_opencl_device; /* specify count of GPU devices to skip, for CLI users */
void *opencl_device_id; /* pass explicit cl_device_id as void*, for API users */
char *psz_clbin_file; /* compiled OpenCL kernel cache file */
char *psz_clbin_file; /* filename (in UTF-8) of the compiled OpenCL kernel cache file */
/* Slicing parameters */
int i_slice_max_size; /* Max size per slice in bytes; includes estimated NAL overhead. */

BIN
x264/x264.zip
View File

Binary file not shown.

6
x264/x264_config.h
View File

@ -2,7 +2,7 @@
#define X264_GPL 1
#define X264_INTERLACED 0
#define X264_CHROMA_FORMAT 0
#define X264_REV 2350
#define X264_REV 2380
#define X264_REV_DIFF 0
#define X264_VERSION " r2350 dba1934"
#define X264_POINTVER "0.136.2350 dba1934"
#define X264_VERSION " r2380 3dcf6e2"
#define X264_POINTVER "0.140.2380 3dcf6e2"