add special case to compute aac network birate

diff --git a/coreapi/misc.c b/coreapi/misc.c
index 35a58e2000cb1566b665d64da33db4a42d883ff2..5d4c0ebcc2d365915ece80841e5ac2c1f1e7b858 100644 (file)
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -234,12 +234,21 @@ static int get_codec_bitrate(LinphoneCore *lc, const PayloadType *pt){
        return pt->normal_bitrate;
 }
 
+/*
+ *((codec-birate*ptime/8) + RTP header + UDP header + IP header)*8/ptime;
+ *ptime=1/npacket
+ */
 static double get_audio_payload_bandwidth(LinphoneCore *lc, const PayloadType *pt){
        double npacket=50;
        double packet_size;
        int bitrate;
+       if (strcmp(payload_type_get_mime(&payload_type_aaceld_44k), payload_type_get_mime(pt))==0) {
+               /*special case of aac 44K because ptime= 10ms*/
+               npacket=100;
+       }
+               
        bitrate=get_codec_bitrate(lc,pt);
-       packet_size= (((double)bitrate)/(50*8))+UDP_HDR_SZ+RTP_HDR_SZ+IP4_HDR_SZ;
+       packet_size= (((double)bitrate)/(npacket*8))+UDP_HDR_SZ+RTP_HDR_SZ+IP4_HDR_SZ;
        return packet_size*8.0*npacket;
 }
 

diff --git a/mediastreamer2 b/mediastreamer2
index 07824fcf3879d265c59beaf970d833b5859f3691..23b802c4631fdf909a218a0dd0a77c6cf6d4d5a9 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 07824fcf3879d265c59beaf970d833b5859f3691
+Subproject commit 23b802c4631fdf909a218a0dd0a77c6cf6d4d5a9

diff --git a/oRTP b/oRTP
index 20b527144f9850dd9065d96db7a20244e8a8b227..bd64df5148bdfd4a2ff5153927676fc497118279 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 20b527144f9850dd9065d96db7a20244e8a8b227
+Subproject commit bd64df5148bdfd4a2ff5153927676fc497118279