Merge commit

Connector_TS/main.cpp

@@ -16,7 +16,7 @@
 
 class Transport_Packet {
   public:
-    Transport_Packet( bool NALUStart = false, int PID = 0x100 );
+    Transport_Packet( bool PacketStart = false, int PID = 0x100 );
     void SetPayload( char * Payload, int PayloadLen, int Offset = 13 );
     void SetPesHeader( int Offset = 4 );
     void Write( );
@@ -24,15 +24,17 @@ class Transport_Packet {
     void SetContinuityCounter( int Counter );
     void SetMessageLength( int MsgLen );
     void SetAdaptationField( );
+    void CreatePAT( int ContinuityCounter );
+    void CreatePMT( int ContinuityCounter );
   private:
     int PID;
     char Buffer[188];
 };//Transport Packet
 
-Transport_Packet::Transport_Packet( bool NALUStart, int PID ) {
+Transport_Packet::Transport_Packet( bool PacketStart, int PID ) {
   (*this).PID = PID;
   Buffer[0] = (char)0x47;
-  Buffer[1] = ( NALUStart ? (char)0x40 : 0 ) + (( PID & 0xFF00 ) >> 8 );
+  Buffer[1] = ( PacketStart ? (char)0x40 : 0 ) + (( PID & 0xFF00 ) >> 8 );
   Buffer[2] = ( PID & 0x00FF );
   Buffer[3] = (char)0x00;
 }
@@ -43,7 +45,7 @@ void Transport_Packet::SetMessageLength( int MsgLen ) {
 }
 
 void Transport_Packet::SetContinuityCounter( int Counter ) {
-  Buffer[3] = (char)0x00 + ( Counter & 0x0F );
+  Buffer[3] = ( Buffer[3] & 0xF0 ) + ( Counter & 0x0F );
 }
 
 void Transport_Packet::SetPesHeader( int Offset ) {
@@ -74,6 +76,87 @@ void Transport_Packet::SetPayload( char * Payload, int PayloadLen, int Offset )
   memcpy( &Buffer[Offset], Payload, std::min( PayloadLen, 188-Offset ) );
 }
 
+
+void Transport_Packet::CreatePAT( int ContinuityCounter ) {
+  Buffer[3] = (char)0x10 + ContinuityCounter;
+  Buffer[4] = (char)0x00;
+  Buffer[5] = (char)0x00;
+  Buffer[6] = (char)0xD0;
+  Buffer[7] = (char)0x0D;
+  Buffer[8] = (char)0x00;
+  Buffer[9] = (char)0x01;
+  Buffer[10] = (char)0xC1;
+  Buffer[11] = (char)0x00;
+  Buffer[12] = (char)0x00;
+  Buffer[13] = (char)0x00;
+  Buffer[14] = (char)0x01;
+  Buffer[15] = (char)0xF0;
+  Buffer[16] = (char)0x00;
+  
+  Buffer[17] = (char)0x2A;
+  Buffer[18] = (char)0xB1;
+  Buffer[19] = (char)0x04;
+  Buffer[20] = (char)0xB2;
+  for(int i = 21; i < 188; i++ ) {
+    Buffer[i] = (char)0xFF;
+  }
+}
+
+void Transport_Packet::CreatePMT( int ContinuityCounter ) {
+  Buffer[3] = (char)0x10 + ContinuityCounter;
+  Buffer[4] = (char)0x00;
+  Buffer[5] = (char)0x02;
+  Buffer[6] = (char)0xB0;
+  Buffer[7] = (char)0x17;
+  Buffer[8] = (char)0x00;
+  Buffer[9] = (char)0x01;
+  Buffer[10] = (char)0xC1;
+  Buffer[11] = (char)0x00;
+  Buffer[12] = (char)0x00;
+  Buffer[13] = (char)0xE1;
+  Buffer[14] = (char)0x00;
+  Buffer[15] = (char)0xF0;
+  Buffer[16] = (char)0x00;
+  Buffer[17] = (char)0x1B;
+  Buffer[18] = (char)0xE1;
+  Buffer[19] = (char)0x00;
+  Buffer[20] = (char)0xF0;
+  Buffer[21] = (char)0x00;
+  Buffer[22] = (char)0x03;
+  Buffer[23] = (char)0xE1;
+  Buffer[24] = (char)0x01;
+  Buffer[25] = (char)0xF0;
+  Buffer[26] = (char)0x00;
+  
+  Buffer[27] = (char)0x4E;
+  Buffer[28] = (char)0x59;
+  Buffer[29] = (char)0x3D;
+  Buffer[30] = (char)0x1E;
+  
+  for(int i = 31; i < 188; i++ ) {
+    Buffer[i] = (char)0xFF;
+  }
+}
+
+
+void SendPAT( Socket::Connection conn ) {
+  static int ContinuityCounter = 0;
+  Transport_Packet TS;
+  TS = Transport_Packet( true, 0 );
+  TS.CreatePAT( ContinuityCounter );
+  TS.Write( conn );
+  ContinuityCounter = ( ContinuityCounter + 1 ) & 0x0F;
+}
+
+void SendPMT( Socket::Connection conn ) {
+  static int ContinuityCounter = 0;
+  Transport_Packet TS;
+  TS = Transport_Packet( true, 0x1000 );
+  TS.CreatePMT( ContinuityCounter );
+  TS.Write( conn );
+  ContinuityCounter = ( ContinuityCounter + 1 ) & 0x0F;  
+}
+
 std::vector<Transport_Packet> WrapNalus( FLV::Tag tag ) {
   static int ContinuityCounter = 0;
   Transport_Packet TS;
@@ -81,7 +164,7 @@ std::vector<Transport_Packet> WrapNalus( FLV::Tag tag ) {
   std::cerr << "Wrapping a tag of length " << tag.len << " into " << PacketAmount << " TS Packet(s)\n";
   std::vector<Transport_Packet> Result;
   char LeadIn[4] = { (char)0x00, (char)0x00, (char)0x00, (char)0x01 };
-  TS = Transport_Packet( true );
+  TS = Transport_Packet( true, 0x100 );
   TS.SetContinuityCounter( ContinuityCounter );
   ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F );
   TS.SetAdaptationField( );
@@ -91,7 +174,7 @@ std::vector<Transport_Packet> WrapNalus( FLV::Tag tag ) {
   TS.SetPayload( &tag.data[16], 171, 17 );
   Result.push_back( TS );
   for( int i = 0; i < (PacketAmount - 1); i++ ) {
-    TS = Transport_Packet( false );
+    TS = Transport_Packet( false, 0x100 );
     TS.SetContinuityCounter( ContinuityCounter );
     ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F );
     TS.SetPayload( &tag.data[187+(184*i)], 184, 4 );
@@ -105,7 +188,8 @@ void Transport_Packet::Write( ) {
 }
 
 void Transport_Packet::Write( Socket::Connection conn ) {
-  conn.write( Buffer, 188 );
+//  conn.write( Buffer, 188 );
+  for( int i = 0; i < 188; i++ ) { std::cout << Buffer[i]; }
 }
 
 int TS_Handler( Socket::Connection conn ) {
@@ -145,6 +229,8 @@ int TS_Handler( Socket::Connection conn ) {
               if( firstvideo ) {
                 firstvideo = false;
               } else {
+                SendPAT( conn );
+                SendPMT( conn );
                 std::vector<Transport_Packet> Meh = WrapNalus( tag );
                 std::cerr << "Received " << Meh.size( ) << " Transport Packet(s)\n";
                 for( int i = 0; i < Meh.size( ); i++ ) {

TS_Analyser/main.cpp

@@ -401,12 +401,19 @@ int main( ) {
   adaptation_field AF;
   pes_packet PES;
   int ProgramNum;
-  while( std::cin.good( ) && BlockNo <= 1000 ) {
+  std::ofstream outfile;
+  outfile.open( "out.ts" );
+  while( std::cin.good( ) ) { // && BlockNo <= 1000 ) {
     for( int i = 0; i < 188; i++ ) {
       if( std::cin.good( ) ){ TempChar[i] = std::cin.get(); }
     }
-
+ 
-    if( ( ( TempChar[1] & 0x1F ) << 8 ) + ( TempChar[2] ) != 0x1FFF ) {    
+    int PID = ( ( TempChar[1] & 0x1F ) << 8 ) + ( TempChar[2] );
+    if( true ) { 
+/*      for( int i = 0; i < 188; i++ ) {
+        outfile << TempChar[i];
+      } */
+      
       printf( "Block %d:\n", BlockNo );
       printf( "\tSync Byte:\t\t\t%X\n", TempChar[0] );
       printf( "\tTransport Error Indicator:\t%d\n", ( ( TempChar[1] & 0x80 ) != 0 ) );
@@ -443,7 +450,6 @@ int main( ) {
       }
 
       BlockNo ++;
-      
     } else {
       EmptyBlocks ++;
     }

util/socket.cpp

@@ -404,19 +404,19 @@ Socket::Connection Socket::Server::accept(bool nonblock){
     if (addrinfo.sin6_family == AF_INET6){
       tmp.remotehost = inet_ntop(AF_INET6, &(addrinfo.sin6_addr), addrconv, INET6_ADDRSTRLEN);
       #if DEBUG >= 4
-      printf("IPv6 addr: %s\n", tmp.remotehost.c_str());
+      fprintf(stderr,"IPv6 addr: %s\n", tmp.remotehost.c_str());
       #endif
     }
     if (addrinfo.sin6_family == AF_INET){
       tmp.remotehost = inet_ntop(AF_INET, &(((sockaddr_in*)&addrinfo)->sin_addr), addrconv, INET6_ADDRSTRLEN);
       #if DEBUG >= 4
-      printf("IPv4 addr: %s\n", tmp.remotehost.c_str());
+      fprintf(stderr,"IPv4 addr: %s\n", tmp.remotehost.c_str());
       #endif
     }
     if (addrinfo.sin6_family == AF_UNIX){
       #if DEBUG >= 4
       tmp.remotehost = ((sockaddr_un*)&addrinfo)->sun_path;
-      printf("Unix addr: %s\n", tmp.remotehost.c_str());
+      fprintf(stderr,"Unix addr: %s\n", tmp.remotehost.c_str());
       #endif
       tmp.remotehost = "UNIX_SOCKET";
     }