Begin adding full support for GOOG-REMB\nFix iOS 'broken pipe' issue when UDP sockets are invalidated by the OS

23 files changed, 1666 insertions, 1307 deletions

diff --git a/branches/2.0/doubango/tinyDAV/include/tinydav/tdav_session_av.h b/branches/2.0/doubango/tinyDAV/include/tinydav/tdav_session_av.h
index 30dbb62..3460fbf 100644
--- a/branches/2.0/doubango/tinyDAV/include/tinydav/tdav_session_av.h
+++ b/branches/2.0/doubango/tinyDAV/include/tinydav/tdav_session_av.h
@@ -58,7 +58,15 @@ typedef struct tdav_session_av_s
 
 	tmedia_srtp_type_t srtp_type;
 	tmedia_srtp_mode_t srtp_mode;
-
+    struct {
+        uint64_t count_last_time;
+        uint64_t count;
+    } bytes_in;
+    struct {
+        uint64_t count_last_time;
+        uint64_t count;
+    } bytes_out;
+    uint64_t time_last_frame_loss_report; // from jb
 	int32_t bandwidth_max_upload_kbps;
 	int32_t bandwidth_max_download_kbps;
 	int32_t fps;
diff --git a/branches/2.0/doubango/tinyDAV/src/codecs/vpx/tdav_codec_vp8.c b/branches/2.0/doubango/tinyDAV/src/codecs/vpx/tdav_codec_vp8.c
index bbda542..051b194 100644
--- a/branches/2.0/doubango/tinyDAV/src/codecs/vpx/tdav_codec_vp8.c
+++ b/branches/2.0/doubango/tinyDAV/src/codecs/vpx/tdav_codec_vp8.c
@@ -164,6 +164,8 @@ static int tdav_codec_vp8_set(tmedia_codec_t* self, const tmedia_param_t* param)
 			else {

 				TMEDIA_CODEC(vp8)->bandwidth_max_upload = max_bw_new;

 			}

+            vp8->encoder.cfg.rc_target_bitrate = TSK_CLAMP(0, vp8->encoder.cfg.rc_target_bitrate, TMEDIA_CODEC(vp8)->bandwidth_max_upload);

+            TSK_DEBUG_INFO("New target bitrate = %d kbps", vp8->encoder.cfg.rc_target_bitrate);

 			reconf = tsk_true;

 		}

 		else if (tsk_striequals(param->key, "bandwidth-max-upload")) {

diff --git a/branches/2.0/doubango/tinyDAV/src/tdav_session_av.c b/branches/2.0/doubango/tinyDAV/src/tdav_session_av.c
index 69e1bff..8c15c18 100644
--- a/branches/2.0/doubango/tinyDAV/src/tdav_session_av.c
+++ b/branches/2.0/doubango/tinyDAV/src/tdav_session_av.c
@@ -765,6 +765,9 @@ int tdav_session_av_stop(tdav_session_av_t* self)
         }
     }
     
+    self->bytes_in.count_last_time = self->bytes_out.count_last_time = 0;
+    self->bytes_in.count = self->bytes_out.count = 0;
+    
     return ret;
 }
 
diff --git a/branches/2.0/doubango/tinyDAV/src/video/tdav_session_video.c b/branches/2.0/doubango/tinyDAV/src/video/tdav_session_video.c
index 6606d84..4ee6812 100644
--- a/branches/2.0/doubango/tinyDAV/src/video/tdav_session_video.c
+++ b/branches/2.0/doubango/tinyDAV/src/video/tdav_session_video.c
@@ -1,29 +1,29 @@
 /*
-* Copyright (C) 2010-2014 Mamadou DIOP.
-* Copyright (C) 2011-2014 Doubango Telecom.
-*
-*	
-* This file is part of Open Source Doubango Framework.
-*
-* DOUBANGO is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*	
-* DOUBANGO is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*	
-* You should have received a copy of the GNU General Public License
-* along with DOUBANGO.
-*
-*/
+ * Copyright (C) 2010-2014 Mamadou DIOP.
+ * Copyright (C) 2011-2014 Doubango Telecom.
+ *
+ *
+ * This file is part of Open Source Doubango Framework.
+ *
+ * DOUBANGO is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DOUBANGO is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with DOUBANGO.
+ *
+ */
 
 /**@file tdav_session_video.c
-* @brief Video Session plugin.
-*
-*/
+ * @brief Video Session plugin.
+ *
+ */
 #include "tinydav/video/tdav_session_video.h"
 #include "tinydav/video/tdav_converter_video.h"
 #include "tinydav/video/jb/tdav_video_jb.h"
@@ -70,69 +70,79 @@
 #define TDAV_SESSION_VIDEO_PKT_LOSS_MEDIUM		22
 #define TDAV_SESSION_VIDEO_PKT_LOSS_HIGH		63
 
+#if !defined(TDAV_SESSION_VIDEO_PKT_LOSS_NO_REPORT_BEFORE_INCREASING_BW)
+#   define TDAV_SESSION_VIDEO_PKT_LOSS_NO_REPORT_BEFORE_INCREASING_BW  5000 // millis
+#endif
+
 // The maximum number of pakcet loss allowed
 #define TDAV_SESSION_VIDEO_PKT_LOSS_MAX_COUNT_TO_REQUEST_FIR	50
 
+#if !defined (TDAV_GOOG_REMB_FULL_SUPPORT)
+#   define TDAV_GOOG_REMB_FULL_SUPPORT 0
+#endif
+
 static const tmedia_codec_action_t __action_encode_idr = tmedia_codec_action_encode_idr;
 static const tmedia_codec_action_t __action_encode_bw_up = tmedia_codec_action_bw_up;
 static const tmedia_codec_action_t __action_encode_bw_down = tmedia_codec_action_bw_down;
 
 // FIXME: lock ?
