Imported Upstream version 0.13.2+dsfg1

plugins/linux-jack/CMakeLists.txt

@@ -0,0 +1,35 @@
+project(linux-jack)
+
+if(DISABLE_JACK)
+	message(STATUS "JACK support disabled")
+	return()
+endif()
+
+find_package(Jack)
+if(NOT JACK_FOUND AND ENABLE_JACK)
+	message(FATAL_ERROR "JACK Audio Connection Kit not found but set as enabled")
+elseif(NOT JACK_FOUND)
+	message(STATUS "JACK Audio Connection Kit not found, disabling JACK plugin")
+	return()
+endif()
+
+include_directories(
+	SYSTEM "${CMAKE_SOURCE_DIR}/libobs"
+	${JACK_INCLUDE_DIR}
+)
+
+set(linux-jack_SOURCES
+	linux-jack.c
+	jack-wrapper.c
+	jack-input.c
+)
+
+add_library(linux-jack MODULE
+	${linux-jack_SOURCES}
+)
+target_link_libraries(linux-jack
+	libobs
+	${JACK_LIBRARIES}
+)
+
+install_obs_plugin_with_data(linux-jack data)

plugins/linux-jack/data/locale/bg-BG.ini

@@ -0,0 +1,2 @@
+Channels="Брой канали"
+

plugins/linux-jack/data/locale/ca-ES.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Inicia el servidor JACK"
+Channels="Nombre de canals"
+JACKInput="Client d'entrada JACK"
+

plugins/linux-jack/data/locale/cs-CZ.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Spustit JACK Server"
+Channels="Počet kanálů"
+JACKInput="Klient JACK vstupu"
+

plugins/linux-jack/data/locale/da-DK.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Start JACK server"
+Channels="Antal af kanaler"
+JACKInput="JACK input klient"
+

plugins/linux-jack/data/locale/de-DE.ini

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

plugins/linux-jack/data/locale/el-GR.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Εκκίνηση του διακομιστή JACK"
+Channels="Αριθμός καναλιών"
+JACKInput="Πελάτης εισόδου JACK"
+

plugins/linux-jack/data/locale/en-US.ini

@@ -0,0 +1,3 @@
+StartJACKServer="Start JACK Server"
+Channels="Number of Channels"
+JACKInput="JACK Input Client"

plugins/linux-jack/data/locale/es-ES.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Iniciar servidor JACK"
+Channels="Número de canales"
+JACKInput="JACK de entrada de cliente"
+

plugins/linux-jack/data/locale/eu-ES.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Hasi JACK Zerbitzaria"
+Channels="Bide Zenbatekoa"
+JACKInput="JACK Sarrera Bezeroa"
+

plugins/linux-jack/data/locale/fi-FI.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Käynnistä JACK palvelin"
+Channels="Kanavien määrä"
+JACKInput="JACK sisääntuloasiakas"
+

plugins/linux-jack/data/locale/fr-FR.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Démarrer le serveur JACK"
+Channels="Nombre de canaux"
+JACKInput="Client d'entrée JACK"
+

plugins/linux-jack/data/locale/gl-ES.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Iniciar o servidor JACK"
+Channels="Número de canles"
+JACKInput="Cliente de entrada JACK"
+

plugins/linux-jack/data/locale/hr-HR.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Pokreni JACK server"
+Channels="Broj kanala"
+JACKInput="JACK klijent ulaza"
+

plugins/linux-jack/data/locale/hu-HU.ini

@@ -0,0 +1,4 @@
+StartJACKServer="JACK Kiszolgáló indítása"
+Channels="Csatornák száma"
+JACKInput="JACK Csatlakozó Ügyfél"
+

plugins/linux-jack/data/locale/it-IT.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Avvia il Server JACK"
+Channels="Numero dei canali"
+JACKInput="Ingresso JACK Client"
+

plugins/linux-jack/data/locale/ja-JP.ini

@@ -0,0 +1,4 @@
+StartJACKServer="JACKサーバーを開始"
+Channels="チャンネル数"
+JACKInput="JACK入力クライアント"
+

plugins/linux-jack/data/locale/ko-KR.ini

@@ -0,0 +1,4 @@
+StartJACKServer="JACK 서버 시작"
+Channels="채널 수"
+JACKInput="JACK 입력 클라이언트"
+

plugins/linux-jack/data/locale/nb-NO.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Start JACK server"
+Channels="Antall kanaler"
+JACKInput="JACK innputtklient"
+

plugins/linux-jack/data/locale/nl-NL.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Start JACK Server"
+Channels="Aantal Kanalen"
+JACKInput="JACK Input Client"
+

