summaryrefslogtreecommitdiff
path: root/toxav/audio.c
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-06-23 17:16:28 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-06-24 19:17:32 +0000
commit8e00294b3cb9808ce55160240454359638178275 (patch)
tree095a7708b3fe3566951ebe7b068ee66a8beed3c1 /toxav/audio.c
parent5a8790eab0ed9421445adce40526462b9e6742c3 (diff)
Add Logger to various net_crypto functions.
In preparation for adding log statements. Also, fix an uninitialised variable warning in cppcheck.
Diffstat (limited to 'toxav/audio.c')
-rw-r--r--toxav/audio.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/toxav/audio.c b/toxav/audio.c
index 85639f16..3b46d1d5 100644
--- a/toxav/audio.c
+++ b/toxav/audio.c
@@ -33,16 +33,17 @@
33static struct JitterBuffer *jbuf_new(uint32_t capacity); 33static struct JitterBuffer *jbuf_new(uint32_t capacity);
34static void jbuf_clear(struct JitterBuffer *q); 34static void jbuf_clear(struct JitterBuffer *q);
35static void jbuf_free(struct JitterBuffer *q); 35static void jbuf_free(struct JitterBuffer *q);
36static int jbuf_write(Logger *log, struct JitterBuffer *q, struct RTPMessage *m); 36static int jbuf_write(const Logger *log, struct JitterBuffer *q, struct RTPMessage *m);
37static struct RTPMessage *jbuf_read(struct JitterBuffer *q, int32_t *success); 37static struct RTPMessage *jbuf_read(struct JitterBuffer *q, int32_t *success);
38OpusEncoder *create_audio_encoder(Logger *log, int32_t bit_rate, int32_t sampling_rate, int32_t channel_count); 38static OpusEncoder *create_audio_encoder(const Logger *log, int32_t bit_rate, int32_t sampling_rate,
39bool reconfigure_audio_encoder(Logger *log, OpusEncoder **e, int32_t new_br, int32_t new_sr, uint8_t new_ch, 39 int32_t channel_count);
40 int32_t *old_br, int32_t *old_sr, int32_t *old_ch); 40static bool reconfigure_audio_encoder(const Logger *log, OpusEncoder **e, int32_t new_br, int32_t new_sr,
41bool reconfigure_audio_decoder(ACSession *ac, int32_t sampling_rate, int8_t channels); 41 uint8_t new_ch, int32_t *old_br, int32_t *old_sr, int32_t *old_ch);
42static bool reconfigure_audio_decoder(ACSession *ac, int32_t sampling_rate, int8_t channels);
42 43
43 44
44 45
45ACSession *ac_new(Logger *log, ToxAV *av, uint32_t friend_number, toxav_audio_receive_frame_cb *cb, void *cb_data) 46ACSession *ac_new(const Logger *log, ToxAV *av, uint32_t friend_number, toxav_audio_receive_frame_cb *cb, void *cb_data)
46{ 47{
47 ACSession *ac = (ACSession *)calloc(sizeof(ACSession), 1); 48 ACSession *ac = (ACSession *)calloc(sizeof(ACSession), 1);
48 49
@@ -309,7 +310,7 @@ static void jbuf_free(struct JitterBuffer *q)
309 free(q->queue); 310 free(q->queue);
310 free(q); 311 free(q);
311} 312}
312static int jbuf_write(Logger *log, struct JitterBuffer *q, struct RTPMessage *m) 313static int jbuf_write(const Logger *log, struct JitterBuffer *q, struct RTPMessage *m)
313{ 314{
314 uint16_t sequnum = m->header.sequnum; 315 uint16_t sequnum = m->header.sequnum;
315 316
@@ -363,7 +364,7 @@ static struct RTPMessage *jbuf_read(struct JitterBuffer *q, int32_t *success)
363 *success = 0; 364 *success = 0;
364 return nullptr; 365 return nullptr;
365} 366}
366OpusEncoder *create_audio_encoder(Logger *log, int32_t bit_rate, int32_t sampling_rate, int32_t channel_count) 367OpusEncoder *create_audio_encoder(const Logger *log, int32_t bit_rate, int32_t sampling_rate, int32_t channel_count)
367{ 368{
368 int status = OPUS_OK; 369 int status = OPUS_OK;
369 /* 370 /*
@@ -456,7 +457,7 @@ FAILURE:
456 return nullptr; 457 return nullptr;
457} 458}
458 459
459bool reconfigure_audio_encoder(Logger *log, OpusEncoder **e, int32_t new_br, int32_t new_sr, uint8_t new_ch, 460bool reconfigure_audio_encoder(const Logger *log, OpusEncoder **e, int32_t new_br, int32_t new_sr, uint8_t new_ch,
460 int32_t *old_br, int32_t *old_sr, int32_t *old_ch) 461 int32_t *old_br, int32_t *old_sr, int32_t *old_ch)
461{ 462{
462 /* Values are checked in toxav.c */ 463 /* Values are checked in toxav.c */