jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,792 Commits 1 Branch 0 Tags
Commit Graph

1118 Commits

Author SHA1 Message Date
jp9000
c5667a9e46 Log x264 settings 2014-07-13 03:03:31 -07:00
jp9000
2956386109 Make x264 internal logging use the log macros 2014-07-13 03:03:07 -07:00
jp9000
2099ffc33b Fix bug where it would try to set a blank profile 2014-07-13 03:02:18 -07:00
jp9000
5b12a46d41 Use log macros for x264 2014-07-13 03:00:59 -07:00
jp9000
1188ad7561 Fix unreachable code warning 2014-07-12 12:00:12 -07:00
jp9000
f675c8029f Fix 'unused parameter' warnings on windows 2014-07-12 11:59:07 -07:00
jp9000
482791c5b6 Add locale for modules 2014-07-11 17:29:00 -07:00
jp9000
1e7a99eeb4 Rename mac display capture source file 
Rename it from mac-screen-capture.m to mac-display-capture.m to be a bit
more consistent
 2014-07-11 17:25:53 -07:00
fryshorts
1cf19d06f9 Fix infinite loop in v4l2 plugin 
With no device present the capability callbacks would cause an
infinite loop.
 2014-07-11 17:48:12 +02:00
jp9000
3394ac6488 Move mac display capture to mac-capture module 
It was kind of silly that it was residing within the test-input module.
 2014-07-10 21:55:46 -07:00
Jim
83c041e14f Merge pull request #152 from BtbN/cmake_fixes 
Cmake fixes
 2014-07-10 20:43:23 -07:00
BtbN
d09f6dae1f Don't hardcode include directory for plugins 2014-07-10 14:38:46 +02:00
Timo R
f7b1bfa0a8 Reverse swap red&blue logic 2014-07-10 14:35:03 +02:00
jp9000
8355e8c848 Separate x264 parameters by space 
Some x264 parameters actually use the ':' character for their
parameters, so I feel like space would probably be a bit more ideal.
 2014-07-09 13:57:52 -07:00
Palana
23a83054b5 Remove AV_REV_FOURCC macro from mac-avcapture 2014-07-08 14:33:29 +02:00
Palana
f57cc56268 Expand frame format support for mac-avcapture 
Also add a fallback conversion via AVFoundation in case the native
format isn't supported
 2014-07-08 14:31:04 +02:00
Palana
a5108e5fd9 Simplify timestamp handling for mac-avcapture 2014-07-08 14:31:04 +02:00
jp9000
0364672cbb rtmp-stream: Add statistics callbacks 
Add callbacks for total bytes sent and number of dropped frames
 2014-07-06 17:36:45 -07:00
jp9000
be2b0d1398 rtmp-stream: Change TEST_FRAMEDROPS to just sleep 
Instead of making the send buffer size super small, just do a sleep when
sending data to simulate the inability to send out as much data as
desired.
 2014-07-06 17:35:26 -07:00
jp9000
7dfb26eb31 Reset blend state to default after drawing 2014-07-03 14:12:48 -07:00
Palana
d79b28e9ba Add FPS entries "Highest" and "Match OBS FPS" for win-dshow 2014-07-02 19:37:50 +02:00
Palana
45d42af46c Add name for VideoFormat::Any 2014-07-02 19:37:50 +02:00
Palana
1052590aa5 Implement frame rate autoselection for win-dshow device update 2014-07-02 19:37:49 +02:00
Palana
2bf0163aa5 Update config modified callbacks with disable/autoselection semantics 
Autoselection is only implemented for frame rate as it doesn't make
sense to autoselect the video format (Any fills the role of library
supplied autoselection) or the resolution (it may make sense to
implement resolution matching based on the current transformation
settings in the future though)
 2014-07-02 19:37:43 +02:00
