From df665088b0c25c266db0c1e152c3e02f0f203fa0 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 23 Dec 2014 13:24:48 +0100 Subject: [PATCH] UltraGrid 1.3 --- NEWS | 3 +-- configure.ac | 2 +- src/transmit.cpp | 3 +++ src/video_rxtx/rtp.cpp | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 4d9844bf0..258c9f40d 100644 --- 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 index 432f193c5..fc25a70c9 100644 --- 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 index 385df2464..3e77ae938 100644 --- 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 index 0c13d0470..4ecbac1ab 100644 --- 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);