ims-volte-vowifi
/
doubango
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix issue 281

This commit is contained in:
bossiel 2013-06-19 19:12:33 +00:00
parent 6d20f4b9d2
commit cdee7030b4
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
branches/2.0/doubango/tinyDAV/src/audio/tdav_speex_jitterbuffer.c
View File

@ -134,7 +134,7 @@ static int tdav_speex_jitterbuffer_put(tmedia_jitterbuffer_t* self, void* data,
if(jb->buff.index >= jb->x_data_size){
tsk_size_t copied = 0;
for(i = 0; (i + jb->x_data_size) <= jb->buff.index; i += jb->x_data_size){
jb_packet.data = &jb->buff.ptr[i];
jb_packet.data = (char*)&jb->buff.ptr[i];
jb_packet.timestamp = (++jb->fake_seqnum * jb_packet.span);// reassembled pkt will have fake seqnum
jitter_buffer_put(jb->state, &jb_packet);
copied += jb->x_data_size;

2
branches/2.0/doubango/tinyDAV/src/codecs/g729/tdav_codec_g729.c
View File

@ -93,7 +93,7 @@ static int tdav_codec_g729ab_close(tmedia_codec_t* self)
{
tdav_codec_g729ab_t* g729a = (tdav_codec_g729ab_t*)self;
(g729a);
(void)(g729a);
/* resources will be freed by the dctor() */

7
branches/2.0/doubango/tinyDAV/src/tdav_session_av.c
View File

@ -46,6 +46,7 @@
#include <math.h> /* log10 */
#include <limits.h> /* INT_MAX */
#include <ctype.h> /* isspace */
#if HAVE_SRTP
@ -1191,7 +1192,7 @@ int tdav_session_av_set_ro(tdav_session_av_t* self, const struct tsdp_header_M_s
// check if the RTP profile from remote party is supported or not
if((profile_remote = _sdp_profile_from_string(m->proto)) == RTP_PROFILE_NONE){
TSK_DEBUG_ERROR("%s not supported as RTP profile");
TSK_DEBUG_ERROR("%s not supported as RTP profile", m->proto);
return -2;
}
// check that all options in the profile are supported
@ -1844,7 +1845,7 @@ static int _sdp_acaps_from_sdp(const sdp_headerM_Or_Message* sdp, sdp_acap_xt (*
break;
}
if(tag <= 0 || (tag + 1) > SDP_CAPS_COUNT_MAX){
TSK_DEBUG_WARN("Ignoring tag with value = %d");
TSK_DEBUG_WARN("Ignoring tag with value = %d", tag);
goto next;
}
@ -2018,7 +2019,7 @@ static int _sdp_pcfgs_from_sdp(const sdp_headerM_Or_Message* sdp, sdp_acap_xt (*
break;
}
if(tag <= 0 || (tag + 1) > SDP_CAPS_COUNT_MAX){
TSK_DEBUG_WARN("Ignoring tag with value = %d");
TSK_DEBUG_WARN("Ignoring tag with value = %d", tag);
goto next_A;
}

4
branches/2.0/doubango/tinyDAV/src/video/jb/tdav_video_jb.c
View File

@ -413,8 +413,8 @@ static void* TSK_STDCALL _tdav_video_jb_decode_thread_func(void *arg)
jb->decode_last_seq_num_with_mark = -1; // -1 -> unset
jb->decode_last_time = tsk_time_now();
(now);
(delay);
(void)(now);
(void)(delay);
TSK_DEBUG_INFO("Video jitter buffer thread - ENTER");

7
branches/2.0/doubango/tinyDAV/src/video/tdav_session_video.c
View File

@ -860,10 +860,11 @@ static int _tdav_session_video_decode(tdav_session_video_t* self, const trtp_rtp
// congetion control
// send RTCP-REMB if:
// - fps changed
// - first frame
// - congestion control is enabled and
// - fps changed or
// - first frame or
// - approximately every 5 minutes (300 = 60 * 5)
if(self->fps_changed && base->congestion_ctrl_enabled && base->rtp_manager && (self->decoder.codec_decoded_frames_count == 0 || ((self->decoder.codec_decoded_frames_count % (TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.fps * 300)) == 0))){
if(base->congestion_ctrl_enabled && base->rtp_manager && (self->fps_changed || self->decoder.codec_decoded_frames_count == 0 || ((self->decoder.codec_decoded_frames_count % (TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.fps * 300)) == 0))){
int32_t bandwidth_max_upload_kbps = base->bandwidth_max_upload_kbps;
int32_t bandwidth_max_download_kbps = base->bandwidth_max_download_kbps;
// bandwidth already computed in start() be the decoded video size was not correct and based on the SDP negotiation