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

4
plugins/linux-jack/data/locale/de-DE.ini
View file

@ -1,4 +1,4 @@
StartJACKServer="JACK-Server starten"
StartJACKServer="JACK‐Server starten"
Channels="Anzahl der Kanäle"
JACKInput="JACK-Eingabe-Client"
JACKInput="JACK‐Eingabe‐Client"

34
plugins/linux-jack/jack-input.c
View file

@ -33,7 +33,7 @@ static const char *jack_input_getname(void *unused)
*/
static void jack_destroy(void *vptr)
{
struct jack_data* data = (struct jack_data*)vptr;
struct jack_data *data = (struct jack_data *)vptr;
if (!data)
return;
@ -51,14 +51,14 @@ static void jack_destroy(void *vptr)
*/
static void jack_update(void *vptr, obs_data_t *settings)
{
struct jack_data* data = (struct jack_data*)vptr;
struct jack_data *data = (struct jack_data *)vptr;
if (!data)
return;
const char *new_device;
bool settings_changed = false;
bool settings_changed = false;
bool new_jack_start_server = obs_data_get_bool(settings, "startjack");
int new_channel_count = obs_data_get_int(settings, "channels");
int new_channel_count = obs_data_get_int(settings, "channels");
if (new_jack_start_server != data->start_jack_server) {
data->start_jack_server = new_jack_start_server;
@ -99,7 +99,7 @@ static void *jack_create(obs_data_t *settings, obs_source_t *source)
struct jack_data *data = bzalloc(sizeof(struct jack_data));
pthread_mutex_init(&data->jack_mutex, NULL);
data->source = source;
data->source = source;
data->channels = -1;
jack_update(data, settings);
@ -129,22 +129,22 @@ static obs_properties_t *jack_input_properties(void *unused)
obs_properties_t *props = obs_properties_create();
obs_properties_add_int(props, "channels",
obs_module_text("Channels"), 1, 8, 1);
obs_properties_add_int(props, "channels", obs_module_text("Channels"),
1, 8, 1);
obs_properties_add_bool(props, "startjack",
obs_module_text("StartJACKServer"));
obs_module_text("StartJACKServer"));
return props;
}
struct obs_source_info jack_output_capture = {
.id = "jack_output_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_AUDIO,
.get_name = jack_input_getname,
.create = jack_create,
.destroy = jack_destroy,
.update = jack_update,
.get_defaults = jack_input_defaults,
.get_properties = jack_input_properties
.id = "jack_output_capture",
.type = OBS_SOURCE_TYPE_INPUT,
.output_flags = OBS_SOURCE_AUDIO,
.get_name = jack_input_getname,
.create = jack_create,
.destroy = jack_destroy,
.update = jack_update,
.get_defaults = jack_input_defaults,
.get_properties = jack_input_properties,
};

77
plugins/linux-jack/jack-wrapper.c
View file

@ -36,33 +36,39 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
static enum speaker_layout jack_channels_to_obs_speakers(uint_fast32_t channels)
{
switch(channels) {
case 1: return SPEAKERS_MONO;
case 2: return SPEAKERS_STEREO;
case 3: return SPEAKERS_2POINT1;
case 5: return SPEAKERS_4POINT1;
case 6: return SPEAKERS_5POINT1;
switch (channels) {
case 1:
return SPEAKERS_MONO;
case 2:
return SPEAKERS_STEREO;
case 3:
return SPEAKERS_2POINT1;
case 5:
return SPEAKERS_4POINT1;
case 6:
return SPEAKERS_5POINT1;
/* What should we do with 7 channels? */
/* case 7: return SPEAKERS_...; */
case 8: return SPEAKERS_7POINT1;
case 8:
return SPEAKERS_7POINT1;
}
return SPEAKERS_UNKNOWN;
}
int jack_process_callback(jack_nframes_t nframes, void* arg)
int jack_process_callback(jack_nframes_t nframes, void *arg)
{
struct jack_data* data = (struct jack_data*)arg;
struct jack_data *data = (struct jack_data *)arg;
if (data == 0)
return 0;
pthread_mutex_lock(&data->jack_mutex);
struct obs_source_audio out;
out.speakers = jack_channels_to_obs_speakers(data->channels);
out.samples_per_sec = jack_get_sample_rate (data->jack_client);
out.speakers = jack_channels_to_obs_speakers(data->channels);
out.samples_per_sec = jack_get_sample_rate(data->jack_client);
/* format is always 32 bit float for jack */
out.format = AUDIO_FORMAT_FLOAT_PLANAR;
out.format = AUDIO_FORMAT_FLOAT_PLANAR;
for (unsigned int i = 0; i < data->channels; ++i) {
jack_default_audio_sample_t *jack_buffer =
@ -71,61 +77,61 @@ int jack_process_callback(jack_nframes_t nframes, void* arg)
out.data[i] = (uint8_t *)jack_buffer;
}
out.frames = nframes;
out.frames = nframes;
out.timestamp = os_gettime_ns() -
jack_frames_to_time(data->jack_client, nframes);
jack_frames_to_time(data->jack_client, nframes);
obs_source_output_audio(data->source, &out);
pthread_mutex_unlock(&data->jack_mutex);
return 0;
}
int_fast32_t jack_init(struct jack_data* data)
int_fast32_t jack_init(struct jack_data *data)
{
pthread_mutex_lock(&data->jack_mutex);
if (data->jack_client != NULL)
goto good;
jack_options_t jack_option = data->start_jack_server ?
JackNullOption : JackNoStartServer;
jack_options_t jack_option =
data->start_jack_server ? JackNullOption : JackNoStartServer;
data->jack_client = jack_client_open(data->device, jack_option, 0);
if (data->jack_client == NULL) {
blog(LOG_ERROR,
"jack_client_open Error:"
"Could not create JACK client! %s",
data->device);
"jack_client_open Error:"
"Could not create JACK client! %s",
data->device);
goto error;
}
data->jack_ports = (jack_port_t**)bzalloc(
sizeof(jack_port_t*) * data->channels);
data->jack_ports =
(jack_port_t **)bzalloc(sizeof(jack_port_t *) * data->channels);
for (unsigned int i = 0; i < data->channels; ++i) {
char port_name[10] = {'\0'};
snprintf(port_name, sizeof(port_name), "in_%u", i+1);
snprintf(port_name, sizeof(port_name), "in_%u", i + 1);
data->jack_ports[i] = jack_port_register(data->jack_client,
port_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
data->jack_ports[i] = jack_port_register(
data->jack_client, port_name, JACK_DEFAULT_AUDIO_TYPE,
JackPortIsInput, 0);
if (data->jack_ports[i] == NULL) {
blog(LOG_ERROR,
"jack_port_register Error:"
"Could not create JACK port! %s",
port_name);
"jack_port_register Error:"
"Could not create JACK port! %s",
port_name);
goto error;
}
}
if (jack_set_process_callback(data->jack_client,
jack_process_callback, data) != 0) {
if (jack_set_process_callback(data->jack_client, jack_process_callback,
data) != 0) {
blog(LOG_ERROR, "jack_set_process_callback Error");
goto error;
}
if (jack_activate(data->jack_client) != 0) {
blog(LOG_ERROR,
"jack_activate Error:"
"Could not activate JACK client!");
blog(LOG_ERROR, "jack_activate Error:"
"Could not activate JACK client!");
goto error;
}
@ -138,7 +144,7 @@ error:
return 1;
}
void deactivate_jack(struct jack_data* data)
void deactivate_jack(struct jack_data *data)
{
pthread_mutex_lock(&data->jack_mutex);
@ -146,7 +152,8 @@ void deactivate_jack(struct jack_data* data)
if (data->jack_ports != NULL) {
for (int i = 0; i < data->channels; ++i) {
if (data->jack_ports[i] != NULL)
jack_port_unregister(data->jack_client,
jack_port_unregister(
data->jack_client,
data->jack_ports[i]);
}
bfree(data->jack_ports);

4
plugins/linux-jack/jack-wrapper.h
View file

@ -43,9 +43,9 @@ struct jack_data {
/**
* Initialize the jack client and register the ports
*/
int_fast32_t jack_init(struct jack_data* data);
int_fast32_t jack_init(struct jack_data *data);
/**
* Destroys the jack client and unregisters the ports
*/
void deactivate_jack(struct jack_data* data);
void deactivate_jack(struct jack_data *data);