diff options
author | mannol <eniz_vukovic@hotmail.com> | 2015-04-21 02:31:12 +0200 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2015-04-21 02:31:12 +0200 |
commit | 3fd0ee5f0873924b4881b0e33eb1c17ea877ab4a (patch) | |
tree | 6a4ee64a3ea7f0191ccfd0205a68411cf0b84063 /toxav/codec.c | |
parent | cbb8fdd4eab3bae4db1179f1fa04cdaa35957aeb (diff) |
Final touchups
Diffstat (limited to 'toxav/codec.c')
-rw-r--r-- | toxav/codec.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/toxav/codec.c b/toxav/codec.c index e64c4d52..57e43c67 100644 --- a/toxav/codec.c +++ b/toxav/codec.c | |||
@@ -328,7 +328,6 @@ void cs_do(CSession *cs) | |||
328 | LOGGER_WARNING("Failed to reconfigure decoder!"); | 328 | LOGGER_WARNING("Failed to reconfigure decoder!"); |
329 | rtp_free_msg(NULL, msg); | 329 | rtp_free_msg(NULL, msg); |
330 | continue; | 330 | continue; |
331 | // goto DONE; | ||
332 | } | 331 | } |
333 | 332 | ||
334 | rc = opus_decode(cs->audio_decoder, msg->data + 4, msg->length - 4, tmp, 5760, 0); | 333 | rc = opus_decode(cs->audio_decoder, msg->data + 4, msg->length - 4, tmp, 5760, 0); |
@@ -347,7 +346,6 @@ void cs_do(CSession *cs) | |||
347 | 346 | ||
348 | LOGGED_LOCK(cs->queue_mutex); | 347 | LOGGED_LOCK(cs->queue_mutex); |
349 | } | 348 | } |
350 | // DONE:; | ||
351 | } | 349 | } |
352 | 350 | ||
353 | /********************* VIDEO *********************/ | 351 | /********************* VIDEO *********************/ |
@@ -497,12 +495,12 @@ void cs_kill(CSession *cs) | |||
497 | * the callback is unregistered before cs_kill is called. | 495 | * the callback is unregistered before cs_kill is called. |
498 | */ | 496 | */ |
499 | 497 | ||
500 | vpx_codec_destroy(cs->v_encoder); | ||
501 | vpx_codec_destroy(cs->v_decoder); | ||
502 | opus_encoder_destroy(cs->audio_encoder); | 498 | opus_encoder_destroy(cs->audio_encoder); |
503 | opus_decoder_destroy(cs->audio_decoder); | 499 | opus_decoder_destroy(cs->audio_decoder); |
504 | rb_free(cs->vbuf_raw); | ||
505 | jbuf_free(cs->j_buf); | 500 | jbuf_free(cs->j_buf); |
501 | vpx_codec_destroy(cs->v_encoder); | ||
502 | vpx_codec_destroy(cs->v_decoder); | ||
503 | rb_free(cs->vbuf_raw); | ||
506 | free(cs->frame_buf); | 504 | free(cs->frame_buf); |
507 | free(cs->split_video_frame); | 505 | free(cs->split_video_frame); |
508 | 506 | ||
@@ -600,7 +598,7 @@ void queue_message(RTPSession *session, RTPMessage *msg) | |||
600 | { | 598 | { |
601 | CSession *cs = session->cs; | 599 | CSession *cs = session->cs; |
602 | 600 | ||
603 | if (!cs) | 601 | if (!cs) |
604 | return; | 602 | return; |
605 | 603 | ||
606 | /* Audio */ | 604 | /* Audio */ |