From 3b70789e27e28d2d98c9a0d191060b4b3449ff05 Mon Sep 17 00:00:00 2001
From: Erik Zandvliet <erik.zandvliet@ddvtech.com>
Date: Mon, 17 Dec 2012 13:52:00 +0100
Subject: [PATCH] Bugfix in TS concerning audio init data

---
 src/conn_ts.cpp            | 6 +-----
 src/converters/dtsc2ts.cpp | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/conn_ts.cpp b/src/conn_ts.cpp
index 63eda36c..2c320db5 100644
--- a/src/conn_ts.cpp
+++ b/src/conn_ts.cpp
@@ -1,5 +1,3 @@
-#define DEBUG 10
-
 /// \file conn_ts.cpp
 /// Contains the main code for the TS Connector
 
@@ -16,7 +14,6 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/types.h>
-#include <sys/epoll.h>
 #include <mist/socket.h>
 #include <mist/config.h>
 #include <mist/stream.h>
@@ -80,7 +77,6 @@ int TS_Handler( Socket::Connection conn, std::string streamname ) {
           }
           if( IsKeyFrame ) {
             TimeStamp = ( Strm.getPacket(0)["time"].asInt() * 27000 );
-            fprintf( stderr, "Keyframe, timeStamp: %llu (%llu)\n", TimeStamp, (TimeStamp / 27000) );
           }
           int TSType;
           bool FirstPic = true;
@@ -150,7 +146,7 @@ int TS_Handler( Socket::Connection conn, std::string streamname ) {
         } else if( Strm.lastType() == DTSC::AUDIO ) {
           WritePesHeader = true;
           DTMIData = Strm.lastData();
-          ToPack = TS::GetAudioHeader( DTMIData.size() );
+          ToPack = TS::GetAudioHeader( DTMIData.size(), Strm.metadata["audio"]["init"].asString() );
           ToPack += DTMIData;
           TimeStamp = Strm.getPacket(0)["time"].asInt() * 81000;
           while( ToPack.size() ) {
diff --git a/src/converters/dtsc2ts.cpp b/src/converters/dtsc2ts.cpp
index f798e4e5..3f0f9a9f 100644
--- a/src/converters/dtsc2ts.cpp
+++ b/src/converters/dtsc2ts.cpp
@@ -49,7 +49,6 @@ int main( ) {
         }
         if( IsKeyFrame ) {
           TimeStamp = ( DTSCStream.getPacket(0)["time"].asInt() * 27000 );
-          fprintf( stderr, "Keyframe, timeStamp: %llu (%llu)\n", TimeStamp, (TimeStamp / 27000) );
         }
         int TSType;
         bool FirstPic = true;
@@ -119,7 +118,7 @@ int main( ) {
       } else if( DTSCStream.lastType() == DTSC::AUDIO ) {
         WritePesHeader = true;
         DTMIData = DTSCStream.lastData();
-        ToPack = TS::GetAudioHeader( DTMIData.size() );
+        ToPack = TS::GetAudioHeader( DTMIData.size(), DTSCStream.metadata["audio"]["init"].asString() );
         ToPack += DTMIData;
         TimeStamp = DTSCStream.getPacket(0)["time"].asInt() * 81000;
         while( ToPack.size() ) {