lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 24.0.1+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2019-09-22 23:19:10 +02:00
parent b14f9eae6d
commit 5a730d6ec3
842 changed files with 42245 additions and 33385 deletions
Download patch file Download diff file Expand all files Collapse all files

66
plugins/mac-capture/audio-device-enum.c
View file

@ -10,15 +10,15 @@
static inline bool device_is_input(char *device)
{
return astrstri(device, "soundflower") == NULL &&
astrstri(device, "wavtap") == NULL &&
astrstri(device, "wavtap") == NULL &&
astrstri(device, "soundsiphon") == NULL;
}
static inline bool enum_success(OSStatus stat, const char *msg)
{
if (stat != noErr) {
blog(LOG_WARNING, "[coreaudio_enum_devices] %s failed: %d",
msg, (int)stat);
blog(LOG_WARNING, "[coreaudio_enum_devices] %s failed: %d", msg,
(int)stat);
return false;
}
@ -26,22 +26,20 @@ static inline bool enum_success(OSStatus stat, const char *msg)
}
typedef bool (*enum_device_proc_t)(void *param, CFStringRef cf_name,
CFStringRef cf_uid, AudioDeviceID id);
CFStringRef cf_uid, AudioDeviceID id);
static bool coreaudio_enum_device(enum_device_proc_t proc, void *param,
AudioDeviceID id)
AudioDeviceID id)
{
UInt32 size = 0;
CFStringRef cf_name = NULL;
CFStringRef cf_uid = NULL;
bool enum_next = true;
OSStatus stat;
UInt32 size = 0;
CFStringRef cf_name = NULL;
CFStringRef cf_uid = NULL;
bool enum_next = true;
OSStatus stat;
AudioObjectPropertyAddress addr = {
kAudioDevicePropertyStreams,
kAudioDevicePropertyScopeInput,
kAudioObjectPropertyElementMaster
};
AudioObjectPropertyAddress addr = {kAudioDevicePropertyStreams,
kAudioDevicePropertyScopeInput,
kAudioObjectPropertyElementMaster};
/* check to see if it's a mac input device */
AudioObjectGetPropertyDataSize(id, &addr, 0, NULL, &size);
@ -72,27 +70,25 @@ fail:
static void enum_devices(enum_device_proc_t proc, void *param)
{
AudioObjectPropertyAddress addr = {
kAudioHardwarePropertyDevices,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster
};
AudioObjectPropertyAddress addr = {kAudioHardwarePropertyDevices,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster};
UInt32 size = 0;
UInt32 count;
OSStatus stat;
UInt32 size = 0;
UInt32 count;
OSStatus stat;
AudioDeviceID *ids;
stat = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &addr,
0, NULL, &size);
0, NULL, &size);
if (!enum_success(stat, "get kAudioObjectSystemObject data size"))
return;
ids = bmalloc(size);
ids = bmalloc(size);
count = size / sizeof(AudioDeviceID);
stat = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr,
0, NULL, &size, ids);
stat = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0,
NULL, &size, ids);
if (enum_success(stat, "get kAudioObjectSystemObject data"))
for (UInt32 i = 0; i < count; i++)
@ -104,20 +100,20 @@ static void enum_devices(enum_device_proc_t proc, void *param)
struct add_data {
struct device_list *list;
bool input;
bool input;
};
static bool coreaudio_enum_add_device(void *param, CFStringRef cf_name,
CFStringRef cf_uid, AudioDeviceID id)
CFStringRef cf_uid, AudioDeviceID id)
{
struct add_data *data = param;
struct add_data *data = param;
struct device_item item;
memset(&item, 0, sizeof(item));
if (!cfstr_copy_dstr(cf_name, kCFStringEncodingUTF8, &item.name))
goto fail;
if (!cfstr_copy_dstr(cf_uid, kCFStringEncodingUTF8, &item.value))
if (!cfstr_copy_dstr(cf_uid, kCFStringEncodingUTF8, &item.value))
goto fail;
if (data->input || !device_is_input(item.value.array))
@ -137,18 +133,18 @@ void coreaudio_enum_devices(struct device_list *list, bool input)
}
struct device_id_data {
CFStringRef uid;
CFStringRef uid;
AudioDeviceID *id;
bool found;
bool found;
};
static bool get_device_id(void *param, CFStringRef cf_name, CFStringRef cf_uid,
AudioDeviceID id)
AudioDeviceID id)
{
struct device_id_data *data = param;
if (CFStringCompare(cf_uid, data->uid, 0) == 0) {
*data->id = id;
*data->id = id;
data->found = true;
return false;
}

4
plugins/mac-capture/audio-device-enum.h
View file

@ -20,13 +20,13 @@ struct device_list {
static inline void device_list_free(struct device_list *list)
{
for (size_t i = 0; i < list->items.num; i++)
device_item_free(list->items.array+i);
device_item_free(list->items.array + i);
da_free(list->items);
}
static inline void device_list_add(struct device_list *list,
struct device_item *item)
struct device_item *item)
{
da_push_back(list->items, item);
memset(item, 0, sizeof(struct device_item));

22
plugins/mac-capture/data/locale/gl-ES.ini
View file

@ -1,21 +1,21 @@
CoreAudio.InputCapture="Captura de entrada de audio"
CoreAudio.OutputCapture="Captura de saída de audio"
CoreAudio.InputCapture="Captura de entrada de son"
CoreAudio.OutputCapture="Captura de saída de son"
CoreAudio.Device="Dispositivo"
CoreAudio.Device.Default="Por defecto"
CoreAudio.Device.Default="Predeterminado"
DisplayCapture="Captura de pantalla"
DisplayCapture.Display="Pantalla"
DisplayCapture.ShowCursor="Mostrar o cursor"
WindowCapture="Capturar xanela"
WindowCapture.ShowShadow="Mostrar sombra da xanela"
DisplayCapture.ShowCursor="Amosar o cursor"
WindowCapture="Captura da xanela"
WindowCapture.ShowShadow="Amosar a sombra da xanela"
WindowUtils.Window="Xanela"
WindowUtils.ShowEmptyNames="Mostrar xanelas con nomes baleiros"
WindowUtils.ShowEmptyNames="Amosar as xanelas con nomes baleiros"
CropMode="Recortar"
CropMode.None="Ningún"
CropMode.Manual="Manual"
CropMode.ToWindow="Á xanela"
CropMode.ToWindowAndManual="Á xanela e manual"
Crop.origin.x="Recortar á esquerda"
Crop.origin.y="Recortar arriba"
Crop.size.width="Recortar á dereita"
Crop.size.height="Recortar abaixo"
Crop.origin.x="Recortar pola esquerda"
Crop.origin.y="Recortar por riba"
Crop.size.width="Recortar pola dereita"
Crop.size.height="Recortar por baixo"

2
plugins/mac-capture/data/locale/ka-GE.ini
View file

@ -1,4 +1,4 @@
CoreAudio.InputCapture="შემავალი ხმოვანი სიგნალის ჩაწერა"
CoreAudio.InputCapture="შემავალი ხმის ჩაწერა"
CoreAudio.OutputCapture="გამოტანილი ხმის ჩაწერა"
CoreAudio.Device="მოწყობილობა"
CoreAudio.Device.Default="ნაგულისხმევი"

2
plugins/mac-capture/data/locale/ro-RO.ini
View file

@ -4,7 +4,7 @@ CoreAudio.Device="Dispozitiv"
CoreAudio.Device.Default="Implicit"
DisplayCapture="Captură de display"
DisplayCapture.Display="Display"
DisplayCapture.ShowCursor="Arată cursorul"
DisplayCapture.ShowCursor="Afișează cursorul"
WindowCapture="Captură de fereastră"
WindowCapture.ShowShadow="Afișează umbra ferestrei"
WindowUtils.Window="Fereastră"

2
plugins/mac-capture/data/locale/sl-SI.ini
View file

@ -5,7 +5,7 @@ CoreAudio.Device.Default="Privzeto"
DisplayCapture="Zajemanje zaslona"
DisplayCapture.Display="Zaslon"
DisplayCapture.ShowCursor="Prikaži kazalec"
WindowCapture="Zajem Okna"
WindowCapture="Zajemanje okna"
WindowCapture.ShowShadow="Prikaži senco okna"
WindowUtils.Window="Okno"
WindowUtils.ShowEmptyNames="Prikaži okna z praznimi imeni"

343
plugins/mac-capture/mac-audio.c
View file

@ -15,44 +15,44 @@
#define PROPERTY_FORMATS kAudioStreamPropertyAvailablePhysicalFormats
#define SCOPE_OUTPUT kAudioUnitScope_Output
#define SCOPE_INPUT kAudioUnitScope_Input
#define SCOPE_INPUT kAudioUnitScope_Input
#define SCOPE_GLOBAL kAudioUnitScope_Global
#define BUS_OUTPUT 0
#define BUS_INPUT 1
#define BUS_INPUT 1
#define MAX_DEVICES 20
#define set_property AudioUnitSetProperty
#define get_property AudioUnitGetProperty
#define TEXT_AUDIO_INPUT obs_module_text("CoreAudio.InputCapture");
#define TEXT_AUDIO_OUTPUT obs_module_text("CoreAudio.OutputCapture");
#define TEXT_DEVICE obs_module_text("CoreAudio.Device")
#define TEXT_AUDIO_INPUT obs_module_text("CoreAudio.InputCapture");
#define TEXT_AUDIO_OUTPUT obs_module_text("CoreAudio.OutputCapture");
#define TEXT_DEVICE obs_module_text("CoreAudio.Device")
#define TEXT_DEVICE_DEFAULT obs_module_text("CoreAudio.Device.Default")
struct coreaudio_data {
char *device_name;
char *device_uid;
AudioUnit unit;
AudioDeviceID device_id;
AudioBufferList *buf_list;
bool au_initialized;
bool active;
bool default_device;
bool input;
bool no_devices;
char *device_name;
char *device_uid;
AudioUnit unit;
AudioDeviceID device_id;
AudioBufferList *buf_list;
bool au_initialized;
bool active;
bool default_device;
bool input;
bool no_devices;
uint32_t sample_rate;
enum audio_format format;
uint32_t sample_rate;
enum audio_format format;
enum speaker_layout speakers;
pthread_t reconnect_thread;
os_event_t *exit_event;
volatile bool reconnecting;
unsigned long retry_time;
pthread_t reconnect_thread;
os_event_t *exit_event;
volatile bool reconnecting;
unsigned long retry_time;
obs_source_t *source;
obs_source_t *source;
};
static bool get_default_output_device(struct coreaudio_data *ca)
@ -74,17 +74,16 @@ static bool get_default_output_device(struct coreaudio_data *ca)
static bool find_device_id_by_uid(struct coreaudio_data *ca)
{
UInt32 size = sizeof(AudioDeviceID);
CFStringRef cf_uid = NULL;
CFStringRef qual = NULL;
UInt32 qual_size = 0;
OSStatus stat;
bool success;
UInt32 size = sizeof(AudioDeviceID);
CFStringRef cf_uid = NULL;
CFStringRef qual = NULL;
UInt32 qual_size = 0;
OSStatus stat;
bool success;
AudioObjectPropertyAddress addr = {
.mScope = kAudioObjectPropertyScopeGlobal,
.mElement = kAudioObjectPropertyElementMaster
};
.mScope = kAudioObjectPropertyScopeGlobal,
.mElement = kAudioObjectPropertyElementMaster};
if (!ca->device_uid)
ca->device_uid = bstrdup("default");
@ -105,12 +104,13 @@ static bool find_device_id_by_uid(struct coreaudio_data *ca)
}
cf_uid = CFStringCreateWithCString(NULL, ca->device_uid,
kCFStringEncodingUTF8);
kCFStringEncodingUTF8);
if (ca->default_device) {
addr.mSelector = PROPERTY_DEFAULT_DEVICE;
stat = AudioObjectGetPropertyData(kAudioObjectSystemObject,
&addr, qual_size, &qual, &size, &ca->device_id);
&addr, qual_size, &qual,
&size, &ca->device_id);
success = (stat == noErr);
} else {
success = coreaudio_get_device_id(cf_uid, &ca->device_id);
@ -123,7 +123,7 @@ static bool find_device_id_by_uid(struct coreaudio_data *ca)
}
static inline void ca_warn(struct coreaudio_data *ca, const char *func,
const char *format, ...)
const char *format, ...)
{
va_list args;
struct dstr str = {0};
@ -139,11 +139,11 @@ static inline void ca_warn(struct coreaudio_data *ca, const char *func,
}
static inline bool ca_success(OSStatus stat, struct coreaudio_data *ca,
const char *func, const char *action)
const char *func, const char *action)
{
if (stat != noErr) {
blog(LOG_WARNING, "[%s]:[device '%s'] %s failed: %d",
func, ca->device_name, action, (int)stat);
blog(LOG_WARNING, "[%s]:[device '%s'] %s failed: %d", func,
ca->device_name, action, (int)stat);
return false;
}
@ -156,17 +156,18 @@ enum coreaudio_io_type {
};
static inline bool enable_io(struct coreaudio_data *ca,
enum coreaudio_io_type type, bool enable)
enum coreaudio_io_type type, bool enable)
{
UInt32 enable_int = enable;
return set_property(ca->unit, kAudioOutputUnitProperty_EnableIO,
(type == IO_TYPE_INPUT) ? SCOPE_INPUT : SCOPE_OUTPUT,
(type == IO_TYPE_INPUT) ? BUS_INPUT : BUS_OUTPUT,
&enable_int, sizeof(enable_int));
(type == IO_TYPE_INPUT) ? SCOPE_INPUT
: SCOPE_OUTPUT,
(type == IO_TYPE_INPUT) ? BUS_INPUT : BUS_OUTPUT,
&enable_int, sizeof(enable_int));
}
static inline enum audio_format convert_ca_format(UInt32 format_flags,
UInt32 bits)
UInt32 bits)
{
bool planar = (format_flags & kAudioFormatFlagIsNonInterleaved) != 0;
@ -191,13 +192,20 @@ static inline enum audio_format convert_ca_format(UInt32 format_flags,
static inline enum speaker_layout convert_ca_speaker_layout(UInt32 channels)
{
switch (channels) {
case 1: return SPEAKERS_MONO;
case 2: return SPEAKERS_STEREO;
case 3: return SPEAKERS_2POINT1;
case 4: return SPEAKERS_4POINT0;
case 5: return SPEAKERS_4POINT1;
case 6: return SPEAKERS_5POINT1;
case 8: return SPEAKERS_7POINT1;
case 1:
return SPEAKERS_MONO;
case 2:
return SPEAKERS_STEREO;
case 3:
return SPEAKERS_2POINT1;
case 4:
return SPEAKERS_4POINT0;
case 5:
return SPEAKERS_4POINT1;
case 6:
return SPEAKERS_5POINT1;
case 8:
return SPEAKERS_7POINT1;
}
return SPEAKERS_UNKNOWN;
@ -218,7 +226,7 @@ static bool coreaudio_init_format(struct coreaudio_data *ca)
channels = get_audio_channels(aoi.speakers);
stat = get_property(ca->unit, kAudioUnitProperty_StreamFormat,
SCOPE_INPUT, BUS_INPUT, &desc, &size);
SCOPE_INPUT, BUS_INPUT, &desc, &size);
if (!ca_success(stat, ca, "coreaudio_init_format", "get input format"))
return false;
@ -229,11 +237,11 @@ static bool coreaudio_init_format(struct coreaudio_data *ca)
desc.mChannelsPerFrame = channels;
desc.mBytesPerFrame = channels * desc.mBitsPerChannel / 8;
desc.mBytesPerPacket =
desc.mFramesPerPacket * desc.mBytesPerFrame;
desc.mFramesPerPacket * desc.mBytesPerFrame;
}
stat = set_property(ca->unit, kAudioUnitProperty_StreamFormat,
SCOPE_OUTPUT, BUS_INPUT, &desc, size);
SCOPE_OUTPUT, BUS_INPUT, &desc, size);
if (!ca_success(stat, ca, "coreaudio_init_format", "set output format"))
return false;
@ -244,10 +252,11 @@ static bool coreaudio_init_format(struct coreaudio_data *ca)
ca->format = convert_ca_format(desc.mFormatFlags, desc.mBitsPerChannel);
if (ca->format == AUDIO_FORMAT_UNKNOWN) {
ca_warn(ca, "coreaudio_init_format", "unknown format flags: "
"%u, bits: %u",
(unsigned int)desc.mFormatFlags,
(unsigned int)desc.mBitsPerChannel);
ca_warn(ca, "coreaudio_init_format",
"unknown format flags: "
"%u, bits: %u",
(unsigned int)desc.mFormatFlags,
(unsigned int)desc.mBitsPerChannel);
return false;
}
@ -255,9 +264,10 @@ static bool coreaudio_init_format(struct coreaudio_data *ca)
ca->speakers = convert_ca_speaker_layout(desc.mChannelsPerFrame);
if (ca->speakers == SPEAKERS_UNKNOWN) {
ca_warn(ca, "coreaudio_init_format", "unknown speaker layout: "
"%u channels",
(unsigned int)desc.mChannelsPerFrame);
ca_warn(ca, "coreaudio_init_format",
"unknown speaker layout: "
"%u channels",
(unsigned int)desc.mChannelsPerFrame);
return false;
}
@ -267,24 +277,23 @@ static bool coreaudio_init_format(struct coreaudio_data *ca)
static bool coreaudio_init_buffer(struct coreaudio_data *ca)
{
UInt32 buf_size = 0;
UInt32 size = 0;
UInt32 frames = 0;
UInt32 size = 0;
UInt32 frames = 0;
OSStatus stat;
AudioObjectPropertyAddress addr = {
kAudioDevicePropertyStreamConfiguration,
kAudioDevicePropertyScopeInput,
kAudioObjectPropertyElementMaster
};
kAudioObjectPropertyElementMaster};
stat = AudioObjectGetPropertyDataSize(ca->device_id, &addr, 0, NULL,
&buf_size);
&buf_size);
if (!ca_success(stat, ca, "coreaudio_init_buffer", "get list size"))
return false;
size = sizeof(frames);
stat = get_property(ca->unit, kAudioDevicePropertyBufferFrameSize,
SCOPE_GLOBAL, 0, &frames, &size);
SCOPE_GLOBAL, 0, &frames, &size);
if (!ca_success(stat, ca, "coreaudio_init_buffer", "get frame size"))
return false;
@ -293,7 +302,7 @@ static bool coreaudio_init_buffer(struct coreaudio_data *ca)
ca->buf_list = bmalloc(buf_size);
stat = AudioObjectGetPropertyData(ca->device_id, &addr, 0, NULL,
&buf_size, ca->buf_list);
&buf_size, ca->buf_list);
if (!ca_success(stat, ca, "coreaudio_init_buffer", "allocate")) {
bfree(ca->buf_list);
ca->buf_list = NULL;
@ -304,7 +313,7 @@ static bool coreaudio_init_buffer(struct coreaudio_data *ca)
size = ca->buf_list->mBuffers[i].mDataByteSize;
ca->buf_list->mBuffers[i].mData = bmalloc(size);
}
return true;
}
@ -318,31 +327,28 @@ static void buf_list_free(AudioBufferList *buf_list)
}
}
static OSStatus input_callback(
void *data,
AudioUnitRenderActionFlags *action_flags,
const AudioTimeStamp *ts_data,
UInt32 bus_num,
UInt32 frames,
AudioBufferList *ignored_buffers)
static OSStatus input_callback(void *data,
AudioUnitRenderActionFlags *action_flags,
const AudioTimeStamp *ts_data, UInt32 bus_num,
UInt32 frames, AudioBufferList *ignored_buffers)
{
struct coreaudio_data *ca = data;
OSStatus stat;
struct obs_source_audio audio;
stat = AudioUnitRender(ca->unit, action_flags, ts_data, bus_num, frames,
ca->buf_list);
ca->buf_list);
if (!ca_success(stat, ca, "input_callback", "audio retrieval"))
return noErr;
for (UInt32 i = 0; i < ca->buf_list->mNumberBuffers; i++)
audio.data[i] = ca->buf_list->mBuffers[i].mData;
audio.frames = frames;
audio.speakers = ca->speakers;
audio.format = ca->format;
audio.frames = frames;
audio.speakers = ca->speakers;
audio.format = ca->format;
audio.samples_per_sec = ca->sample_rate;
audio.timestamp = ts_data->mHostTime;
audio.timestamp = ts_data->mHostTime;
obs_source_output_audio(ca->source, &audio);
@ -360,7 +366,8 @@ static void *reconnect_thread(void *param)
ca->reconnecting = true;
while (os_event_timedwait(ca->exit_event, ca->retry_time) == ETIMEDOUT) {
while (os_event_timedwait(ca->exit_event, ca->retry_time) ==
ETIMEDOUT) {
if (coreaudio_init(ca))
break;
}
@ -379,15 +386,15 @@ static void coreaudio_begin_reconnect(struct coreaudio_data *ca)
ret = pthread_create(&ca->reconnect_thread, NULL, reconnect_thread, ca);
if (ret != 0)
blog(LOG_WARNING, "[coreaudio_begin_reconnect] failed to "
"create thread, error code: %d", ret);
blog(LOG_WARNING,
"[coreaudio_begin_reconnect] failed to "
"create thread, error code: %d",
ret);
}
static OSStatus notification_callback(
AudioObjectID id,
UInt32 num_addresses,
const AudioObjectPropertyAddress addresses[],
void *data)
static OSStatus
notification_callback(AudioObjectID id, UInt32 num_addresses,
const AudioObjectPropertyAddress addresses[], void *data)
{
struct coreaudio_data *ca = data;
@ -399,8 +406,10 @@ static OSStatus notification_callback(
else
ca->retry_time = 2000;
blog(LOG_INFO, "coreaudio: device '%s' disconnected or changed. "
"attempting to reconnect", ca->device_name);
blog(LOG_INFO,
"coreaudio: device '%s' disconnected or changed. "
"attempting to reconnect",
ca->device_name);
coreaudio_begin_reconnect(ca);
@ -412,50 +421,48 @@ static OSStatus notification_callback(
static OSStatus add_listener(struct coreaudio_data *ca, UInt32 property)
{
AudioObjectPropertyAddress addr = {
property,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster
};
AudioObjectPropertyAddress addr = {property,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster};
return AudioObjectAddPropertyListener(ca->device_id, &addr,
notification_callback, ca);
notification_callback, ca);
}
static bool coreaudio_init_hooks(struct coreaudio_data *ca)
{
OSStatus stat;
AURenderCallbackStruct callback_info = {
.inputProc = input_callback,
.inputProcRefCon = ca
};
AURenderCallbackStruct callback_info = {.inputProc = input_callback,
.inputProcRefCon = ca};
stat = add_listener(ca, kAudioDevicePropertyDeviceIsAlive);
if (!ca_success(stat, ca, "coreaudio_init_hooks",
"set disconnect callback"))
"set disconnect callback"))
return false;
stat = add_listener(ca, PROPERTY_FORMATS);
if (!ca_success(stat, ca, "coreaudio_init_hooks",
"set format change callback"))
"set format change callback"))
return false;
if (ca->default_device) {
AudioObjectPropertyAddress addr = {
PROPERTY_DEFAULT_DEVICE,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster
};
kAudioObjectPropertyElementMaster};
stat = AudioObjectAddPropertyListener(kAudioObjectSystemObject,
&addr, notification_callback, ca);
&addr,
notification_callback,
ca);
if (!ca_success(stat, ca, "coreaudio_init_hooks",
"set device change callback"))
"set device change callback"))
return false;
}
stat = set_property(ca->unit, kAudioOutputUnitProperty_SetInputCallback,
SCOPE_GLOBAL, 0, &callback_info, sizeof(callback_info));
SCOPE_GLOBAL, 0, &callback_info,
sizeof(callback_info));
if (!ca_success(stat, ca, "coreaudio_init_hooks", "set input callback"))
return false;
@ -464,32 +471,29 @@ static bool coreaudio_init_hooks(struct coreaudio_data *ca)
static void coreaudio_remove_hooks(struct coreaudio_data *ca)
{
AURenderCallbackStruct callback_info = {
.inputProc = NULL,
.inputProcRefCon = NULL
};
AURenderCallbackStruct callback_info = {.inputProc = NULL,
.inputProcRefCon = NULL};
AudioObjectPropertyAddress addr = {
kAudioDevicePropertyDeviceIsAlive,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster
};
AudioObjectPropertyAddress addr = {kAudioDevicePropertyDeviceIsAlive,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster};
AudioObjectRemovePropertyListener(ca->device_id, &addr,
notification_callback, ca);
notification_callback, ca);
addr.mSelector = PROPERTY_FORMATS;
AudioObjectRemovePropertyListener(ca->device_id, &addr,
notification_callback, ca);
notification_callback, ca);
if (ca->default_device) {
addr.mSelector = PROPERTY_DEFAULT_DEVICE;
AudioObjectRemovePropertyListener(kAudioObjectSystemObject,
&addr, notification_callback, ca);
&addr, notification_callback,
ca);
}
set_property(ca->unit, kAudioOutputUnitProperty_SetInputCallback,
SCOPE_GLOBAL, 0, &callback_info, sizeof(callback_info));
SCOPE_GLOBAL, 0, &callback_info, sizeof(callback_info));
}
static bool coreaudio_get_device_name(struct coreaudio_data *ca)
@ -501,21 +505,22 @@ static bool coreaudio_get_device_name(struct coreaudio_data *ca)
const AudioObjectPropertyAddress addr = {
kAudioDevicePropertyDeviceNameCFString,
kAudioObjectPropertyScopeInput,
kAudioObjectPropertyElementMaster
};
kAudioObjectPropertyElementMaster};
OSStatus stat = AudioObjectGetPropertyData(ca->device_id, &addr,
0, NULL, &size, &cf_name);
OSStatus stat = AudioObjectGetPropertyData(ca->device_id, &addr, 0,
NULL, &size, &cf_name);
if (stat != noErr) {
blog(LOG_WARNING, "[coreaudio_get_device_name] failed to "
"get name: %d", (int)stat);
blog(LOG_WARNING,
"[coreaudio_get_device_name] failed to "
"get name: %d",
(int)stat);
return false;
}
name = cfstr_copy_cstr(cf_name, kCFStringEncodingUTF8);
if (!name) {
blog(LOG_WARNING, "[coreaudio_get_device_name] failed to "
"convert name to cstr for some reason");
"convert name to cstr for some reason");
return false;
}
@ -555,9 +560,8 @@ static void coreaudio_stop(struct coreaudio_data *ca)
static bool coreaudio_init_unit(struct coreaudio_data *ca)
{
AudioComponentDescription desc = {
.componentType = kAudioUnitType_Output,
.componentSubType = kAudioUnitSubType_HALOutput
};
.componentType = kAudioUnitType_Output,
.componentSubType = kAudioUnitSubType_HALOutput};
AudioComponent component = AudioComponentFindNext(NULL, &desc);
if (!component) {
@ -596,7 +600,8 @@ static bool coreaudio_init(struct coreaudio_data *ca)
goto fail;
stat = set_property(ca->unit, kAudioOutputUnitProperty_CurrentDevice,
SCOPE_GLOBAL, 0, &ca->device_id, sizeof(ca->device_id));
SCOPE_GLOBAL, 0, &ca->device_id,
sizeof(ca->device_id));
if (!ca_success(stat, ca, "coreaudio_init", "set current device"))
goto fail;
@ -625,9 +630,10 @@ fail:
static void coreaudio_try_init(struct coreaudio_data *ca)
{
if (!coreaudio_init(ca)) {
blog(LOG_INFO, "coreaudio: failed to find device "
"uid: %s, waiting for connection",
ca->device_uid);
blog(LOG_INFO,
"coreaudio: failed to find device "
"uid: %s, waiting for connection",
ca->device_uid);
ca->retry_time = 2000;
@ -723,20 +729,22 @@ static void coreaudio_defaults(obs_data_t *settings)
}
static void *coreaudio_create(obs_data_t *settings, obs_source_t *source,
bool input)
bool input)
{
struct coreaudio_data *ca = bzalloc(sizeof(struct coreaudio_data));
if (os_event_init(&ca->exit_event, OS_EVENT_TYPE_MANUAL) != 0) {
blog(LOG_ERROR, "[coreaudio_create] failed to create "
"semephore: %d", errno);
blog(LOG_ERROR,
"[coreaudio_create] failed to create "
"semephore: %d",
errno);
bfree(ca);
return NULL;
}
ca->device_uid = bstrdup(obs_data_get_string(settings, "device_id"));
ca->source = source;
ca->input = input;
ca->source = source;
ca->input = input;
if (!ca->device_uid)
ca->device_uid = bstrdup("default");
@ -746,38 +754,39 @@ static void *coreaudio_create(obs_data_t *settings, obs_source_t *source,
}
static void *coreaudio_create_input_capture(obs_data_t *settings,
obs_source_t *source)
obs_source_t *source)
{
return coreaudio_create(settings, source, true);
}
static void *coreaudio_create_output_capture(obs_data_t *settings,
obs_source_t *source)
obs_source_t *source)
{
return coreaudio_create(settings, source, false);
}
static obs_properties_t *coreaudio_properties(bool input)
{
obs_properties_t *props = obs_properties_create();
obs_property_t *property;
obs_properties_t *props = obs_properties_create();
obs_property_t *property;
struct device_list devices;
memset(&devices, 0, sizeof(struct device_list));
property = obs_properties_add_list(props, "device_id", TEXT_DEVICE,
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
OBS_COMBO_TYPE_LIST,
OBS_COMBO_FORMAT_STRING);
coreaudio_enum_devices(&devices, input);
if (devices.items.num)
obs_property_list_add_string(property, TEXT_DEVICE_DEFAULT,
"default");
"default");
for (size_t i = 0; i < devices.items.num; i++) {
struct device_item *item = devices.items.array+i;
obs_property_list_add_string(property,
item->name.array, item->value.array);
struct device_item *item = devices.items.array + i;
obs_property_list_add_string(property, item->name.array,
item->value.array);
}
device_list_free(&devices);
@ -799,28 +808,26 @@ static obs_properties_t *coreaudio_output_properties(void *unused)
}
struct obs_source_info coreaudio_input_capture_info = {
.id = "coreaudio_input_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_AUDIO |
OBS_SOURCE_DO_NOT_DUPLICATE,
.get_name = coreaudio_input_getname,
.create = coreaudio_create_input_capture,
.destroy = coreaudio_destroy,
.update = coreaudio_update,
.get_defaults = coreaudio_defaults,
.get_properties = coreaudio_input_properties
.id = "coreaudio_input_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_AUDIO | OBS_SOURCE_DO_NOT_DUPLICATE,
.get_name = coreaudio_input_getname,
.create = coreaudio_create_input_capture,
.destroy = coreaudio_destroy,
.update = coreaudio_update,
.get_defaults = coreaudio_defaults,
.get_properties = coreaudio_input_properties,
};
struct obs_source_info coreaudio_output_capture_info = {
.id = "coreaudio_output_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_AUDIO |
OBS_SOURCE_DO_NOT_DUPLICATE |
OBS_SOURCE_DO_NOT_SELF_MONITOR,
.get_name = coreaudio_output_getname,
.create = coreaudio_create_output_capture,
.destroy = coreaudio_destroy,
.update = coreaudio_update,
.get_defaults = coreaudio_defaults,
.get_properties = coreaudio_output_properties
.id = "coreaudio_output_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_AUDIO | OBS_SOURCE_DO_NOT_DUPLICATE |
OBS_SOURCE_DO_NOT_SELF_MONITOR,
.get_name = coreaudio_output_getname,
.create = coreaudio_create_output_capture,
.destroy = coreaudio_destroy,
.update = coreaudio_update,
.get_defaults = coreaudio_defaults,
.get_properties = coreaudio_output_properties,
};

