*/
/**
* @file conversation/gnunet-helper-audio-playback.c
- * @brief constants for network protocols
+ * @brief program to playback audio data to the speaker
* @author Siomon Dieterle
* @author Andreas Fuchs
+ * @author Christian Grothoff
*/
#include "platform.h"
#include "gnunet_util_lib.h"
#define MAXLINE 4096
+#define SAMPLING_RATE 48000
+
/**
* Pulseaudio specification. May change in the future.
*/
static pa_sample_spec sample_spec = {
.format = PA_SAMPLE_FLOAT32LE,
- .rate = 48000,
+ .rate = SAMPLING_RATE,
.channels = 1
};
*/
static pa_stream *stream_out;
-/**
- * Pulseaudio io events
- */
-static pa_io_event *stdio_event;
-
/**
* OPUS decoder
*/
static int frame_size;
/**
- * The sampling rate used in Pulseaudio specification
+ * Pipe we use to signal the main loop that we are ready to receive.
*/
-static opus_int32 sampling_rate;
-
-/**
- * Audio buffer
- */
-static void *buffer;
-
-/**
- * Length of audio buffer
- */
-static size_t buffer_length;
-
-/**
- * Read index for transmit buffer
- */
-static size_t buffer_index;
-
+static int ready_pipe[2];
/**
* Message callback
*/
static int
-stdin_receiver (void *cls,
+stdin_receiver (void *cls,
void *client,
const struct GNUNET_MessageHeader *msg)
{
struct AudioMessage *audio;
+ int ret;
switch (ntohs (msg->type))
{
case GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO:
audio = (struct AudioMessage *) msg;
-
- int len =
- opus_decode_float (dec,
- (const unsigned char *) &audio[1],
- ntohs (audio->header.size) - sizeof (struct AudioMessage),
- pcm_buffer,
- frame_size, 0);
- // FIXME: pcm_length != len???
+
+ ret = opus_decode_float (dec,
+ (const unsigned char *) &audio[1],
+ ntohs (audio->header.size) - sizeof (struct AudioMessage),
+ pcm_buffer,
+ frame_size, 0);
+ if (ret < 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Opus decoding failed: %d\n",
+ ret);
+ return GNUNET_OK;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Decoded frame with %u bytes\n",
+ ntohs (audio->header.size));
if (pa_stream_write
- (stream_out, (uint8_t *) pcm_buffer, pcm_length, NULL, 0,
+ (stream_out, pcm_buffer, pcm_length, NULL, 0,
PA_SEEK_RELATIVE) < 0)
- {
+ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("pa_stream_write() failed: %s\n"),
pa_strerror (pa_context_errno (context)));
return GNUNET_OK;
- }
+ }
break;
default:
break;
}
-/**
- * Write some data to the stream
- */
-static void
-do_stream_write (size_t length)
-{
- size_t l;
- GNUNET_assert (length);
-
- if (!buffer || !buffer_length)
- {
- return;
- }
-
-
- l = length;
- if (l > buffer_length)
- {
- l = buffer_length;
-
- }
-
- if (pa_stream_write
- (stream_out, (uint8_t *) buffer + buffer_index, l, NULL, 0,
- PA_SEEK_RELATIVE) < 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("pa_stream_write() failed: %s\n"),
- pa_strerror (pa_context_errno (context)));
- quit (1);
- return;
- }
-
- buffer_length -= l;
- buffer_index += l;
-
- if (!buffer_length)
- {
- pa_xfree (buffer);
- buffer = NULL;
- buffer_index = buffer_length = 0;
- }
-}
-
-
/**
* Callback when data is there for playback
*/
static void
-stream_write_callback (pa_stream * s, size_t length, void *userdata)
+stream_write_callback (pa_stream * s,
+ size_t length,
+ void *userdata)
{
-
- if (stdio_event)
- {
- mainloop_api->io_enable (stdio_event, PA_IO_EVENT_INPUT);
- }
-
-
- if (!buffer)
- {
- return;
- }
-
-
- do_stream_write (length);
+ /* unblock 'main' */
+ if (-1 != ready_pipe[1])
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Unblocking main loop!\n");
+ write (ready_pipe[1], "r", 1);
+ }
}
* Pulseaudio stream state callback
*/
static void
-context_state_callback (pa_context * c, void *userdata)
+context_state_callback (pa_context * c,
+ void *userdata)
{
int p;
- GNUNET_assert (c);
+ GNUNET_assert (NULL != c);
switch (pa_context_get_state (c))
+ {
+ case PA_CONTEXT_CONNECTING:
+ case PA_CONTEXT_AUTHORIZING:
+ case PA_CONTEXT_SETTING_NAME:
+ break;
+ case PA_CONTEXT_READY:
+ {
+ GNUNET_assert (!stream_out);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Connection established.\n"));
+ if (!(stream_out =
+ pa_stream_new (c, "GNUNET VoIP playback", &sample_spec, NULL)))
{
- case PA_CONTEXT_CONNECTING:
- case PA_CONTEXT_AUTHORIZING:
- case PA_CONTEXT_SETTING_NAME:
- break;
-
- case PA_CONTEXT_READY:
- {
- GNUNET_assert (c);
- GNUNET_assert (!stream_out);
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Connection established.\n"));
-
-
- if (!
- (stream_out =
- pa_stream_new (c, "GNUNET VoIP playback", &sample_spec, NULL)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("pa_stream_new() failed: %s\n"),
- pa_strerror (pa_context_errno (c)));
- goto fail;
- }
-
- pa_stream_set_write_callback (stream_out, stream_write_callback,
- NULL);
-
- if ((p =
- pa_stream_connect_playback (stream_out, NULL, NULL, 0, NULL,
- NULL)) < 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("pa_stream_connect_playback() failed: %s\n"),
- pa_strerror (pa_context_errno (c)));
- goto fail;
- }
-
- break;
- }
-
- case PA_CONTEXT_TERMINATED:
- quit (0);
- break;
-
- case PA_CONTEXT_FAILED:
- default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Connection failure: %s\n"),
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("pa_stream_new() failed: %s\n"),
pa_strerror (pa_context_errno (c)));
goto fail;
}
+ pa_stream_set_write_callback (stream_out,
+ &stream_write_callback,
+ NULL);
+ if ((p =
+ pa_stream_connect_playback (stream_out, NULL,
+ NULL,
+ PA_STREAM_ADJUST_LATENCY | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE,
+ NULL, NULL)) < 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("pa_stream_connect_playback() failed: %s\n"),
+ pa_strerror (pa_context_errno (c)));
+ goto fail;
+ }
+ break;
+ }
+ case PA_CONTEXT_TERMINATED:
+ quit (0);
+ break;
+ case PA_CONTEXT_FAILED:
+ default:
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Connection failure: %s\n"),
+ pa_strerror (pa_context_errno (c)));
+ goto fail;
+ }
return;
-
-fail:
+ fail:
quit (1);
}
int r;
if (!pa_sample_spec_valid (&sample_spec))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Wrong Spec\n"));
- }
-
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Wrong Spec\n"));
+ }
/* set up threaded playback mainloop */
-
if (!(m = pa_threaded_mainloop_new ()))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("pa_mainloop_new() failed.\n"));
- }
-
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("pa_mainloop_new() failed.\n"));
+ }
mainloop_api = pa_threaded_mainloop_get_api (m);
-
-
/* listen to signals */
-
r = pa_signal_init (mainloop_api);
GNUNET_assert (r == 0);
pa_signal_new (SIGINT, exit_signal_callback, NULL);
/* connect to the main pulseaudio context */
-
if (!(context = pa_context_new (mainloop_api, "GNUnet VoIP")))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("pa_context_new() failed.\n"));
- }
-
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("pa_context_new() failed.\n"));
+ }
pa_context_set_state_callback (context, context_state_callback, NULL);
if (pa_context_connect (context, NULL, 0, NULL) < 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("pa_context_connect() failed: %s\n"),
- pa_strerror (pa_context_errno (context)));
- }
-
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("pa_context_connect() failed: %s\n"),
+ pa_strerror (pa_context_errno (context)));
+ }
if (pa_threaded_mainloop_start (m) < 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("pa_mainloop_run() failed.\n"));
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("pa_mainloop_run() failed.\n"));
+ }
}
{
int err;
int channels = 1;
- sampling_rate = 48000;
- frame_size = sampling_rate / 50;
+
+ frame_size = SAMPLING_RATE / 50;
pcm_length = frame_size * channels * sizeof (float);
- dec = opus_decoder_create (sampling_rate, channels, &err);
+ dec = opus_decoder_create (SAMPLING_RATE, channels, &err);
pcm_buffer = (float *) pa_xmalloc (frame_size * channels * sizeof (float));
}
int
main (int argc, char *argv[])
{
+ static unsigned long long toff;
+
char readbuf[MAXLINE];
struct GNUNET_SERVER_MessageStreamTokenizer *stdin_mst;
+ char c;
+ ssize_t ret;
- fprintf (stderr, "HERE!\n");
GNUNET_assert (GNUNET_OK ==
GNUNET_log_setup ("gnunet-helper-audio-playback",
"WARNING",
NULL));
+ if (0 != pipe (ready_pipe))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe");
+ return 1;
+ }
stdin_mst = GNUNET_SERVER_mst_create (&stdin_receiver, NULL);
opus_init ();
pa_init ();
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Waiting for PulseAudio to be ready.\n");
+ GNUNET_assert (1 == read (ready_pipe[0], &c, 1));
+ close (ready_pipe[0]);
+ close (ready_pipe[1]);
+ ready_pipe[0] = -1;
+ ready_pipe[1] = -1;
while (1)
{
- ssize_t ret = read (0, readbuf, sizeof (readbuf));
+ ret = read (0, readbuf, sizeof (readbuf));
+ toff += ret;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received %d bytes of audio data (total: %llu)\n",
+ (int) ret,
+ toff);
if (0 > ret)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Read error from STDIN: %s\n"),
+ _("Read error from STDIN: %s\n"),
strerror (errno));
break;
- }
+ }
+ if (0 == ret)
+ break;
GNUNET_SERVER_mst_receive (stdin_mst, NULL,
readbuf, ret,
GNUNET_NO, GNUNET_NO);
projects / oweals / gnunet.git / blobdiff