Boston, MA 02111-1307, USA.
*/
/**
- * @file conversation/gnunet-helper-audio-playback.c
- * @brief constants for network protocols
+ * @file conversation/gnunet-helper-audio-record.c
+ * @brief program to record audio data from the microphone
* @author Siomon Dieterle
* @author Andreas Fuchs
* @author Christian Grothoff
static float *pcm_buffer;
/**
- * Length of the pcm data needed for one OPUS frame
+ * Length of the pcm data needed for one OPUS frame
*/
static int pcm_length;
size_t off;
ssize_t ret;
int len; // FIXME: int?
- size_t msg_size;
+ size_t msg_size;
while (transmit_buffer_length >= transmit_buffer_index + pcm_length)
{
if (0 != new_size)
{
nbuf = pa_xmalloc (new_size);
- memmove (nbuf,
+ memmove (nbuf,
&transmit_buffer[transmit_buffer_index],
- new_size);
+ new_size);
pa_xfree (transmit_buffer);
transmit_buffer = nbuf;
}
transmit_buffer = NULL;
}
transmit_buffer_index = 0;
- transmit_buffer_length = new_size;
+ transmit_buffer_length = new_size;
}
*/
static void
stream_read_callback (pa_stream * s,
- size_t length,
+ size_t length,
void *userdata)
{
const void *data;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got %u/%u bytes of PCM data\n",
+ length,
+ pcm_length);
+
GNUNET_assert (NULL != s);
GNUNET_assert (length > 0);
if (stdio_event)
if (pa_stream_peek (s, (const void **) &data, &length) < 0)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("pa_stream_peek() failed: %s\n"),
pa_strerror (pa_context_errno (context)));
quit (1);
GNUNET_assert (length > 0);
if (NULL != transmit_buffer)
{
- transmit_buffer = pa_xrealloc (transmit_buffer,
+ transmit_buffer = pa_xrealloc (transmit_buffer,
transmit_buffer_length + length);
- memcpy (&transmit_buffer[transmit_buffer_length],
+ memcpy (&transmit_buffer[transmit_buffer_length],
data,
length);
transmit_buffer_length += length;
* Exit callback for SIGTERM and SIGINT
*/
static void
-exit_signal_callback (pa_mainloop_api * m,
- pa_signal_event * e,
+exit_signal_callback (pa_mainloop_api * m,
+ pa_signal_event * e,
int sig,
void *userdata)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Got signal, exiting.\n"));
quit (1);
}
{
case PA_STREAM_CREATING:
case PA_STREAM_TERMINATED:
- break;
+ break;
case PA_STREAM_READY:
{
const pa_buffer_attr *a;
- char cmt[PA_CHANNEL_MAP_SNPRINT_MAX],
- sst[PA_SAMPLE_SPEC_SNPRINT_MAX];
-
+ char cmt[PA_CHANNEL_MAP_SNPRINT_MAX];
+ char sst[PA_SAMPLE_SPEC_SNPRINT_MAX];
+
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Stream successfully created.\n"));
-
+
if (!(a = pa_stream_get_buffer_attr (s)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("pa_stream_get_buffer_attr() failed: %s\n"),
pa_strerror (pa_context_errno
(pa_stream_get_context (s))));
-
+
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Buffer metrics: maxlength=%u, fragsize=%u\n"),
a->maxlength, a->fragsize);
- }
+ }
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Using sample spec '%s', channel map '%s'.\n"),
pa_sample_spec_snprint (sst, sizeof (sst),
pa_stream_get_sample_spec (s)),
pa_channel_map_snprint (cmt, sizeof (cmt),
pa_stream_get_channel_map (s)));
-
+
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Connected to device %s (%u, %ssuspended).\n"),
pa_stream_get_device_name (s),
pa_stream_get_device_index (s),
pa_stream_is_suspended (s) ? "" : "not ");
- }
- break;
+ }
+ break;
case PA_STREAM_FAILED:
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Stream error: %s\n"),
pa_strerror (pa_context_errno (pa_stream_get_context (s))));
quit (1);
case PA_CONTEXT_READY:
{
int r;
-
- GNUNET_assert (!stream_in);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ pa_buffer_attr na;
+
+ GNUNET_assert (!stream_in);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Connection established.\n"));
if (! (stream_in =
pa_stream_new (c, "GNUNET_VoIP recorder", &sample_spec, NULL)))
pa_strerror (pa_context_errno (c)));
goto fail;
}
- pa_stream_set_state_callback (stream_in, stream_state_callback, NULL);
- pa_stream_set_read_callback (stream_in, stream_read_callback, NULL);
- if ((r = pa_stream_connect_record (stream_in, NULL, NULL, 0)) < 0)
+ pa_stream_set_state_callback (stream_in, &stream_state_callback, NULL);
+ pa_stream_set_read_callback (stream_in, &stream_read_callback, NULL);
+ memset (&na, 0, sizeof (na));
+ na.maxlength = UINT32_MAX;
+ na.fragsize = pcm_length;
+ if ((r = pa_stream_connect_record (stream_in, NULL, &na,
+ PA_STREAM_ADJUST_LATENCY)) < 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("pa_stream_connect_record() failed: %s\n"),
pa_strerror (pa_context_errno (c)));
goto fail;
}
-
+
break;
- }
+ }
case PA_CONTEXT_TERMINATED:
quit (0);
- break;
+ break;
case PA_CONTEXT_FAILED:
default:
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
if (!pa_sample_spec_valid (&sample_spec))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Wrong Spec\n"));
}
/* set up main record loop */
if (!(m = pa_mainloop_new ()))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("pa_mainloop_new() failed.\n"));
}
mainloop_api = pa_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);
- pa_signal_new (SIGTERM, exit_signal_callback, NULL);
+ pa_signal_new (SIGINT, &exit_signal_callback, NULL);
+ pa_signal_new (SIGTERM, &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,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("pa_context_new() failed.\n"));
- }
- pa_context_set_state_callback (context, context_state_callback, NULL);
+ }
+ 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,
}
if (pa_mainloop_run (m, &i) < 0)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("pa_mainloop_run() failed.\n"));
}
}
pcm_buffer = pa_xmalloc (pcm_length);
opus_data = GNUNET_malloc (max_payload_bytes);
enc = opus_encoder_create (SAMPLING_RATE,
- channels,
+ channels,
OPUS_APPLICATION_VOIP,
&err);
+ opus_encoder_ctl (enc,
+ OPUS_SET_PACKET_LOSS_PERC(1));
+ opus_encoder_ctl (enc,
+ OPUS_SET_COMPLEXITY(10));
+ opus_encoder_ctl (enc,
+ OPUS_SET_INBAND_FEC(1));
+ opus_encoder_ctl (enc,
+ OPUS_SET_SIGNAL (OPUS_SIGNAL_VOICE));
}
{
GNUNET_assert (GNUNET_OK ==
GNUNET_log_setup ("gnunet-helper-audio-record",
- "DEBUG",
- "/tmp/helper-audio-record"));
+ "WARNING",
+ NULL));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Audio source starts\n");
audio_message = GNUNET_malloc (UINT16_MAX);
audio_message->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO);
opus_init ();
projects / oweals / gnunet.git / blobdiff