diff options
author | mannol <eniz_vukovic@hotmail.com> | 2014-03-12 00:22:49 +0100 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2014-03-12 00:22:49 +0100 |
commit | 9ba7cb7e76935e8e8c1ae0d5614cae2d248b22ae (patch) | |
tree | 23d1f00323021cb26c7edf989f0957141649d662 | |
parent | 54b1dafb0b6f56e1f2f153cf7bf457be9053ae09 (diff) |
Removed logging to stderr and fixed timeout handling
-rw-r--r-- | toxav/media.c | 8 | ||||
-rwxr-xr-x | toxav/msi.c | 8 | ||||
-rwxr-xr-x | toxav/rtp.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/toxav/media.c b/toxav/media.c index f6c33309..a9a4adb8 100644 --- a/toxav/media.c +++ b/toxav/media.c | |||
@@ -197,7 +197,7 @@ int init_video_decoder(CodecState *cs) | |||
197 | { | 197 | { |
198 | if (vpx_codec_dec_init_ver(&cs->v_decoder, VIDEO_CODEC_DECODER_INTERFACE, NULL, 0, | 198 | if (vpx_codec_dec_init_ver(&cs->v_decoder, VIDEO_CODEC_DECODER_INTERFACE, NULL, 0, |
199 | VPX_DECODER_ABI_VERSION) != VPX_CODEC_OK) { | 199 | VPX_DECODER_ABI_VERSION) != VPX_CODEC_OK) { |
200 | fprintf(stderr, "Init video_decoder failed!\n"); | 200 | /*fprintf(stderr, "Init video_decoder failed!\n");*/ |
201 | return -1; | 201 | return -1; |
202 | } | 202 | } |
203 | 203 | ||
@@ -210,7 +210,7 @@ int init_audio_decoder(CodecState *cs, uint32_t audio_channels) | |||
210 | cs->audio_decoder = opus_decoder_create(cs->audio_sample_rate, audio_channels, &rc ); | 210 | cs->audio_decoder = opus_decoder_create(cs->audio_sample_rate, audio_channels, &rc ); |
211 | 211 | ||
212 | if ( rc != OPUS_OK ) { | 212 | if ( rc != OPUS_OK ) { |
213 | fprintf(stderr, "Error while starting audio decoder!\n"); | 213 | /*fprintf(stderr, "Error while starting audio decoder!\n");*/ |
214 | return -1; | 214 | return -1; |
215 | } | 215 | } |
216 | 216 | ||
@@ -224,7 +224,7 @@ int init_video_encoder(CodecState *cs, uint16_t width, uint16_t height, uint32_t | |||
224 | int res = vpx_codec_enc_config_default(VIDEO_CODEC_ENCODER_INTERFACE, &cfg, 0); | 224 | int res = vpx_codec_enc_config_default(VIDEO_CODEC_ENCODER_INTERFACE, &cfg, 0); |
225 | 225 | ||
226 | if (res) { | 226 | if (res) { |
227 | fprintf(stderr, "Failed to get config: %s\n", vpx_codec_err_to_string(res)); | 227 | /*fprintf(stderr, "Failed to get config: %s\n", vpx_codec_err_to_string(res));*/ |
228 | return -1; | 228 | return -1; |
229 | } | 229 | } |
230 | 230 | ||
@@ -234,7 +234,7 @@ int init_video_encoder(CodecState *cs, uint16_t width, uint16_t height, uint32_t | |||
234 | 234 | ||
235 | if (vpx_codec_enc_init_ver(&cs->v_encoder, VIDEO_CODEC_ENCODER_INTERFACE, &cfg, 0, | 235 | if (vpx_codec_enc_init_ver(&cs->v_encoder, VIDEO_CODEC_ENCODER_INTERFACE, &cfg, 0, |
236 | VPX_ENCODER_ABI_VERSION) != VPX_CODEC_OK) { | 236 | VPX_ENCODER_ABI_VERSION) != VPX_CODEC_OK) { |
237 | fprintf(stderr, "Failed to initialize encoder\n"); | 237 | /*fprintf(stderr, "Failed to initialize encoder\n");*/ |
238 | return -1; | 238 | return -1; |
239 | } | 239 | } |
240 | 240 | ||
diff --git a/toxav/msi.c b/toxav/msi.c index 7cc55de2..77ee1b38 100755 --- a/toxav/msi.c +++ b/toxav/msi.c | |||
@@ -729,7 +729,10 @@ void *handle_timeout ( void *arg ) | |||
729 | { | 729 | { |
730 | /* Send hangup either way */ | 730 | /* Send hangup either way */ |
731 | MSISession *_session = arg; | 731 | MSISession *_session = arg; |
732 | 732 | ||
733 | if ( callbacks[MSI_OnRequestTimeout].function ) callbacks[MSI_OnRequestTimeout].function ( callbacks[MSI_OnRequestTimeout].data ); | ||
734 | if ( callbacks[MSI_OnEnding].function ) callbacks[MSI_OnEnding ].function ( callbacks[MSI_OnEnding].data ); | ||
735 | |||
733 | if ( _session && _session->call ) { | 736 | if ( _session && _session->call ) { |
734 | 737 | ||
735 | uint32_t *_peers = _session->call->peers; | 738 | uint32_t *_peers = _session->call->peers; |
@@ -744,9 +747,6 @@ void *handle_timeout ( void *arg ) | |||
744 | 747 | ||
745 | } | 748 | } |
746 | 749 | ||
747 | if ( callbacks[MSI_OnRequestTimeout].function ) callbacks[MSI_OnRequestTimeout].function ( callbacks[MSI_OnRequestTimeout].data ); | ||
748 | if ( callbacks[MSI_OnEnding].function ) callbacks[MSI_OnEnding ].function ( callbacks[MSI_OnEnding].data ); | ||
749 | |||
750 | return NULL; | 750 | return NULL; |
751 | } | 751 | } |
752 | 752 | ||
diff --git a/toxav/rtp.c b/toxav/rtp.c index ef5d0928..ea70ca74 100755 --- a/toxav/rtp.c +++ b/toxav/rtp.c | |||
@@ -751,7 +751,7 @@ int rtp_send_msg ( RTPSession *session, Messenger *messenger, const uint8_t *dat | |||
751 | 751 | ||
752 | /*if ( full_length != sendpacket ( messenger->net, *((IP_Port*) &session->dest), _send_data, full_length) ) {*/ | 752 | /*if ( full_length != sendpacket ( messenger->net, *((IP_Port*) &session->dest), _send_data, full_length) ) {*/ |
753 | if ( full_length != send_custom_user_packet(messenger, session->dest, _send_data, full_length) ) { | 753 | if ( full_length != send_custom_user_packet(messenger, session->dest, _send_data, full_length) ) { |
754 | fprintf(stderr, "Rtp error: %s\n", strerror(errno)); | 754 | /*fprintf(stderr, "Rtp error: %s\n", strerror(errno));*/ |
755 | return -1; | 755 | return -1; |
756 | } | 756 | } |
757 | 757 | ||
@@ -823,7 +823,7 @@ RTPSession *rtp_init_session ( int payload_type, | |||
823 | 823 | ||
824 | /*networking_registerhandler(messenger->net, payload_type, rtp_handle_packet, _retu);*/ | 824 | /*networking_registerhandler(messenger->net, payload_type, rtp_handle_packet, _retu);*/ |
825 | if ( -1 == custom_user_packet_registerhandler(messenger, friend_num, payload_type, rtp_handle_packet, _retu) ) { | 825 | if ( -1 == custom_user_packet_registerhandler(messenger, friend_num, payload_type, rtp_handle_packet, _retu) ) { |
826 | fprintf(stderr, "Error setting custom register handler for rtp session\n"); | 826 | /*fprintf(stderr, "Error setting custom register handler for rtp session\n");*/ |
827 | free(_retu); | 827 | free(_retu); |
828 | return NULL; | 828 | return NULL; |
829 | } | 829 | } |