[asterisk-commits] oej: branch oej/chocolate-video-congestion-11 r433369 - in /team/oej/chocolat...

[SVN commits to the Asterisk project]

Author: oej
Date: Wed Mar 25 05:28:12 2015
New Revision: 433369

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433369
Log:
Minor stuff

Modified:
    team/oej/chocolate-video-congestion-11/channels/chan_sip.c
    team/oej/chocolate-video-congestion-11/sipp/inviteremb.txt

Modified: team/oej/chocolate-video-congestion-11/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/chocolate-video-congestion-11/channels/chan_sip.c?view=diff&rev=433369&r1=433368&r2=433369
==============================================================================
--- team/oej/chocolate-video-congestion-11/channels/chan_sip.c (original)
+++ team/oej/chocolate-video-congestion-11/channels/chan_sip.c Wed Mar 25 05:28:12 2015
@@ -12770,10 +12770,10 @@
 	ast_str_append(m_buf, 0, " %d", rtp_code);
 	ast_str_append(a_buf, 0, "a=rtpmap:%d %s/%u\r\n", rtp_code, subtype, rate);
 
-	if (format == AST_FORMAT_H264 /* || format == AST_FORMAT_VP8 */ ) {
+	if (format->id == AST_FORMAT_H264 /* || format == AST_FORMAT_VP8 */ ) {
 		if (ast_rtp_instance_get_prop(p->vrtp, AST_RTP_PROPERTY_RTCPFB_REMB)) {
 			/* NOte: Will only be added for answers. */
-			ast_str_append(&a_video, 0, " a=rtcp-fb:%d goog-remb\r\n", rtp_code);
+			ast_str_append(a_buf, 0, " a=rtcp-fb:%d goog-remb\r\n", rtp_code);
 		}
 	}
 

Modified: team/oej/chocolate-video-congestion-11/sipp/inviteremb.txt
URL: http://svnview.digium.com/svn/asterisk/team/oej/chocolate-video-congestion-11/sipp/inviteremb.txt?view=diff&rev=433369&r1=433368&r2=433369
==============================================================================
--- team/oej/chocolate-video-congestion-11/sipp/inviteremb.txt (original)
+++ team/oej/chocolate-video-congestion-11/sipp/inviteremb.txt Wed Mar 25 05:28:12 2015
@@ -25,7 +25,7 @@
 a=sendrecv
 a=maxptime:20
 m=video 64544 RTP/AVPF 100
-a=rtpmap:100 VP8/90000
+a=rtpmap:100 h264/90000
 a=rtcp-fb:100 ccm fir
 a=rtcp-fb:100 nack
 a=rtcp-fb:100 nack pli