plugins/linux-jack/data/locale/pl-PL.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Start serwera JACK"
+Channels="Liczba kanałów"
+JACKInput="Klient wejść JACK"
+

plugins/linux-jack/data/locale/pt-BR.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Inciar servidor JACK"
+Channels="Número de canais"
+JACKInput="Cliente de entrada do JACK"
+

plugins/linux-jack/data/locale/pt-PT.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Inciar servidor JACK"
+Channels="Número de canais"
+JACKInput="Entrada de cliente do JACK"
+

plugins/linux-jack/data/locale/ro-RO.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Porneste Serverul JACK"
+Channels="Numar de canale"
+JACKInput="Clientul de input JACK"
+

plugins/linux-jack/data/locale/ru-RU.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Запустить сервер JACK"
+Channels="Количество каналов"
+JACKInput="Клиент ввода JACK"
+

plugins/linux-jack/data/locale/sk-SK.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Spustiť JACK server"
+Channels="Počet kanálov"
+JACKInput="JACK vstupný klient"
+

plugins/linux-jack/data/locale/sl-SI.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Vklopi JACK Server"
+Channels="Število kanalov"
+JACKInput="JACK vhodni odjemalec"
+

plugins/linux-jack/data/locale/sr-CS.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Pokreni JACK server"
+Channels="Broj kanala"
+JACKInput="JACK klijent ulaza"
+

plugins/linux-jack/data/locale/sr-SP.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Покрени JACK сервер"
+Channels="Број канала"
+JACKInput="JACK клијент улаза"
+

plugins/linux-jack/data/locale/sv-SE.ini

@@ -0,0 +1,4 @@
+StartJACKServer="Starta JACK Server"
+Channels="Antal kanaler"
+JACKInput="JACK Input klient"
+

plugins/linux-jack/data/locale/tr-TR.ini

@@ -0,0 +1,4 @@
+StartJACKServer="JACK Sunucusunu Başlat"
+Channels="Kanal Sayısı"
+JACKInput="JACK Giriş İstemcisi"
+

plugins/linux-jack/data/locale/zh-CN.ini

@@ -0,0 +1,4 @@
+StartJACKServer="启动 JACK 服务器"
+Channels="通道数"
+JACKInput="JACK 输入客户端"
+

plugins/linux-jack/data/locale/zh-TW.ini

@@ -0,0 +1,4 @@
+StartJACKServer="啟動 JACK音訊伺服器"
+Channels="聲道數"
+JACKInput="JACK 輸入端"
+

plugins/linux-jack/jack-input.c