212
plugins/mac-capture/mac-display-capture.m
View file

@ -120,16 +120,15 @@ static inline void update_window_params(struct display_capture *dc)
if (!requires_window(dc->crop))
return;
NSArray *arr = (NSArray*)CGWindowListCopyWindowInfo(
kCGWindowListOptionIncludingWindow,
dc->window.window_id);
NSArray *arr = (NSArray *)CGWindowListCopyWindowInfo(
kCGWindowListOptionIncludingWindow, dc->window.window_id);
if (arr.count) {
NSDictionary *dict = arr[0];
NSDictionary *ref = dict[(NSString*)kCGWindowBounds];
NSDictionary *ref = dict[(NSString *)kCGWindowBounds];
CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)ref,
&dc->window_rect);
dc->on_screen = dict[(NSString*)kCGWindowIsOnscreen] != nil;
&dc->window_rect);
dc->on_screen = dict[(NSString *)kCGWindowIsOnscreen] != nil;
dc->window_rect =
[dc->screen convertRectToBacking:dc->window_rect];
@ -144,8 +143,10 @@ static inline void update_window_params(struct display_capture *dc)
}
static inline void display_stream_update(struct display_capture *dc,
CGDisplayStreamFrameStatus status, uint64_t display_time,
IOSurfaceRef frame_surface, CGDisplayStreamUpdateRef update_ref)
CGDisplayStreamFrameStatus status,
uint64_t display_time,
IOSurfaceRef frame_surface,
CGDisplayStreamUpdateRef update_ref)
{
UNUSED_PARAMETER(display_time);
UNUSED_PARAMETER(update_ref);
@ -176,8 +177,7 @@ static inline void display_stream_update(struct display_capture *dc,
size_t dropped_frames = CGDisplayStreamUpdateGetDropCount(update_ref);
if (dropped_frames > 0)
blog(LOG_INFO, "%s: Dropped %zu frames",
obs_source_get_name(dc->source),
dropped_frames);
obs_source_get_name(dc->source), dropped_frames);
}
static bool init_display_stream(struct display_capture *dc)
@ -192,38 +192,34 @@ static bool init_display_stream(struct display_capture *dc)
NSNumber *screen_num = dc->screen.deviceDescription[@"NSScreenNumber"];
CGDirectDisplayID disp_id = (CGDirectDisplayID)screen_num.pointerValue;
NSDictionary *rect_dict = CFBridgingRelease(
CGRectCreateDictionaryRepresentation(
CGRectMake(0, 0,
dc->screen.frame.size.width,
dc->screen.frame.size.height)));
NSDictionary *rect_dict =
CFBridgingRelease(CGRectCreateDictionaryRepresentation(
CGRectMake(0, 0, dc->screen.frame.size.width,
dc->screen.frame.size.height)));
CFBooleanRef show_cursor_cf =
dc->hide_cursor ? kCFBooleanFalse : kCFBooleanTrue;
CFBooleanRef show_cursor_cf = dc->hide_cursor ? kCFBooleanFalse
: kCFBooleanTrue;
NSDictionary *dict = @{
(__bridge NSString*)kCGDisplayStreamSourceRect: rect_dict,
(__bridge NSString*)kCGDisplayStreamQueueDepth: @5,
(__bridge NSString*)kCGDisplayStreamShowCursor:
(id)show_cursor_cf,
(__bridge NSString *)kCGDisplayStreamSourceRect: rect_dict,
(__bridge NSString *)kCGDisplayStreamQueueDepth: @5,
(__bridge NSString *)
kCGDisplayStreamShowCursor: (id)show_cursor_cf,
};
os_event_init(&dc->disp_finished, OS_EVENT_TYPE_MANUAL);
const CGSize *size = &dc->frame.size;
dc->disp = CGDisplayStreamCreateWithDispatchQueue(disp_id,
size->width, size->height, 'BGRA',
(__bridge CFDictionaryRef)dict,
dispatch_queue_create(NULL, NULL),
^(CGDisplayStreamFrameStatus status,
uint64_t displayTime,
IOSurfaceRef frameSurface,
CGDisplayStreamUpdateRef updateRef)
{
display_stream_update(dc, status, displayTime,
frameSurface, updateRef);
}
);
dc->disp = CGDisplayStreamCreateWithDispatchQueue(
disp_id, size->width, size->height, 'BGRA',
(__bridge CFDictionaryRef)dict,
dispatch_queue_create(NULL, NULL),
^(CGDisplayStreamFrameStatus status, uint64_t displayTime,
IOSurfaceRef frameSurface,
CGDisplayStreamUpdateRef updateRef) {
display_stream_update(dc, status, displayTime,
frameSurface, updateRef);
});
return !CGDisplayStreamStart(dc->disp);
}
@ -252,8 +248,7 @@ bool init_vertbuf(struct display_capture *dc)
void load_crop(struct display_capture *dc, obs_data_t *settings);
static void *display_capture_create(obs_data_t *settings,
obs_source_t *source)
static void *display_capture_create(obs_data_t *settings, obs_source_t *source)
{
UNUSED_PARAMETER(source);
UNUSED_PARAMETER(settings);
@ -303,25 +298,24 @@ fail:
}
static void build_sprite(struct gs_vb_data *data, float fcx, float fcy,
float start_u, float end_u, float start_v, float end_v)
float start_u, float end_u, float start_v, float end_v)
{
struct vec2 *tvarray = data->tvarray[0].array;
vec3_set(data->points+1, fcx, 0.0f, 0.0f);
vec3_set(data->points+2, 0.0f, fcy, 0.0f);
vec3_set(data->points+3, fcx, fcy, 0.0f);
vec2_set(tvarray, start_u, start_v);
vec2_set(tvarray+1, end_u, start_v);
vec2_set(tvarray+2, start_u, end_v);
vec2_set(tvarray+3, end_u, end_v);
vec3_set(data->points + 1, fcx, 0.0f, 0.0f);
vec3_set(data->points + 2, 0.0f, fcy, 0.0f);
vec3_set(data->points + 3, fcx, fcy, 0.0f);
vec2_set(tvarray, start_u, start_v);
vec2_set(tvarray + 1, end_u, start_v);
vec2_set(tvarray + 2, start_u, end_v);
vec2_set(tvarray + 3, end_u, end_v);
}
static inline void build_sprite_rect(struct gs_vb_data *data,
float origin_x, float origin_y, float end_x, float end_y)
static inline void build_sprite_rect(struct gs_vb_data *data, float origin_x,
float origin_y, float end_x, float end_y)
{
build_sprite(data, fabs(end_x - origin_x), fabs(end_y - origin_y),
origin_x, end_x,
origin_y, end_y);
origin_x, end_x, origin_y, end_y);
}
static void display_capture_video_tick(void *data, float seconds)
@ -348,8 +342,8 @@ static void display_capture_video_tick(void *data, float seconds)
if (requires_window(dc->crop) && !dc->on_screen)
goto cleanup;
CGPoint origin = { 0.f };
CGPoint end = { 0.f };
CGPoint origin = {0.f};
CGPoint end = {0.f};
switch (dc->crop) {
float x, y;
@ -379,10 +373,9 @@ static void display_capture_video_tick(void *data, float seconds)
break;
}
obs_enter_graphics();
build_sprite_rect(gs_vertexbuffer_get_data(dc->vertbuf),
origin.x, origin.y, end.x, end.y);
build_sprite_rect(gs_vertexbuffer_get_data(dc->vertbuf), origin.x,
origin.y, end.x, end.y);
if (dc->tex)
gs_texture_rebind_iosurface(dc->tex, dc->prev);
@ -412,7 +405,7 @@ static void display_capture_video_render(void *data, gs_effect_t *effect)
gs_load_samplerstate(dc->sampler, 0);
gs_technique_t *tech = gs_effect_get_technique(dc->effect, "Draw");
gs_effect_set_texture(gs_effect_get_param_by_name(dc->effect, "image"),
dc->tex);
dc->tex);
gs_technique_begin(tech);
gs_technique_begin_pass(tech, 0);
@ -428,9 +421,9 @@ static const char *display_capture_getname(void *unused)
return obs_module_text("DisplayCapture");
}
#define CROPPED_LENGTH(rect, origin_, length) \
fabs((rect ## .size. ## length - dc->crop_rect.size. ## length) - \
(rect ## .origin. ## origin_ + dc->crop_rect.origin. ## origin_))
#define CROPPED_LENGTH(rect, origin_, length) \
fabs((rect##.size.##length - dc->crop_rect.size.##length) - \
(rect##.origin.##origin_ + dc->crop_rect.origin.##origin_))
static uint32_t display_capture_getwidth(void *data)
{
@ -502,20 +495,20 @@ void load_crop(struct display_capture *dc, obs_data_t *settings)
#define CROP_VAR_NAME(var, mode) (mode "." #var)
#define LOAD_CROP_VAR(var, mode) \
dc->crop_rect.var = obs_data_get_double(settings, \
CROP_VAR_NAME(var, mode));
dc->crop_rect.var = \
obs_data_get_double(settings, CROP_VAR_NAME(var, mode));
switch (dc->crop) {
case CROP_MANUAL:
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(size.height, "manual");
break;
case CROP_TO_WINDOW_AND_MANUAL:
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(size.height, "window");
break;
@ -552,7 +545,7 @@ static void display_capture_update(void *data, obs_data_t *settings)
}
static bool switch_crop_mode(obs_properties_t *props, obs_property_t *p,
obs_data_t *settings)
obs_data_t *settings)
{
UNUSED_PARAMETER(p);
@ -561,20 +554,20 @@ static bool switch_crop_mode(obs_properties_t *props, obs_property_t *p,
const char *name;
bool visible;
#define LOAD_CROP_VAR(var, mode) \
#define LOAD_CROP_VAR(var, mode) \
name = CROP_VAR_NAME(var, mode); \
obs_property_set_visible(obs_properties_get(props, name), visible);
visible = crop == CROP_MANUAL;
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(size.height, "manual");
visible = crop == CROP_TO_WINDOW_AND_MANUAL;
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(size.height, "window");
#undef LOAD_CROP_VAR
@ -582,15 +575,12 @@ static bool switch_crop_mode(obs_properties_t *props, obs_property_t *p,
return true;
}
static const char *crop_names[] = {
"CropMode.None",
"CropMode.Manual",
"CropMode.ToWindow",
"CropMode.ToWindowAndManual"
};
static const char *crop_names[] = {"CropMode.None", "CropMode.Manual",
"CropMode.ToWindow",
"CropMode.ToWindowAndManual"};
#ifndef COUNTOF
#define COUNTOF(x) (sizeof(x)/sizeof(x[0]))
#define COUNTOF(x) (sizeof(x) / sizeof(x[0]))
#endif
static obs_properties_t *display_capture_properties(void *unused)
{
@ -598,9 +588,9 @@ static obs_properties_t *display_capture_properties(void *unused)
obs_properties_t *props = obs_properties_create();
obs_property_t *list = obs_properties_add_list(props,
"display", obs_module_text("DisplayCapture.Display"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_t *list = obs_properties_add_list(
props, "display", obs_module_text("DisplayCapture.Display"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
for (unsigned i = 0; i < [NSScreen screens].count; i++) {
char buf[10];
@ -609,11 +599,11 @@ static obs_properties_t *display_capture_properties(void *unused)
}
obs_properties_add_bool(props, "show_cursor",
obs_module_text("DisplayCapture.ShowCursor"));
obs_module_text("DisplayCapture.ShowCursor"));
obs_property_t *crop = obs_properties_add_list(props, "crop_mode",
obs_module_text("CropMode"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_t *crop = obs_properties_add_list(
props, "crop_mode", obs_module_text("CropMode"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_set_modified_callback(crop, switch_crop_mode);
for (unsigned i = 0; i < COUNTOF(crop_names); i++) {
@ -627,22 +617,22 @@ static obs_properties_t *display_capture_properties(void *unused)
obs_property_t *p;
const char *name;
float min;
#define LOAD_CROP_VAR(var, mode) \
name = CROP_VAR_NAME(var, mode); \
p = obs_properties_add_float(props, name, \
obs_module_text("Crop."#var), min, 4096.f, .5f); \
#define LOAD_CROP_VAR(var, mode) \
name = CROP_VAR_NAME(var, mode); \
p = obs_properties_add_float( \
props, name, obs_module_text("Crop." #var), min, 4096.f, .5f); \
obs_property_set_visible(p, false);
min = 0.f;
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(origin.x, "manual");
LOAD_CROP_VAR(origin.y, "manual");
LOAD_CROP_VAR(size.width, "manual");
LOAD_CROP_VAR(size.height, "manual");
min = -4096.f;
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(origin.x, "window");
LOAD_CROP_VAR(origin.y, "window");
LOAD_CROP_VAR(size.width, "window");
LOAD_CROP_VAR(size.height, "window");
#undef LOAD_CROP_VAR
@ -650,22 +640,22 @@ static obs_properties_t *display_capture_properties(void *unused)
}
struct obs_source_info display_capture_info = {
.id = "display_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.get_name = display_capture_getname,
.id = "display_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.get_name = display_capture_getname,
.create = display_capture_create,
.destroy = display_capture_destroy,
.create = display_capture_create,
.destroy = display_capture_destroy,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
OBS_SOURCE_DO_NOT_DUPLICATE,
.video_tick = display_capture_video_tick,
.video_render = display_capture_video_render,
.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
OBS_SOURCE_DO_NOT_DUPLICATE,
.video_tick = display_capture_video_tick,
.video_render = display_capture_video_render,
.get_width = display_capture_getwidth,
.get_height = display_capture_getheight,
.get_width = display_capture_getwidth,
.get_height = display_capture_getheight,
.get_defaults = display_capture_defaults,
.get_defaults = display_capture_defaults,
.get_properties = display_capture_properties,
.update = display_capture_update,
.update = display_capture_update,
};

89
plugins/mac-capture/mac-window-capture.m
View file

@ -21,61 +21,59 @@ struct window_capture {
DARRAY(uint8_t) buffer;
pthread_t capture_thread;
pthread_t capture_thread;
os_event_t *capture_event;
os_event_t *stop_event;
};
static CGImageRef get_image(struct window_capture *wc)
{
NSArray *arr = (NSArray*)CGWindowListCreate(
kCGWindowListOptionIncludingWindow,
wc->window.window_id);
NSArray *arr = (NSArray *)CGWindowListCreate(
kCGWindowListOptionIncludingWindow, wc->window.window_id);
[arr autorelease];
if (arr.count)
return CGWindowListCreateImage(CGRectNull,
kCGWindowListOptionIncludingWindow,
wc->window.window_id, wc->image_option);
return CGWindowListCreateImage(
CGRectNull, kCGWindowListOptionIncludingWindow,
wc->window.window_id, wc->image_option);
if (!find_window(&wc->window, NULL, false))
return NULL;
return CGWindowListCreateImage(CGRectNull,
kCGWindowListOptionIncludingWindow,
wc->window.window_id, wc->image_option);
kCGWindowListOptionIncludingWindow,
wc->window.window_id, wc->image_option);
}
static inline void capture_frame(struct window_capture *wc)
{
uint64_t ts = os_gettime_ns();
uint64_t ts = os_gettime_ns();
CGImageRef img = get_image(wc);
if (!img)
return;
size_t width = CGImageGetWidth(img);
size_t width = CGImageGetWidth(img);
size_t height = CGImageGetHeight(img);
CGRect rect = {{0, 0}, {width, height}};
da_reserve(wc->buffer, width * height * 4);
uint8_t *data = wc->buffer.array;
CGContextRef cg_context = CGBitmapContextCreate(data, width, height,
8, width * 4, wc->color_space,
kCGBitmapByteOrder32Host |
kCGImageAlphaPremultipliedFirst);
CGContextRef cg_context = CGBitmapContextCreate(
data, width, height, 8, width * 4, wc->color_space,
kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst);
CGContextSetBlendMode(cg_context, kCGBlendModeCopy);
CGContextDrawImage(cg_context, rect, img);
CGContextRelease(cg_context);
CGImageRelease(img);
struct obs_source_frame frame = {
.format = VIDEO_FORMAT_BGRA,
.width = width,
.height = height,
.data[0] = data,
.format = VIDEO_FORMAT_BGRA,
.width = width,
.height = height,
.data[0] = data,
.linesize[0] = width * 4,
.timestamp = ts,
.timestamp = ts,
};
obs_source_output_video(wc->source, &frame);
@ -99,7 +97,7 @@ static void *capture_thread(void *data)
}
static inline void *window_capture_create_internal(obs_data_t *settings,
obs_source_t *source)
obs_source_t *source)
{
struct window_capture *wc = bzalloc(sizeof(struct window_capture));
@ -111,8 +109,9 @@ static inline void *window_capture_create_internal(obs_data_t *settings,
init_window(&wc->window, settings);
wc->image_option = obs_data_get_bool(settings, "show_shadow") ?
kCGWindowImageDefault : kCGWindowImageBoundsIgnoreFraming;
wc->image_option = obs_data_get_bool(settings, "show_shadow")
? kCGWindowImageDefault
: kCGWindowImageBoundsIgnoreFraming;
os_event_init(&wc->capture_event, OS_EVENT_TYPE_AUTO);
os_event_init(&wc->stop_event, OS_EVENT_TYPE_MANUAL);
@ -135,7 +134,7 @@ static void window_capture_destroy(void *data)
os_event_signal(cap->stop_event);
os_event_signal(cap->capture_event);
pthread_join(cap->capture_thread, NULL);
CGColorSpaceRelease(cap->color_space);
@ -165,26 +164,28 @@ static obs_properties_t *window_capture_properties(void *unused)
add_window_properties(props);
obs_properties_add_bool(props, "show_shadow",
obs_module_text("WindowCapture.ShowShadow"));
obs_module_text("WindowCapture.ShowShadow"));
return props;
}
static inline void window_capture_update_internal(struct window_capture *wc,
obs_data_t *settings)
obs_data_t *settings)
{
wc->image_option = obs_data_get_bool(settings, "show_shadow") ?
kCGWindowImageDefault : kCGWindowImageBoundsIgnoreFraming;
wc->image_option = obs_data_get_bool(settings, "show_shadow")
? kCGWindowImageDefault
: kCGWindowImageBoundsIgnoreFraming;
update_window(&wc->window, settings);
if (wc->window.window_name.length) {
blog(LOG_INFO, "[window-capture: '%s'] update settings:\n"
"\twindow: %s\n"
"\towner: %s",
obs_source_get_name(wc->source),
[wc->window.window_name UTF8String],
[wc->window.owner_name UTF8String]);
blog(LOG_INFO,
"[window-capture: '%s'] update settings:\n"
"\twindow: %s\n"
"\towner: %s",
obs_source_get_name(wc->source),
[wc->window.window_name UTF8String],
[wc->window.owner_name UTF8String]);
}
}
@ -202,7 +203,7 @@ static const char *window_capture_getname(void *unused)
}
static inline void window_capture_tick_internal(struct window_capture *wc,
float seconds)
float seconds)
{
UNUSED_PARAMETER(seconds);
os_event_signal(wc->capture_event);
@ -221,17 +222,17 @@ static void window_capture_tick(void *data, float seconds)
}
struct obs_source_info window_capture_info = {
.id = "window_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.get_name = window_capture_getname,
.id = "window_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.get_name = window_capture_getname,
.create = window_capture_create,
.destroy = window_capture_destroy,
.create = window_capture_create,
.destroy = window_capture_destroy,
.output_flags = OBS_SOURCE_ASYNC_VIDEO,
.video_tick = window_capture_tick,
.output_flags = OBS_SOURCE_ASYNC_VIDEO,
.video_tick = window_capture_tick,
.get_defaults = window_capture_defaults,
.get_defaults = window_capture_defaults,
.get_properties = window_capture_properties,
.update = window_capture_update,
.update = window_capture_update,
};

6
plugins/mac-capture/window-utils.h
View file

@ -5,11 +5,11 @@
#include <obs-module.h>
struct cocoa_window {
CGWindowID window_id;
CGWindowID window_id;
pthread_mutex_t name_lock;
NSString *owner_name;
NSString *window_name;
NSString *owner_name;
NSString *window_name;
uint64_t next_search_time;
};

94
plugins/mac-capture/window-utils.m
View file

@ -2,13 +2,12 @@
#include <util/platform.h>
#define WINDOW_NAME ((NSString*)kCGWindowName)
#define WINDOW_NUMBER ((NSString*)kCGWindowNumber)
#define OWNER_NAME ((NSString*)kCGWindowOwnerName)
#define OWNER_PID ((NSNumber*)kCGWindowOwnerPID)
#define WINDOW_NAME ((NSString *)kCGWindowName)
#define WINDOW_NUMBER ((NSString *)kCGWindowNumber)
#define OWNER_NAME ((NSString *)kCGWindowOwnerName)
#define OWNER_PID ((NSNumber *)kCGWindowOwnerPID)
static NSComparator win_info_cmp = ^(NSDictionary *o1, NSDictionary *o2)
{
static NSComparator win_info_cmp = ^(NSDictionary *o1, NSDictionary *o2) {
NSComparisonResult res = [o1[OWNER_NAME] compare:o2[OWNER_NAME]];
if (res != NSOrderedSame)
return res;
@ -26,9 +25,8 @@ static NSComparator win_info_cmp = ^(NSDictionary *o1, NSDictionary *o2)
NSArray *enumerate_windows(void)
{
NSArray *arr = (NSArray*)CGWindowListCopyWindowInfo(
kCGWindowListOptionOnScreenOnly,
kCGNullWindowID);
NSArray *arr = (NSArray *)CGWindowListCopyWindowInfo(
kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
[arr autorelease];
@ -60,8 +58,8 @@ bool find_window(cocoa_window_t cw, obs_data_t *settings, bool force)
pthread_mutex_unlock(&cw->name_lock);
NSNumber *window_id = (NSNumber*)dict[WINDOW_NUMBER];
cw->window_id = window_id.intValue;
NSNumber *window_id = (NSNumber *)dict[WINDOW_NUMBER];
cw->window_id = window_id.intValue;
obs_data_set_int(settings, "window", cw->window_id);
return true;
@ -76,9 +74,9 @@ void init_window(cocoa_window_t cw, obs_data_t *settings)
{
pthread_mutex_init(&cw->name_lock, NULL);
cw->owner_name = @(obs_data_get_string(settings, "owner_name"));
cw->owner_name = @(obs_data_get_string(settings, "owner_name"));
cw->window_name = @(obs_data_get_string(settings, "window_name"));
[cw->owner_name retain];
[cw->owner_name retain];
[cw->window_name retain];
find_window(cw, settings, true);
}
@ -86,22 +84,22 @@ void init_window(cocoa_window_t cw, obs_data_t *settings)
void destroy_window(cocoa_window_t cw)
{
pthread_mutex_destroy(&cw->name_lock);
[cw->owner_name release];
[cw->owner_name release];
[cw->window_name release];
}
void update_window(cocoa_window_t cw, obs_data_t *settings)
{
pthread_mutex_lock(&cw->name_lock);
[cw->owner_name release];
[cw->owner_name release];
[cw->window_name release];
cw->owner_name = @(obs_data_get_string(settings, "owner_name"));
cw->window_name = @(obs_data_get_string(settings, "window_name"));
[cw->owner_name retain];
cw->owner_name = @(obs_data_get_string(settings, "owner_name"));
cw->window_name = @(obs_data_get_string(settings, "window_name"));
[cw->owner_name retain];
[cw->window_name retain];
pthread_mutex_unlock(&cw->name_lock);
cw->window_id = obs_data_get_int(settings, "window");
cw->window_id = obs_data_get_int(settings, "window");
}
static inline const char *make_name(NSString *owner, NSString *name)
@ -116,7 +114,7 @@ static inline const char *make_name(NSString *owner, NSString *name)
static inline NSDictionary *find_window_dict(NSArray *arr, int window_id)
{
for (NSDictionary *dict in arr) {
NSNumber *wid = (NSNumber*)dict[WINDOW_NUMBER];
NSNumber *wid = (NSNumber *)dict[WINDOW_NUMBER];
if (wid.intValue == window_id)
return dict;
}
@ -125,12 +123,11 @@ static inline NSDictionary *find_window_dict(NSArray *arr, int window_id)
}
static inline bool window_changed_internal(obs_property_t *p,
obs_data_t *settings)
obs_data_t *settings)
{
int window_id = obs_data_get_int(settings, "window");
int window_id = obs_data_get_int(settings, "window");
NSString *window_owner = @(obs_data_get_string(settings, "owner_name"));
NSString *window_name =
@(obs_data_get_string(settings, "window_name"));
NSString *window_name = @(obs_data_get_string(settings, "window_name"));
NSDictionary *win_info = @{
OWNER_NAME: window_owner,
@ -147,39 +144,38 @@ static inline bool window_changed_internal(obs_property_t *p,
obs_property_list_clear(p);
for (NSDictionary *dict in arr) {
NSString *owner = (NSString*)dict[OWNER_NAME];
NSString *name = (NSString*)dict[WINDOW_NAME];
NSNumber *wid = (NSNumber*)dict[WINDOW_NUMBER];
NSString *owner = (NSString *)dict[OWNER_NAME];
NSString *name = (NSString *)dict[WINDOW_NAME];
NSNumber *wid = (NSNumber *)dict[WINDOW_NUMBER];
if (!window_added &&
win_info_cmp(win_info, dict) == NSOrderedAscending) {
win_info_cmp(win_info, dict) == NSOrderedAscending) {
window_added = true;
size_t idx = obs_property_list_add_int(p,
make_name(window_owner, window_name),
window_id);
size_t idx = obs_property_list_add_int(
p, make_name(window_owner, window_name),
window_id);
obs_property_list_item_disable(p, idx, true);
}
if (!show_empty_names && !name.length &&
window_id != wid.intValue)
window_id != wid.intValue)
continue;
obs_property_list_add_int(p, make_name(owner, name),
wid.intValue);
wid.intValue);
}
if (!window_added) {
size_t idx = obs_property_list_add_int(p,
make_name(window_owner, window_name),
window_id);
size_t idx = obs_property_list_add_int(
p, make_name(window_owner, window_name), window_id);
obs_property_list_item_disable(p, idx, true);
}
if (!window_found)
return true;
NSString *owner = (NSString*)cur[OWNER_NAME];
NSString *window = (NSString*)cur[WINDOW_NAME];
NSString *owner = (NSString *)cur[OWNER_NAME];
NSString *window = (NSString *)cur[WINDOW_NAME];
obs_data_set_string(settings, "owner_name", owner.UTF8String);
obs_data_set_string(settings, "window_name", window.UTF8String);
@ -188,7 +184,7 @@ static inline bool window_changed_internal(obs_property_t *p,
}
static bool window_changed(obs_properties_t *props, obs_property_t *p,
obs_data_t *settings)
obs_data_t *settings)
{
UNUSED_PARAMETER(props);
@ -198,12 +194,12 @@ static bool window_changed(obs_properties_t *props, obs_property_t *p,
}
static bool toggle_empty_names(obs_properties_t *props, obs_property_t *p,
obs_data_t *settings)
obs_data_t *settings)
{
UNUSED_PARAMETER(p);
return window_changed(props, obs_properties_get(props, "window"),
settings);
settings);
}
void window_defaults(obs_data_t *settings)
@ -214,20 +210,20 @@ void window_defaults(obs_data_t *settings)
void add_window_properties(obs_properties_t *props)
{
obs_property_t *window_list = obs_properties_add_list(props,
"window", obs_module_text("WindowUtils.Window"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_t *window_list = obs_properties_add_list(
props, "window", obs_module_text("WindowUtils.Window"),
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
obs_property_set_modified_callback(window_list, window_changed);
obs_property_t *empty = obs_properties_add_bool(props,
"show_empty_names",
obs_module_text("WindowUtils.ShowEmptyNames"));
obs_property_t *empty = obs_properties_add_bool(
props, "show_empty_names",
obs_module_text("WindowUtils.ShowEmptyNames"));
obs_property_set_modified_callback(empty, toggle_empty_names);
}
void show_window_properties(obs_properties_t *props, bool show)
{
obs_property_set_visible(obs_properties_get(props, "window"), show);
obs_property_set_visible(
obs_properties_get(props, "show_empty_names"), show);
obs_property_set_visible(obs_properties_get(props, "show_empty_names"),
show);
}