UltraGrid 1.3

MartinPulec · MartinPulec · commit df665088b0c2 · 2014-12-23T13:27:07.000+01:00
diff --git a/NEWS b/NEWS
@@ -3,7 +3,6 @@
 * further Windows compatibility (including GPUJPEG)
 * added encryption
 * added AV Foundation capture
-* OS X 10.9 compatibility
 * added CUDA implementation of LDGM
 * multiple performance improvements
 * added logo capture filter
@@ -12,7 +11,7 @@
 * support for new operating systems (OS X 10.10, Ubuntu 14.10, Windows 8)
 * added RTSP capturer
 * added resize capture filter
-* standard encapsulation for H.264 and A-law/u-law/OPUS audio and RTSP transmission/server
+* standard encapsulation for H.264 and A-law/u-law/OPUS audio and RTSP server
 
 1.2
 =====
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([UltraGrid], [1.3-rc1], [ultragrid-dev@cesnet.cz])
+AC_INIT([UltraGrid], [1.3], [ultragrid-dev@cesnet.cz])
 AM_INIT_AUTOMAKE([1.10])
 AC_PREREQ(2.61)
 AC_CONFIG_SRCDIR([src/main.cpp])
diff --git a/src/transmit.cpp b/src/transmit.cpp
@@ -626,6 +626,9 @@ tx_send_base(struct tx *tx, struct video_frame *frame, struct rtp *rtp_session,
                                         mult_index = (mult_index + 1) % tx->mult_count;
                 }
 
+                //fprintf(stderr, "%d\n", packet_rate);
+                struct timespec tm = { 0, packet_rate };
+                nanosleep(&tm, NULL);
                 do {
                         GET_STOPTIME;
                         GET_DELTA;
diff --git a/src/video_rxtx/rtp.cpp b/src/video_rxtx/rtp.cpp
@@ -77,6 +77,7 @@ using namespace std;
 void rtp_video_rxtx::process_message(struct msg_sender *msg)
 {
         int ret;
+        assert(m_rxtx_mode == MODE_SENDER); // sender only
         switch(msg->type) {
                 case SENDER_MSG_CHANGE_RECEIVER:
                         assert(m_connections_count == 1);

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 dnl Process this file with autoconf to produce a configure script.
 -AC_INIT([UltraGrid], [1.3-rc1], [[email protected]])
 +AC_INIT([UltraGrid], [1.3], [[email protected]])
 AM_INIT_AUTOMAKE([1.10])
 AC_PREREQ(2.61)
 AC_CONFIG_SRCDIR([src/main.cpp])
Original file line number	Diff line number	Diff line change
`@@ -626,6 +626,9 @@ tx_send_base(struct tx tx, struct video_frame frame, struct rtp *rtp_session,`
`626`	`626`	`mult_index = (mult_index + 1) % tx->mult_count;`
`627`	`627`	`}`
`628`	`628`
	`629`	`+ //fprintf(stderr, "%d\n", packet_rate);`
	`630`	`+ struct timespec tm = { 0, packet_rate };`
	`631`	`+ nanosleep(&tm, NULL);`
`629`	`632`	`do {`
`630`	`633`	`GET_STOPTIME;`
`631`	`634`	`GET_DELTA;`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ using namespace std;`
`77`	`77`	`void rtp_video_rxtx::process_message(struct msg_sender *msg)`
`78`	`78`	`{`
`79`	`79`	`int ret;`
	`80`	`+ assert(m_rxtx_mode == MODE_SENDER); // sender only`
`80`	`81`	`switch(msg->type) {`
`81`	`82`	`case SENDER_MSG_CHANGE_RECEIVER:`
`82`	`83`	`assert(m_connections_count == 1);`