4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify media i/o interfaces

Browse source 
Completely revamped the entire media i/o data and handlers.  The
original idea was to have a system that would have connecting media
inputs and outputs, but at a certain point I realized that this was an
unnecessary complexity for what we wanted to do.  (Also, it reminded me
of directshow filters, and I HATE directshow with a passion, and
wouldn't wish it upon my greatest enemy)

Now, audio/video outputs are connected to directly, with better callback
handlers, and will eventually have the ability to automatically handle
conversions such as 4:4:4 to 4:2:0 when connecting to an input that uses
them.  Doing this will allow the video/audio i/o handlers to also
prevent duplicate conversion, as well as make it easier/simple to use.

My true goal for this is to make output and encoder plugins as simple to
create as possible.  I want to be able to be able to create an output
plugin with almost no real hassle of having to worry about image
conversions, media inputs/outputs, etc.  A plugin developer shouldn't
have to handle that sort of stuff when he/she doesn't really need to.

Plugins will be able to simply create a callback via obs_video() and/or
obs_audio(), and they will automatically receive the audio/video data in
the formats requested via a simple callback, without needing to do
almost anything else at all.
This commit is contained in:
jp9000 2014-01-14 01:58:47 -07:00
commit 62c2b1d74e
18 changed files with 317 additions and 422 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libobs/obs-source.c
View file

@ -323,8 +323,11 @@ void obs_source_video_tick(obs_source_t source, float seconds)
static inline uint64_t conv_frames_to_time(obs_source_t source, size_t frames)
{
const struct audio_info *info = audio_output_getinfo(obs->audio.audio);
double sps_to_ns = 1000000000.0 / (double)info->samples_per_sec;
const struct audio_output_info *info;
double sps_to_ns;
info = audio_output_getinfo(obs->audio.audio);
sps_to_ns = 1000000000.0 / (double)info->samples_per_sec;
return (uint64_t)((double)frames * sps_to_ns);
}
@ -783,7 +786,7 @@ static inline struct filtered_audio *filter_async_audio(obs_source_t source,
static inline void reset_resampler(obs_source_t source,
const struct source_audio *audio)
{
const struct audio_info *obs_info;
const struct audio_output_info *obs_info;
struct resample_info output_info;
obs_info = audio_output_getinfo(obs->audio.audio);