Prepare v1.2.1v1.2.1

5 files changed, 15 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e597ed5..670e564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 This file contains information about the changes done to
 ODR-DabMux in this repository
 
+2017-01-29: Matthias P. Braendli <matthias@mpb.li>
+	(v1.2.1):
+		Bugfix for illegal memory access in EDI PFT layer.
+		Add experimental STI-D(PI, X)/RTP input.
+
 2017-01-24: Matthias P. Braendli <matthias@mpb.li>
 	(v1.2.0):
 		Remove the libfec dependency.
diff --git a/README.md b/README.md
index a68f16e..0fcc850 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,8 @@ Features of ODR-DabMux:
 - ZeroMQ and TCP ETI outputs that can be used with ODR-DabMod
 - ZeroMQ input that can be used with ODR-AudioEnc
   which supports CURVE authentication
+- Experimental STI-D(PI, X)/RTP input intended to be compatible
+  with AVT encoders.
 - Logging to syslog
 - Monitoring using munin tool
 - Includes a Telnet and ZMQ Remote Control for setting/getting parameters
diff --git a/TODO b/TODO
index fb56034..a3142f0 100644
--- a/TODO
+++ b/TODO
@@ -15,6 +15,10 @@ ODR-DabMod to add EDI input there too.
 
 Initial work started in http://git.mpb.li/git/odr-edilib/
 
+There is experimental support for STI(PI, X)/RTP using UDP, which is used by
+AVT encoders. It does not properly reorder incoming UDP packets nor align
+STI frames with ETI frames.
+
 
 Explicit Service Linking
 ------------------------
diff --git a/configure.ac b/configure.ac
index 8aefaef..cf52e05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 # along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([ODR-DabMux], [1.2.0], [matthias.braendli@mpb.li])
+AC_INIT([ODR-DabMux], [1.2.1], [matthias.braendli@mpb.li])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([-Wall subdir-objects foreign])
diff --git a/src/input/Udp.cpp b/src/input/Udp.cpp
index a7f9013..2cb49e7 100644
--- a/src/input/Udp.cpp
+++ b/src/input/Udp.cpp
@@ -289,13 +289,15 @@ void Sti_d_Rtp::receive_packet()
         index += NST*4+4;
 
         const size_t dataSize = STL - 2*CRCSTF;
+
         const size_t frameNumber = DFCTH*250 + DFCTL;
+        (void)frameNumber;
         // TODO must align framenumber with ETI
+        // TODO reordering
 
         vec_u8 data(dataSize);
         copy(buf+index, buf+index+dataSize, data.begin());
 
-        // TODO reordering
         m_queue.push_back(data);
     }