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

Merge pull request #89 from fryshorts/pulse-input 

Improve logging for pulseaudio plugin
master
Jim 2014-05-19 18:56:27 -07:00
parent 1d809bab65 ac4a054bdd
commit 1e525c4713
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
plugins/linux-pulseaudio/pulse-input.c
View File

@ -25,18 +25,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
struct pulse_data {
obs_source_t source;
pa_stream *stream;
/* user settings */
bool ostime;
char *device;
/* server info */
enum speaker_layout speakers;
pa_sample_format_t format;
uint_fast32_t samples_per_sec;
uint_fast32_t bytes_per_frame;
uint_fast8_t channels;
uint_fast32_t bytes_per_frame;
pa_stream *stream;
bool ostime;
/* statistics */
uint_fast32_t packets;
uint_fast64_t frames;
};
static void pulse_stop_recording(struct pulse_data *data);
@ -112,16 +116,14 @@ static void pulse_stream_read(pa_stream *p, size_t nbytes, void *userdata)
goto exit;
if (!frames) {
blog(LOG_DEBUG,
"pulse-input: Got audio hole of %u bytes",
blog(LOG_ERROR, "pulse-input: Got audio hole of %u bytes",
(unsigned int) bytes);
pa_stream_drop(data->stream);
goto exit;
}
if (pa_stream_get_time(data->stream, &pa_time) < 0) {
blog(LOG_ERROR,
"pulse-input: Failed to get timing info !");
blog(LOG_ERROR, "pulse-input: Failed to get timing info !");
pa_stream_drop(data->stream);
goto exit;
}
@ -138,8 +140,10 @@ static void pulse_stream_read(pa_stream *p, size_t nbytes, void *userdata)
out.timestamp = pa_time - (pa_latency * 1000);
obs_source_output_audio(data->source, &out);
pa_stream_drop(data->stream);
data->packets++;
data->frames += out.frames;
pa_stream_drop(data->stream);
exit:
pulse_signal(0);
}
@ -153,14 +157,19 @@ static void pulse_server_info(pa_context *c, const pa_server_info *i,
UNUSED_PARAMETER(c);
PULSE_DATA(userdata);
blog(LOG_INFO, "pulse-input: Server name: '%s %s'",
i->server_name, i->server_version);
data->format = i->sample_spec.format;
data->samples_per_sec = i->sample_spec.rate;
data->channels = i->sample_spec.channels;
blog(LOG_DEBUG, "pulse-input: Default format: %s, %u Hz, %u channels",
blog(LOG_INFO, "pulse-input: "
"Audio format: %s, %u Hz, %u channels with %s timestamps",
pa_sample_format_to_string(i->sample_spec.format),
i->sample_spec.rate,
i->sample_spec.channels);
i->sample_spec.channels,
(data->ostime) ? "OS" : "PA");
pulse_signal(0);
}
@ -186,8 +195,6 @@ static int_fast32_t pulse_start_recording(struct pulse_data *data)
}
data->bytes_per_frame = pa_frame_size(&spec);
blog(LOG_DEBUG, "pulse-input: %u bytes per frame",
(unsigned int) data->bytes_per_frame);
data->stream = pulse_stream_new(obs_source_getname(data->source),
&spec, NULL);
@ -223,7 +230,8 @@ static int_fast32_t pulse_start_recording(struct pulse_data *data)
return -1;
}
blog(LOG_DEBUG, "pulse-input: Recording started");
blog(LOG_INFO, "pulse-input: Started recording from '%s'",
data->device);
return 0;
}
@ -239,6 +247,12 @@ static void pulse_stop_recording(struct pulse_data *data)
data->stream = NULL;
pulse_unlock();
}
blog(LOG_INFO, "pulse-input: Stopped recording from '%s'",
data->device);
blog(LOG_INFO, "pulse-input: Got %"PRIuFAST32
" packets with %"PRIuFAST64" frames",
data->packets, data->frames);
}
/**
@ -396,8 +410,6 @@ static void pulse_destroy(void *vptr)
if (data->device)
bfree(data->device);
bfree(data);
blog(LOG_DEBUG, "pulse-input: Input destroyed");
}
/**
@ -407,13 +419,13 @@ static void pulse_update(void *vptr, obs_data_t settings)
{
PULSE_DATA(vptr);
bool restart = false;
char *new_device;
const char *new_device;
new_device = bstrdup(obs_data_getstring(settings, "device_id"));
new_device = obs_data_getstring(settings, "device_id");
if (!data->device || strcmp(data->device, new_device) != 0) {
if (data->device)
bfree(data->device);
data->device = new_device;
data->device = bstrdup(new_device);
restart = true;
}

10
plugins/linux-pulseaudio/pulse-wrapper.c
View File

@ -41,8 +41,6 @@ static void pulse_context_state_changed(pa_context *c, void *userdata)
UNUSED_PARAMETER(userdata);
UNUSED_PARAMETER(c);
blog(LOG_DEBUG, "pulse: context state changed");
pulse_signal(0);
}
@ -111,8 +109,6 @@ int_fast32_t pulse_init()
}
pulse_refs++;
blog(LOG_DEBUG, "pulse: Reference count increased to %"PRIuFAST32,
pulse_refs);
pthread_mutex_unlock(&pulse_mutex);
@ -123,11 +119,7 @@ void pulse_unref()
{
pthread_mutex_lock(&pulse_mutex);
pulse_refs--;
blog(LOG_DEBUG, "pulse: Reference count decreased to %"PRIuFAST32,
pulse_refs);
if (pulse_refs == 0) {
if (--pulse_refs == 0) {
pulse_lock();
if (pulse_context != NULL) {
pa_context_disconnect(pulse_context);