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

Add mac audio capture

Browse Source 
- Add CoreAudio device input capture for mac audio capturing.  The code
   should cover just about everything for capturing mac input device
   audio.  Because of the way mac audio is designed, users may have no
   choice but to obtain the open source soundflower software to capture
   their mac's desktop audio.  It may be necessary for us to distribute
   it with the program as well.

 - Hide event backend

 - Use win32 events for windows

 - Allow timed waits for events

 - Fix a few warnings
This commit is contained in:
jp9000
2014-02-26 22:43:31 -08:00
parent a1a1f1a64c
commit 33dc028c7e
15 changed files with 969 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libobs/CMakeLists.txt
View File

@@ -22,12 +22,14 @@ add_definitions(-DPTW32_STATIC_LIB)
if(WIN32)
set(libobs_PLATFORM_SOURCES
obs-windows.c
util/threading-windows.c
util/platform-windows.c)
set(libobs_PLATFORM_DEPS
w32-pthreads)
elseif(APPLE)
set(libobs_PLATFORM_SOURCES
obs-cocoa.c
util/threading-posix.c
util/platform-cocoa.m)
set_source_files_properties(${libobs_PLATFORM_SOURCES}
@@ -44,6 +46,7 @@ elseif(APPLE)
elseif(UNIX)
set(libobs_PLATFORM_SOURCES
obs-nix.c
util/threading-posic.c
util/platform-nix.c)
endif()

10
libobs/media-io/audio-io.c
View File

@@ -38,7 +38,7 @@ struct audio_input {
void *param;
};
static inline audio_input_free(struct audio_input *input)
static inline void audio_input_free(struct audio_input *input)
{
audio_resampler_destroy(input->resampler);
}
@@ -435,7 +435,7 @@ static void *audio_thread(void *param)
uint64_t prev_time = os_gettime_ns() - buffer_time;
uint64_t audio_time;
while (event_try(&audio->stop_event) == EAGAIN) {
while (event_try(audio->stop_event) == EAGAIN) {
os_sleep_ms(AUDIO_WAIT_TIME);
pthread_mutex_lock(&audio->line_mutex);
@@ -611,7 +611,7 @@ void audio_output_close(audio_t audio)
return;
if (audio->initialized) {
event_signal(&audio->stop_event);
event_signal(audio->stop_event);
pthread_join(audio->thread, &thread_ret);
}
@@ -629,7 +629,7 @@ void audio_output_close(audio_t audio)
da_free(audio->mix_buffers[i]);
da_free(audio->inputs);
event_destroy(&audio->stop_event);
event_destroy(audio->stop_event);
pthread_mutex_destroy(&audio->line_mutex);
bfree(audio);
}
@@ -764,7 +764,7 @@ static inline void mul_vol_32bit(void *array, float volume, size_t total_num)
for (size_t i = 0; i < total_num; i++) {
double val = (double)vals[i] / 2147483647.0;
double output = val * volume;
double output = val * dvol;
vals[i] = (int32_t)(CLAMP(output, -1.0, 1.0) * 2147483647.0);
}
}

16
libobs/media-io/video-io.c
View File

@@ -125,11 +125,11 @@ static void *video_thread(void *param)
struct video_output *video = param;
uint64_t cur_time = os_gettime_ns();
while (event_try(&video->stop_event) == EAGAIN) {
while (event_try(video->stop_event) == EAGAIN) {
/* wait half a frame, update frame */
os_sleepto_ns(cur_time += (video->frame_time/2));
video->cur_video_time = cur_time;
event_signal(&video->update_event);
event_signal(video->update_event);
/* wait another half a frame, swap and output frames */
os_sleepto_ns(cur_time += (video->frame_time/2));
@@ -198,8 +198,8 @@ void video_output_close(video_t video)
video_input_free(&video->inputs.array[i]);
da_free(video->inputs);
event_destroy(&video->update_event);
event_destroy(&video->stop_event);
event_destroy(video->update_event);
event_destroy(video->stop_event);
pthread_mutex_destroy(&video->data_mutex);
pthread_mutex_destroy(&video->input_mutex);
bfree(video);
@@ -339,8 +339,8 @@ bool video_output_wait(video_t video)
{
if (!video) return false;
event_wait(&video->update_event);
return event_try(&video->stop_event) == EAGAIN;
event_wait(video->update_event);
return event_try(video->stop_event) == EAGAIN;
}
uint64_t video_getframetime(video_t video)
@@ -361,8 +361,8 @@ void video_output_stop(video_t video)
return;
if (video->initialized) {
event_signal(&video->stop_event);
event_signal(video->stop_event);
pthread_join(video->thread, &thread_ret);
event_signal(&video->update_event);
event_signal(video->update_event);
}
}

4
libobs/media-io/video-scaler-ffmpeg.c
View File

@@ -133,9 +133,9 @@ bool video_scaler_scale(video_scaler_t scaler,
return false;
int ret = sws_scale(scaler->swscale,
input, in_linesize,
input, (const int *)in_linesize,
0, scaler->src_height,
output, out_linesize);
output, (const int *)out_linesize);
if (ret <= 0) {
blog(LOG_DEBUG, "video_scaler_scale: sws_scale failed: %d",
ret);

1
libobs/obs-video.c
View File

@@ -421,7 +421,6 @@ void *obs_video_thread(void *param)
render_displays();
output_frame(cur_time);
}
UNUSED_PARAMETER(param);

149
libobs/util/threading-posix.c Normal file
View File

@@ -0,0 +1,149 @@
/*
* Copyright (c) 2014 Hugh Bailey <obs.jim@gmail.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef __APPLE__
#include <sys/time.h>
#endif
#include "bmem.h"
#include "threading.h"
struct event_data {
pthread_mutex_t mutex;
pthread_cond_t cond;
volatile bool signalled;
bool manual;
};
int event_init(event_t *event, enum event_type type)
{
int code = 0;
struct event_data *data = bzalloc(sizeof(struct event_data));
if ((code = pthread_mutex_init(&data->mutex, NULL)) < 0) {
bfree(data);
return code;
}
if ((code = pthread_cond_init(&data->cond, NULL)) < 0) {
pthread_mutex_destroy(&data->mutex);
bfree(data);
return code;
}
data->manual = (type == EVENT_TYPE_MANUAL);
data->signalled = false;
*event = data;
return 0;
}
void event_destroy(event_t event)
{
if (event) {
pthread_mutex_destroy(&event->mutex);
pthread_cond_destroy(&event->cond);
bfree(event);
}
}
int event_wait(event_t event)
{
int code = 0;
pthread_mutex_lock(&event->mutex);
if (!event->signalled)
code = pthread_cond_wait(&event->cond, &event->mutex);
if (code == 0) {
if (!event->manual)
event->signalled = false;
pthread_mutex_unlock(&event->mutex);
}
return code;
}
static inline void add_ms_to_ts(struct timespec *ts,
unsigned long milliseconds)
{
ts->tv_sec += milliseconds/1000;
ts->tv_nsec += (milliseconds%1000)*1000000;
if (ts->tv_nsec > 1000000000) {
ts->tv_sec += 1;
ts->tv_nsec -= 1000000000;
}
}
int event_timedwait(event_t event, unsigned long milliseconds)
{
int code = 0;
pthread_mutex_lock(&event->mutex);
if (!event->signalled) {
struct timespec ts;
#ifdef __APPLE__
struct timeval tv;
gettimeofday(&tv, NULL);
ts.tv_sec = tv.tv_sec;
ts.tv_nsec = tv.tv_usec * 1000;
#else
clock_gettime(CLOCK_REALTIME, &ts);
#endif
add_ms_to_ts(&ts, milliseconds);
code = pthread_cond_timedwait(&event->cond, &event->mutex, &ts);
}
if (code == 0) {
if (!event->manual)
event->signalled = false;
pthread_mutex_unlock(&event->mutex);
}
return code;
}
int event_try(event_t event)
{
pthread_mutex_lock(&event->mutex);
if (event->signalled) {
if (!event->manual)
event->signalled = false;
pthread_mutex_unlock(&event->mutex);
return 0;
}
pthread_mutex_unlock(&event->mutex);
return EAGAIN;
}
int event_signal(event_t event)
{
int code = 0;
pthread_mutex_lock(&event->mutex);
code = pthread_cond_signal(&event->cond);
event->signalled = true;
pthread_mutex_unlock(&event->mutex);
return code;
}
void event_reset(event_t event)
{
pthread_mutex_lock(&event->mutex);
event->signalled = false;
pthread_mutex_unlock(&event->mutex);
}

114
libobs/util/threading-windows.c Normal file
View File

@@ -0,0 +1,114 @@
/*
* Copyright (c) 2014 Hugh Bailey <obs.jim@gmail.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "bmem.h"
#include "threading.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
struct event_data {
HANDLE handle;
};
int event_init(event_t *event, enum event_type type)
{
HANDLE handle;
struct event_data *data;
handle = CreateEvent(NULL, (type == EVENT_TYPE_MANUAL), FALSE, NULL);
if (!handle)
return -1;
data = bmalloc(sizeof(struct event_data));
data->handle = handle;
*event = data;
return 0;
}
void event_destroy(event_t event)
{
if (event) {
CloseHandle(event->handle);
bfree(event);
}
}
int event_wait(event_t event)
{
DWORD code;
if (!event)
return EINVAL;
code = WaitForSingleObject(event->handle, INFINITE);
if (code != WAIT_OBJECT_0)
return EINVAL;
return 0;
}
int event_timedwait(event_t event, unsigned long milliseconds)
{
DWORD code;
if (!event)
return EINVAL;
code = WaitForSingleObject(event->handle, milliseconds);
if (code == WAIT_TIMEOUT)
return ETIMEDOUT;
else if (code != WAIT_OBJECT_0)
return EINVAL;
return 0;
}
int event_try(event_t event)
{
DWORD code;
if (!event)
return EINVAL;
code = WaitForSingleObject(event->handle, 0);
if (code == WAIT_TIMEOUT)
return EAGAIN;
else if (code != WAIT_OBJECT_0)
return EINVAL;
return 0;
}
int event_signal(event_t event)
{
if (!event)
return EINVAL;
if (!SetEvent(event->handle))
return EINVAL;
return 0;
}
void event_reset(event_t event)
{
if (!event)
return;
ResetEvent(event->handle);
}

88
libobs/util/threading.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013 Hugh Bailey <obs.jim@gmail.com>
* Copyright (c) 2013-2014 Hugh Bailey <obs.jim@gmail.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -46,90 +46,22 @@ static inline void pthread_mutex_init_value(pthread_mutex_t *mutex)
*mutex = init_val;
}
struct event_data {
pthread_mutex_t mutex;
pthread_cond_t cond;
bool signalled;
bool manual;
};
enum event_type {
EVENT_TYPE_AUTO,
EVENT_TYPE_MANUAL
};
typedef struct event_data event_t;
struct event_data;
typedef struct event_data *event_t;
static inline int event_init(event_t *event, enum event_type type)
{
int code = 0;
EXPORT int event_init(event_t *event, enum event_type type);
EXPORT void event_destroy(event_t event);
EXPORT int event_wait(event_t event);
EXPORT int event_timedwait(event_t event, unsigned long milliseconds);
EXPORT int event_try(event_t event);
EXPORT int event_signal(event_t event);
EXPORT void event_reset(event_t event);
if ((code = pthread_mutex_init(&event->mutex, NULL)) < 0)
return code;
if ((code = pthread_cond_init(&event->cond, NULL)) < 0)
pthread_mutex_destroy(&event->mutex);
event->manual = (type == EVENT_TYPE_MANUAL);
event->signalled = false;
return code;
}
static inline void event_destroy(event_t *event)
{
if (event) {
pthread_mutex_destroy(&event->mutex);
pthread_cond_destroy(&event->cond);
}
}
static inline int event_wait(event_t *event)
{
int code = 0;
pthread_mutex_lock(&event->mutex);
if (event->signalled ||
(code = pthread_cond_wait(&event->cond, &event->mutex)) == 0) {
if (!event->manual)
event->signalled = false;
pthread_mutex_unlock(&event->mutex);
}
return code;
}
static inline int event_try(event_t *event)
{
pthread_mutex_lock(&event->mutex);
if (event->signalled) {
if (!event->manual)
event->signalled = false;
pthread_mutex_unlock(&event->mutex);
return 0;
}
pthread_mutex_unlock(&event->mutex);
return EAGAIN;
}
static inline int event_signal(event_t *event)
{
int code = 0;
pthread_mutex_lock(&event->mutex);
code = pthread_cond_signal(&event->cond);
event->signalled = true;
pthread_mutex_unlock(&event->mutex);
return code;
}
static inline void event_reset(event_t *event)
{
pthread_mutex_lock(&event->mutex);
event->signalled = false;
pthread_mutex_unlock(&event->mutex);
}
#ifdef __cplusplus
}