-#define _tdav_session_video_codec_set(__self, key, value) \
+#define _tdav_session_video_codec_set(__self, __key, __value) \
 { \
-	static tmedia_param_t* __param = tsk_null; \
-	if(!__param){ \
-	__param = tmedia_param_create(tmedia_pat_set,  \
-	tmedia_video,  \
-	tmedia_ppt_codec,  \
-	tmedia_pvt_int32, \
-	"action", \
-	(void*)&value); \
-	} \
-	if((__self)->encoder.codec && __param){ \
-	/*tsk_mutex_lock((__self)->encoder.h_mutex);*/ \
-	if(TDAV_SESSION_AV(__self)->producer && TDAV_SESSION_AV(__self)->producer->encoder.codec_id == (__self)->encoder.codec->id) { /* Whether the producer ourput encoded frames */ \
-	tmedia_producer_set(TDAV_SESSION_AV(__self)->producer, __param); \
-	} \
-			else { \
-			tmedia_codec_set((tmedia_codec_t*)(__self)->encoder.codec, __param); \
+static tmedia_param_t* __param = tsk_null; \
+if(!__param){ \
+__param = tmedia_param_create(tmedia_pat_set,  \
+tmedia_video,  \
+tmedia_ppt_codec,  \
+tmedia_pvt_int32, \
+__key, \
+(void*)&__value); \
+} \
+if((__self)->encoder.codec && __param){ \
+/*tsk_mutex_lock((__self)->encoder.h_mutex);*/ \
+if(TDAV_SESSION_AV(__self)->producer && TDAV_SESSION_AV(__self)->producer->encoder.codec_id == (__self)->encoder.codec->id) { /* Whether the producer ourput encoded frames */ \
+tmedia_producer_set(TDAV_SESSION_AV(__self)->producer, __param); \
 } \
-	/*tsk_mutex_unlock((__self)->encoder.h_mutex);*/ \
-	} \
-	/* TSK_OBJECT_SAFE_FREE(param); */ \
+else { \
+tmedia_codec_set((tmedia_codec_t*)(__self)->encoder.codec, __param); \
+} \
+/*tsk_mutex_unlock((__self)->encoder.h_mutex);*/ \
+} \
+/* TSK_OBJECT_SAFE_FREE(param); */ \
 }
 
 #define _tdav_session_video_remote_requested_idr(__self, __ssrc_media) { \
-	uint64_t __now = tsk_time_now(); \
-	tsk_bool_t too_close = tsk_false; \
-	if((__now - (__self)->avpf.last_fir_time) > TDAV_SESSION_VIDEO_AVPF_FIR_HONOR_INTERVAL_MIN){ /* guard to avoid sending too many FIR */ \
-	_tdav_session_video_codec_set((__self), "action", __action_encode_idr); \
-	}else { too_close = tsk_true; TSK_DEBUG_INFO("***IDR request tooo close(%llu ms)...ignoring****", (__now - (__self)->avpf.last_fir_time)); } \
-	if((__self)->cb_rtcpevent.func){ \
-	(__self)->cb_rtcpevent.func((__self)->cb_rtcpevent.context, tmedia_rtcp_event_type_fir, (__ssrc_media)); \
-	} \
-	if (!too_close) { /* if too close don't update "last_fir_time" to "now" to be sure interval will increase */ \
-	(__self)->avpf.last_fir_time = __now; \
-	} \
+uint64_t __now = tsk_time_now(); \
+tsk_bool_t too_close = tsk_false; \
+if((__now - (__self)->avpf.last_fir_time) > TDAV_SESSION_VIDEO_AVPF_FIR_HONOR_INTERVAL_MIN){ /* guard to avoid sending too many FIR */ \
+_tdav_session_video_codec_set((__self), "action", __action_encode_idr); \
+}else { too_close = tsk_true; TSK_DEBUG_INFO("***IDR request tooo close(%llu ms)...ignoring****", (__now - (__self)->avpf.last_fir_time)); } \
+if((__self)->cb_rtcpevent.func){ \
+(__self)->cb_rtcpevent.func((__self)->cb_rtcpevent.context, tmedia_rtcp_event_type_fir, (__ssrc_media)); \
+} \
+if (!too_close) { /* if too close don't update "last_fir_time" to "now" to be sure interval will increase */ \
+(__self)->avpf.last_fir_time = __now; \
+} \
 }
 #define _tdav_session_video_local_request_idr(_session, _reason, _ssrc) \
 { \
-	tdav_session_av_t* _base = (tdav_session_av_t*)_session; \
-	if ((_base)->avpf_mode_neg || (_base)->is_fb_fir_neg) { \
-	/*return*/ trtp_manager_signal_frame_corrupted((_base)->rtp_manager, _ssrc); \
-	} \
-		else if ((_session)->rfc5168_cb.fun) { \
-		/*return*/ (_session)->rfc5168_cb.fun((_session)->rfc5168_cb.usrdata, (_session), (_reason), tmedia_session_rfc5168_cmd_picture_fast_update); \
+tdav_session_av_t* _base = (tdav_session_av_t*)_session; \
+if ((_base)->avpf_mode_neg || (_base)->is_fb_fir_neg) { \
+/*return*/ trtp_manager_signal_frame_corrupted((_base)->rtp_manager, _ssrc); \
+} \
+else if ((_session)->rfc5168_cb.fun) { \
+/*return*/ (_session)->rfc5168_cb.fun((_session)->rfc5168_cb.usrdata, (_session), (_reason), tmedia_session_rfc5168_cmd_picture_fast_update); \
 } \
 }
 #define _tdav_session_video_bw_up(__self) _tdav_session_video_codec_set(__self, "action", __action_encode_bw_up)
 #define _tdav_session_video_bw_down(__self) _tdav_session_video_codec_set(__self, "action", __action_encode_bw_down)
+#define _tdav_session_video_bw_kbps(__self, __bw_kbps) _tdav_session_video_codec_set(__self, "bw_kbps", __bw_kbps)
+
 
 #define _tdav_session_video_reset_loss_prob(__self) \
 { \
-	(__self)->encoder.pkt_loss_level = tdav_session_video_pkt_loss_level_low; \
-	(__self)->encoder.pkt_loss_prob_bad = TDAV_SESSION_VIDEO_PKT_LOSS_PROB_BAD; \
-	(__self)->encoder.pkt_loss_prob_good = TDAV_SESSION_VIDEO_PKT_LOSS_PROB_GOOD; \
+(__self)->encoder.pkt_loss_level = tdav_session_video_pkt_loss_level_low; \
+(__self)->encoder.pkt_loss_prob_bad = TDAV_SESSION_VIDEO_PKT_LOSS_PROB_BAD; \
+(__self)->encoder.pkt_loss_prob_good = TDAV_SESSION_VIDEO_PKT_LOSS_PROB_GOOD; \
 }
 
 static int _tdav_session_video_set_defaults(tdav_session_video_t* self);
@@ -145,1229 +155,1352 @@ static int _tdav_session_video_set_callbacks(tmedia_session_t* self);
 // or Producer callback to sendRaw() data "as is"
 static int tdav_session_video_raw_cb(const tmedia_video_encode_result_xt* result)
 {
-	tdav_session_av_t* base = (tdav_session_av_t*)result->usr_data;
-	tdav_session_video_t* video = (tdav_session_video_t*)result->usr_data;
-	trtp_rtp_header_t* rtp_header = (trtp_rtp_header_t*)result->proto_hdr;
-	trtp_rtp_packet_t* packet = tsk_null;
-	int ret = 0;
-	tsk_size_t s;
-
-	if(base->rtp_manager && base->rtp_manager->is_started){
-		if(rtp_header){
-			// uses negotiated SSRC (SDP)
-			rtp_header->ssrc = base->rtp_manager->rtp.ssrc.local;
-			// uses negotiated payload type
-			if(base->pt_map.local != base->rtp_manager->rtp.payload_type || base->pt_map.remote != rtp_header->payload_type || base->pt_map.neg == -1){
-				if(rtp_header->codec_id == tmedia_codec_id_none){
-					TSK_DEBUG_WARN("Internal codec id is equal to none");
-				}
-				else{
-					const tsk_list_item_t* item;
-					tsk_bool_t found = tsk_false;
-					tsk_list_lock(TMEDIA_SESSION(base)->neg_codecs);
-					tsk_list_foreach(item, TMEDIA_SESSION(base)->neg_codecs){
-						if((item->data) && ((const tmedia_codec_t*)item->data)->id == rtp_header->codec_id){
-							base->pt_map.local = base->rtp_manager->rtp.payload_type;
-							base->pt_map.remote = rtp_header->payload_type;
-							base->pt_map.neg = atoi(((const tmedia_codec_t*)item->data)->neg_format);
-							found = tsk_true;
-							break;
-						}
-					}
-					tsk_list_unlock(TMEDIA_SESSION(base)->neg_codecs);
-					if(found){
-						TSK_DEBUG_INFO("Codec PT mapping: local=%d, remote=%d, neg=%d", base->pt_map.local, base->pt_map.remote, base->pt_map.neg);
-					}
-					else{
-						TSK_DEBUG_ERROR("Failed to map codec PT: local=%d, remote=%d", base->rtp_manager->rtp.payload_type, rtp_header->payload_type);
-					}
-				}
-			}
-			rtp_header->payload_type = base->pt_map.neg;
-		}
-		packet = rtp_header 
-			? trtp_rtp_packet_create_2(rtp_header)
-			: trtp_rtp_packet_create(base->rtp_manager->rtp.ssrc.local, base->rtp_manager->rtp.seq_num, base->rtp_manager->rtp.timestamp, base->rtp_manager->rtp.payload_type, result->last_chunck);
-
-		if(packet ){
-			tsk_size_t rtp_hdr_size;
-			if(result->last_chunck){
+    tdav_session_av_t* base = (tdav_session_av_t*)result->usr_data;
+    tdav_session_video_t* video = (tdav_session_video_t*)result->usr_data;
+    trtp_rtp_header_t* rtp_header = (trtp_rtp_header_t*)result->proto_hdr;
+    trtp_rtp_packet_t* packet = tsk_null;
+    int ret = 0;
+    tsk_size_t s;
+    
+    if(base->rtp_manager && base->rtp_manager->is_started){
+        if(rtp_header){
+            // uses negotiated SSRC (SDP)
+            rtp_header->ssrc = base->rtp_manager->rtp.ssrc.local;
+            // uses negotiated payload type
+            if(base->pt_map.local != base->rtp_manager->rtp.payload_type || base->pt_map.remote != rtp_header->payload_type || base->pt_map.neg == -1){
+                if(rtp_header->codec_id == tmedia_codec_id_none){
+                    TSK_DEBUG_WARN("Internal codec id is equal to none");
+                }
+                else{
+                    const tsk_list_item_t* item;
+                    tsk_bool_t found = tsk_false;
+                    tsk_list_lock(TMEDIA_SESSION(base)->neg_codecs);
+                    tsk_list_foreach(item, TMEDIA_SESSION(base)->neg_codecs){
+                        if((item->data) && ((const tmedia_codec_t*)item->data)->id == rtp_header->codec_id){
+                            base->pt_map.local = base->rtp_manager->rtp.payload_type;
+                            base->pt_map.remote = rtp_header->payload_type;
+                            base->pt_map.neg = atoi(((const tmedia_codec_t*)item->data)->neg_format);
+                            found = tsk_true;
+                            break;
+                        }
+                    }
+                    tsk_list_unlock(TMEDIA_SESSION(base)->neg_codecs);
+                    if(found){
+                        TSK_DEBUG_INFO("Codec PT mapping: local=%d, remote=%d, neg=%d", base->pt_map.local, base->pt_map.remote, base->pt_map.neg);
+                    }
+                    else{
+                        TSK_DEBUG_ERROR("Failed to map codec PT: local=%d, remote=%d", base->rtp_manager->rtp.payload_type, rtp_header->payload_type);
+                    }
+                }
+            }
+            rtp_header->payload_type = base->pt_map.neg;
+        }
+        packet = rtp_header
+        ? trtp_rtp_packet_create_2(rtp_header)
+        : trtp_rtp_packet_create(base->rtp_manager->rtp.ssrc.local, base->rtp_manager->rtp.seq_num, base->rtp_manager->rtp.timestamp, base->rtp_manager->rtp.payload_type, result->last_chunck);
+        
+        if(packet ){
+            tsk_size_t rtp_hdr_size;
+            if(result->last_chunck){
 #if 1
 #if 1
-				/*	http://www.cs.columbia.edu/~hgs/rtp/faq.html#timestamp-computed
-				For video, time clock rate is fixed at 90 kHz. The timestamps generated depend on whether the application can determine the frame number or not. 
-				If it can or it can be sure that it is transmitting every frame with a fixed frame rate, the timestamp is governed by the nominal frame rate. Thus, for a 30 f/s video, timestamps would increase by 3,000 for each frame, for a 25 f/s video by 3,600 for each frame. 
-				If a frame is transmitted as several RTP packets, these packets would all bear the same timestamp. 
-				If the frame number cannot be determined or if frames are sampled aperiodically, as is typically the case for software codecs, the timestamp has to be computed from the system clock (e.g., gettimeofday())
-				*/
-
-				if(!video->encoder.last_frame_time){
-					// For the first frame it's not possible to compute the duration as there is no previous one.
-					// In this case, we trust the duration from the result (computed based on the codec fps and rate).
-					video->encoder.last_frame_time = tsk_time_now();
-					base->rtp_manager->rtp.timestamp += result->duration;
-				}
-				else{
-					uint64_t now = tsk_time_now();
-					uint32_t duration = (uint32_t)(now - video->encoder.last_frame_time);
-					base->rtp_manager->rtp.timestamp += (duration * 90/* 90KHz */);
-					video->encoder.last_frame_time = now;
-				}
+                /*	http://www.cs.columbia.edu/~hgs/rtp/faq.html#timestamp-computed
+                 For video, time clock rate is fixed at 90 kHz. The timestamps generated depend on whether the application can determine the frame number or not.
+                 If it can or it can be sure that it is transmitting every frame with a fixed frame rate, the timestamp is governed by the nominal frame rate. Thus, for a 30 f/s video, timestamps would increase by 3,000 for each frame, for a 25 f/s video by 3,600 for each frame.
+                 If a frame is transmitted as several RTP packets, these packets would all bear the same timestamp.
+                 If the frame number cannot be determined or if frames are sampled aperiodically, as is typically the case for software codecs, the timestamp has to be computed from the system clock (e.g., gettimeofday())
+                 */
+                
+                if(!video->encoder.last_frame_time){
+                    // For the first frame it's not possible to compute the duration as there is no previous one.
+                    // In this case, we trust the duration from the result (computed based on the codec fps and rate).
+                    video->encoder.last_frame_time = tsk_time_now();
+                    base->rtp_manager->rtp.timestamp += result->duration;
+                }
+                else{
+                    uint64_t now = tsk_time_now();
+                    uint32_t duration = (uint32_t)(now - video->encoder.last_frame_time);
+                    base->rtp_manager->rtp.timestamp += (duration * 90/* 90KHz */);
+                    video->encoder.last_frame_time = now;
+                }
 #else
-				base->rtp_manager->rtp.timestamp = (uint32_t)(tsk_gettimeofday_ms() * 90/* 90KHz */);
+                base->rtp_manager->rtp.timestamp = (uint32_t)(tsk_gettimeofday_ms() * 90/* 90KHz */);
 #endif
 #else
-				base->rtp_manager->rtp.timestamp += result->duration;
+                base->rtp_manager->rtp.timestamp += result->duration;
 #endif
-
-			}
-
-			packet->payload.data_const = result->buffer.ptr;
-			packet->payload.size = result->buffer.size;
-			s = trtp_manager_send_rtp_packet(base->rtp_manager, packet, tsk_false); // encrypt and send data
-			++base->rtp_manager->rtp.seq_num; // seq_num must be incremented here (before the bail) because already used by SRTP context
-			if(s < TRTP_RTP_HEADER_MIN_SIZE) { 
-				TSK_DEBUG_ERROR("Failed to send packet with seqnum=%u. %u expected but only %u sent", (unsigned)packet->header->seq_num, (unsigned)packet->payload.size, (unsigned)s);
-				goto bail;
-			}
-			rtp_hdr_size = TRTP_RTP_HEADER_MIN_SIZE + (packet->header->csrc_count << 2);
-			// Save packet
-			if(base->avpf_mode_neg){
-				trtp_rtp_packet_t* packet_avpf = tsk_object_ref(packet);
-				// when SRTP is used, "serial_buffer" will contains the encoded buffer with both RTP header and payload
-				// Hack the RTP packet payload to point to the the SRTP data instead of unencrypted ptr
-				packet_avpf->payload.size = (s - rtp_hdr_size);
-				packet_avpf->payload.data_const = tsk_null;
-				if(!(packet_avpf->payload.data = tsk_malloc(packet_avpf->payload.size))){// FIXME: to be optimized (reuse memory address)
-					TSK_DEBUG_ERROR("failed to allocate buffer");
-					goto bail;
-				}
-				memcpy(packet_avpf->payload.data, (((const uint8_t*)base->rtp_manager->rtp.serial_buffer.ptr) + rtp_hdr_size), packet_avpf->payload.size);
-				tsk_list_lock(video->avpf.packets);
-				if(video->avpf.count > video->avpf.max){
-					tsk_list_remove_first_item(video->avpf.packets);
-				}
-				else{
-					++video->avpf.count;
-				}
-
-				// The packet must not added 'ascending' but 'back' because the sequence number coult wrap
-				// For example:
-				//	- send(65533, 65534, 65535, 0, 1)
-				//  - will be stored as (if added 'ascending'): 0, 1, 65533, 65534, 65535
-				//  - this means there is no benefit (if added 'ascending') as we cannot make 'smart search' using seqnums
-				// tsk_list_push_ascending_data(video->avpf.packets, (void**)&packet_avpf); // filtered per seqnum
-				tsk_list_push_back_data(video->avpf.packets, (void**)&packet_avpf);
-				tsk_list_unlock(video->avpf.packets);
-			}
-
-			// Send FEC packet
-			// FIXME: protect only Intra and Params packets
-			if(base->ulpfec.codec && (s > TRTP_RTP_HEADER_MIN_SIZE)){
-				packet->payload.data_const = (((const uint8_t*)base->rtp_manager->rtp.serial_buffer.ptr) + rtp_hdr_size);
-				packet->payload.size = (s - rtp_hdr_size);
-				ret = tdav_codec_ulpfec_enc_protect((struct tdav_codec_ulpfec_s*)base->ulpfec.codec, packet);
-				if(result->last_chunck){
-					trtp_rtp_packet_t* packet_fec;
-					if((packet_fec = trtp_rtp_packet_create(base->rtp_manager->rtp.ssrc.local, base->ulpfec.seq_num++, base->ulpfec.timestamp, base->ulpfec.payload_type, tsk_true))){
-						// serialize the FEC payload packet packet
-						s = tdav_codec_ulpfec_enc_serialize((const struct tdav_codec_ulpfec_s*)base->ulpfec.codec, &video->encoder.buffer, &video->encoder.buffer_size);
-						if(s > 0){
-							packet_fec->payload.data_const = video->encoder.buffer;
-							packet_fec->payload.size = s;
-							s = trtp_manager_send_rtp_packet(base->rtp_manager, packet_fec, tsk_true/* already encrypted */);
-						}
-						TSK_OBJECT_SAFE_FREE(packet_fec);
-					}
-					base->ulpfec.timestamp += result->duration;
-					ret = tdav_codec_ulpfec_enc_reset((struct tdav_codec_ulpfec_s*)base->ulpfec.codec);
-				}
-			}
+                
+            }
+            
+            packet->payload.data_const = result->buffer.ptr;
+            packet->payload.size = result->buffer.size;
+            s = trtp_manager_send_rtp_packet(base->rtp_manager, packet, tsk_false); // encrypt and send data
+            ++base->rtp_manager->rtp.seq_num; // seq_num must be incremented here (before the bail) because already used by SRTP context
+            if(s < TRTP_RTP_HEADER_MIN_SIZE) {
+                // without audio session iOS "audio" background mode is useless and UDP sockets will be closed: e.g. GE's video-only sessions
+#if TDAV_UNDER_IPHONE
+                if (tnet_geterrno() == TNET_ERROR_BROKENPIPE) {
+                    TSK_DEBUG_INFO("iOS UDP pipe is broken (restoration is progress): failed to send packet with seqnum=%u. %u expected but only %u sent", (unsigned)packet->header->seq_num, (unsigned)packet->payload.size, (unsigned)s);
+                }
+#endif /* TDAV_UNDER_IPHONE */
+                TSK_DEBUG_ERROR("Failed to send packet with seqnum=%u. %u expected but only %u sent", (unsigned)packet->header->seq_num, (unsigned)packet->payload.size, (unsigned)s);
+                // save data expected to be sent in order to honor RTCP-NACK requests
+                s = base->rtp_manager->rtp.serial_buffer.index;
+            }
+            
+            rtp_hdr_size = TRTP_RTP_HEADER_MIN_SIZE + (packet->header->csrc_count << 2);
+            // Save packet
+            if (base->avpf_mode_neg && (s > TRTP_RTP_HEADER_MIN_SIZE)) {
+                trtp_rtp_packet_t* packet_avpf = tsk_object_ref(packet);
+                // when SRTP is used, "serial_buffer" will contains the encoded buffer with both RTP header and payload
+                // Hack the RTP packet payload to point to the the SRTP data instead of unencrypted ptr
+                packet_avpf->payload.size = (s - rtp_hdr_size);
+                packet_avpf->payload.data_const = tsk_null;
+                if(!(packet_avpf->payload.data = tsk_malloc(packet_avpf->payload.size))){// FIXME: to be optimized (reuse memory address)
+                    TSK_DEBUG_ERROR("failed to allocate buffer");
+                    goto bail;
+                }
+                memcpy(packet_avpf->payload.data, (((const uint8_t*)base->rtp_manager->rtp.serial_buffer.ptr) + rtp_hdr_size), packet_avpf->payload.size);
+                tsk_list_lock(video->avpf.packets);
+                if(video->avpf.count > video->avpf.max){
+                    tsk_list_remove_first_item(video->avpf.packets);
+                }
+                else{
+                    ++video->avpf.count;
+                }
+                
+                // The packet must not added 'ascending' but 'back' because the sequence number coult wrap
+                // For example:
+                //	- send(65533, 65534, 65535, 0, 1)
+                //  - will be stored as (if added 'ascending'): 0, 1, 65533, 65534, 65535
+                //  - this means there is no benefit (if added 'ascending') as we cannot make 'smart search' using seqnums
+                // tsk_list_push_ascending_data(video->avpf.packets, (void**)&packet_avpf); // filtered per seqnum
+                tsk_list_push_back_data(video->avpf.packets, (void**)&packet_avpf);
+                tsk_list_unlock(video->avpf.packets);
+            }
+            
+            // Send FEC packet
+            // FIXME: protect only Intra and Params packets
+            if(base->ulpfec.codec && (s > TRTP_RTP_HEADER_MIN_SIZE)){
+                packet->payload.data_const = (((const uint8_t*)base->rtp_manager->rtp.serial_buffer.ptr) + rtp_hdr_size);
+                packet->payload.size = (s - rtp_hdr_size);
+                ret = tdav_codec_ulpfec_enc_protect((struct tdav_codec_ulpfec_s*)base->ulpfec.codec, packet);
+                if(result->last_chunck){
+                    trtp_rtp_packet_t* packet_fec;
+                    if((packet_fec = trtp_rtp_packet_create(base->rtp_manager->rtp.ssrc.local, base->ulpfec.seq_num++, base->ulpfec.timestamp, base->ulpfec.payload_type, tsk_true))){
+                        // serialize the FEC payload packet packet
+                        s = tdav_codec_ulpfec_enc_serialize((const struct tdav_codec_ulpfec_s*)base->ulpfec.codec, &video->encoder.buffer, &video->encoder.buffer_size);
+                        if(s > 0){
+                            packet_fec->payload.data_const = video->encoder.buffer;
+                            packet_fec->payload.size = s;
+                            s = trtp_manager_send_rtp_packet(base->rtp_manager, packet_fec, tsk_true/* already encrypted */);
+                        }
+                        TSK_OBJECT_SAFE_FREE(packet_fec);
+                    }
+                    base->ulpfec.timestamp += result->duration;
+                    ret = tdav_codec_ulpfec_enc_reset((struct tdav_codec_ulpfec_s*)base->ulpfec.codec);
+                }
+            }
 #if 0
-			// Send RED Packet
-			if(ret == 0 && video->red.codec){
-				// don't need to lock as the buffer is never used by other codecs
-				tsk_size_t red_pay_size = video->red.codec->plugin->encode(
-					video->red.codec, 
-					buffer, size, 
-					&video->encoder.buffer, &video->encoder.buffer_size
-					);
-				if(red_pay_size > 1){
-					packet->header->payload_type = video->red.payload_type;
-					((uint8_t*)video->encoder.buffer)[0] = packet->header->payload_type;
-					packet->payload.data_const = video->encoder.buffer;
-					packet->payload.size = red_pay_size;
-					trtp_manager_send_rtp_2(base->rtp_manager, packet);
-				}
-			}
+            // Send RED Packet
+            if (ret == 0 && video->red.codec) {
+                // don't need to lock as the buffer is never used by other codecs
+                tsk_size_t red_pay_size = video->red.codec->plugin->encode(
+                                                                           video->red.codec,
+                                                                           buffer, size,
+                                                                           &video->encoder.buffer, &video->encoder.buffer_size
+                                                                           );
+                if(red_pay_size > 1){
+                    packet->header->payload_type = video->red.payload_type;
+                    ((uint8_t*)video->encoder.buffer)[0] = packet->header->payload_type;
+                    packet->payload.data_const = video->encoder.buffer;
+                    packet->payload.size = red_pay_size;
+                    trtp_manager_send_rtp_2(base->rtp_manager, packet);
+                }
+            }
 #endif
-		}
-		else{
-			TSK_DEBUG_ERROR("Failed to create packet");
-		}
-	}
-	else{
-		//--TSK_DEBUG_WARN("Session not ready yet");
-	}
-
+        }
+        else {
+            TSK_DEBUG_ERROR("Failed to create packet");
+        }
+    }
+    else{
+        //--TSK_DEBUG_WARN("Session not ready yet");
+    }
+    
 bail:
-	TSK_OBJECT_SAFE_FREE(packet);
-	return ret;
+    TSK_OBJECT_SAFE_FREE(packet);
+    return ret;
 }
 
 // Codec Callback after decoding
 static int tdav_session_video_decode_cb(const tmedia_video_decode_result_xt* result)
 {
-	tdav_session_av_t* base = (tdav_session_av_t*)result->usr_data;
-	tdav_session_video_t* video = (tdav_session_video_t*)base;
-
-	switch(result->type){
-		case tmedia_video_decode_result_type_idr:
-			{
-				if(video->decoder.last_corrupted_timestamp != ((const trtp_rtp_header_t*)result->proto_hdr)->timestamp){
-					TSK_DEBUG_INFO("IDR frame decoded");
-					video->decoder.stream_corrupted = tsk_false;
-				}
-				else{
-					TSK_DEBUG_INFO("IDR frame decoded but corrupted :(");
-				}
-				break;
-			}
-		case tmedia_video_decode_result_type_error:
-			{
-				TSK_DEBUG_INFO("Decoding failed -> request Full Intra Refresh (FIR)");
-				_tdav_session_video_local_request_idr(TMEDIA_SESSION(video), "DECODED_FAILED", ((const trtp_rtp_header_t*)result->proto_hdr)->ssrc);
-				break;
-			}
-		default: break;
-	}
-	return 0;
+    tdav_session_av_t* base = (tdav_session_av_t*)result->usr_data;
+    tdav_session_video_t* video = (tdav_session_video_t*)base;
+    
+    switch(result->type){
+        case tmedia_video_decode_result_type_idr:
+        {
+            if(video->decoder.last_corrupted_timestamp != ((const trtp_rtp_header_t*)result->proto_hdr)->timestamp){
+                TSK_DEBUG_INFO("IDR frame decoded");
+                video->decoder.stream_corrupted = tsk_false;
+            }
+            else{
+                TSK_DEBUG_INFO("IDR frame decoded but corrupted :(");
+            }
+            break;
+        }
+        case tmedia_video_decode_result_type_error:
+        {
+            TSK_DEBUG_INFO("Decoding failed -> request Full Intra Refresh (FIR)");
+            _tdav_session_video_local_request_idr(TMEDIA_SESSION(video), "DECODED_FAILED", ((const trtp_rtp_header_t*)result->proto_hdr)->ssrc);
+            break;
+        }
+        default: break;
+    }
+    return 0;
 }
 
 // Producer callback (From the producer to the network) => encode data before send()
 static int tdav_session_video_producer_enc_cb(const void* callback_data, const void* buffer, tsk_size_t size)
 {
-	tdav_session_video_t* video = (tdav_session_video_t*)callback_data;
-	tdav_session_av_t* base = (tdav_session_av_t*)callback_data;
-	tsk_size_t yuv420p_size = 0;
-	int ret = 0;
-
-	if(!base){
-		TSK_DEBUG_ERROR("Null session");
-		return 0;
-	}
-
-	// do nothing if session is held
-	// when the session is held the end user will get feedback he also has possibilities to put the consumer and producer on pause
-	if (TMEDIA_SESSION(base)->lo_held) {
-		return 0;
-	}
-
-	// do nothing if not started yet
-	if (!video->started) {
-		TSK_DEBUG_INFO("Video session not started yet");
-		return 0;
-	}
-
-	// get best negotiated codec if not already done
-	// the encoder codec could be null when session is renegotiated without re-starting (e.g. hold/resume)
-	if (!video->encoder.codec) {
-		const tmedia_codec_t* codec;
-		tsk_safeobj_lock(base);
-		if (!(codec = tdav_session_av_get_best_neg_codec(base))) {
-			TSK_DEBUG_ERROR("No codec matched");
-			tsk_safeobj_unlock(base);
-			return -2;
-		}
-		video->encoder.codec = tsk_object_ref(TSK_OBJECT(codec));
-		tsk_safeobj_unlock(base);
-	}
-
-	if (base->rtp_manager) {
-		//static int __rotation_counter = 0;
-		/* encode */
-		tsk_size_t out_size = 0;
-		tmedia_codec_t* codec_encoder = tsk_null;
-
-		if (!base->rtp_manager->is_started) {
-			TSK_DEBUG_ERROR("Not started");
-			goto bail;
-		}
-
-		// take a reference to the encoder to make sure it'll not be destroyed while we're using it
-		codec_encoder = tsk_object_ref(video->encoder.codec);
-		if (!codec_encoder) {
-			TSK_DEBUG_ERROR("The encoder is null");
-			goto bail;
-		}
-
+    tdav_session_video_t* video = (tdav_session_video_t*)callback_data;
+    tdav_session_av_t* base = (tdav_session_av_t*)callback_data;
+    tsk_size_t yuv420p_size = 0;
+    int ret = 0;
+    
+    if(!base){
+        TSK_DEBUG_ERROR("Null session");
+        return 0;
+    }
+    
+    // do nothing if session is held
+    // when the session is held the end user will get feedback he also has possibilities to put the consumer and producer on pause
+    if (TMEDIA_SESSION(base)->lo_held) {
+        return 0;
+    }
+    
+    // do nothing if not started yet
+    if (!video->started) {
+        TSK_DEBUG_INFO("Video session not started yet");
+        return 0;
+    }
+    
+    // get best negotiated codec if not already done
+    // the encoder codec could be null when session is renegotiated without re-starting (e.g. hold/resume)
+    if (!video->encoder.codec) {
+        const tmedia_codec_t* codec;
+        tsk_safeobj_lock(base);
+        if (!(codec = tdav_session_av_get_best_neg_codec(base))) {
+            TSK_DEBUG_ERROR("No codec matched");
+            tsk_safeobj_unlock(base);
+            return -2;
+        }
+        video->encoder.codec = tsk_object_ref(TSK_OBJECT(codec));
+        tsk_safeobj_unlock(base);
+    }
+    
+    if (base->rtp_manager) {
+        //static int __rotation_counter = 0;
+        /* encode */
+        tsk_size_t out_size = 0;
+        tmedia_codec_t* codec_encoder = tsk_null;
+        
+        if (!base->rtp_manager->is_started) {
+            TSK_DEBUG_ERROR("Not started");
+            goto bail;
+        }
+        
+        // take a reference to the encoder to make sure it'll not be destroyed while we're using it
+        codec_encoder = tsk_object_ref(video->encoder.codec);
+        if (!codec_encoder) {
+            TSK_DEBUG_ERROR("The encoder is null");
+            goto bail;
+        }
+        
 #define PRODUCER_OUTPUT_FIXSIZE (base->producer->video.chroma != tmedia_chroma_mjpeg) // whether the output data has a fixed size/length
 #define PRODUCER_OUTPUT_RAW (base->producer->encoder.codec_id == tmedia_codec_id_none) // Otherwise, frames from the producer are already encoded
 #define PRODUCER_SIZE_CHANGED ((video->conv.producerWidth && video->conv.producerWidth != base->producer->video.width) || (video->conv.producerHeight && video->conv.producerHeight != base->producer->video.height) \
-	|| (video->conv.xProducerSize && (video->conv.xProducerSize != size && PRODUCER_OUTPUT_FIXSIZE)))
+|| (video->conv.xProducerSize && (video->conv.xProducerSize != size && PRODUCER_OUTPUT_FIXSIZE)))
 #define ENCODED_NEED_FLIP (TMEDIA_CODEC_VIDEO(codec_encoder)->out.flip)
 #define ENCODED_NEED_RESIZE (base->producer->video.width != TMEDIA_CODEC_VIDEO(codec_encoder)->out.width || base->producer->video.height != TMEDIA_CODEC_VIDEO(codec_encoder)->out.height)
 #define PRODUCED_FRAME_NEED_ROTATION (base->producer->video.rotation != 0)
 #define PRODUCED_FRAME_NEED_MIRROR (base->producer->video.mirror != tsk_false)
 #define PRODUCED_FRAME_NEED_CHROMA_CONVERSION (base->producer->video.chroma != TMEDIA_CODEC_VIDEO(codec_encoder)->out.chroma)
-		// Video codecs only accept YUV420P buffers ==> do conversion if needed or producer doesn't have the right size
-		if (PRODUCER_OUTPUT_RAW && (PRODUCED_FRAME_NEED_CHROMA_CONVERSION || PRODUCER_SIZE_CHANGED || ENCODED_NEED_FLIP || ENCODED_NEED_RESIZE ||PRODUCED_FRAME_NEED_ROTATION || PRODUCED_FRAME_NEED_MIRROR)) {
-			// Create video converter if not already done or producer size have changed
-			if(!video->conv.toYUV420 || PRODUCER_SIZE_CHANGED){
-				TSK_OBJECT_SAFE_FREE(video->conv.toYUV420);
-				video->conv.producerWidth = base->producer->video.width;
-				video->conv.producerHeight = base->producer->video.height;
-				video->conv.xProducerSize = size;
-
-				TSK_DEBUG_INFO("producer size = (%d, %d)", (int)base->producer->video.width, (int)base->producer->video.height);
-				if (!(video->conv.toYUV420 = tmedia_converter_video_create(base->producer->video.width, base->producer->video.height, base->producer->video.chroma, TMEDIA_CODEC_VIDEO(codec_encoder)->out.width, TMEDIA_CODEC_VIDEO(codec_encoder)->out.height,
-					TMEDIA_CODEC_VIDEO(codec_encoder)->out.chroma))){
-						TSK_DEBUG_ERROR("Failed to create video converter");
-						ret = -5;
-						goto bail;
-				}
-				// restore/set rotation scaling info because producer size could change
-				tmedia_converter_video_set_scale_rotated_frames(video->conv.toYUV420, video->encoder.scale_rotated_frames);
-			}
-		}
-
-		if(video->conv.toYUV420){
-			video->encoder.scale_rotated_frames = video->conv.toYUV420->scale_rotated_frames;
-			// check if rotation have changed and alert the codec
-			// we avoid scalling the frame after rotation because it's CPU intensive and keeping the image ratio is difficult
-			// it's up to the encoder to swap (w,h) and to track the rotation value
-			if(video->encoder.rotation != base->producer->video.rotation){
-				tmedia_param_t* param = tmedia_param_create(tmedia_pat_set,
-					tmedia_video, 
-					tmedia_ppt_codec, 
-					tmedia_pvt_int32,
-					"rotation",
-					(void*)&base->producer->video.rotation);
-				if (!param) {
-					TSK_DEBUG_ERROR("Failed to create a media parameter");
-					return -1;
-				}
-				video->encoder.rotation = base->producer->video.rotation; // update rotation to avoid calling the function several times
-				ret = tmedia_codec_set(codec_encoder, param);
-				TSK_OBJECT_SAFE_FREE(param);
-				// (ret != 0) -> not supported by the codec -> to be done by the converter
-				video->encoder.scale_rotated_frames = (ret != 0);
-			}
-
-			// update one-shot parameters
-			tmedia_converter_video_set(video->conv.toYUV420, base->producer->video.rotation, TMEDIA_CODEC_VIDEO(codec_encoder)->out.flip, base->producer->video.mirror, video->encoder.scale_rotated_frames);
-
-			yuv420p_size = tmedia_converter_video_process(video->conv.toYUV420, buffer, size, &video->encoder.conv_buffer, &video->encoder.conv_buffer_size);
-			if (!yuv420p_size || !video->encoder.conv_buffer) {
-				TSK_DEBUG_ERROR("Failed to convert XXX buffer to YUV42P");
-				ret = -6;
-				goto bail;
-			}
-		}
-
-		// Encode data
-		tsk_mutex_lock(video->encoder.h_mutex);
-		if (video->started && codec_encoder->opened) { // stop() function locks the encoder mutex before changing "started"
-			if (video->encoder.conv_buffer && yuv420p_size) {
-				/* producer doesn't support yuv42p */
-				out_size = codec_encoder->plugin->encode(codec_encoder, video->encoder.conv_buffer, yuv420p_size, &video->encoder.buffer, &video->encoder.buffer_size);
-			}
-			else {
-				/* producer supports yuv42p */
-				out_size = codec_encoder->plugin->encode(codec_encoder, buffer, size, &video->encoder.buffer, &video->encoder.buffer_size);
-			}
-		}
-		tsk_mutex_unlock(video->encoder.h_mutex);
-
-		if (out_size) {
-			/* Never called, see tdav_session_video_raw_cb() */
-			trtp_manager_send_rtp(base->rtp_manager, video->encoder.buffer, out_size, 6006, tsk_true, tsk_true);
-		}
-bail: 
-		TSK_OBJECT_SAFE_FREE(codec_encoder);
-	}
-	else {
-		TSK_DEBUG_ERROR("Invalid parameter");
-		ret = -1;
-	}
-
-	return ret;
+        // Video codecs only accept YUV420P buffers ==> do conversion if needed or producer doesn't have the right size
+        if (PRODUCER_OUTPUT_RAW && (PRODUCED_FRAME_NEED_CHROMA_CONVERSION || PRODUCER_SIZE_CHANGED || ENCODED_NEED_FLIP || ENCODED_NEED_RESIZE ||PRODUCED_FRAME_NEED_ROTATION || PRODUCED_FRAME_NEED_MIRROR)) {
+            // Create video converter if not already done or producer size have changed
+            if(!video->conv.toYUV420 || PRODUCER_SIZE_CHANGED){
+                TSK_OBJECT_SAFE_FREE(video->conv.toYUV420);
+                video->conv.producerWidth = base->producer->video.width;
+                video->conv.producerHeight = base->producer->video.height;
+                video->conv.xProducerSize = size;
+                
+                TSK_DEBUG_INFO("producer size = (%d, %d)", (int)base->producer->video.width, (int)base->producer->video.height);
+                if (!(video->conv.toYUV420 = tmedia_converter_video_create(base->producer->video.width, base->producer->video.height, base->producer->video.chroma, TMEDIA_CODEC_VIDEO(codec_encoder)->out.width, TMEDIA_CODEC_VIDEO(codec_encoder)->out.height,
+                                                                           TMEDIA_CODEC_VIDEO(codec_encoder)->out.chroma))){
+                    TSK_DEBUG_ERROR("Failed to create video converter");
+                    ret = -5;
+                    goto bail;
+                }
+                // restore/set rotation scaling info because producer size could change
+                tmedia_converter_video_set_scale_rotated_frames(video->conv.toYUV420, video->encoder.scale_rotated_frames);
+            }
+        }
+        
+        if(video->conv.toYUV420){
+            video->encoder.scale_rotated_frames = video->conv.toYUV420->scale_rotated_frames;
+            // check if rotation have changed and alert the codec
+            // we avoid scalling the frame after rotation because it's CPU intensive and keeping the image ratio is difficult
+            // it's up to the encoder to swap (w,h) and to track the rotation value
+            if(video->encoder.rotation != base->producer->video.rotation){
+                tmedia_param_t* param = tmedia_param_create(tmedia_pat_set,
+                                                            tmedia_video,
+                                                            tmedia_ppt_codec,
+                                                            tmedia_pvt_int32,
+                                                            "rotation",
+                                                            (void*)&base->producer->video.rotation);
+                if (!param) {
+                    TSK_DEBUG_ERROR("Failed to create a media parameter");
+                    return -1;
+                }
+                video->encoder.rotation = base->producer->video.rotation; // update rotation to avoid calling the function several times
+                ret = tmedia_codec_set(codec_encoder, param);
+                TSK_OBJECT_SAFE_FREE(param);
+                // (ret != 0) -> not supported by the codec -> to be done by the converter
+                video->encoder.scale_rotated_frames = (ret != 0);
+            }
+            
+            // update one-shot parameters
+            tmedia_converter_video_set(video->conv.toYUV420, base->producer->video.rotation, TMEDIA_CODEC_VIDEO(codec_encoder)->out.flip, base->producer->video.mirror, video->encoder.scale_rotated_frames);
+            
+            yuv420p_size = tmedia_converter_video_process(video->conv.toYUV420, buffer, size, &video->encoder.conv_buffer, &video->encoder.conv_buffer_size);
+            if (!yuv420p_size || !video->encoder.conv_buffer) {
+                TSK_DEBUG_ERROR("Failed to convert XXX buffer to YUV42P");
+                ret = -6;
+                goto bail;
+            }
+        }
+        
+        // Encode data
+        tsk_mutex_lock(video->encoder.h_mutex);
+        if (video->started && codec_encoder->opened) { // stop() function locks the encoder mutex before changing "started"
+            if (video->encoder.conv_buffer && yuv420p_size) {
+                /* producer doesn't support yuv42p */
+                out_size = codec_encoder->plugin->encode(codec_encoder, video->encoder.conv_buffer, yuv420p_size, &video->encoder.buffer, &video->encoder.buffer_size);
+            }
+            else {
+                /* producer supports yuv42p */
+                out_size = codec_encoder->plugin->encode(codec_encoder, buffer, size, &video->encoder.buffer, &video->encoder.buffer_size);
+            }
+        }
+        tsk_mutex_unlock(video->encoder.h_mutex);
+        
+        if (out_size) {
+            /* Never called, see tdav_session_video_raw_cb() */
+            trtp_manager_send_rtp(base->rtp_manager, video->encoder.buffer, out_size, 6006, tsk_true, tsk_true);
+        }
+    bail:
+        TSK_OBJECT_SAFE_FREE(codec_encoder);
+    }
+    else {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        ret = -1;
+    }
+    
+    return ret;
 }
 
 // RTP callback (Network -> Decoder -> Consumer)
 static int tdav_session_video_rtp_cb(const void* callback_data, const trtp_rtp_packet_t* packet)
 {
-	tdav_session_video_t* video = (tdav_session_video_t*)callback_data;
-	tdav_session_av_t* base = (tdav_session_av_t*)callback_data;
-
-	if(!video || !packet || !packet->header){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-
-	if(packet->header->payload_type == base->red.payload_type){
-		static void* __red_buffer_ptr = tsk_null; // Never used
-		static tsk_size_t __red_buffer_size = 0; // Never used
-		if(!base->red.codec){
-			TSK_DEBUG_ERROR("No RED codec could be found");
-			return -2;
-		}
-		// Decode RED data
-		base->red.codec->plugin->decode(
-			base->red.codec, 
-			(packet->payload.data ? packet->payload.data : packet->payload.data_const), packet->payload.size, 
-			&__red_buffer_ptr, &__red_buffer_size, 
-			packet->header
-			);
-		return 0;
-	}
-	else if(packet->header->payload_type == base->ulpfec.payload_type){
-		if(!base->ulpfec.codec){
-			TSK_DEBUG_ERROR("No ULPFEC codec could be found");
-			return -2;
-		}
-		// FIXME: do something
-		return 0;
-	}
-	else{
-		return video->jb
-			? tdav_video_jb_put(video->jb, (trtp_rtp_packet_t*)packet)
-			: _tdav_session_video_decode(video, packet);
-	}
+    tdav_session_video_t* video = (tdav_session_video_t*)callback_data;
+    tdav_session_av_t* base = (tdav_session_av_t*)callback_data;
+    
+    if(!video || !packet || !packet->header){
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    
+    if(packet->header->payload_type == base->red.payload_type){
+        static void* __red_buffer_ptr = tsk_null; // Never used
+        static tsk_size_t __red_buffer_size = 0; // Never used
+        if(!base->red.codec){
+            TSK_DEBUG_ERROR("No RED codec could be found");
+            return -2;
+        }
+        // Decode RED data
+        base->red.codec->plugin->decode(
+                                        base->red.codec,
+                                        (packet->payload.data ? packet->payload.data : packet->payload.data_const), packet->payload.size,
+                                        &__red_buffer_ptr, &__red_buffer_size,
+                                        packet->header
+                                        );
+        return 0;
+    }
+    else if(packet->header->payload_type == base->ulpfec.payload_type){
+        if(!base->ulpfec.codec){
+            TSK_DEBUG_ERROR("No ULPFEC codec could be found");
+            return -2;
+        }
+        // FIXME: do something
+        return 0;
+    }
+    else{
+        return video->jb
+        ? tdav_video_jb_put(video->jb, (trtp_rtp_packet_t*)packet)
+        : _tdav_session_video_decode(video, packet);
+    }
 }
 
 // RTCP callback (Network -> This)
 static int tdav_session_video_rtcp_cb(const void* callback_data, const trtp_rtcp_packet_t* packet)
 {
-	const trtp_rtcp_report_psfb_t* psfb;
-	const trtp_rtcp_report_rtpfb_t* rtpfb;
-	const trtp_rtcp_rblocks_L_t* blocks = tsk_null;
-
-	tdav_session_video_t* video = (tdav_session_video_t*)callback_data;
-	tdav_session_av_t* base = (tdav_session_av_t*)callback_data;
-	tsk_size_t i;
-
-	if((blocks = (packet->header->type == trtp_rtcp_packet_type_rr) ? ((const trtp_rtcp_report_rr_t*)packet)->blocks : 
-		(packet->header->type == trtp_rtcp_packet_type_sr ? ((const trtp_rtcp_report_sr_t*)packet)->blocks : tsk_null))){
-			const tsk_list_item_t* item;
-			const trtp_rtcp_rblock_t* block;
-			tsk_list_foreach(item, blocks){
-				if(!(block = item->data)) continue;
-				if(base->rtp_manager->rtp.ssrc.local == block->ssrc){
-					tdav_session_video_pkt_loss_level_t pkt_loss_level = tdav_session_video_pkt_loss_level_low;
-					if(block->fraction > TDAV_SESSION_VIDEO_PKT_LOSS_HIGH)  pkt_loss_level = tdav_session_video_pkt_loss_level_high;
-					else if(block->fraction > TDAV_SESSION_VIDEO_PKT_LOSS_MEDIUM)  pkt_loss_level = tdav_session_video_pkt_loss_level_medium;
-					if(pkt_loss_level == tdav_session_video_pkt_loss_level_high || (pkt_loss_level > video->encoder.pkt_loss_level)){ // high or low -> medium
-						video->encoder.pkt_loss_level = pkt_loss_level;
-						if(video->encoder.pkt_loss_prob_bad-- <= 0){
-							int32_t new_pkt_loss_fact = TSK_CLAMP(TDAV_SESSION_VIDEO_PKT_LOSS_FACT_MIN, (video->encoder.pkt_loss_fact + 1), TDAV_SESSION_VIDEO_PKT_LOSS_FACT_MAX);
-							if(video->encoder.pkt_loss_fact != new_pkt_loss_fact){
-								TSK_DEBUG_INFO("Downgrade bandwidth %d->%d", video->encoder.pkt_loss_fact, new_pkt_loss_fact);
-								video->encoder.pkt_loss_fact = new_pkt_loss_fact;
-								_tdav_session_video_bw_down(video);
-							}
-							_tdav_session_video_reset_loss_prob(video);
-						}
-					}
-					else{
-						if(video->encoder.pkt_loss_prob_good-- <= 0){
-							int32_t new_pkt_loss_fact = TSK_CLAMP(TDAV_SESSION_VIDEO_PKT_LOSS_FACT_MIN, (video->encoder.pkt_loss_fact - 1), TDAV_SESSION_VIDEO_PKT_LOSS_FACT_MAX);
-							if(video->encoder.pkt_loss_fact != new_pkt_loss_fact){
-								TSK_DEBUG_INFO("Upgrade bandwidth %d->%d", video->encoder.pkt_loss_fact, new_pkt_loss_fact);
-								video->encoder.pkt_loss_fact = new_pkt_loss_fact;
-								_tdav_session_video_bw_up(video);
-							}
-							_tdav_session_video_reset_loss_prob(video);
-						}
-					}
-					break;
-				}
-			}
-	}
-
-	i = 0;
-	while((psfb = (const trtp_rtcp_report_psfb_t*)trtp_rtcp_packet_get_at(packet, trtp_rtcp_packet_type_psfb, i++))){
-		switch(psfb->fci_type){
-			case trtp_rtcp_psfb_fci_type_fir:
-				{
-					TSK_DEBUG_INFO("Receiving RTCP-FIR (%u)", ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media);
-					_tdav_session_video_remote_requested_idr(video, ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media);
-					break;
-				}
-			case trtp_rtcp_psfb_fci_type_pli:
-				{
-					uint64_t now;
-					TSK_DEBUG_INFO("Receiving RTCP-PLI (%u)", ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media);
-					now = tsk_time_now();
-					// more than one PLI in 500ms ?
-					// "if" removed because PLI really means codec prediction chain is broken
-					/*if((now - video->avpf.last_pli_time) < 500)*/{
-						_tdav_session_video_remote_requested_idr(video, ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media);
-					}
-					video->avpf.last_pli_time = now;
-					break;
-				}
-			case trtp_rtcp_psfb_fci_type_afb:
-				{
-					if(psfb->afb.type == trtp_rtcp_psfb_afb_type_remb){
-						uint32_t bandwidth = ((psfb->afb.remb.mantissa << psfb->afb.remb.exp) / 1024);
-						TSK_DEBUG_INFO("Receiving RTCP-AFB-REMB (%u), exp=%u, mantissa=%u, bandwidth = %ukbps", ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media, psfb->afb.remb.exp, psfb->afb.remb.mantissa, bandwidth);
-						// for now we just don't respect the requested bandwidth
-					}
-					break;
-				}
-			default: break;
-		}
-	}
-	i = 0;
-	while((rtpfb = (const trtp_rtcp_report_rtpfb_t*)trtp_rtcp_packet_get_at(packet, trtp_rtcp_packet_type_rtpfb, i++))){
-		switch(rtpfb->fci_type){
-			default: break;
-			case trtp_rtcp_rtpfb_fci_type_nack:
-				{
-					if(rtpfb->nack.blp && rtpfb->nack.pid){
-						tsk_size_t i;
-						int32_t j;
-						uint16_t pid, blp;
-						const tsk_list_item_t* item;
-						const trtp_rtp_packet_t* pkt_rtp;
-						for(i = 0; i < rtpfb->nack.count; ++i){
-							static const int32_t __Pow2[16] = { 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000 };
-							int32_t blp_count;
-							blp = rtpfb->nack.blp[i];
-							blp_count = blp ? 16 : 0;
-
-							for(j = -1/*Packet ID (PID)*/; j < blp_count; ++j){
-								if(j == -1 || (blp & __Pow2[j])){
-									pid = (rtpfb->nack.pid[i] + (j + 1));
-									tsk_list_lock(video->avpf.packets);
-									tsk_list_foreach(item, video->avpf.packets){
-										if(!(pkt_rtp = item->data)){
-											continue;
-										}
-
-										// Very Important: the seq_nums are not consecutive because of wrapping. 
-										// For example, '65533, 65534, 65535, 0, 1' is a valid sequences which means we have to check all packets (probaly need somthing smarter)
-										if(pkt_rtp->header->seq_num == pid){
-											TSK_DEBUG_INFO("NACK Found, pid=%d, blp=%u", pid, blp);
-											trtp_manager_send_rtp_packet(base->rtp_manager, pkt_rtp, tsk_true);
-											break;
-										}
-										if(item == video->avpf.packets->tail){
-											// should never be called unless the tail is too small
-											int32_t old_max = (int32_t)video->avpf.max;
-											int32_t len_drop = (pkt_rtp->header->seq_num - pid);
-											video->avpf.max = TSK_CLAMP((int32_t)tmedia_defaults_get_avpf_tail_min(), (old_max + len_drop), (int32_t)tmedia_defaults_get_avpf_tail_max());
-											TSK_DEBUG_INFO("**NACK requesting dropped frames. List=[%d-%d], requested=%d, List.Max=%d, List.Count=%d. RTT is probably too high.", 
-												((const trtp_rtp_packet_t*)TSK_LIST_FIRST_DATA(video->avpf.packets))->header->seq_num,
-												((const trtp_rtp_packet_t*)TSK_LIST_LAST_DATA(video->avpf.packets))->header->seq_num,
-												pid, 
-												(int)video->avpf.max,
-												(int)video->avpf.count);
-											// FIR not really requested but needed
-											/*_tdav_session_video_remote_requested_idr(video, ((const trtp_rtcp_report_fb_t*)rtpfb)->ssrc_media);
-											tsk_list_clear_items(video->avpf.packets);
-											video->avpf.count = 0;*/
-										} // if(last_item)
-									}// foreach(pkt)
-									tsk_list_unlock(video->avpf.packets);
-								}// if(BLP is set)
-							}// foreach(BIT in BLP)
-						}// foreach(nack)
-					}// if(nack-blp and nack-pid are set)
-					break;
-				}// case
-		}// switch
-	}// while(rtcp-pkt)
-
-	return 0;
+    int ret = 0;
+    const trtp_rtcp_report_psfb_t* psfb;
+    const trtp_rtcp_report_rtpfb_t* rtpfb;
+    const trtp_rtcp_rblocks_L_t* blocks = tsk_null;
+    
+    tdav_session_video_t* video = (tdav_session_video_t*)callback_data;
+    tdav_session_av_t* base = (tdav_session_av_t*)callback_data;
+    tsk_size_t i;
+    
+    if((blocks = (packet->header->type == trtp_rtcp_packet_type_rr) ? ((const trtp_rtcp_report_rr_t*)packet)->blocks :
+        (packet->header->type == trtp_rtcp_packet_type_sr ? ((const trtp_rtcp_report_sr_t*)packet)->blocks : tsk_null))){
+        const tsk_list_item_t* item;
+        const trtp_rtcp_rblock_t* block;
+        tsk_list_foreach(item, blocks){
+            if(!(block = item->data)) continue;
+            if(base->rtp_manager->rtp.ssrc.local == block->ssrc){
+                tdav_session_video_pkt_loss_level_t pkt_loss_level = tdav_session_video_pkt_loss_level_low;
+                TSK_DEBUG_INFO("RTCP pkt loss fraction=%d", block->fraction);
+                if(block->fraction > TDAV_SESSION_VIDEO_PKT_LOSS_HIGH)  pkt_loss_level = tdav_session_video_pkt_loss_level_high;
+                else if(block->fraction > TDAV_SESSION_VIDEO_PKT_LOSS_MEDIUM)  pkt_loss_level = tdav_session_video_pkt_loss_level_medium;
+                if (pkt_loss_level == tdav_session_video_pkt_loss_level_high || (pkt_loss_level > video->encoder.pkt_loss_level)){ // high or low -> medium
+                    video->encoder.pkt_loss_level = pkt_loss_level;
+                    if(video->encoder.pkt_loss_prob_bad-- <= 0){
+                        int32_t new_pkt_loss_fact = TSK_CLAMP(TDAV_SESSION_VIDEO_PKT_LOSS_FACT_MIN, (video->encoder.pkt_loss_fact + 1), TDAV_SESSION_VIDEO_PKT_LOSS_FACT_MAX);
+                        if (video->encoder.pkt_loss_fact != new_pkt_loss_fact) {
+                            TSK_DEBUG_INFO("Downgrade bandwidth %d->%d", video->encoder.pkt_loss_fact, new_pkt_loss_fact);
+                            video->encoder.pkt_loss_fact = new_pkt_loss_fact;
+                            _tdav_session_video_bw_down(video);
+                        }
+                        _tdav_session_video_reset_loss_prob(video);
+                    }
+                }
+                else{
+                    if (video->encoder.pkt_loss_prob_good-- <= 0) {
+                        int32_t new_pkt_loss_fact = TSK_CLAMP(TDAV_SESSION_VIDEO_PKT_LOSS_FACT_MIN, (video->encoder.pkt_loss_fact - 1), TDAV_SESSION_VIDEO_PKT_LOSS_FACT_MAX);
+                        if (video->encoder.pkt_loss_fact != new_pkt_loss_fact) {
+                            TSK_DEBUG_INFO("Upgrade bandwidth %d->%d", video->encoder.pkt_loss_fact, new_pkt_loss_fact);
+                            video->encoder.pkt_loss_fact = new_pkt_loss_fact;
+                            _tdav_session_video_bw_up(video);
+                        }
+                        _tdav_session_video_reset_loss_prob(video);
+                    }
+                }
+                break;
+            }
+        }
+    }
+    
+    i = 0;
+    while((psfb = (const trtp_rtcp_report_psfb_t*)trtp_rtcp_packet_get_at(packet, trtp_rtcp_packet_type_psfb, i++))){
+        switch(psfb->fci_type){
+            case trtp_rtcp_psfb_fci_type_fir:
+            {
+                TSK_DEBUG_INFO("Receiving RTCP-FIR (%u)", ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media);
+                _tdav_session_video_remote_requested_idr(video, ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media);
+                break;
+            }
+            case trtp_rtcp_psfb_fci_type_pli:
+            {
+                uint64_t now;
+                TSK_DEBUG_INFO("Receiving RTCP-PLI (%u)", ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media);
+                now = tsk_time_now();
+                // more than one PLI in 500ms ?
+                // "if" removed because PLI really means codec prediction chain is broken
+                /*if((now - video->avpf.last_pli_time) < 500)*/{
+                    _tdav_session_video_remote_requested_idr(video, ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media);
+                }
+                video->avpf.last_pli_time = now;
+                break;
+            }
+            case trtp_rtcp_psfb_fci_type_afb:
+            {
+                if (psfb->afb.type == trtp_rtcp_psfb_afb_type_remb) {
+                    uint32_t bandwidth_up_reported_kpbs = ((psfb->afb.remb.mantissa << psfb->afb.remb.exp) / 1024);
+                    TSK_DEBUG_INFO("Receiving RTCP-AFB-REMB (%u), exp=%u, mantissa=%u, bandwidth = %ukbps, congestion_ctrl_enabled=%s", ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media, psfb->afb.remb.exp, psfb->afb.remb.mantissa, bandwidth_up_reported_kpbs, base->congestion_ctrl_enabled ? "yes" : "no");
+#if TDAV_GOOG_REMB_FULL_SUPPORT
+                    if (base->congestion_ctrl_enabled) {
+                        uint32_t remb_upload_kbps = 0;
+                        tsk_bool_t remb_ok = tsk_false;
+                        uint64_t bytes_count_now;
+                        uint64_t bytes_count_out;
+                        static uint64_t* bytes_count_in_ptr_null = tsk_null;
+                        
+                        if ((ret = trtp_manager_get_bytes_count(base->rtp_manager, bytes_count_in_ptr_null, &bytes_count_out)) == 0) {
+                            uint64_t duration;
+                            bytes_count_now = tsk_time_now();
+                            duration = (bytes_count_now - base->bytes_out.count_last_time);
+                            remb_ok = (base->bytes_out.count_last_time != 0 && duration > 0);
+                            if (remb_ok) {
+                                remb_upload_kbps = (int32_t)((((bytes_count_out - base->bytes_out.count) * 8 * 1000) / 1024) / duration);
+                                TSK_DEBUG_INFO("remb_upload_kbps=%u, bandwidth_up_reported_kpbs=%u", remb_upload_kbps, bandwidth_up_reported_kpbs);
+                            }
+                            base->bytes_out.count_last_time = bytes_count_now;
+                            base->bytes_out.count = bytes_count_out;
+                        }
+                        if (remb_ok) {
+                            int32_t pkt_loss_percent = bandwidth_up_reported_kpbs >= remb_upload_kbps ? 0 : ((remb_upload_kbps - bandwidth_up_reported_kpbs) / remb_upload_kbps) * 100;
+                            TSK_DEBUG_INFO("GOO-REMB: pkt_loss_percent=%d", pkt_loss_percent);
+                            if (pkt_loss_percent > 5) {
+                                // more than 5% pkt loss
+                                TSK_DEBUG_WARN("pkt_loss_percent(%u) > 5%%, using lower bw(%d)", pkt_loss_percent, bandwidth_up_reported_kpbs);
+                                _tdav_session_video_bw_kbps(video, bandwidth_up_reported_kpbs);
+                            }
+                            else if (pkt_loss_percent == 0) {
+#if 0
+                                // no pkt loss --> increase bw
+                                int32_t target_bw_max_upload_kbps = base->bandwidth_max_upload_kbps; // user-defined (guard), INT_MAX if not defined
+                                if (video->encoder.codec) {
+                                    target_bw_max_upload_kbps = TSK_MIN(
+                                                                        tmedia_get_video_bandwidth_kbps_2(TMEDIA_CODEC_VIDEO(video->encoder.codec)->out.width, TMEDIA_CODEC_VIDEO(video->encoder.codec)->out.height, TMEDIA_CODEC_VIDEO(video->encoder.codec)->out.fps),
+                                                                        target_bw_max_upload_kbps);
+                                }
+                                if (target_bw_max_upload_kbps > remb_upload_kbps + ((remb_upload_kbps / 100) * 20)) {
+                                    // target (best) bw is 20% less than what we're sending --> increase by 5%
+                                    uint32_t new_upload_kbps = remb_upload_kbps + ((remb_upload_kbps / 100) * 5);
+                                    TSK_DEBUG_INFO("current upload bw is too low, increasing from %u to %u", remb_upload_kbps, new_upload_kbps);
+                                    _tdav_session_video_bw_kbps(video, new_upload_kbps);
+                                }
+#endif /* 0 */
+                            }
+                        }
+
+                    }
+#else
+                    // for now we just don't respect the requested bandwidth
+#endif /* TDAV_GOOG_REMB_FULL_SUPPORT */
+                }
+                break;
+            }
+            default: break;
+        }
+    }
+    i = 0;
+    while((rtpfb = (const trtp_rtcp_report_rtpfb_t*)trtp_rtcp_packet_get_at(packet, trtp_rtcp_packet_type_rtpfb, i++))){
+        switch(rtpfb->fci_type){
+            default: break;
+            case trtp_rtcp_rtpfb_fci_type_nack:
+            {
+                if(rtpfb->nack.blp && rtpfb->nack.pid){
+                    tsk_size_t i;
+                    int32_t j;
+                    uint16_t pid, blp;
+                    const tsk_list_item_t* item;
+                    const trtp_rtp_packet_t* pkt_rtp;
+                    for(i = 0; i < rtpfb->nack.count; ++i){
+                        static const int32_t __Pow2[16] = { 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80, 0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000 };
+                        int32_t blp_count;
+                        blp = rtpfb->nack.blp[i];
+                        blp_count = blp ? 16 : 0;
+                        
+                        for(j = -1/*Packet ID (PID)*/; j < blp_count; ++j){
+                            if(j == -1 || (blp & __Pow2[j])){
+                                pid = (rtpfb->nack.pid[i] + (j + 1));
+                                tsk_list_lock(video->avpf.packets);
+                                tsk_list_foreach(item, video->avpf.packets){
+                                    if(!(pkt_rtp = item->data)){
+                                        continue;
+                                    }
+                                    
+                                    // Very Important: the seq_nums are not consecutive because of wrapping.
+                                    // For example, '65533, 65534, 65535, 0, 1' is a valid sequences which means we have to check all packets (probaly need somthing smarter)
+                                    if(pkt_rtp->header->seq_num == pid){
+                                        TSK_DEBUG_INFO("NACK Found, pid=%d, blp=%u", pid, blp);
+                                        trtp_manager_send_rtp_packet(base->rtp_manager, pkt_rtp, tsk_true);
+                                        break;
+                                    }
+                                    if(item == video->avpf.packets->tail){
+                                        // should never be called unless the tail is too small
+                                        int32_t old_max = (int32_t)video->avpf.max;
+                                        int32_t len_drop = (pkt_rtp->header->seq_num - pid);
+                                        video->avpf.max = TSK_CLAMP((int32_t)tmedia_defaults_get_avpf_tail_min(), (old_max + len_drop), (int32_t)tmedia_defaults_get_avpf_tail_max());
+                                        TSK_DEBUG_INFO("**NACK requesting dropped frames. List=[%d-%d], requested=%d, List.Max=%d, List.Count=%d. RTT is probably too high.",
+                                                       ((const trtp_rtp_packet_t*)TSK_LIST_FIRST_DATA(video->avpf.packets))->header->seq_num,
+                                                       ((const trtp_rtp_packet_t*)TSK_LIST_LAST_DATA(video->avpf.packets))->header->seq_num,
+                                                       pid,
+                                                       (int)video->avpf.max,
+                                                       (int)video->avpf.count);
+                                        // FIR not really requested but needed
+                                        /*_tdav_session_video_remote_requested_idr(video, ((const trtp_rtcp_report_fb_t*)rtpfb)->ssrc_media);
+                                         tsk_list_clear_items(video->avpf.packets);
+                                         video->avpf.count = 0;*/
+                                    } // if(last_item)
+                                }// foreach(pkt)
+                                tsk_list_unlock(video->avpf.packets);
+                            }// if(BLP is set)
+                        }// foreach(BIT in BLP)
+                    }// foreach(nack)
+                }// if(nack-blp and nack-pid are set)
+                break;
+            }// case
+        }// switch
+    }// while(rtcp-pkt)
+    
+    return ret;
 }
 
 static int _tdav_session_video_set_defaults(tdav_session_video_t* self)
 {
-	if (!self) {
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-	self->jb_enabled = tmedia_defaults_get_videojb_enabled();
-	self->zero_artifacts = tmedia_defaults_get_video_zeroartifacts_enabled();
-	self->avpf.max = tmedia_defaults_get_avpf_tail_min();
-	self->encoder.pkt_loss_level = tdav_session_video_pkt_loss_level_low;
-	self->encoder.pkt_loss_prob_bad = 0; // honor first report
-	self->encoder.pkt_loss_prob_good = TDAV_SESSION_VIDEO_PKT_LOSS_PROB_GOOD;
-	self->encoder.last_frame_time = 0;
-
-	// reset rotation info (MUST for reINVITE when mobile device in portrait[90 degrees])
-	self->encoder.rotation = 0;
-
-	TSK_DEBUG_INFO("Video 'zero-artifacts' option = %s", self->zero_artifacts  ? "yes" : "no");
-
-	return 0;
+    if (!self) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    self->jb_enabled = tmedia_defaults_get_videojb_enabled();
+    self->zero_artifacts = tmedia_defaults_get_video_zeroartifacts_enabled();
+    self->avpf.max = tmedia_defaults_get_avpf_tail_min();
+    self->encoder.pkt_loss_level = tdav_session_video_pkt_loss_level_low;
+    self->encoder.pkt_loss_prob_bad = 0; // honor first report
+    self->encoder.pkt_loss_prob_good = TDAV_SESSION_VIDEO_PKT_LOSS_PROB_GOOD;
+    self->encoder.last_frame_time = 0;
+    
+    // reset rotation info (MUST for reINVITE when mobile device in portrait[90 degrees])
+    self->encoder.rotation = 0;
+    
+    TSK_DEBUG_INFO("Video 'zero-artifacts' option = %s", self->zero_artifacts  ? "yes" : "no");
+    
+    return 0;
 }
 
 // From jitter buffer to codec
 static int _tdav_session_video_jb_cb(const tdav_video_jb_cb_data_xt* data)
 {
-	tdav_session_video_t* video = (tdav_session_video_t*)data->usr_data;
-	tdav_session_av_t* base = (tdav_session_av_t*)data->usr_data;
-	tmedia_session_t* session = (tmedia_session_t*)data->usr_data;
-
-	switch(data->type){
-		default: break;
-		case tdav_video_jb_cb_data_type_rtp:
-			{
-				return _tdav_session_video_decode(video, data->rtp.pkt);
-			}
-		case tdav_video_jb_cb_data_type_tmfr:
-			{
-				_tdav_session_video_local_request_idr(session, "TMFR", data->ssrc);
-			}
-		case tdav_video_jb_cb_data_type_fl:
-			{
-				if(data->fl.count > TDAV_SESSION_VIDEO_PKT_LOSS_MAX_COUNT_TO_REQUEST_FIR){
-					_tdav_session_video_local_request_idr(session, "TMFR", data->ssrc);
-				}
-				else {
-					if (base->avpf_mode_neg || base->is_fb_nack_neg) { // AVPF?
-						// Send RTCP-NACK
-						tsk_size_t i, j, k;
-						uint16_t seq_nums[16];
-						for(i = 0; i < data->fl.count; i+=16){
-							for(j = 0, k = i; j < 16 && k < data->fl.count; ++j, ++k){
-								seq_nums[j] = (uint16_t)(data->fl.seq_num + i + j);
-								TSK_DEBUG_INFO("Request re-send(%u)", seq_nums[j]);
-							}
-							trtp_manager_signal_pkt_loss(base->rtp_manager, data->ssrc, seq_nums, j);
-						}
-					}
-				}
-
-				break;
-			}
-		case tdav_video_jb_cb_data_type_fps_changed:
-			{
-				if(base->congestion_ctrl_enabled){
-					video->fps_changed = tsk_true;
-					if(video->decoder.codec){
-						TSK_DEBUG_INFO("Congestion control enabled and fps updated from %u to %u", data->fps.old, data->fps.new);
-						TMEDIA_CODEC_VIDEO(video->decoder.codec)->in.fps = data->fps.new;
-					}
-				}
-				break;
-			}
-	}
-
-	return 0;
+    tdav_session_video_t* video = (tdav_session_video_t*)data->usr_data;
+    tdav_session_av_t* base = (tdav_session_av_t*)data->usr_data;
+    tmedia_session_t* session = (tmedia_session_t*)data->usr_data;
+    
+    switch(data->type){
+        default: break;
+        case tdav_video_jb_cb_data_type_rtp:
+        {
+            return _tdav_session_video_decode(video, data->rtp.pkt);
+        }
+        case tdav_video_jb_cb_data_type_tmfr:
+        {
+            base->time_last_frame_loss_report = tsk_time_now();
+            _tdav_session_video_local_request_idr(session, "TMFR", data->ssrc);
+        }
+        case tdav_video_jb_cb_data_type_fl:
+        {
+            base->time_last_frame_loss_report = tsk_time_now();
+            if(data->fl.count > TDAV_SESSION_VIDEO_PKT_LOSS_MAX_COUNT_TO_REQUEST_FIR){
+                _tdav_session_video_local_request_idr(session, "TMFR", data->ssrc);
+            }
+            else {
+                if (base->avpf_mode_neg || base->is_fb_nack_neg) { // AVPF?
+                    // Send RTCP-NACK
+                    tsk_size_t i, j, k;
+                    uint16_t seq_nums[16];
+                    for(i = 0; i < data->fl.count; i+=16){
+                        for(j = 0, k = i; j < 16 && k < data->fl.count; ++j, ++k){
+                            seq_nums[j] = (uint16_t)(data->fl.seq_num + i + j);
+                            TSK_DEBUG_INFO("Request re-send(%u)", seq_nums[j]);
+                        }
+                        trtp_manager_signal_pkt_loss(base->rtp_manager, data->ssrc, seq_nums, j);
+                    }
+                }
+            }
+            
+            break;
+        }
+        case tdav_video_jb_cb_data_type_fps_changed:
+        {
+            if(base->congestion_ctrl_enabled){
+                video->fps_changed = tsk_true;
+                if(video->decoder.codec){
+                    TSK_DEBUG_INFO("Congestion control enabled and fps updated from %u to %u", data->fps.old, data->fps.new);
+                    TMEDIA_CODEC_VIDEO(video->decoder.codec)->in.fps = data->fps.new;
+                }
+            }
+            break;
+        }
+    }
+    
+    return 0;
 }
 
 int _tdav_session_video_open_decoder(tdav_session_video_t* self, uint8_t payload_type)
 {
-	int ret = 0;
-
-	if ((self->decoder.codec_payload_type != payload_type) || !self->decoder.codec) {
-		tsk_istr_t format;
-		TSK_OBJECT_SAFE_FREE(self->decoder.codec);
-		tsk_itoa(payload_type, &format);
-		if (!(self->decoder.codec = tmedia_codec_find_by_format(TMEDIA_SESSION(self)->neg_codecs, format)) || !self->decoder.codec->plugin || !self->decoder.codec->plugin->decode) {
-			TSK_DEBUG_ERROR("%s is not a valid payload for this session", format);
-			ret = -2;
-			goto bail;
-		}
-		self->decoder.codec_payload_type = payload_type;
-		self->decoder.codec_decoded_frames_count = 0; // because we switched the codecs
-	}
-	// Open codec if not already done
-	if (!TMEDIA_CODEC(self->decoder.codec)->opened){
-		if ((ret = tmedia_codec_open(self->decoder.codec))) {
-			TSK_DEBUG_ERROR("Failed to open [%s] codec", self->decoder.codec->plugin->desc);
-			goto bail;
-		}
-		self->decoder.codec_decoded_frames_count = 0; // because first time to use
-	}
-
+    int ret = 0;
+    
+    if ((self->decoder.codec_payload_type != payload_type) || !self->decoder.codec) {
+        tsk_istr_t format;
+        TSK_OBJECT_SAFE_FREE(self->decoder.codec);
+        tsk_itoa(payload_type, &format);
+        if (!(self->decoder.codec = tmedia_codec_find_by_format(TMEDIA_SESSION(self)->neg_codecs, format)) || !self->decoder.codec->plugin || !self->decoder.codec->plugin->decode) {
+            TSK_DEBUG_ERROR("%s is not a valid payload for this session", format);
+            ret = -2;
+            goto bail;
+        }
+        self->decoder.codec_payload_type = payload_type;
+        self->decoder.codec_decoded_frames_count = 0; // because we switched the codecs
+    }
+    // Open codec if not already done
+    if (!TMEDIA_CODEC(self->decoder.codec)->opened){
+        if ((ret = tmedia_codec_open(self->decoder.codec))) {
+            TSK_DEBUG_ERROR("Failed to open [%s] codec", self->decoder.codec->plugin->desc);
+            goto bail;
+        }
+        self->decoder.codec_decoded_frames_count = 0; // because first time to use
+    }
+    
 bail:
-	return ret;
+    return ret;
 }
 
 static int _tdav_session_video_decode(tdav_session_video_t* self, const trtp_rtp_packet_t* packet)
 {
-	tdav_session_av_t* base = (tdav_session_av_t*)self;
-	static const trtp_rtp_header_t* __rtp_header = tsk_null;
-	static const tmedia_codec_id_t __codecs_supporting_zero_artifacts = (tmedia_codec_id_vp8 | tmedia_codec_id_h264_bp | tmedia_codec_id_h264_mp | tmedia_codec_id_h263);
-	int ret = 0;
-
-	if(!self || !packet || !packet->header){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-
-	tsk_safeobj_lock(base);
-
-	if(self->started && base->consumer && base->consumer->is_started){
-		tsk_size_t out_size, _size;
-		const void* _buffer;
-		tdav_session_video_t* video = (tdav_session_video_t*)base;
-
-		// Find the codec to use to decode the RTP payload
-		if(!self->decoder.codec || self->decoder.codec_payload_type != packet->header->payload_type){
-			if((ret = _tdav_session_video_open_decoder(self, packet->header->payload_type))){
-				goto bail;
-			}
-		}
-
-		// check whether bypassing is enabled (e.g. rtcweb breaker ON and media coder OFF)
-		if(TMEDIA_SESSION(self)->bypass_decoding){
-			// set codec id for internal use (useful to find codec with dynamic payload type)
-			TRTP_RTP_HEADER(packet->header)->codec_id = self->decoder.codec->id;
-			// consume the frame
-			ret = tmedia_consumer_consume(base->consumer, (packet->payload.data ? packet->payload.data : packet->payload.data_const), packet->payload.size, packet->header);
-			goto bail;
-		}
-
-		// Check if stream is corrupted or not
-		if(video->decoder.last_seqnum && (video->decoder.last_seqnum + 1) != packet->header->seq_num){
-			TSK_DEBUG_INFO("/!\\Video stream corrupted because of packet loss [%u - %u]. Pause rendering if 'zero_artifacts' (supported = %s, enabled = %s).", 
-				video->decoder.last_seqnum, 
-				packet->header->seq_num,
-				(__codecs_supporting_zero_artifacts & self->decoder.codec->id) ? "yes" : "no",
-				self->zero_artifacts ? "yes" : "no"
-				);
-			if(!video->decoder.stream_corrupted){ // do not do the job twice
-				if(self->zero_artifacts && (__codecs_supporting_zero_artifacts & self->decoder.codec->id)){
-					// request IDR now and every time after 'TDAV_SESSION_VIDEO_AVPF_FIR_REQUEST_INTERVAL_MIN' ellapsed
-					// 'zero-artifacts' not enabled then, we'll request IDR when decoding fails
-					TSK_DEBUG_INFO("Sending FIR to request IDR...");
-					_tdav_session_video_local_request_idr(TMEDIA_SESSION(video), "ZERO_ART_CORRUPTED", packet->header->ssrc);
-				}
-				// value will be updated when we decode an IDR frame
-				video->decoder.stream_corrupted = tsk_true;
-				video->decoder.stream_corrupted_since = tsk_time_now();
-			}
-			// will be used as guard to avoid redering corrupted IDR
-			video->decoder.last_corrupted_timestamp = packet->header->timestamp;
-		}
-		video->decoder.last_seqnum = packet->header->seq_num; // update last seqnum
-
-		// Decode data
-		out_size = self->decoder.codec->plugin->decode(
-			self->decoder.codec, 
-			(packet->payload.data ? packet->payload.data : packet->payload.data_const), packet->payload.size, 
-			&self->decoder.buffer, &self->decoder.buffer_size,
-			packet->header
-			);
-		// check
-		if(!out_size || !self->decoder.buffer){
-			goto bail;
-		}
-		// check if stream is corrupted
-		// the above decoding process is required in order to reset stream corruption status when IDR frame is decoded
-		if(self->zero_artifacts && self->decoder.stream_corrupted && (__codecs_supporting_zero_artifacts & self->decoder.codec->id)){
-			TSK_DEBUG_INFO("Do not render video frame because stream is corrupted and 'zero-artifacts' is enabled. Last seqnum=%u", video->decoder.last_seqnum);
-			if(video->decoder.stream_corrupted && (tsk_time_now() - video->decoder.stream_corrupted_since) > TDAV_SESSION_VIDEO_AVPF_FIR_REQUEST_INTERVAL_MIN){
-				TSK_DEBUG_INFO("Sending FIR to request IDR because frame corrupted since %llu...", video->decoder.stream_corrupted_since);
-				_tdav_session_video_local_request_idr(TMEDIA_SESSION(video), "ZERO_ART_CORRUPTED", packet->header->ssrc);
-			}
-			goto bail;
-		}
-
-		// important: do not override the display size (used by the end-user) unless requested
-		if(base->consumer->video.display.auto_resize){
-			base->consumer->video.display.width = TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.width;//decoded width
-			base->consumer->video.display.height = TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.height;//decoded height
-		}
-
-		// Convert decoded data to the consumer chroma and size
+    tdav_session_av_t* base = (tdav_session_av_t*)self;
+    static const trtp_rtp_header_t* __rtp_header = tsk_null;
+    static const tmedia_codec_id_t __codecs_supporting_zero_artifacts = (tmedia_codec_id_vp8 | tmedia_codec_id_h264_bp | tmedia_codec_id_h264_mp | tmedia_codec_id_h263);
+    int ret = 0;
+    
+    if(!self || !packet || !packet->header){
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    
+    tsk_safeobj_lock(base);
+    
+    if (self->started && base->consumer && base->consumer->is_started) {
+        tsk_size_t out_size, _size;
+        const void* _buffer;
+        tdav_session_video_t* video = (tdav_session_video_t*)base;
+        
+        // Find the codec to use to decode the RTP payload
+        if(!self->decoder.codec || self->decoder.codec_payload_type != packet->header->payload_type){
+            if((ret = _tdav_session_video_open_decoder(self, packet->header->payload_type))){
+                goto bail;
+            }
+        }
+        
+        // check whether bypassing is enabled (e.g. rtcweb breaker ON and media coder OFF)
+        if(TMEDIA_SESSION(self)->bypass_decoding){
+            // set codec id for internal use (useful to find codec with dynamic payload type)
+            TRTP_RTP_HEADER(packet->header)->codec_id = self->decoder.codec->id;
+            // consume the frame
+            ret = tmedia_consumer_consume(base->consumer, (packet->payload.data ? packet->payload.data : packet->payload.data_const), packet->payload.size, packet->header);
+            goto bail;
+        }
+        
+        // Check if stream is corrupted or not
+        if(video->decoder.last_seqnum && (video->decoder.last_seqnum + 1) != packet->header->seq_num){
+            TSK_DEBUG_INFO("/!\\Video stream corrupted because of packet loss [%u - %u]. Pause rendering if 'zero_artifacts' (supported = %s, enabled = %s).",
+                           video->decoder.last_seqnum,
+                           packet->header->seq_num,
+                           (__codecs_supporting_zero_artifacts & self->decoder.codec->id) ? "yes" : "no",
+                           self->zero_artifacts ? "yes" : "no"
+                           );
+            if(!video->decoder.stream_corrupted){ // do not do the job twice
+                if(self->zero_artifacts && (__codecs_supporting_zero_artifacts & self->decoder.codec->id)){
+                    // request IDR now and every time after 'TDAV_SESSION_VIDEO_AVPF_FIR_REQUEST_INTERVAL_MIN' ellapsed
+                    // 'zero-artifacts' not enabled then, we'll request IDR when decoding fails
+                    TSK_DEBUG_INFO("Sending FIR to request IDR...");
+                    _tdav_session_video_local_request_idr(TMEDIA_SESSION(video), "ZERO_ART_CORRUPTED", packet->header->ssrc);
+                }
+                // value will be updated when we decode an IDR frame
+                video->decoder.stream_corrupted = tsk_true;
+                video->decoder.stream_corrupted_since = tsk_time_now();
+            }
+            // will be used as guard to avoid redering corrupted IDR
+            video->decoder.last_corrupted_timestamp = packet->header->timestamp;
+        }
+        video->decoder.last_seqnum = packet->header->seq_num; // update last seqnum
+        
+        // Decode data
+        out_size = self->decoder.codec->plugin->decode(
+                                                       self->decoder.codec,
+                                                       (packet->payload.data ? packet->payload.data : packet->payload.data_const), packet->payload.size,
+                                                       &self->decoder.buffer, &self->decoder.buffer_size,
+                                                       packet->header
+                                                       );
+        // check
+        if(!out_size || !self->decoder.buffer){
+            goto bail;
+        }
+        // check if stream is corrupted
+        // the above decoding process is required in order to reset stream corruption status when IDR frame is decoded
+        if(self->zero_artifacts && self->decoder.stream_corrupted && (__codecs_supporting_zero_artifacts & self->decoder.codec->id)){
+            TSK_DEBUG_INFO("Do not render video frame because stream is corrupted and 'zero-artifacts' is enabled. Last seqnum=%u", video->decoder.last_seqnum);
+            if(video->decoder.stream_corrupted && (tsk_time_now() - video->decoder.stream_corrupted_since) > TDAV_SESSION_VIDEO_AVPF_FIR_REQUEST_INTERVAL_MIN){
+                TSK_DEBUG_INFO("Sending FIR to request IDR because frame corrupted since %llu...", video->decoder.stream_corrupted_since);
+                _tdav_session_video_local_request_idr(TMEDIA_SESSION(video), "ZERO_ART_CORRUPTED", packet->header->ssrc);
+            }
+            goto bail;
+        }
+        
+        // important: do not override the display size (used by the end-user) unless requested
+        if(base->consumer->video.display.auto_resize){
+            base->consumer->video.display.width = TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.width;//decoded width
+            base->consumer->video.display.height = TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.height;//decoded height
+        }
+        
+        // Convert decoded data to the consumer chroma and size
 #define CONSUMER_NEED_DECODER (base->consumer->decoder.codec_id == tmedia_codec_id_none) // Otherwise, the consumer requires encoded frames
 #define CONSUMER_IN_N_DISPLAY_MISMATCH		(!base->consumer->video.display.auto_resize && (base->consumer->video.in.width != base->consumer->video.display.width || base->consumer->video.in.height != base->consumer->video.display.height))
 #define CONSUMER_DISPLAY_N_CODEC_MISMATCH		(base->consumer->video.display.width != TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.width || base->consumer->video.display.height != TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.height)
 #define CONSUMER_DISPLAY_N_CONVERTER_MISMATCH	( (self->conv.fromYUV420 && self->conv.fromYUV420->dstWidth != base->consumer->video.display.width) || (self->conv.fromYUV420 && self->conv.fromYUV420->dstHeight != base->consumer->video.display.height) )
 #define CONSUMER_CHROMA_MISMATCH	(base->consumer->video.display.chroma != TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.chroma)
 #define DECODED_NEED_FLIP	(TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.flip)
-
-		if(CONSUMER_NEED_DECODER && (CONSUMER_CHROMA_MISMATCH || CONSUMER_DISPLAY_N_CODEC_MISMATCH || CONSUMER_IN_N_DISPLAY_MISMATCH || CONSUMER_DISPLAY_N_CONVERTER_MISMATCH || DECODED_NEED_FLIP)){
-
-			// Create video converter if not already done
-			if(!self->conv.fromYUV420 || CONSUMER_DISPLAY_N_CONVERTER_MISMATCH){
-				TSK_OBJECT_SAFE_FREE(self->conv.fromYUV420);
-
-				// create converter
-				if(!(self->conv.fromYUV420 = tmedia_converter_video_create(TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.width, TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.height, TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.chroma, base->consumer->video.display.width, base->consumer->video.display.height,
-					base->consumer->video.display.chroma))){
-						TSK_DEBUG_ERROR("Failed to create video converter");
-						ret = -3;
-						goto bail;
-				}
-			}
-		}
-
-		// update consumer size using the codec decoded values
-		// must be done here to avoid fooling "CONSUMER_IN_N_DISPLAY_MISMATCH" unless "auto_resize" option is enabled
-		base->consumer->video.in.width = TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.width;//decoded width
-		base->consumer->video.in.height = TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.height;//decoded height
-
-		if(self->conv.fromYUV420){
-			// update one-shot parameters
-			tmedia_converter_video_set_flip(self->conv.fromYUV420, TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.flip);
-			// convert data to the consumer's chroma
-			out_size = tmedia_converter_video_process(self->conv.fromYUV420, self->decoder.buffer, self->decoder.buffer_size, &self->decoder.conv_buffer, &self->decoder.conv_buffer_size);
-			if(!out_size || !self->decoder.conv_buffer){
-				TSK_DEBUG_ERROR("Failed to convert YUV420 buffer to consumer's chroma");
-				ret = -4;
-				goto bail;
-			}
-
-			_buffer = self->decoder.conv_buffer;
-			_size = out_size;
-		}
-		else{
-			_buffer = self->decoder.buffer;
-			_size = out_size;
-		}
-
-		// congetion control
-		// send RTCP-REMB if:
-		//  - congestion control is enabled and
-		//  - fps changed or
-		//	- first frame or
-		//  - approximately every 5 minutes (300 = 60 * 5)
-		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() but the decoded video size was not correct and based on the SDP negotiation
-			bandwidth_max_download_kbps = TSK_MIN(
-				tmedia_get_video_bandwidth_kbps_2(TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.width, TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.height, TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.fps),
-				bandwidth_max_download_kbps);
-			if(self->encoder.codec){
-				bandwidth_max_upload_kbps = TSK_MIN(
-					tmedia_get_video_bandwidth_kbps_2(TMEDIA_CODEC_VIDEO(self->encoder.codec)->out.width, TMEDIA_CODEC_VIDEO(self->encoder.codec)->out.height, TMEDIA_CODEC_VIDEO(self->encoder.codec)->out.fps),
-					bandwidth_max_upload_kbps);
-			}
-			self->fps_changed = tsk_false; // reset
-			TSK_DEBUG_INFO("video with congestion control enabled: max_bw_up=%d kpbs, max_bw_down=%d kpbs", bandwidth_max_upload_kbps, bandwidth_max_download_kbps);
-			ret = trtp_manager_set_app_bandwidth_max(base->rtp_manager, bandwidth_max_upload_kbps, bandwidth_max_download_kbps);
-		}
-		// inc() frame count and consume decoded video
-		++self->decoder.codec_decoded_frames_count;
-		ret = tmedia_consumer_consume(base->consumer, _buffer, _size, __rtp_header);
-	}
-	else if(!base->consumer || !base->consumer->is_started){
-		TSK_DEBUG_INFO("Consumer not started (is_null=%d)", !base->consumer);
-	}
-
+        
+        if(CONSUMER_NEED_DECODER && (CONSUMER_CHROMA_MISMATCH || CONSUMER_DISPLAY_N_CODEC_MISMATCH || CONSUMER_IN_N_DISPLAY_MISMATCH || CONSUMER_DISPLAY_N_CONVERTER_MISMATCH || DECODED_NEED_FLIP)){
+            
+            // Create video converter if not already done
+            if(!self->conv.fromYUV420 || CONSUMER_DISPLAY_N_CONVERTER_MISMATCH){
+                TSK_OBJECT_SAFE_FREE(self->conv.fromYUV420);
+                
+                // create converter
+                if(!(self->conv.fromYUV420 = tmedia_converter_video_create(TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.width, TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.height, TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.chroma, base->consumer->video.display.width, base->consumer->video.display.height,
+                                                                           base->consumer->video.display.chroma))){
+                    TSK_DEBUG_ERROR("Failed to create video converter");
+                    ret = -3;
+                    goto bail;
+                }
+            }
+        }
+        
+        // update consumer size using the codec decoded values
+        // must be done here to avoid fooling "CONSUMER_IN_N_DISPLAY_MISMATCH" unless "auto_resize" option is enabled
+        base->consumer->video.in.width = TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.width;//decoded width
+        base->consumer->video.in.height = TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.height;//decoded height
+        
+        if(self->conv.fromYUV420){
+            // update one-shot parameters
+            tmedia_converter_video_set_flip(self->conv.fromYUV420, TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.flip);
+            // convert data to the consumer's chroma
+            out_size = tmedia_converter_video_process(self->conv.fromYUV420, self->decoder.buffer, self->decoder.buffer_size, &self->decoder.conv_buffer, &self->decoder.conv_buffer_size);
+            if(!out_size || !self->decoder.conv_buffer){
+                TSK_DEBUG_ERROR("Failed to convert YUV420 buffer to consumer's chroma");
+                ret = -4;
+                goto bail;
+            }
+            
+            _buffer = self->decoder.conv_buffer;
+            _size = out_size;
+        }
+        else{
+            _buffer = self->decoder.buffer;
+            _size = out_size;
+        }
+        
+        // congetion control
+        // send RTCP-REMB if:
+        //  - congestion control is enabled and
+        //  - fps changed or
+        //	- first frame or
+        //  - approximately every 1 seconds (1 = 1 * 1)
+        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 * 1)) == 0))){
+            int32_t bandwidth_max_upload_kbps = base->bandwidth_max_upload_kbps;
+            int32_t bandwidth_max_download_kbps = base->bandwidth_max_download_kbps; // user-defined (guard), INT_MAX if not defined
+            // bandwidth already computed in start() but the decoded video size was not correct and based on the SDP negotiation
+            bandwidth_max_download_kbps = TSK_MIN(
+                                                  tmedia_get_video_bandwidth_kbps_2(TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.width, TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.height, TMEDIA_CODEC_VIDEO(self->decoder.codec)->in.fps),
+                                                  bandwidth_max_download_kbps);
+            if (self->encoder.codec) {
+                bandwidth_max_upload_kbps = TSK_MIN(
+                                                    tmedia_get_video_bandwidth_kbps_2(TMEDIA_CODEC_VIDEO(self->encoder.codec)->out.width, TMEDIA_CODEC_VIDEO(self->encoder.codec)->out.height, TMEDIA_CODEC_VIDEO(self->encoder.codec)->out.fps),
+                                                    bandwidth_max_upload_kbps);
+            }
+            
+#if TDAV_GOOG_REMB_FULL_SUPPORT
+            {
+                tsk_bool_t remb_ok = tsk_false;
+                int32_t remb_download_kbps = 0;
+                uint64_t now = 0;
+                uint64_t bytes_count_in;
+                static uint64_t* bytes_count_out_ptr_null = tsk_null;
+                if ((ret = trtp_manager_get_bytes_count(base->rtp_manager, &bytes_count_in, bytes_count_out_ptr_null)) == 0) {
+                    uint64_t duration;
+                    now = tsk_time_now();
+                    duration = (now - base->bytes_in.count_last_time);
+                    remb_ok = (base->bytes_in.count_last_time != 0 && duration > 0);
+                    if (remb_ok) {
+                        remb_download_kbps = (int32_t)((((bytes_count_in - base->bytes_in.count) * 8 * 1000) / 1024) / duration);
+                        TSK_DEBUG_INFO("remb_download_kbps=%d", remb_download_kbps);
+                    }
+                    base->bytes_in.count_last_time = now;
+                    base->bytes_in.count = bytes_count_in;
+                }
+                if (remb_ok) {
+                    // if "remb_ok" is true then "now" has a valid value
+                    if ((now - base->time_last_frame_loss_report) > TDAV_SESSION_VIDEO_PKT_LOSS_NO_REPORT_BEFORE_INCREASING_BW) {
+                        TSK_DEBUG_INFO("No pakt loss since %d millis ... adding 5%% to the estimated max bandwidth", TDAV_SESSION_VIDEO_PKT_LOSS_NO_REPORT_BEFORE_INCREASING_BW);
+                        remb_download_kbps += (remb_download_kbps / 100) * 5; // add 5% to the estimated bandwidth
+                    }
+                    // CLAMP is used to make sure we will not report more than what the user defined as max values even if the estimated values are higher
+                    bandwidth_max_download_kbps = TSK_CLAMP(0, remb_download_kbps, bandwidth_max_download_kbps);
+                }
+            }
+#endif /* TDAV_GOOG_REMB_FULL_SUPPORT */
+            
+            self->fps_changed = tsk_false; // reset
+            TSK_DEBUG_INFO("video with congestion control enabled: max_bw_up(unused)=%d kpbs, max_bw_down=%d kpbs", bandwidth_max_upload_kbps, bandwidth_max_download_kbps);
+            ret = trtp_manager_set_app_bandwidth_max(base->rtp_manager, bandwidth_max_upload_kbps/* unused */, bandwidth_max_download_kbps);
+        }
+        // inc() frame count and consume decoded video
+        ++self->decoder.codec_decoded_frames_count;
+        ret = tmedia_consumer_consume(base->consumer, _buffer, _size, __rtp_header);
+    }
+    else if (!base->consumer || !base->consumer->is_started) {
+        TSK_DEBUG_INFO("Consumer not started (is_null=%d)", !base->consumer);
+    }
+    
 bail:
