[svn-commits] oej: branch oej/chocolate-video-congestion-11 r433547 - /team/oej/chocolate-v...

[SVN commits to the Digium repositories]

Author: oej
Date: Fri Mar 27 04:48:29 2015
New Revision: 433547

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433547
Log:
It's Friday. Be nice, gcc.

Modified:
    team/oej/chocolate-video-congestion-11/res/res_rtp_asterisk.c

Modified: team/oej/chocolate-video-congestion-11/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/chocolate-video-congestion-11/res/res_rtp_asterisk.c?view=diff&rev=433547&r1=433546&r2=433547
==============================================================================
--- team/oej/chocolate-video-congestion-11/res/res_rtp_asterisk.c (original)
+++ team/oej/chocolate-video-congestion-11/res/res_rtp_asterisk.c Fri Mar 27 04:48:29 2015
@@ -477,6 +477,7 @@
 static void ast_rtp_stop(struct ast_rtp_instance *instance);
 static int ast_rtp_qos_set(struct ast_rtp_instance *instance, int tos, int cos, const char* desc);
 static int ast_rtp_sendcng(struct ast_rtp_instance *instance, int level);
+static void ast_rtp_remb_estimate(struct ast_rtp_instance *instance);
 
 #ifdef HAVE_OPENSSL_SRTP
 static int ast_rtp_activate(struct ast_rtp_instance *instance);
@@ -4596,20 +4597,20 @@
 				bitspersec = (unsigned int) (rtp->multi_payload_size * 8) / (transmissiontime * 1000);
 			
 			} else {
-				lastrxts_reuse=1;
-				multi_payload_size += res - hdrlen;
+				rtp->lastrxts_reuse=1;
+				rtp->multi_payload_size += res - hdrlen;
 				transmissiontime = 0;	/* Wrong - where's the network transmission? */
 			}
 			/* We have a new time stamp. */
 			/* Do something with the data we have */
-			if (lastrxts_reuse == 1) {
-				ast_debug(1, " ===> Got single frame with a payload size (bytes) of %d. \n", (int) multi_payload_size);
+			if (rtp->lastrxts_reuse == 1) {
+				ast_debug(1, " ===> Got single frame with a payload size (bytes) of %d. \n", (int) rtp->multi_payload_size);
 			} else {
 				ast_debug(1, " ===> Combined %d frames with an aggregated payload size (bytes) of %d. Transmission time %d millisecs\n", (int) lastrxts_reuse, (int) multi_payload_size, (int) transmissiontime);
 			}
 			/* Reset counters */
-			lastrxts_reuse = 0;
-			multi_payload_size = 0;
+			rtp->lastrxts_reuse = 0;
+			rtp->multi_payload_size = 0;
 		}
 	}
 	rtp->lastrxts = timestamp;