Palana
2702259c75 Add DecodeDeviceId helper with DStr targets 2014-07-02 19:31:53 +02:00
Palana
fdc2ebf980 Add FPS/VideoFormat to name conversion helpers 2014-07-02 19:31:52 +02:00
Palana
453a8b21cd Add device caps matching helpers 2014-07-02 18:22:03 +02:00
Palana
f854ac7b78 Remove user config modifying code 2014-07-02 17:55:05 +02:00
Palana
765d2e89f4 Use <limits> instead of constant 2014-07-02 17:42:20 +02:00
Palana
a7cc60ec11 Refactor resolution, frame rate, and video format matching in win-dshow 2014-07-02 17:40:55 +02:00
jp9000
0b398cfad9 rtmp-stream: Log when user stops the stream 2014-07-02 00:24:55 -07:00
jp9000
697acbb4d5 rtmp-stream: Use helper log macros 
Use warn/info/debug helper macro functions to output
warnings/information/debug log data that's preformatted to include the
module and the current output name.
 2014-07-02 00:20:50 -07:00
jp9000
de478d3295 Change drop threshold to macro, use milliseconds 
Like with other plugins, a macro is ideal for preventing typos and
misspellings of the setting.  Also, add a property for drop threshold.
 2014-07-01 15:08:01 -07:00
jp9000
a527f30b94 rtmp-output: Remove unused properties 2014-07-01 15:05:15 -07:00
jp9000
058f3ca7b0 Remove FILE_TEST macro from rtmp-stream.c 2014-07-01 13:41:55 -07:00
jp9000
5c5f63e8b8 Output version/commit to RTMP stream metadata 
Might come in useful for debugging issues later on.
 2014-07-01 13:41:32 -07:00
BtbN
8b14aa8f4a Add missing header to CMakeLists.txt 2014-06-28 20:54:14 +02:00
jp9000
cf0b8be3a2 Add image source plugin 
A simple plugin that does nothing more than display an image file as a
source.
 2014-06-28 10:35:17 -07:00
jp9000
7b12133af3 Use uint8_t* instead of void* for texture data 
NOTE: In texture_setimage, I had to move variables to the top of the
scope because microsoft's C compiler will give the legacy C90 error of:
'illegal use of this type as an expression'.

To sum it up, microsoft's C compiler is still utter garbage.
 2014-06-28 10:12:57 -07:00
jp9000
9478624b22 win-wasapi: Use macros instead of strings 
Instead of using strings for setting names, use macros.  Macros prevent
mis-spellings, prevent usage of the wrong name, and if you get it wrong,
it will simply fail to compile, helping to ensure that the right setting
value is being used.
 2014-06-28 09:03:57 -07:00
jp9000
9851c061e2 linux-xshm: Fix potentially uninitialized var. 2014-06-27 21:43:42 -07:00
Jim
8e860576ea Merge pull request #128 from palana/mac-avcapture-settings-changes 
Update mac-avcapture to use recent property and data changes
 2014-06-26 11:27:31 -07:00
jp9000
dbb9124bf6 Remove 'effect' param from effect param funcs 
Similar to the shader functions, the effect parameter functions take
the effect as a parameter.  However, the effect parameter is pretty
pointless, because the effect parameter.. parameter stores the effect
pointer interally.
 2014-06-25 22:24:27 -07:00
Palana
f09f969bc0 Disable default device selection for mac-avcapture 
Since adding a source now opens the config dialog for that source
the convenience gain from having a device automatically start capturing
is outweighed by the inconvenience from having captured images
unintentionally recorded/streamed
 2014-06-25 23:33:26 +02:00
Palana
2b5bd11671 Implement preset auto select notification for mac-avcapture 2014-06-25 23:33:26 +02:00
Palana
77e9763747 Add disconnected (selected) devices to device list for mac-avcapture 
This requires the (localized) device name to be stored
 2014-06-25 23:33:26 +02:00
Palana
e4601ac655 Show unsupported selected presets for mac-avcapture 
Configured presets that are unsupported are now preserved in the user config,
but listed as disabled
 2014-06-25 23:33:26 +02:00
Palana
847bb83007 Change preset order to highest first for mac-avcapture 2014-06-25 23:32:58 +02:00
Jim
2ea50cab36 Merge pull request #124 from jp9000/new-locale-handling 
Update to new module locale API
 2014-06-25 12:58:05 -07:00
jp9000
0b4a259e56 Remove 'locale' parameter from all callbacks 
The locale parameter was a mistake, because it puts extra needless
burden upon the module developer to have to handle this variable for
each and every single callback function.  The parameter is being removed
in favor of a single centralized module callback function that
specifically updates locale information for a module only when needed.
 2014-06-25 12:36:26 -07:00