38c2fc87aa
Move all data into the subdir it belongs to
...
Completely removes the build dir in favor of cmake based build layouting
2014-07-19 01:38:41 +02:00
3b26db389d
Fix Jansson dependency importing
2014-07-17 18:13:25 +02:00
a01b59fb21
Reset blend state for image source
...
This is more of a temporary fix for the time being, it needs to handle
blend state changes better, perhaps via push/pop of state changes
2014-07-16 14:53:21 -07:00
2920281e69
mac-avcapture: Remove debug code
2014-07-16 22:39:00 +02:00
07ac02e62b
Localization correction for image plugin
...
Closes #181
2014-07-16 02:38:11 +02:00
a3293c4cd6
Update libdshowcapture to the latest version
2014-07-15 08:20:47 -07:00
4c539a427d
Use OBS_CONFIG as version string for the FLV mux
2014-07-14 09:52:36 -07:00
902874e362
mac-avcapture: Fix logic error in preset list handling
2014-07-13 20:20:07 +02:00
082e1bff02
mac-avcapture: Remove default device name
...
No need to give it a name other than the empty string
2014-07-13 20:20:07 +02:00
ea3e755427
Log fdk_aac module settings
2014-07-13 03:12:54 -07:00
94d047bb69
Log FFmpeg AAC encoder settings
2014-07-13 03:10:16 -07:00
c5667a9e46
Log x264 settings
2014-07-13 03:03:31 -07:00
2956386109
Make x264 internal logging use the log macros
2014-07-13 03:03:07 -07:00
2099ffc33b
Fix bug where it would try to set a blank profile
2014-07-13 03:02:18 -07:00
5b12a46d41
Use log macros for x264
2014-07-13 03:00:59 -07:00
1188ad7561
Fix unreachable code warning
2014-07-12 12:00:12 -07:00
f675c8029f
Fix 'unused parameter' warnings on windows
2014-07-12 11:59:07 -07:00
482791c5b6
Add locale for modules
2014-07-11 17:29:00 -07:00
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
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
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
83c041e14f
Merge pull request #152 from BtbN/cmake_fixes
...
Cmake fixes
2014-07-10 20:43:23 -07:00
d09f6dae1f
Don't hardcode include directory for plugins
2014-07-10 14:38:46 +02:00
f7b1bfa0a8
Reverse swap red&blue logic
2014-07-10 14:35:03 +02:00
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
23a83054b5
Remove AV_REV_FOURCC macro from mac-avcapture
2014-07-08 14:33:29 +02:00
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
a5108e5fd9
Simplify timestamp handling for mac-avcapture
2014-07-08 14:31:04 +02:00
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
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
7dfb26eb31
Reset blend state to default after drawing
2014-07-03 14:12:48 -07:00
d79b28e9ba
Add FPS entries "Highest" and "Match OBS FPS" for win-dshow
2014-07-02 19:37:50 +02:00
45d42af46c
Add name for VideoFormat::Any
2014-07-02 19:37:50 +02:00
1052590aa5
Implement frame rate autoselection for win-dshow device update
2014-07-02 19:37:49 +02:00
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
2702259c75
Add DecodeDeviceId helper with DStr targets
2014-07-02 19:31:53 +02:00
fdc2ebf980
Add FPS/VideoFormat to name conversion helpers
2014-07-02 19:31:52 +02:00
453a8b21cd
Add device caps matching helpers
2014-07-02 18:22:03 +02:00
f854ac7b78
Remove user config modifying code
2014-07-02 17:55:05 +02:00
765d2e89f4
Use <limits> instead of constant
2014-07-02 17:42:20 +02:00
a7cc60ec11
Refactor resolution, frame rate, and video format matching in win-dshow
2014-07-02 17:40:55 +02:00
0b398cfad9
rtmp-stream: Log when user stops the stream
2014-07-02 00:24:55 -07:00
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
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
a527f30b94
rtmp-output: Remove unused properties
2014-07-01 15:05:15 -07:00
058f3ca7b0
Remove FILE_TEST macro from rtmp-stream.c
2014-07-01 13:41:55 -07:00
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
8b14aa8f4a
Add missing header to CMakeLists.txt
2014-06-28 20:54:14 +02:00
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
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
BtbN
jp9000
Palana
Anry
fryshorts