summaryrefslogtreecommitdiff
path: root/toxav/toxav.c
diff options
context:
space:
mode:
authormannol <eniz_vukovic@hotmail.com>2014-08-04 00:15:19 +0200
committermannol <eniz_vukovic@hotmail.com>2014-08-04 00:15:19 +0200
commitd08d03236806cbc062968910983b92dc59763404 (patch)
tree89c370ec44def742bb2ce37a8ede88ca0fbae425 /toxav/toxav.c
parent733c509582cf6d1366ec3284d4089f24fe4bbae5 (diff)
parent401982008eabdc9fd60820f720e65636273a3422 (diff)
Update with upstream
Diffstat (limited to 'toxav/toxav.c')
-rw-r--r--toxav/toxav.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/toxav/toxav.c b/toxav/toxav.c
index d544d2f5..0c3a1c8f 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -97,16 +97,16 @@ typedef struct {
97} DECODE_PACKET; 97} DECODE_PACKET;
98 98
99#define VIDEO_DECODE_QUEUE_SIZE 2 99#define VIDEO_DECODE_QUEUE_SIZE 2
100#define AUDIO_DECODE_QUEUE_SIZE 8 100#define AUDIO_DECODE_QUEUE_SIZE 16
101 101
102struct _ToxAv { 102struct _ToxAv {
103 Messenger *messenger; 103 Messenger *messenger;
104 MSISession *msi_session; /** Main msi session */ 104 MSISession *msi_session; /** Main msi session */
105 CallSpecific *calls; /** Per-call params */ 105 CallSpecific *calls; /** Per-call params */
106 106
107 void (*audio_callback)(ToxAv *, int32_t, int16_t *, int, void*); 107 void (*audio_callback)(ToxAv *, int32_t, int16_t *, int, void *);
108 void (*video_callback)(ToxAv *, int32_t, vpx_image_t *, void*); 108 void (*video_callback)(ToxAv *, int32_t, vpx_image_t *, void *);
109 109
110 void *audio_callback_userdata; 110 void *audio_callback_userdata;
111 void *video_callback_userdata; 111 void *video_callback_userdata;
112 112
@@ -272,7 +272,8 @@ void toxav_register_callstate_callback ( ToxAv *av, ToxAVCallback callback, ToxA
272 * @param callback The callback 272 * @param callback The callback
273 * @return void 273 * @return void
274 */ 274 */
275void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv *, int32_t, int16_t *, int, void*), void* user_data) 275void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv *, int32_t, int16_t *, int, void *),
276 void *user_data)
276{ 277{
277 av->audio_callback = callback; 278 av->audio_callback = callback;
278 av->audio_callback_userdata = user_data; 279 av->audio_callback_userdata = user_data;
@@ -284,7 +285,8 @@ void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv *, in
284 * @param callback The callback 285 * @param callback The callback
285 * @return void 286 * @return void
286 */ 287 */
287void toxav_register_video_recv_callback (ToxAv *av, void (*callback)(ToxAv *, int32_t, vpx_image_t *, void*), void* user_data) 288void toxav_register_video_recv_callback (ToxAv *av, void (*callback)(ToxAv *, int32_t, vpx_image_t *, void *),
289 void *user_data)
288{ 290{
289 av->video_callback = callback; 291 av->video_callback = callback;
290 av->video_callback_userdata = user_data; 292 av->video_callback_userdata = user_data;
@@ -1081,7 +1083,7 @@ void toxav_handle_packet(RTPSession *_session, RTPMessage *_msg)
1081 av->audio_decode_write = (w + 1) % AUDIO_DECODE_QUEUE_SIZE; 1083 av->audio_decode_write = (w + 1) % AUDIO_DECODE_QUEUE_SIZE;
1082 pthread_cond_signal(&av->decode_cond); 1084 pthread_cond_signal(&av->decode_cond);
1083 } else { 1085 } else {
1084 printf("dropped audio frame\n"); 1086 LOGGER_DEBUG("Dropped audio frame\n");
1085 free(p); 1087 free(p);
1086 } 1088 }
1087 1089
@@ -1121,7 +1123,7 @@ void toxav_handle_packet(RTPSession *_session, RTPMessage *_msg)
1121 av->video_decode_write = (w + 1) % VIDEO_DECODE_QUEUE_SIZE; 1123 av->video_decode_write = (w + 1) % VIDEO_DECODE_QUEUE_SIZE;
1122 pthread_cond_signal(&av->decode_cond); 1124 pthread_cond_signal(&av->decode_cond);
1123 } else { 1125 } else {
1124 printf("dropped video frame\n"); 1126 LOGGER_DEBUG("Dropped video frame\n");
1125 free(p); 1127 free(p);
1126 } 1128 }
1127 1129