-	tsk_safeobj_unlock(base);
-
-	return ret;
+    tsk_safeobj_unlock(base);
+    
+    return ret;
 }
 
 /* ============ Plugin interface ================= */
 
 static int tdav_session_video_set(tmedia_session_t* self, const tmedia_param_t* param)
 {
-	int ret = 0;
-	tdav_session_video_t* video;
-	tdav_session_av_t* base;
-
-	if(!self){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-
-	// try with the base class to see if this option is supported or not
-	if (tdav_session_av_set(TDAV_SESSION_AV(self), param) == tsk_true) {
-		return 0;
-	}
-
-	video = (tdav_session_video_t*)self;
-	base = (tdav_session_av_t*)self;
-
-	if(param->plugin_type == tmedia_ppt_codec){
-		tsk_mutex_lock(video->encoder.h_mutex);
-		ret = tmedia_codec_set((tmedia_codec_t*)video->encoder.codec, param);
-		tsk_mutex_unlock(video->encoder.h_mutex);
-	}
-	else if(param->plugin_type == tmedia_ppt_consumer){
-		if(!base->consumer){
-			TSK_DEBUG_ERROR("No consumer associated to this session");
-			return -1;
-		}
-		if(param->value_type == tmedia_pvt_int32){
-			if(tsk_striequals(param->key, "flip")){
-				tsk_list_item_t* item;
-				tsk_bool_t flip = (tsk_bool_t)TSK_TO_INT32((uint8_t*)param->value);
-				tmedia_codecs_L_t *codecs = tsk_object_ref(self->codecs);
-				tsk_list_foreach(item, codecs){
-					TMEDIA_CODEC_VIDEO(item->data)->in.flip = flip;
-				}
-				tsk_object_unref(codecs);
-			}
-		}
-		ret = tmedia_consumer_set(base->consumer, param);
-	}
-	else if(param->plugin_type == tmedia_ppt_producer){
-		if(!base->producer){
-			TSK_DEBUG_ERROR("No producer associated to this session");
-			return -1;
-		}
-		if(param->value_type == tmedia_pvt_int32){
-			if(tsk_striequals(param->key, "flip")){
-				tsk_list_item_t* item;
-				tsk_bool_t flip = (tsk_bool_t)TSK_TO_INT32((uint8_t*)param->value);
-				tmedia_codecs_L_t *codecs = tsk_object_ref(self->codecs);
-				tsk_list_foreach(item, codecs){
-					TMEDIA_CODEC_VIDEO(item->data)->out.flip = flip;
-				}
-				tsk_object_unref(codecs);
-			}
-		}
-		ret = tmedia_producer_set(base->producer, param);
-	}
-	else{
-		if (param->value_type == tmedia_pvt_int32){
-			if (tsk_striequals(param->key, "bandwidth-level")){
-				tsk_list_item_t* item;
-				self->bl = (tmedia_bandwidth_level_t)TSK_TO_INT32((uint8_t*)param->value);
-				self->codecs = tsk_object_ref(self->codecs);
-				tsk_list_foreach(item, self->codecs){
-					((tmedia_codec_t*)item->data)->bl = self->bl;
-				}
-				tsk_object_unref(self->codecs);
-			}
-		}
-	}
-
-	return ret;
+    int ret = 0;
+    tdav_session_video_t* video;
+    tdav_session_av_t* base;
+    
+    if(!self){
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    
+    // try with the base class to see if this option is supported or not
+    if (tdav_session_av_set(TDAV_SESSION_AV(self), param) == tsk_true) {
+        return 0;
+    }
+    
+    video = (tdav_session_video_t*)self;
+    base = (tdav_session_av_t*)self;
+    
+    if(param->plugin_type == tmedia_ppt_codec){
+        tsk_mutex_lock(video->encoder.h_mutex);
+        ret = tmedia_codec_set((tmedia_codec_t*)video->encoder.codec, param);
+        tsk_mutex_unlock(video->encoder.h_mutex);
+    }
+    else if(param->plugin_type == tmedia_ppt_consumer){
+        if(!base->consumer){
+            TSK_DEBUG_ERROR("No consumer associated to this session");
+            return -1;
+        }
+        if(param->value_type == tmedia_pvt_int32){
+            if(tsk_striequals(param->key, "flip")){
+                tsk_list_item_t* item;
+                tsk_bool_t flip = (tsk_bool_t)TSK_TO_INT32((uint8_t*)param->value);
+                tmedia_codecs_L_t *codecs = tsk_object_ref(self->codecs);
+                tsk_list_foreach(item, codecs){
+                    TMEDIA_CODEC_VIDEO(item->data)->in.flip = flip;
+                }
+                tsk_object_unref(codecs);
+            }
+        }
+        ret = tmedia_consumer_set(base->consumer, param);
+    }
+    else if(param->plugin_type == tmedia_ppt_producer){
+        if(!base->producer){
+            TSK_DEBUG_ERROR("No producer associated to this session");
+            return -1;
+        }
+        if(param->value_type == tmedia_pvt_int32){
+            if(tsk_striequals(param->key, "flip")){
+                tsk_list_item_t* item;
+                tsk_bool_t flip = (tsk_bool_t)TSK_TO_INT32((uint8_t*)param->value);
+                tmedia_codecs_L_t *codecs = tsk_object_ref(self->codecs);
+                tsk_list_foreach(item, codecs){
+                    TMEDIA_CODEC_VIDEO(item->data)->out.flip = flip;
+                }
+                tsk_object_unref(codecs);
+            }
+        }
+        ret = tmedia_producer_set(base->producer, param);
+    }
+    else{
+        if (param->value_type == tmedia_pvt_int32){
+            if (tsk_striequals(param->key, "bandwidth-level")){
+                tsk_list_item_t* item;
+                self->bl = (tmedia_bandwidth_level_t)TSK_TO_INT32((uint8_t*)param->value);
+                self->codecs = tsk_object_ref(self->codecs);
+                tsk_list_foreach(item, self->codecs){
+                    ((tmedia_codec_t*)item->data)->bl = self->bl;
+                }
+                tsk_object_unref(self->codecs);
+            }
+        }
+    }
+    
+    return ret;
 }
 
 static int tdav_session_video_get(tmedia_session_t* self, tmedia_param_t* param)
 {
-	if (!self || !param) {
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-
-	// try with the base class to see if this option is supported or not
-	if (tdav_session_av_get(TDAV_SESSION_AV(self), param) == tsk_true) {
-		return 0;
-	}
-	else {
-		if (param->plugin_type == tmedia_ppt_session) {
-			if (param->value_type == tmedia_pvt_pobject) {
-				if (tsk_striequals(param->key, "codec-encoder")) {
-					*((tsk_object_t**)param->value) = tsk_object_ref(TDAV_SESSION_VIDEO(self)->encoder.codec); // up to the caller to release the object
-					return 0;
-				}
-			}
-		}
-	}
-
-	TSK_DEBUG_WARN("This session doesn't support get(%s)", param->key);
-	return -2;
+    if (!self || !param) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    
+    // try with the base class to see if this option is supported or not
+    if (tdav_session_av_get(TDAV_SESSION_AV(self), param) == tsk_true) {
+        return 0;
+    }
+    else {
+        if (param->plugin_type == tmedia_ppt_session) {
+            if (param->value_type == tmedia_pvt_pobject) {
+                if (tsk_striequals(param->key, "codec-encoder")) {
+                    *((tsk_object_t**)param->value) = tsk_object_ref(TDAV_SESSION_VIDEO(self)->encoder.codec); // up to the caller to release the object
+                    return 0;
+                }
+            }
+        }
+    }
+    
+    TSK_DEBUG_WARN("This session doesn't support get(%s)", param->key);
+    return -2;
 }
 
 static int tdav_session_video_prepare(tmedia_session_t* self)
 {
-	tdav_session_av_t* base = (tdav_session_av_t*)(self);
-	tdav_session_video_t* video = (tdav_session_video_t*)self;
-	int ret;
-
-	if((ret = tdav_session_av_prepare(base))){
-		TSK_DEBUG_ERROR("tdav_session_av_prepare(video) failed");
-		return ret;
-	}
-
-	if(base->rtp_manager){
-		ret = trtp_manager_set_rtp_callback(base->rtp_manager, tdav_session_video_rtp_cb, base);
-		ret = trtp_manager_set_rtcp_callback(base->rtp_manager, tdav_session_video_rtcp_cb, base);
-	}
-
-	return ret;
+    tdav_session_av_t* base = (tdav_session_av_t*)(self);
+    tdav_session_video_t* video = (tdav_session_video_t*)self;
+    int ret;
+    
+    if((ret = tdav_session_av_prepare(base))){
+        TSK_DEBUG_ERROR("tdav_session_av_prepare(video) failed");
+        return ret;
+    }
+    
+    if(base->rtp_manager){
+        ret = trtp_manager_set_rtp_callback(base->rtp_manager, tdav_session_video_rtp_cb, base);
+        ret = trtp_manager_set_rtcp_callback(base->rtp_manager, tdav_session_video_rtcp_cb, base);
+    }
+    
+    return ret;
 }
 
 static int tdav_session_video_start(tmedia_session_t* self)
 {
-	int ret;
-	tdav_session_video_t* video;
-	const tmedia_codec_t* codec;
-	tdav_session_av_t* base;
-
-	if (!self) {
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-
-	video = (tdav_session_video_t*)self;
-	base = (tdav_session_av_t*)self;
-
-	if (video->started) {
-		TSK_DEBUG_INFO("Video session already started");
-		return 0;
-	}
-
-	// ENCODER codec
-	if (!(codec = tdav_session_av_get_best_neg_codec(base))) {
-		TSK_DEBUG_ERROR("No codec matched");
-		return -2;
-	}
-	tsk_mutex_lock(video->encoder.h_mutex);
-	TSK_OBJECT_SAFE_FREE(video->encoder.codec);
-	video->encoder.codec = tsk_object_ref((tsk_object_t*)codec);
-
-	// initialize the encoder using user-defined values
-	if ((ret = tdav_session_av_init_encoder(base, video->encoder.codec))) {
-		TSK_DEBUG_ERROR("Failed to initialize the encoder [%s] codec", video->encoder.codec->plugin->desc);
-		return ret;
-	}
-	if (!TMEDIA_CODEC(video->encoder.codec)->opened) {
-		if((ret = tmedia_codec_open(video->encoder.codec))){
-			tsk_mutex_unlock(video->encoder.h_mutex);
-			TSK_DEBUG_ERROR("Failed to open [%s] codec", video->encoder.codec->plugin->desc);
-			return ret;
-		}
-	}
-	tsk_mutex_unlock(video->encoder.h_mutex);
-
-	if (video->jb) {
-		if ((ret = tdav_video_jb_start(video->jb))) {
-			TSK_DEBUG_ERROR("Failed to start jitter buffer");
-			return ret;
-		}
-	}
-
-	if ((ret = tdav_session_av_start(base, video->encoder.codec))) {
-		TSK_DEBUG_ERROR("tdav_session_av_start(video) failed");
-		return ret;
-	}	
-	video->started = tsk_true;
-	return ret;
+    int ret;
+    tdav_session_video_t* video;
+    const tmedia_codec_t* codec;
+    tdav_session_av_t* base;
+    
+    if (!self) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    
+    video = (tdav_session_video_t*)self;
+    base = (tdav_session_av_t*)self;
+    
+    if (video->started) {
+        TSK_DEBUG_INFO("Video session already started");
+        return 0;
+    }
+    
+    // ENCODER codec
+    if (!(codec = tdav_session_av_get_best_neg_codec(base))) {
+        TSK_DEBUG_ERROR("No codec matched");
+        return -2;
+    }
+    tsk_mutex_lock(video->encoder.h_mutex);
+    TSK_OBJECT_SAFE_FREE(video->encoder.codec);
+    video->encoder.codec = tsk_object_ref((tsk_object_t*)codec);
+    // initialize the encoder using user-defined values
+    if ((ret = tdav_session_av_init_encoder(base, video->encoder.codec))) {
+        TSK_DEBUG_ERROR("Failed to initialize the encoder [%s] codec", video->encoder.codec->plugin->desc);
+        return ret;
+    }
+    if (!TMEDIA_CODEC(video->encoder.codec)->opened) {
+        if((ret = tmedia_codec_open(video->encoder.codec))){
+            tsk_mutex_unlock(video->encoder.h_mutex);
+            TSK_DEBUG_ERROR("Failed to open [%s] codec", video->encoder.codec->plugin->desc);
+            return ret;
+        }
+    }
+    tsk_mutex_unlock(video->encoder.h_mutex);
+    
+    if (video->jb) {
+        if ((ret = tdav_video_jb_start(video->jb))) {
+            TSK_DEBUG_ERROR("Failed to start jitter buffer");
+            return ret;
+        }
+    }
+    
+    if ((ret = tdav_session_av_start(base, video->encoder.codec))) {
+        TSK_DEBUG_ERROR("tdav_session_av_start(video) failed");
+        return ret;
+    }
+    video->started = tsk_true;
+    return ret;
 }
 
 static int tdav_session_video_stop(tmedia_session_t* self)
 {
-	int ret;
-	tdav_session_video_t* video;
-	tdav_session_av_t* base;
-
-	TSK_DEBUG_INFO("tdav_session_video_stop");
-
-	video = (tdav_session_video_t*)self;
-	base = (tdav_session_av_t*)self;
-
-	// must be here to make sure no other thread will lock the encoder once we have done it
-	tsk_mutex_lock(video->encoder.h_mutex); // encoder thread will check "started" var right after the lock is passed
-	video->started = tsk_false;
-	tsk_mutex_unlock(video->encoder.h_mutex);
-	// at this step we're sure that encode() will no longer be called which means we can safely close the codec
-
-	if (video->jb) {
-		ret = tdav_video_jb_stop(video->jb);
-	}
-	// clear AVPF packets and wait for the dtor() before destroying the list
-	tsk_list_lock(video->avpf.packets);
-	tsk_list_clear_items(video->avpf.packets);
-	tsk_list_unlock(video->avpf.packets);
-
-	// tdav_session_av_stop() : stop producer and consumer, close encoder and all other codecs, stop rtpManager...
-	// no need to lock the encoder to avoid using a closed codec (see above)
-	// no need to lock the decoder as the rtpManager will be stop before closing the codec
-	// lock-free stop() may avoid deadlock issue (cannot reproduce it myself) on Hovis
-	ret = tdav_session_av_stop(base);
-	tsk_mutex_lock(video->encoder.h_mutex);
-	TSK_OBJECT_SAFE_FREE(video->encoder.codec);
-	tsk_mutex_unlock(video->encoder.h_mutex);
-	TSK_OBJECT_SAFE_FREE(video->decoder.codec);
-
-	// reset default values to make sure next start will be called with right defaults
-	// do not call this function in start to avoid overriding values defined between prepare() and start()
-	_tdav_session_video_set_defaults(video);
-
-	return ret;
+    int ret;
+    tdav_session_video_t* video;
+    tdav_session_av_t* base;
+    
+    TSK_DEBUG_INFO("tdav_session_video_stop");
+    
+    video = (tdav_session_video_t*)self;
+    base = (tdav_session_av_t*)self;
+    
+    // must be here to make sure no other thread will lock the encoder once we have done it
+    tsk_mutex_lock(video->encoder.h_mutex); // encoder thread will check "started" var right after the lock is passed
+    video->started = tsk_false;
+    tsk_mutex_unlock(video->encoder.h_mutex);
+    // at this step we're sure that encode() will no longer be called which means we can safely close the codec
+    
+    if (video->jb) {
+        ret = tdav_video_jb_stop(video->jb);
+    }
+    // clear AVPF packets and wait for the dtor() before destroying the list
+    tsk_list_lock(video->avpf.packets);
+    tsk_list_clear_items(video->avpf.packets);
+    tsk_list_unlock(video->avpf.packets);
+    
+    // tdav_session_av_stop() : stop producer and consumer, close encoder and all other codecs, stop rtpManager...
+    // no need to lock the encoder to avoid using a closed codec (see above)
+    // no need to lock the decoder as the rtpManager will be stop before closing the codec
+    // lock-free stop() may avoid deadlock issue (cannot reproduce it myself) on Hovis
+    ret = tdav_session_av_stop(base);
+    tsk_mutex_lock(video->encoder.h_mutex);
+    TSK_OBJECT_SAFE_FREE(video->encoder.codec);
+    tsk_mutex_unlock(video->encoder.h_mutex);
+    TSK_OBJECT_SAFE_FREE(video->decoder.codec);
+    
+    // reset default values to make sure next start will be called with right defaults
+    // do not call this function in start to avoid overriding values defined between prepare() and start()
+    _tdav_session_video_set_defaults(video);
+    
+    return ret;
 }
 
 static int tdav_session_video_pause(tmedia_session_t* self)
 {
-	return tdav_session_av_pause(TDAV_SESSION_AV(self));
+    return tdav_session_av_pause(TDAV_SESSION_AV(self));
 }
 
 static const tsdp_header_M_t* tdav_session_video_get_lo(tmedia_session_t* self)
 {
-	tsk_bool_t updated = tsk_false;
-	const tsdp_header_M_t* ret;
-	tdav_session_av_t* base = TDAV_SESSION_AV(self);
-
-	if(!(ret = tdav_session_av_get_lo(base, &updated))){
-		TSK_DEBUG_ERROR("tdav_session_av_get_lo(video) failed");
-		return tsk_null;
-	}
-
-	if(updated){
-		// set callbacks
-		_tdav_session_video_set_callbacks(self);
-	}
-
-	return ret;
+    tsk_bool_t updated = tsk_false;
+    const tsdp_header_M_t* ret;
+    tdav_session_av_t* base = TDAV_SESSION_AV(self);
+    
+    if(!(ret = tdav_session_av_get_lo(base, &updated))){
+        TSK_DEBUG_ERROR("tdav_session_av_get_lo(video) failed");
+        return tsk_null;
+    }
+    
+    if(updated){
+        // set callbacks
+        _tdav_session_video_set_callbacks(self);
+    }
+    
+    return ret;
 }
 
 static int tdav_session_video_set_ro(tmedia_session_t* self, const tsdp_header_M_t* m)
 {
-	int ret;
-	tsk_bool_t updated = tsk_false;
-	tdav_session_av_t* base = TDAV_SESSION_AV(self);
-
-	if((ret = tdav_session_av_set_ro(base, m, &updated))){
-		TSK_DEBUG_ERROR("tdav_session_av_set_ro(video) failed");
-		return ret;
-	}
-
-	if (updated) {
-		// set callbacks
-		ret = _tdav_session_video_set_callbacks(self);
-	}
-
-	return ret;
+    int ret;
+    tsk_bool_t updated = tsk_false;
+    tdav_session_av_t* base = TDAV_SESSION_AV(self);
+    
+    if((ret = tdav_session_av_set_ro(base, m, &updated))){
+        TSK_DEBUG_ERROR("tdav_session_av_set_ro(video) failed");
+        return ret;
+    }
+    
+    // Check if "RTCP-NACK" and "RTC-FIR" are supported
+    {
+        const tmedia_codec_t* codec;
+        base->is_fb_fir_neg = base->is_fb_nack_neg = base->is_fb_googremb_neg = tsk_false;
+        if ((codec = tdav_session_av_get_best_neg_codec(base))) {
+            // a=rtcp-fb:* ccm fir
+            // a=rtcp-fb:* nack
+            // a=rtcp-fb:* goog-remb
+            char attr_fir[256], attr_nack[256], attr_goog_remb[256];
+            int index = 0;
+            const tsdp_header_A_t* A;
+            
+            sprintf(attr_fir, "%s ccm fir", codec->neg_format);
+            sprintf(attr_nack, "%s nack", codec->neg_format);
+            sprintf(attr_goog_remb, "%s goog-remb", codec->neg_format);
+            
+            while ((A = tsdp_header_M_findA_at(m, "rtcp-fb", index++))) {
+                if (!base->is_fb_fir_neg) {
+                    base->is_fb_fir_neg = (tsk_striequals(A->value, "* ccm fir") || tsk_striequals(A->value, attr_fir));
+                }
+                if (!base->is_fb_nack_neg) {
+                    base->is_fb_nack_neg = (tsk_striequals(A->value, "* nack") || tsk_striequals(A->value, attr_nack));
+                }
+                if (!base->is_fb_googremb_neg) {
+                    base->is_fb_googremb_neg = (tsk_striequals(A->value, "* goog-remb") || tsk_striequals(A->value, attr_goog_remb));
+                }
+            }			
+        }
+    }
+    
+    if (updated) {
+        // set callbacks
+        ret = _tdav_session_video_set_callbacks(self);
+    }
+    
+    return ret;
 }
 
 // Plugin interface: callback from the end-user to set rtcp event callback (should be called only when encoding is bypassed)
 static int tdav_session_video_rtcp_set_onevent_cbfn(tmedia_session_t* self, const void* context, tmedia_session_rtcp_onevent_cb_f func)
 {
-	tdav_session_video_t* video;
-	tdav_session_av_t* base;
-
-	if(!self){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-
-	video = (tdav_session_video_t*)self;
-	base = (tdav_session_av_t*)self;
-
-	tsk_safeobj_lock(base);
-	video->cb_rtcpevent.context = context;
-	video->cb_rtcpevent.func = func;
-	tsk_safeobj_unlock(base);
-
-	return 0;
+    tdav_session_video_t* video;
+    tdav_session_av_t* base;
+    
+    if(!self){
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    
+    video = (tdav_session_video_t*)self;
+    base = (tdav_session_av_t*)self;
+    
+    tsk_safeobj_lock(base);
+    video->cb_rtcpevent.context = context;
+    video->cb_rtcpevent.func = func;
+    tsk_safeobj_unlock(base);
+    
+    return 0;
 }
 
 // Plugin interface: called by the end-user to send rtcp event (should be called only when encoding is bypassed)
 static int tdav_session_video_rtcp_send_event(tmedia_session_t* self, tmedia_rtcp_event_type_t event_type, uint32_t ssrc_media)
 {
-	tdav_session_video_t* video;
-	tdav_session_av_t* base;
-	int ret = -1;
-
-	if(!self){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-
-	video = (tdav_session_video_t*)self;
-	base = (tdav_session_av_t*)self;
-
-	tsk_safeobj_lock(base);
-	switch(event_type){
-		case tmedia_rtcp_event_type_fir:
-			{
-				if(base->rtp_manager && base->rtp_manager->is_started){
-					if(!ssrc_media){ // when called from C++/Java/C# bindings "ssrc_media" is a default parameter with value=0
-						ssrc_media = base->rtp_manager->rtp.ssrc.remote;
-					}
-					TSK_DEBUG_INFO("Send FIR(%u)", ssrc_media);
-					_tdav_session_video_local_request_idr(self, "CALLBACK", ssrc_media);
-				}
-				break;
-			}
-	}
-	tsk_safeobj_unlock(base);
-
-	return ret;
+    tdav_session_video_t* video;
+    tdav_session_av_t* base;
+    int ret = -1;
+    
+    if(!self){
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    
+    video = (tdav_session_video_t*)self;
+    base = (tdav_session_av_t*)self;
+    
+    tsk_safeobj_lock(base);
+    switch(event_type){
+        case tmedia_rtcp_event_type_fir:
+        {
+            if(base->rtp_manager && base->rtp_manager->is_started){
+                if(!ssrc_media){ // when called from C++/Java/C# bindings "ssrc_media" is a default parameter with value=0
+                    ssrc_media = base->rtp_manager->rtp.ssrc.remote;
+                }
+                TSK_DEBUG_INFO("Send FIR(%u)", ssrc_media);
+                _tdav_session_video_local_request_idr(self, "CALLBACK", ssrc_media);
+            }
+            break;
+        }
+    }
+    tsk_safeobj_unlock(base);
+    
+    return ret;
 }
 
 // Plugin interface: called by the end-user to recv rtcp event
 static int tdav_session_video_rtcp_recv_event(tmedia_session_t* self, tmedia_rtcp_event_type_t event_type, uint32_t ssrc_media)
 {
-	tdav_session_video_t* video;
-	tdav_session_av_t* base;
-	int ret = -1;
-
-	if (!self){
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-
-	video = (tdav_session_video_t*)self;
-	base = (tdav_session_av_t*)self;
-
-	tsk_safeobj_lock(base);
-	switch(event_type){
-		case tmedia_rtcp_event_type_fir:
-			{
-				_tdav_session_video_remote_requested_idr(video, ssrc_media);
-				ret = 0;
-				break;
-			}
-	}
-	tsk_safeobj_unlock(base);
-
-	return ret;
+    tdav_session_video_t* video;
+    tdav_session_av_t* base;
+    int ret = -1;
+    
+    if (!self){
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    
+    video = (tdav_session_video_t*)self;
+    base = (tdav_session_av_t*)self;
+    
+    tsk_safeobj_lock(base);
+    switch(event_type){
+        case tmedia_rtcp_event_type_fir:
+        {
+            _tdav_session_video_remote_requested_idr(video, ssrc_media);
+            ret = 0;
+            break;
+        }
+    }
+    tsk_safeobj_unlock(base);
+    
+    return ret;
 }
 
 static int _tdav_session_video_set_callbacks(tmedia_session_t* self)
 {
-	if(self){
-		tsk_list_item_t* item;
-		tsk_list_foreach(item, TMEDIA_SESSION(self)->neg_codecs){
-			// set codec callbacks
-			tmedia_codec_video_set_enc_callback(TMEDIA_CODEC_VIDEO(item->data), tdav_session_video_raw_cb, self);
-			tmedia_codec_video_set_dec_callback(TMEDIA_CODEC_VIDEO(item->data), tdav_session_video_decode_cb, self);
-			// set RED callback: redundant data to decode and send to the consumer
-			if(TMEDIA_CODEC(item->data)->plugin == tdav_codec_red_plugin_def_t){
-				tdav_codec_red_set_callback((struct tdav_codec_red_s *)(item->data), tdav_session_video_rtp_cb, self);
-			}
-		}
-	}
-	return 0;
+    if(self){
+        tsk_list_item_t* item;
+        tsk_list_foreach(item, TMEDIA_SESSION(self)->neg_codecs){
+            // set codec callbacks
+            tmedia_codec_video_set_enc_callback(TMEDIA_CODEC_VIDEO(item->data), tdav_session_video_raw_cb, self);
+            tmedia_codec_video_set_dec_callback(TMEDIA_CODEC_VIDEO(item->data), tdav_session_video_decode_cb, self);
+            // set RED callback: redundant data to decode and send to the consumer
+            if(TMEDIA_CODEC(item->data)->plugin == tdav_codec_red_plugin_def_t){
+                tdav_codec_red_set_callback((struct tdav_codec_red_s *)(item->data), tdav_session_video_rtp_cb, self);
+            }
+        }
+    }
+    return 0;
 }
 
 static int _tdav_session_video_init(tdav_session_video_t *p_self, tmedia_type_t e_media_type)
 {
-	int ret;
-	tdav_session_av_t *p_base = TDAV_SESSION_AV(p_self);
-	if (!p_self) {
-		TSK_DEBUG_ERROR("Invalid parameter");
-		return -1;
-	}
-
-	/* init() base */
-	if ((ret = tdav_session_av_init(p_base, e_media_type)) != 0) {
-		TSK_DEBUG_ERROR("tdav_session_av_init(video) failed");
-		return ret;
-	}
-
-	/* init() self */
-	_tdav_session_video_set_defaults(p_self);
-	if (!p_self->encoder.h_mutex && !(p_self->encoder.h_mutex = tsk_mutex_create())) {
-		TSK_DEBUG_ERROR("Failed to create encode mutex");
-		return -4;
-	}
-	if (!p_self->avpf.packets && !(p_self->avpf.packets = tsk_list_create())) {
-		TSK_DEBUG_ERROR("Failed to create list");
-		return -2;
-	}
-	if (p_self->jb_enabled) {
-		if (!p_self->jb && !(p_self->jb = tdav_video_jb_create())) {
-			TSK_DEBUG_ERROR("Failed to create jitter buffer");
-			return -3;
-		}
-		tdav_video_jb_set_callback(p_self->jb, _tdav_session_video_jb_cb, p_self);
-	}
-
-	if (p_base->producer) {
-		tmedia_producer_set_enc_callback(p_base->producer, tdav_session_video_producer_enc_cb, p_self);
-		tmedia_producer_set_raw_callback(p_base->producer, tdav_session_video_raw_cb, p_self);
-	}
-
-	return 0;
+    int ret;
+    tdav_session_av_t *p_base = TDAV_SESSION_AV(p_self);
+    if (!p_self) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    
+    /* init() base */
+    if ((ret = tdav_session_av_init(p_base, e_media_type)) != 0) {
+        TSK_DEBUG_ERROR("tdav_session_av_init(video) failed");
+        return ret;
+    }
+    
+    /* init() self */
+    _tdav_session_video_set_defaults(p_self);
+    if (!p_self->encoder.h_mutex && !(p_self->encoder.h_mutex = tsk_mutex_create())) {
+        TSK_DEBUG_ERROR("Failed to create encode mutex");
+        return -4;
+    }
+    if (!p_self->avpf.packets && !(p_self->avpf.packets = tsk_list_create())) {
+        TSK_DEBUG_ERROR("Failed to create list");
+        return -2;
+    }
+    if (p_self->jb_enabled) {
+        if (!p_self->jb && !(p_self->jb = tdav_video_jb_create())) {
+            TSK_DEBUG_ERROR("Failed to create jitter buffer");
+            return -3;
+        }
+        tdav_video_jb_set_callback(p_self->jb, _tdav_session_video_jb_cb, p_self);
+    }
+    
+    if (p_base->producer) {
+        tmedia_producer_set_enc_callback(p_base->producer, tdav_session_video_producer_enc_cb, p_self);
+        tmedia_producer_set_raw_callback(p_base->producer, tdav_session_video_raw_cb, p_self);
+    }
+    
+    return 0;
 }
 
 
@@ -1377,87 +1510,87 @@ static int _tdav_session_video_init(tdav_session_video_t *p_self, tmedia_type_t
 /* constructor */
 static tsk_object_t* tdav_session_video_ctor(tsk_object_t * self, va_list * app)
 {
-	tdav_session_video_t *video = self;
-	if(video){
-		if (_tdav_session_video_init(video, tmedia_video)) {
-			return tsk_null;
-		}
-	}
-	return self;
+    tdav_session_video_t *video = self;
+    if(video){
+        if (_tdav_session_video_init(video, tmedia_video)) {
+            return tsk_null;
+        }
+    }
+    return self;
 }
 /* destructor */
 static tsk_object_t* tdav_session_video_dtor(tsk_object_t * self)
 { 
-	tdav_session_video_t *video = self;
-	TSK_DEBUG_INFO("*** tdav_session_video_t destroyed ***");
-	if(video){
-		tdav_session_video_stop((tmedia_session_t*)video);
-		// deinit self (rtp manager should be destroyed after the producer)
-		TSK_OBJECT_SAFE_FREE(video->conv.toYUV420);
-		TSK_OBJECT_SAFE_FREE(video->conv.fromYUV420);
-
-		TSK_FREE(video->encoder.buffer);
-		TSK_FREE(video->encoder.conv_buffer);
-		TSK_FREE(video->decoder.buffer);
-		TSK_FREE(video->decoder.conv_buffer);
-
-		TSK_OBJECT_SAFE_FREE(video->encoder.codec);
-		TSK_OBJECT_SAFE_FREE(video->decoder.codec);
-
-		TSK_OBJECT_SAFE_FREE(video->avpf.packets);
-
-		TSK_OBJECT_SAFE_FREE(video->jb);
-
-		if(video->encoder.h_mutex){
-			tsk_mutex_destroy(&video->encoder.h_mutex);
-		}
-
-		/* deinit() base */
-		tdav_session_av_deinit(TDAV_SESSION_AV(video));
-
-		TSK_DEBUG_INFO("*** Video session destroyed ***");
-	}
-
-	return self;
+    tdav_session_video_t *video = self;
+    TSK_DEBUG_INFO("*** tdav_session_video_t destroyed ***");
+    if(video){
+        tdav_session_video_stop((tmedia_session_t*)video);
+        // deinit self (rtp manager should be destroyed after the producer)
+        TSK_OBJECT_SAFE_FREE(video->conv.toYUV420);
+        TSK_OBJECT_SAFE_FREE(video->conv.fromYUV420);
+        
+        TSK_FREE(video->encoder.buffer);
+        TSK_FREE(video->encoder.conv_buffer);
+        TSK_FREE(video->decoder.buffer);
+        TSK_FREE(video->decoder.conv_buffer);
+        
+        TSK_OBJECT_SAFE_FREE(video->encoder.codec);
+        TSK_OBJECT_SAFE_FREE(video->decoder.codec);
+        
+        TSK_OBJECT_SAFE_FREE(video->avpf.packets);
+        
+        TSK_OBJECT_SAFE_FREE(video->jb);
+        
+        if(video->encoder.h_mutex){
+            tsk_mutex_destroy(&video->encoder.h_mutex);
+        }
+        
+        /* deinit() base */
+        tdav_session_av_deinit(TDAV_SESSION_AV(video));
+        
+        TSK_DEBUG_INFO("*** Video session destroyed ***");
+    }
+    
+    return self;
 }
 /* object definition */
 static const tsk_object_def_t tdav_session_video_def_s = 
 {
-	sizeof(tdav_session_video_t),
-	tdav_session_video_ctor, 
-	tdav_session_video_dtor,
-	tmedia_session_cmp, 
+    sizeof(tdav_session_video_t),
+    tdav_session_video_ctor, 
+    tdav_session_video_dtor,
+    tmedia_session_cmp, 
 };
 /* plugin definition*/
 static const tmedia_session_plugin_def_t tdav_session_video_plugin_def_s = 
 {
-	&tdav_session_video_def_s,
-
-	tmedia_video,
-	"video",
-
-	tdav_session_video_set,
-	tdav_session_video_get,
-	tdav_session_video_prepare,
-	tdav_session_video_start,
-	tdav_session_video_pause,
-	tdav_session_video_stop,
-
-	/* Audio part */
-	{ tsk_null },
-
-	tdav_session_video_get_lo,
-	tdav_session_video_set_ro,
-
-	/* T.140 */
-	{ tsk_null },
-
-	/* Rtcp */
-	{
-		tdav_session_video_rtcp_set_onevent_cbfn,
-			tdav_session_video_rtcp_send_event,
-			tdav_session_video_rtcp_recv_event
-	}
+    &tdav_session_video_def_s,
+    
+    tmedia_video,
+    "video",
+    
+    tdav_session_video_set,
+    tdav_session_video_get,
+    tdav_session_video_prepare,
+    tdav_session_video_start,
+    tdav_session_video_pause,
+    tdav_session_video_stop,
+    
+    /* Audio part */
+    { tsk_null },
+    
+    tdav_session_video_get_lo,
+    tdav_session_video_set_ro,
+    
+    /* T.140 */
+    { tsk_null },
+    
+    /* Rtcp */
+    {
+        tdav_session_video_rtcp_set_onevent_cbfn,
+        tdav_session_video_rtcp_send_event,
+        tdav_session_video_rtcp_recv_event
+    }
 };
 const tmedia_session_plugin_def_t *tdav_session_video_plugin_def_t = &tdav_session_video_plugin_def_s;
 
@@ -1467,50 +1600,50 @@ const tmedia_session_plugin_def_t *tdav_session_video_plugin_def_t = &tdav_sessi
 /* constructor */
 static tsk_object_t* tdav_session_bfcpvideo_ctor(tsk_object_t * self, va_list * app)
 {
-	tdav_session_video_t *video = self;
-	if(video){
-		if (_tdav_session_video_init(video, tmedia_bfcp_video)) {
-			return tsk_null;
-		}
-	}
-	return self;
+    tdav_session_video_t *video = self;
+    if(video){
+        if (_tdav_session_video_init(video, tmedia_bfcp_video)) {
+            return tsk_null;
+        }
+    }
+    return self;
 }
 /* object definition */
 static const tsk_object_def_t tdav_session_bfcpvideo_def_s = 
 {
-	sizeof(tdav_session_video_t),
-	tdav_session_bfcpvideo_ctor, 
-	tdav_session_video_dtor,
-	tmedia_session_cmp, 
+    sizeof(tdav_session_video_t),
+    tdav_session_bfcpvideo_ctor, 
+    tdav_session_video_dtor,
+    tmedia_session_cmp, 
 };
 static const tmedia_session_plugin_def_t tdav_session_bfcpvideo_plugin_def_s = 
 {
-	&tdav_session_bfcpvideo_def_s,
-
-	tmedia_bfcp_video,
-	"video",
-
-	tdav_session_video_set,
-	tdav_session_video_get,
-	tdav_session_video_prepare,
-	tdav_session_video_start,
-	tdav_session_video_pause,
-	tdav_session_video_stop,
-
-	/* Audio part */
-	{ tsk_null },
-
-	tdav_session_video_get_lo,
-	tdav_session_video_set_ro,
-
-	/* T.140 */
-	{ tsk_null },
-
-	/* Rtcp */
-	{
-		tdav_session_video_rtcp_set_onevent_cbfn,
-			tdav_session_video_rtcp_send_event,
-			tdav_session_video_rtcp_recv_event
-	}
+    &tdav_session_bfcpvideo_def_s,
+    
+    tmedia_bfcp_video,
+    "video",
+    
+    tdav_session_video_set,
+    tdav_session_video_get,
+    tdav_session_video_prepare,
+    tdav_session_video_start,
+    tdav_session_video_pause,
+    tdav_session_video_stop,
+    
+    /* Audio part */
+    { tsk_null },
+    
+    tdav_session_video_get_lo,
+    tdav_session_video_set_ro,
+    
+    /* T.140 */
+    { tsk_null },
+    
+    /* Rtcp */
+    {
+        tdav_session_video_rtcp_set_onevent_cbfn,
+        tdav_session_video_rtcp_send_event,
+        tdav_session_video_rtcp_recv_event
+    }
 };
 const tmedia_session_plugin_def_t *tdav_session_bfcpvideo_plugin_def_t = &tdav_session_bfcpvideo_plugin_def_s;
diff --git a/branches/2.0/doubango/tinyNET/src/ice/tnet_ice.c b/branches/2.0/doubango/tinyNET/src/ice/tnet_ice.c
index eb9dfbd..196009b 100644
--- a/branches/2.0/doubango/tinyNET/src/ice/tnet_ice.c
+++ b/branches/2.0/doubango/tinyNET/src/ice/tnet_ice.c
@@ -1,7 +1,5 @@
 /*
-* Copyright (C) 2010-2011 Mamadou Diop.
-*
-* Contact: Mamadou Diop <diopmamadou(at)doubango.org>
+* Copyright (C) 2010-2015 Mamadou DIOP
 *	
 * This file is part of Open Source Doubango Framework.
 *
@@ -25,8 +23,5 @@
  *			http://tools.ietf.org/html/draft-ietf-mmusic-ice-19
  *			http://tools.ietf.org/html/draft-ietf-mmusic-ice-tcp-08
  *
- * @author Mamadou Diop <diopmamadou(at)doubango.org>
- *
-
  */
 #include "tnet_ice.h"
diff --git a/branches/2.0/doubango/tinyNET/src/ice/tnet_ice.h b/branches/2.0/doubango/tinyNET/src/ice/tnet_ice.h
index a13c23c..daffd08 100644
--- a/branches/2.0/doubango/tinyNET/src/ice/tnet_ice.h
+++ b/branches/2.0/doubango/tinyNET/src/ice/tnet_ice.h
@@ -1,7 +1,5 @@
 /*
-* Copyright (C) 2010-2011 Mamadou Diop.
-*
-* Contact: Mamadou Diop <diopmamadou(at)doubango.org>
+* Copyright (C) 2010-2015 Mamadou DIOP
 *	
 * This file is part of Open Source Doubango Framework.
 *
@@ -25,9 +23,6 @@
  *			http://tools.ietf.org/html/draft-ietf-mmusic-ice-19
  *			http://tools.ietf.org/html/draft-ietf-mmusic-ice-tcp-08
  *
- * @author Mamadou Diop <diopmamadou(at)doubango.org>
- *
-
  */
 #ifndef TNET_ICE_H
 #define TNET_ICE_H
diff --git a/branches/2.0/doubango/tinyNET/src/ice/tnet_ice_ctx.c b/branches/2.0/doubango/tinyNET/src/ice/tnet_ice_ctx.c
index 3965fcb..ec32235 100644
--- a/branches/2.0/doubango/tinyNET/src/ice/tnet_ice_ctx.c
+++ b/branches/2.0/doubango/tinyNET/src/ice/tnet_ice_ctx.c
@@ -997,6 +997,26 @@ int tnet_ice_ctx_send_turn_rtcp(struct tnet_ice_ctx_s* self, const void* data, t
     : _tnet_ice_ctx_send_turn_raw(self, self->turn.ss_nominated_rtcp, self->turn.peer_id_rtcp, data, size);

 }

 

+int tnet_ice_ctx_turn_get_bytes_count(const struct tnet_ice_ctx_s* self, uint64_t* bytes_in, uint64_t* bytes_out)

+{

+    int ret;

+    

+    if (!self) {

+        TSK_DEBUG_ERROR("Invalid parameter");

+        return -1;

+    }

+    ret = tnet_turn_session_get_bytes_count(self->turn.ss_nominated_rtp, bytes_in, bytes_out);

+    if (ret == 0 && !self->use_rtcpmux) {

+        uint64_t _bytes_in, _bytes_out;

+        ret = tnet_turn_session_get_bytes_count(self->turn.ss_nominated_rtcp, &_bytes_in, &_bytes_out);

+        if (ret == 0) {

+            if (bytes_in) *bytes_in += _bytes_in;

+            if (bytes_out) *bytes_out += _bytes_out;

+        }

+    }

+    return ret;

+}

+

 const char* tnet_ice_ctx_get_ufrag(const struct tnet_ice_ctx_s* self)

 {

     return (self && self->ufrag) ? self->ufrag : tsk_null;

diff --git a/branches/2.0/doubango/tinyNET/src/ice/tnet_ice_ctx.h b/branches/2.0/doubango/tinyNET/src/ice/tnet_ice_ctx.h
index b11d42f..015fdcf 100644
--- a/branches/2.0/doubango/tinyNET/src/ice/tnet_ice_ctx.h
+++ b/branches/2.0/doubango/tinyNET/src/ice/tnet_ice_ctx.h
@@ -1,7 +1,5 @@
 /*
-* Copyright (C) 2012 Doubango Telecom <http://www.doubango.org>.
-*
-* Contact: Mamadou Diop <diopmamadou(at)doubango[dot]org>
+* Copyright (C) 2012-2015 Doubango Telecom <http://www.doubango.org>.
 *	
 * This file is part of Open Source Doubango Framework.
 *
@@ -22,7 +20,6 @@
 
 /**@file tnet_ice_ctx.h
  * @brief Interactive Connectivity Establishment (ICE) implementation as per RFC 5245.
- * @author Mamadou Diop <diopmamadou(at)doubango[dot]org>
  */
 
 #ifndef TNET_ICE_CTX_H
@@ -100,6 +97,7 @@ TINYNET_API int tnet_ice_ctx_recv_stun_message(struct tnet_ice_ctx_s* self, cons
 TINYNET_API int tnet_ice_ctx_send_turn_rtp(struct tnet_ice_ctx_s* self, const void* data, tsk_size_t size);
 TINYNET_API int tnet_ice_ctx_send_turn_rtcp(struct tnet_ice_ctx_s* self, const void* data, tsk_size_t size);
 
+TINYNET_API int tnet_ice_ctx_turn_get_bytes_count(const struct tnet_ice_ctx_s* self, uint64_t* bytes_in, uint64_t* bytes_out);
 TINYNET_API const char* tnet_ice_ctx_get_ufrag(const struct tnet_ice_ctx_s* self);
 TINYNET_API const char* tnet_ice_ctx_get_pwd(const struct tnet_ice_ctx_s* self);
 
diff --git a/branches/2.0/doubango/tinyNET/src/tnet_socket.c b/branches/2.0/doubango/tinyNET/src/tnet_socket.c
index ca5c809..2d104d1 100644
--- a/branches/2.0/doubango/tinyNET/src/tnet_socket.c
+++ b/branches/2.0/doubango/tinyNET/src/tnet_socket.c
@@ -252,6 +252,42 @@ int tnet_socket_send_stream(tnet_socket_t* self, const void* data, tsk_size_t si
 }
 
 /**@ingroup tnet_socket_group
+ * @retval	Zero if succeed and nonzero error code otherwise.
+ */
+int tnet_socket_handle_brokenpipe(tnet_socket_t* self)
+{
+    int ret;
+    tnet_fd_t fd_old, fd_new;
+    if (!self || !TNET_SOCKET_TYPE_IS_DGRAM(self->type)) { // Must be UDP
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    fd_old = self->fd;
+    fd_new = TNET_INVALID_FD;
+    
+    // close old fd
+    ret = tnet_sockfd_close(&self->fd);
+    // try to create an fd binding to the same address
+    if ((ret = tnet_sockfd_init(self->ip, self->port, self->type, &fd_new)) != 0) {
+        TNET_PRINT_LAST_ERROR("Find to bind to %s:%d", self->ip, self->port);
+        // TODO: Create completly new socket?
+        return ret;
+    }
+#if TNET_UNDER_IPHONE || TNET_UNDER_IPHONE_SIMULATOR
+    /* disable SIGPIPE signal */
+    {
+        int yes = 1;
+        if (setsockopt(fd_new, SOL_SOCKET, SO_NOSIGPIPE, (char*)&yes, sizeof(int))){
+            TNET_PRINT_LAST_ERROR("setsockopt(%d, SO_NOSIGPIPE) have failed", fd_new);
+        }
+    }
+#endif /* TNET_UNDER_IPHONE || TNET_UNDER_IPHONE_SIMULATOR */
+    TSK_DEBUG_INFO("Broken pipe result for {%s:%d}: %d -> %d", self->ip, self->port, fd_old, fd_new);
+    self->fd = fd_new;
+    return 0;
+}
+
+/**@ingroup tnet_socket_group
  * 	Closes a socket.
  * @param sock The socket to close.
  * @retval	Zero if succeed and nonzero error code otherwise.
diff --git a/branches/2.0/doubango/tinyNET/src/tnet_socket.h b/branches/2.0/doubango/tinyNET/src/tnet_socket.h
index 2f13f3c..3c7dc34 100644
--- a/branches/2.0/doubango/tinyNET/src/tnet_socket.h
+++ b/branches/2.0/doubango/tinyNET/src/tnet_socket.h
@@ -190,6 +190,7 @@ typedef tsk_list_t tnet_sockets_L_t; /**< List of @ref tnet_socket_t elements. *
 TINYNET_API tnet_socket_t* tnet_socket_create_2(const char*host, tnet_port_t port, tnet_socket_type_t type, tsk_bool_t nonblocking, tsk_bool_t bindsocket);
 TINYNET_API tnet_socket_t* tnet_socket_create(const char* host, tnet_port_t port, tnet_socket_type_t type);
 TINYNET_API int tnet_socket_send_stream(tnet_socket_t* self, const void* data, tsk_size_t size);
+TINYNET_API int tnet_socket_handle_brokenpipe(tnet_socket_t* self);
 
 TINYNET_GEXTERN const tsk_object_def_t *tnet_socket_def_t;
 
diff --git a/branches/2.0/doubango/tinyNET/src/tnet_transport.c b/branches/2.0/doubango/tinyNET/src/tnet_transport.c
index fc66e35..7d26d08 100644
--- a/branches/2.0/doubango/tinyNET/src/tnet_transport.c
+++ b/branches/2.0/doubango/tinyNET/src/tnet_transport.c
@@ -723,6 +723,17 @@ tnet_fd_t tnet_transport_get_master_fd(const tnet_transport_handle_t *handle)
     return ((const tnet_transport_t *)handle)->master ? ((const tnet_transport_t *)handle)->master->fd : TNET_INVALID_FD;
 }
 
+int tnet_transport_get_bytes_count(const tnet_transport_handle_t *handle, uint64_t* bytes_in, uint64_t* bytes_out)
+{
+    if (!handle){
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    if (bytes_in) *bytes_in = ((const tnet_transport_t *)handle)->bytes_in;
+    if (bytes_out) *bytes_out = ((const tnet_transport_t *)handle)->bytes_out;
+    return 0;
+}
+
 /**
  * Connects a socket.
  * @param handle The transport to use to connect() the socket. The new socket will be managed by this transport.
diff --git a/branches/2.0/doubango/tinyNET/src/tnet_transport.h b/branches/2.0/doubango/tinyNET/src/tnet_transport.h
index 2e1a8b8..c4da35b 100644
--- a/branches/2.0/doubango/tinyNET/src/tnet_transport.h
+++ b/branches/2.0/doubango/tinyNET/src/tnet_transport.h
@@ -41,8 +41,6 @@ TNET_BEGIN_DECLS
 
 #define TNET_TRANSPORT_CB_F(callback)							((tnet_transport_cb_f)callback)
 
-typedef void tnet_transport_handle_t;
-
 typedef enum tnet_transport_event_type_e
 {
 	event_data,
@@ -51,6 +49,7 @@ typedef enum tnet_transport_event_type_e
 	event_removed,
 	event_connected,
 	event_accepted,
+    event_brokenpipe, // iOS: UDP sockets closed, to be restored now that the app is on foreground
 
 	event_dtls_handshake_started,
 	event_dtls_handshake_succeed,
@@ -121,6 +120,7 @@ TINYNET_API int tnet_transport_dtls_get_handshakingdata(tnet_transport_handle_t*
 
 TINYNET_API tnet_socket_type_t tnet_transport_get_type(const tnet_transport_handle_t *handle);
 TINYNET_API tnet_fd_t tnet_transport_get_master_fd(const tnet_transport_handle_t *handle);
+TINYNET_API int tnet_transport_get_bytes_count(const tnet_transport_handle_t *handle, uint64_t* bytes_in, uint64_t* bytes_out);
 TINYNET_API int tnet_transport_shutdown(tnet_transport_handle_t* handle);
 
 typedef struct tnet_transport_s
@@ -137,6 +137,9 @@ typedef struct tnet_transport_s
 
 	tsk_object_t *context;
 	tsk_bool_t prepared;
+    
+    uint64_t bytes_out;
+    uint64_t bytes_in;
 
 	//unsigned connected:1;
 	void* mainThreadId[1];
diff --git a/branches/2.0/doubango/tinyNET/src/tnet_transport_cfsocket.c b/branches/2.0/doubango/tinyNET/src/tnet_transport_cfsocket.c
index fc8f4e1..4115b22 100644
--- a/branches/2.0/doubango/tinyNET/src/tnet_transport_cfsocket.c
+++ b/branches/2.0/doubango/tinyNET/src/tnet_transport_cfsocket.c
@@ -490,7 +490,7 @@ bail:
 tsk_size_t tnet_transport_sendto(const tnet_transport_handle_t *handle, tnet_fd_t from, const struct sockaddr *to, const void* buf, tsk_size_t size)
 {
     tnet_transport_t *transport = (tnet_transport_t*)handle;
-    int numberOfBytesSent = 0;
+    int numberOfBytesSent = 0, ret;
     
     if (!transport) {
         TSK_DEBUG_ERROR("Invalid server handle");
@@ -502,9 +502,17 @@ tsk_size_t tnet_transport_sendto(const tnet_transport_handle_t *handle, tnet_fd_
         goto bail;
     }
     
-    if ((numberOfBytesSent = (int)sendto(from, buf, size, 0, to, tnet_get_sockaddr_size(to))) < size) {
-        TNET_PRINT_LAST_ERROR("sendto have failed");
-        goto bail;
+    while (numberOfBytesSent < size && (ret = (int)sendto(from, buf, size, 0, to, tnet_get_sockaddr_size(to))) >= 0) {
+        numberOfBytesSent += ret;
+    }
+    if (numberOfBytesSent < size) {
+        if (tnet_geterrno() == TNET_ERROR_BROKENPIPE) {
+            TSK_DEBUG_INFO("UDP socket with fd=%d returned EPIPE...alerting the sender with 'event_brokenpipe' event", from);
+            TSK_RUNNABLE_ENQUEUE(transport, event_brokenpipe, transport->callback_data, from);
+        }
+        else {
+            TNET_PRINT_LAST_ERROR("sendto(fd=%d) have failed", from);
+        }
     }
     
 bail:
diff --git a/branches/2.0/doubango/tinyNET/src/tnet_transport_poll.c b/branches/2.0/doubango/tinyNET/src/tnet_transport_poll.c
index 3d9e724..7ee6509 100644
--- a/branches/2.0/doubango/tinyNET/src/tnet_transport_poll.c
+++ b/branches/2.0/doubango/tinyNET/src/tnet_transport_poll.c
@@ -237,6 +237,7 @@ tsk_size_t tnet_transport_send(const tnet_transport_handle_t *handle, tnet_fd_t
 	}
 
 bail:
+    transport->bytes_out += numberOfBytesSent;
 	return numberOfBytesSent;
 }
 
@@ -261,6 +262,7 @@ tsk_size_t tnet_transport_sendto(const tnet_transport_handle_t *handle, tnet_fd_
 	}
 		
 bail:
+    transport->bytes_out += numberOfBytesSent;
 	return numberOfBytesSent;
 }
 
@@ -811,6 +813,7 @@ void *tnet_transport_mainthread(void *param)
 				}
 					
 				if(len > 0){
+                    transport->bytes_in += len;
 					e = tnet_transport_event_create(event_data, transport->callback_data, active_socket->fd);
 					e->data = buffer, buffer = tsk_null;
 					e->size = len;
diff --git a/branches/2.0/doubango/tinyNET/src/tnet_transport_win32.c b/branches/2.0/doubango/tinyNET/src/tnet_transport_win32.c
index 34bca5c..6f7886f 100644
--- a/branches/2.0/doubango/tinyNET/src/tnet_transport_win32.c
+++ b/branches/2.0/doubango/tinyNET/src/tnet_transport_win32.c
@@ -285,6 +285,7 @@ try_again:
 	}
 
 bail:
+    transport->bytes_out += sent;
 	return sent;
 }
 
@@ -312,6 +313,7 @@ tsk_size_t tnet_transport_sendto(const tnet_transport_handle_t *handle, tnet_fd_
 	}
 
 bail:
+    transport->bytes_out += numberOfBytesSent;
 	return numberOfBytesSent;
 }
 
@@ -739,6 +741,7 @@ void* TSK_STDCALL tnet_transport_mainthread(void *param)
 			else
 			{
 				tnet_transport_event_t* e = tnet_transport_event_create(event_data, transport->callback_data, active_socket->fd);
+                transport->bytes_in += wsaBuffer.len;
 				e->data = wsaBuffer.buf;
 				e->size = wsaBuffer.len;
 				e->remote_addr = remote_addr;
diff --git a/branches/2.0/doubango/tinyNET/src/tnet_types.h b/branches/2.0/doubango/tinyNET/src/tnet_types.h
index 291ef56..f4b55e2 100644
--- a/branches/2.0/doubango/tinyNET/src/tnet_types.h
+++ b/branches/2.0/doubango/tinyNET/src/tnet_types.h
@@ -77,6 +77,8 @@ typedef char tnet_ip_t[INET6_ADDRSTRLEN];
 typedef uint8_t tnet_mac_address[6];
 typedef unsigned char tnet_fingerprint_t[TNET_FINGERPRINT_MAX + 1];
 
+typedef void tnet_transport_handle_t;
+
 typedef tsk_list_t tnet_interfaces_L_t; /**< List of @ref tnet_interface_t elements*/
 typedef tsk_list_t tnet_addresses_L_t; /**< List of @ref tnet_address_t elements*/
 
@@ -132,6 +134,7 @@ static const char* TNET_DTLS_HASH_NAMES[TNET_DTLS_HASH_TYPE_MAX] =
 #	define TNET_ERROR_INTR					WSAEINTR
 #	define TNET_ERROR_ISCONN				WSAEISCONN
 #	define TNET_ERROR_EAGAIN				TNET_ERROR_WOULDBLOCK /* WinSock FIX */
+#	define TNET_ERROR_BROKENPIPE            WSAECONNABORTED
 #	if (TNET_UNDER_WINDOWS_RT || TNET_UNDER_WINDOWS_CE) /* gai_strerrorA() links against FormatMessageA which is not allowed on the store */
 #		if !defined (WC_ERR_INVALID_CHARS)
 #			define WC_ERR_INVALID_CHARS 0
@@ -163,6 +166,7 @@ static const char* TNET_DTLS_HASH_NAMES[TNET_DTLS_HASH_TYPE_MAX] =
 #	define TNET_ERROR_INTR					EINTR
 #	define TNET_ERROR_ISCONN				EISCONN
 #	define TNET_ERROR_EAGAIN				EAGAIN
+#	define TNET_ERROR_BROKENPIPE            EPIPE
 #	define tnet_gai_strerror				gai_strerror
 #endif
 #define TNET_INVALID_FD				TNET_INVALID_SOCKET
diff --git a/branches/2.0/doubango/tinyNET/src/tnet_utils.c b/branches/2.0/doubango/tinyNET/src/tnet_utils.c
index d0f226e..64b1ea8 100644
--- a/branches/2.0/doubango/tinyNET/src/tnet_utils.c
+++ b/branches/2.0/doubango/tinyNET/src/tnet_utils.c
@@ -1804,14 +1804,14 @@ int tnet_sockfd_sendto(tnet_fd_t fd, const struct sockaddr *to, const void* buf,
 #endif
         if (ret <= 0) {
             if (tnet_geterrno() == TNET_ERROR_WOULDBLOCK) {
-                TSK_DEBUG_INFO("SendUdp() - WouldBlock. Retrying...");
+                TSK_DEBUG_INFO("SendUdp(fd=%d) - WouldBlock. Retrying...", fd);
                 if (try_guard--) {
                     tsk_thread_sleep(10);
                     goto try_again;
                 }
             }
             else {
-                TNET_PRINT_LAST_ERROR("sendto() failed");
+                TNET_PRINT_LAST_ERROR("sendto(fd=%d) failed", fd);
             }
             goto bail;
         }
diff --git a/branches/2.0/doubango/tinyNET/src/turn/tnet_turn_session.c b/branches/2.0/doubango/tinyNET/src/turn/tnet_turn_session.c
index 3434c24..e131dbc 100644
--- a/branches/2.0/doubango/tinyNET/src/turn/tnet_turn_session.c
+++ b/branches/2.0/doubango/tinyNET/src/turn/tnet_turn_session.c
@@ -780,6 +780,15 @@ int tnet_turn_session_get_req_transport(const struct tnet_turn_session_s* pc_sel
 	return 0;
 }
 
+int tnet_turn_session_get_bytes_count(const struct tnet_turn_session_s* pc_self, uint64_t* bytes_in, uint64_t* bytes_out)
+{
+    if (!pc_self) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    return tnet_transport_get_bytes_count(pc_self->p_transport, bytes_in, bytes_out);
+}
+
 int tnet_turn_session_createpermission(struct tnet_turn_session_s* p_self, const char* pc_peer_addr, uint16_t u_peer_port, tnet_turn_peer_id_t* pu_id)
 {
 	int ret = 0;
@@ -2022,6 +2031,22 @@ static int _tnet_turn_session_transport_layer_process_cb(const tnet_transport_ev
 	switch(e->type){
 		case event_data:
 			break;
+        case event_brokenpipe:
+            tsk_safeobj_lock(p_ss);
+            if (p_ss->p_lcl_sock && e->local_fd == p_ss->p_lcl_sock->fd) {
+                tnet_fd_t broken_fd = e->local_fd;
+                tsk_bool_t registered_fd = !!tnet_transport_have_socket(p_ss->p_transport, broken_fd);
+                if (registered_fd) {
+                    tnet_transport_remove_socket(p_ss->p_transport, &broken_fd);
+                }
+                if (tnet_socket_handle_brokenpipe(p_ss->p_lcl_sock) == 0) {
+                    if (registered_fd) {
+                        tnet_transport_add_socket(p_ss->p_transport, p_ss->p_lcl_sock->fd, p_ss->p_lcl_sock->type, tsk_false/* do not take ownership */, tsk_true/* only Meaningful for tls*/, tsk_null);
+                    }
+                }
+            }
+            tsk_safeobj_unlock(p_ss);
+            return 0;
 		case event_connected:
 			if (p_ss->p_lcl_sock && p_ss->p_lcl_sock->fd == e->local_fd) {
                 tsk_safeobj_lock(p_ss);
diff --git a/branches/2.0/doubango/tinyNET/src/turn/tnet_turn_session.h b/branches/2.0/doubango/tinyNET/src/turn/tnet_turn_session.h
index c0dbc47..fa4a030 100644
--- a/branches/2.0/doubango/tinyNET/src/turn/tnet_turn_session.h
+++ b/branches/2.0/doubango/tinyNET/src/turn/tnet_turn_session.h
@@ -87,6 +87,7 @@ TINYNET_API int tnet_turn_session_get_socket_local(struct tnet_turn_session_s* p
 TINYNET_API int tnet_turn_session_get_state_createperm(const struct tnet_turn_session_s* pc_self, tnet_turn_peer_id_t u_peer_id, enum tnet_stun_state_e *pe_state);
 TINYNET_API int tnet_turn_session_get_state_connbind(const struct tnet_turn_session_s* pc_self, tnet_turn_peer_id_t u_peer_id, enum tnet_stun_state_e *pe_state);
 TINYNET_API int tnet_turn_session_get_req_transport(const struct tnet_turn_session_s* pc_self, enum tnet_turn_transport_e *pe_transport);
+TINYNET_API int tnet_turn_session_get_bytes_count(const struct tnet_turn_session_s* pc_self, uint64_t* bytes_in, uint64_t* bytes_out);
 TINYNET_API int tnet_turn_session_createpermission(struct tnet_turn_session_s* p_self, const char* pc_peer_addr, uint16_t u_peer_port, tnet_turn_peer_id_t* pu_peer_id);
 TINYNET_API int tnet_turn_session_deletepermission(struct tnet_turn_session_s* p_self, tnet_turn_peer_id_t u_peer_id);
 TINYNET_API int tnet_turn_session_chanbind(struct tnet_turn_session_s* p_self, tnet_turn_peer_id_t u_peer_id);
diff --git a/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_session.h b/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_session.h
index ec5b657..34ddbbc 100644
--- a/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_session.h
+++ b/branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_session.h
@@ -41,6 +41,7 @@ TRTP_BEGIN_DECLS
 struct trtp_rtcp_packet_s;
 struct trtp_rtp_packet_s;
 struct tnet_ice_ctx_s;
+struct tnet_transport_s;
 
 typedef int (*trtp_rtcp_cb_f)(const void* callback_data, const struct trtp_rtcp_packet_s* packet);
 
@@ -60,6 +61,10 @@ int trtp_rtcp_session_signal_pkt_loss(struct trtp_rtcp_session_s* self, uint32_t
 int trtp_rtcp_session_signal_frame_corrupted(struct trtp_rtcp_session_s* self, uint32_t ssrc_media);
 int trtp_rtcp_session_signal_jb_error(struct trtp_rtcp_session_s* self, uint32_t ssrc_media);
 
+tnet_fd_t trtp_rtcp_session_get_local_fd(const struct trtp_rtcp_session_s* self);
+int trtp_rtcp_session_set_local_fd(struct trtp_rtcp_session_s* self, tnet_fd_t local_fd);
+int trtp_rtcp_session_set_net_transport(struct trtp_rtcp_session_s* self, struct tnet_transport_s* transport);
+
 TRTP_END_DECLS
 
 #endif /* TINYMEDIA_RTCP_SESSION_H */
diff --git a/branches/2.0/doubango/tinyRTP/include/tinyrtp/trtp_manager.h b/branches/2.0/doubango/tinyRTP/include/tinyrtp/trtp_manager.h
index cf2d0fa..1594f9c 100644
--- a/branches/2.0/doubango/tinyRTP/include/tinyrtp/trtp_manager.h
+++ b/branches/2.0/doubango/tinyRTP/include/tinyrtp/trtp_manager.h
@@ -106,6 +106,7 @@ typedef struct trtp_manager_s
 		struct{
 			void* ptr;
 			tsk_size_t size;
+            tsk_size_t index;
 		} serial_buffer;
 	} rtp;
 
@@ -211,6 +212,7 @@ TINYRTP_API int trtp_manager_set_proxy_info(trtp_manager_t* self, enum tnet_prox
 TINYRTP_API int trtp_manager_start(trtp_manager_t* self);
 TINYRTP_API tsk_size_t trtp_manager_send_rtp(trtp_manager_t* self, const void* data, tsk_size_t size, uint32_t duration, tsk_bool_t marker, tsk_bool_t last_packet);
 TINYRTP_API tsk_size_t trtp_manager_send_rtp_packet(trtp_manager_t* self, const struct trtp_rtp_packet_s* packet, tsk_bool_t bypass_encrypt);
+TINYRTP_API int trtp_manager_get_bytes_count(trtp_manager_t* self, uint64_t* bytes_in, uint64_t* bytes_out);
 TINYRTP_API tsk_size_t trtp_manager_send_rtp_raw(trtp_manager_t* self, const void* data, tsk_size_t size);
 TINYRTP_API int trtp_manager_set_app_bandwidth_max(trtp_manager_t* self, int32_t bw_upload_kbps, int32_t bw_download_kbps);
 TINYRTP_API int trtp_manager_signal_pkt_loss(trtp_manager_t* self, uint32_t ssrc_media, const uint16_t* seq_nums, tsk_size_t count);
diff --git a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_session.c b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_session.c
index b93c8ae..3172278 100644
--- a/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_session.c
+++ b/branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_session.c
@@ -38,6 +38,7 @@
 
 #include "ice/tnet_ice_ctx.h"
 #include "turn/tnet_turn_session.h"
+#include "tnet_transport.h"
 
 #include "tnet_utils.h"
 
@@ -268,8 +269,9 @@ typedef struct trtp_rtcp_session_s
 	
 	tsk_bool_t is_started;
 	tnet_fd_t local_fd;
+    struct tnet_transport_s* transport; // not starter -> do not stop
 	const struct sockaddr * remote_addr;
-	struct tnet_ice_ctx_s* ice_ctx;
+	struct tnet_ice_ctx_s* ice_ctx; // not starter -> do not stop
 	tsk_bool_t is_ice_turn_active;
 
 	const void* callback_data;
@@ -355,8 +357,9 @@ static tsk_object_t* trtp_rtcp_session_dtor(tsk_object_t * self)
 		TSK_OBJECT_SAFE_FREE(session->sources);
 		TSK_OBJECT_SAFE_FREE(session->source_local);
 		TSK_OBJECT_SAFE_FREE(session->sdes);
-		TSK_OBJECT_SAFE_FREE(session->ice_ctx);
+		TSK_OBJECT_SAFE_FREE(session->ice_ctx); // not starter -> do not stop
 		TSK_FREE(session->cname);
+        TSK_OBJECT_SAFE_FREE(session->transport); // not starter -> do not stop
 		// release the handle for the global timer manager
 		tsk_timer_mgr_global_unref(&session->timer.handle_global);
 
@@ -765,6 +768,36 @@ int trtp_rtcp_session_signal_jb_error(struct trtp_rtcp_session_s* self, uint32_t
 	return trtp_rtcp_session_signal_frame_corrupted(self, ssrc_media);
 }
 
+tnet_fd_t trtp_rtcp_session_get_local_fd(const struct trtp_rtcp_session_s* self)
+{
+    if (!self) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return TNET_INVALID_FD;
+    }
+    return self->local_fd;
+}
+
+int trtp_rtcp_session_set_local_fd(struct trtp_rtcp_session_s* self, tnet_fd_t local_fd)
+{
+    if (!self) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    self->local_fd = local_fd;
+    return 0;
+}
+
+int trtp_rtcp_session_set_net_transport(struct trtp_rtcp_session_s* self, struct tnet_transport_s* transport)
+{
+    if (!self) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    TSK_OBJECT_SAFE_FREE(self->transport);
+    self->transport = tsk_object_ref(transport);
+    return 0;
+}
+
 static tsk_bool_t _trtp_rtcp_session_have_source(trtp_rtcp_session_t* self, uint32_t ssrc)
 {
 	tsk_list_item_t* item;
@@ -925,9 +958,9 @@ static tsk_size_t _trtp_rtcp_session_send_raw(trtp_rtcp_session_t* self, const v
 		ret = (tnet_ice_ctx_send_turn_rtcp(self->ice_ctx, data, size) == 0) ? size : 0; // returns #0 if ok
 	}
 	else {
-		if (tnet_sockfd_sendto(self->local_fd, self->remote_addr, data, size) == size){ // returns number of sent bytes
-			ret = size;
-		}
+        ret = self->transport
+        ? tnet_transport_sendto(self->transport, self->local_fd, self->remote_addr, data, size)
+        : tnet_sockfd_sendto(self->local_fd, self->remote_addr, data, size);
 	}
 	return ret;
 }
diff --git a/branches/2.0/doubango/tinyRTP/src/trtp_manager.c b/branches/2.0/doubango/tinyRTP/src/trtp_manager.c
index 48d7281..6e6b00e 100644
--- a/branches/2.0/doubango/tinyRTP/src/trtp_manager.c
+++ b/branches/2.0/doubango/tinyRTP/src/trtp_manager.c
@@ -93,6 +93,38 @@ static int _trtp_transport_layer_cb(const tnet_transport_event_t* e)
 			{
 				return _trtp_manager_recv_data(manager, e->data, e->size, e->local_fd, &e->remote_addr);
 			}
+        case event_brokenpipe:
+            {
+                tsk_safeobj_lock(manager);
+                tnet_fd_t broken_fd = e->local_fd;
+                tnet_socket_t* socket = tsk_null;
+                tsk_bool_t is_rtcp_socket = tsk_false;
+                
+                if (manager->transport && manager->transport->master &&  manager->transport->master->fd == broken_fd) {
+                    socket = manager->transport->master;
+                }
+                else if (manager->rtcp.local_socket && manager->rtcp.local_socket->fd == broken_fd) {
+                    socket = manager->rtcp.local_socket;
+                    is_rtcp_socket = tsk_true;
+                }
+                if (socket) {
+                    tsk_bool_t registered_fd = !!tnet_transport_have_socket(manager->transport, broken_fd);
+                    if (registered_fd) {
+                        tnet_transport_remove_socket(manager->transport, &broken_fd); // broken_fd=-1
+                        broken_fd = e->local_fd; // restore
+                    }
+                    if (tnet_socket_handle_brokenpipe(socket) == 0) {
+                        if (registered_fd) {
+                            tnet_transport_add_socket(manager->transport, socket->fd, socket->type, tsk_false/* do not take ownership */, tsk_true/* only Meaningful for tls*/, tsk_null);
+                        }
+                        if (manager->rtcp.session && trtp_rtcp_session_get_local_fd(manager->rtcp.session) == broken_fd) {
+                            trtp_rtcp_session_set_local_fd(manager->rtcp.session, socket->fd);
+                        }
+                    }
+                }
+                tsk_safeobj_unlock(manager);
+                return 0;
+            }
 #if HAVE_SRTP
 			/* DTLS - SRTP events */
 		case event_dtls_handshake_succeed:
@@ -457,8 +489,15 @@ static int _trtp_manager_recv_data(const trtp_manager_t* self, const uint8_t* da
 			err_status_t status;
 			if(self->srtp_ctx_neg_remote){
 				if((status = srtp_unprotect(self->srtp_ctx_neg_remote->rtp.session, (void*)data_ptr, (int*)&data_size)) != err_status_ok){
-					TSK_DEBUG_ERROR("srtp_unprotect(RTP) failed with error code=%d, seq_num=%u", (int)status,  (data_size > 4 ? tnet_ntohs_2(&data_ptr[2]) : 0x0000));
-					return -1;
+                    if (status == err_status_replay_fail) {
+                        // replay (because of RTCP-NACK nothing to worry about)
+                        TSK_DEBUG_INFO("srtp_unprotect(RTP) returned 'err_status_replay_fail'");
+                        return 0;
+                    }
+                    else {
+                        TSK_DEBUG_ERROR("srtp_unprotect(RTP) failed with error code=%d, seq_num=%u", (int)status,  (data_size > 4 ? tnet_ntohs_2(&data_ptr[2]) : 0x0000));
+                        return -1;
+                    }
 				}
 			}
 			#endif
@@ -1463,6 +1502,7 @@ int trtp_manager_start(trtp_manager_t* self)
 		if(self->rtcp.session){
 			ret = trtp_rtcp_session_set_callback(self->rtcp.session, self->rtcp.cb.fun, self->rtcp.cb.usrdata);
 			ret = trtp_rtcp_session_set_app_bandwidth_max(self->rtcp.session, self->app_bw_max_upload, self->app_bw_max_download);
+            ret = trtp_rtcp_session_set_net_transport(self->rtcp.session, self->transport);
 			if((ret = trtp_rtcp_session_start(self->rtcp.session, local_rtcp_fd, (const struct sockaddr *)&self->rtcp.remote_addr))){
 				TSK_DEBUG_ERROR("Failed to start RTCP session");
 				goto bail;
@@ -1568,6 +1608,9 @@ tsk_size_t trtp_manager_send_rtp_packet(trtp_manager_t* self, const struct trtp_
 	}
 
 	tsk_safeobj_lock(self);
+    
+    // reset index
+    self->rtp.serial_buffer.index = 0;
 
 	/* check if transport is started */
 	if(!self->is_started || !self->transport || !self->transport->master){
@@ -1598,7 +1641,7 @@ tsk_size_t trtp_manager_send_rtp_packet(trtp_manager_t* self, const struct trtp_
 	}
 
 	/* serialize and send over the network */
-	if((ret = (int)trtp_rtp_packet_serialize_to(packet, self->rtp.serial_buffer.ptr, xsize))){
+	if ((ret = (int)trtp_rtp_packet_serialize_to(packet, self->rtp.serial_buffer.ptr, xsize))) {
 		void* data_ptr = self->rtp.serial_buffer.ptr;
 		int data_size = ret;
 #if HAVE_SRTP
@@ -1610,6 +1653,7 @@ tsk_size_t trtp_manager_send_rtp_packet(trtp_manager_t* self, const struct trtp_
 			}
 		}
 #endif
+        self->rtp.serial_buffer.index = data_size; // update index
 		if (/* number of bytes sent */(ret = (int)trtp_manager_send_rtp_raw(self, data_ptr, data_size)) > 0) {
 			// forward packet to the RTCP session
 			if (self->rtcp.session) {
@@ -1642,12 +1686,35 @@ tsk_size_t trtp_manager_send_rtp_raw(trtp_manager_t* self, const void* data, tsk
 		ret = (tnet_ice_ctx_send_turn_rtp(self->ice_ctx, data, size) == 0) ? size : 0; // returns #0 if ok
 	}
 	else {
+#if 1
+        ret = tnet_transport_sendto(self->transport, self->transport->master->fd, (const struct sockaddr *)&self->rtp.remote_addr, data, size); // returns number of sent bytes
+#else
 		ret = tnet_sockfd_sendto(self->transport->master->fd, (const struct sockaddr *)&self->rtp.remote_addr, data, size); // returns number of sent bytes
+#endif
 	}
 	tsk_safeobj_unlock(self);
 	return ret;
 }
 
+int trtp_manager_get_bytes_count(trtp_manager_t* self, uint64_t* bytes_in, uint64_t* bytes_out)
+{
+    if (!self) {
+        TSK_DEBUG_ERROR("Invalid parameter");
+        return -1;
+    }
+    if (!self->is_started) {
+        TSK_DEBUG_INFO("trtp_manager_get_bytes_count() called before starting RTP manager... returning zeros");
+        if (bytes_in) *bytes_in = 0;
+        if (bytes_out) *bytes_out = 0;
+        return 0;
+    }
+    
+    if (self->is_ice_turn_active) {
+        return tnet_ice_ctx_turn_get_bytes_count(self->ice_ctx, bytes_in, bytes_out);
+    }
+    return tnet_transport_get_bytes_count(self->transport, bytes_in, bytes_out);
+}
+
 int trtp_manager_set_app_bandwidth_max(trtp_manager_t* self, int32_t bw_upload_kbps, int32_t bw_download_kbps)
 {
 	if(self){
@@ -1660,6 +1727,7 @@ int trtp_manager_set_app_bandwidth_max(trtp_manager_t* self, int32_t bw_upload_k
 	}
 	return -1;
 }
+
 int trtp_manager_signal_pkt_loss(trtp_manager_t* self, uint32_t ssrc_media, const uint16_t* seq_nums, tsk_size_t count)
 {
 	if(self && self->rtcp.session){
@@ -1667,6 +1735,7 @@ int trtp_manager_signal_pkt_loss(trtp_manager_t* self, uint32_t ssrc_media, cons
 	}
 	return -1;
 }
+
 int trtp_manager_signal_frame_corrupted(trtp_manager_t* self, uint32_t ssrc_media)
 {
 	if(self && self->rtcp.session){
@@ -1713,6 +1782,7 @@ int trtp_manager_stop(trtp_manager_t* self)
 	// Stop the RTCP session first (will send BYE)
 	if(self->rtcp.session){
 		ret = trtp_rtcp_session_stop(self->rtcp.session);
+        ret = trtp_rtcp_session_set_net_transport(self->rtcp.session, tsk_null);
 	}
 
 	// Free transport to force next call to start() to create new one with new sockets