@@ -0,0 +1,150 @@
+/*
+Copyright (C) 2015 by Bernd Buschinski <b.buschinski@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "jack-wrapper.h"
+
+#include <obs-module.h>
+
+/**
+ * Returns the name of the plugin
+ */
+static const char *jack_input_getname(void *unused)
+{
+	UNUSED_PARAMETER(unused);
+	return obs_module_text("JACKInput");
+}
+
+/**
+ * Destroy the plugin object and free all memory
+ */
+static void jack_destroy(void *vptr)
+{
+	struct jack_data* data = (struct jack_data*)vptr;
+
+	if (!data)
+		return;
+
+	deactivate_jack(data);
+
+	if (data->device)
+		bfree(data->device);
+	pthread_mutex_destroy(&data->jack_mutex);
+	bfree(data);
+}
+
+/**
+ * Update the input settings
+ */
+static void jack_update(void *vptr, obs_data_t *settings)
+{
+	struct jack_data* data = (struct jack_data*)vptr;
+	if (!data)
+		return;
+
+	const char *new_device;
+	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");
+
+	if (new_jack_start_server != data->start_jack_server) {
+		data->start_jack_server = new_jack_start_server;
+		settings_changed = true;
+	}
+
+	if (new_channel_count != data->channels)
+		/*
+		 * keep "old" channel count  for now,
+		 * we need to destroy the correct number of channels
+		 */
+		settings_changed = true;
+
+	new_device = obs_source_get_name(data->source);
+	if (!data->device || strcmp(data->device, new_device) != 0) {
+		if (data->device)
+			bfree(data->device);
+		data->device = bstrdup(new_device);
+		settings_changed = true;
+	}
+
+	if (settings_changed) {
+		deactivate_jack(data);
+
+		data->channels = new_channel_count;
+
+		if (jack_init(data) != 0) {
+			deactivate_jack(data);
+		}
+	}
+}
+
+/**
+ * Create the plugin object
+ */
+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->channels = -1;
+
+	jack_update(data, settings);
+
+	if (data->jack_client == NULL) {
+		jack_destroy(data);
+		return NULL;
+	}
+	return data;
+}
+
+/**
+ * Get plugin defaults
+ */
+static void jack_input_defaults(obs_data_t *settings)
+{
+	obs_data_set_default_int(settings, "channels", 2);
+	obs_data_set_default_bool(settings, "startjack", false);
+}
+
+/**
+ * Get plugin properties
+ */
+static obs_properties_t *jack_input_properties(void *unused)
+{
+	(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_bool(props, "startjack",
+		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
+};

plugins/linux-jack/jack-wrapper.c

@@ -0,0 +1,160 @@
+/*
+Copyright (C) 2015 by Bernd Buschinski <b.buschinski@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "jack-wrapper.h"
+
+#include <pthread.h>
+#include <stdio.h>
+
+#include <util/platform.h>
+
+#define blog(level, msg, ...) blog(level, "jack-input: " msg, ##__VA_ARGS__)
+
+/**
+ * Get obs speaker layout from number of channels
+ *
+ * @param channels number of channels reported by jack
+ *
+ * @return obs speaker_layout id
+ *
+ * @note This *might* not work for some rather unusual setups, but should work
+ *       fine for the majority of cases.
+ */
+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 4: return SPEAKERS_SURROUND;
+	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;
+	}
+
+	return SPEAKERS_UNKNOWN;
+}
+
+int jack_process_callback(jack_nframes_t nframes, void* 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);
+	/* format is always 32 bit float for jack */
+	out.format          = AUDIO_FORMAT_FLOAT_PLANAR;
+
+	for (unsigned int i = 0; i < data->channels; ++i) {
+		jack_default_audio_sample_t *jack_buffer =
+			(jack_default_audio_sample_t *)jack_port_get_buffer(
+				data->jack_ports[i], nframes);
+		out.data[i] = (uint8_t *)jack_buffer;
+	}
+
+	out.frames    = nframes;
+	out.timestamp = os_gettime_ns() -
+				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)
+{
+	pthread_mutex_lock(&data->jack_mutex);
+
+	if (data->jack_client != NULL)
+		goto good;
+
+	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);
+		goto error;
+	}
+
+	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_%d", i+1);
+
+		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);
+			goto error;
+		}
+	}
+
+	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!");
+		goto error;
+	}
+
+good:
+	pthread_mutex_unlock(&data->jack_mutex);
+	return 0;
+
+error:
+	pthread_mutex_unlock(&data->jack_mutex);
+	return 1;
+}
+
+void deactivate_jack(struct jack_data* data)
+{
+	pthread_mutex_lock(&data->jack_mutex);
+
+	if (data->jack_client) {
+		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,
+						data->jack_ports[i]);
+			}
+			bfree(data->jack_ports);
+			data->jack_ports = NULL;
+		}
+		jack_client_close(data->jack_client);
+		data->jack_client = NULL;
+	}
+	pthread_mutex_unlock(&data->jack_mutex);
+}

plugins/linux-jack/jack-wrapper.h

@@ -0,0 +1,51 @@
+/*
+Copyright (C) 2015 by Bernd Buschinski <b.buschinski@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <jack/jack.h>
+#include <obs.h>
+#include <pthread.h>
+
+struct jack_data {
+	obs_source_t *source;
+
+	/* user settings */
+	char *device;
+	uint_fast8_t channels;
+	bool start_jack_server;
+
+	/* server info */
+	enum speaker_layout speakers;
+	uint_fast32_t samples_per_sec;
+	uint_fast32_t bytes_per_frame;
+
+	jack_client_t *jack_client;
+	jack_port_t **jack_ports;
+
+	pthread_mutex_t jack_mutex;
+};
+
+/**
+ * Initialize the jack client and register the ports
+ */
+int_fast32_t jack_init(struct jack_data* data);
+
+/**
+ * Destroys the jack client and unregisters the ports
+ */
+void deactivate_jack(struct jack_data* data);

plugins/linux-jack/linux-jack.c

@@ -0,0 +1,28 @@
+/*
+Copyright (C) 2015 by Bernd Buschinski <b.buschinski@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include <obs-module.h>
+
+OBS_DECLARE_MODULE()
+OBS_MODULE_USE_DEFAULT_LOCALE("linux-jack", "en-US")
+
+extern struct obs_source_info jack_output_capture;
+
+bool obs_module_load(void)
+{
+	obs_register_source(&jack_output_capture);
+	return true;
+}