From 50f90f15c471e0b8d5bacf1494d6f5279b8d6fc7 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Mon, 1 Aug 2011 02:32:48 +0200 Subject: [PATCH 1/3] Socket lib output changed to stderr --- util/socket.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/socket.cpp b/util/socket.cpp index 60c3c69e..e3d9fb20 100644 --- a/util/socket.cpp +++ b/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"; } From 42052732c1ab9e3020cb814dc00bbc50435a76a8 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Mon, 1 Aug 2011 02:33:08 +0200 Subject: [PATCH 2/3] Added functionality to TS Connector --- Connector_TS/main.cpp | 95 ++++++++++++++++++++++++++++++++++++++++--- TS_Analyser/main.cpp | 15 +++++-- 2 files changed, 100 insertions(+), 10 deletions(-) diff --git a/Connector_TS/main.cpp b/Connector_TS/main.cpp index c020898e..fc937f3f 100644 --- a/Connector_TS/main.cpp +++ b/Connector_TS/main.cpp @@ -16,22 +16,24 @@ 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( ); void Write( ); void Write( Socket::Connection conn ); void SetContinuityCounter( int Counter ); void SetMessageLength( int MsgLen ); + 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; } @@ -42,7 +44,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( ) { @@ -62,6 +64,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)0x30 + ContinuityCounter; + Buffer[4] = (char)0x00; + Buffer[5] = (char)0x00; + Buffer[6] = (char)0xB0; + 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 ); + CountinuityCounter = ( ContinuityCounter + 1 ) & 0x0F; +} + +void SendPMT( Socket::Connection conn ) { + static int ContinuityCounter = 0; + Transport_Packet TS; + TS = Transport_Packet( true, 1000 ); + TS.CreatePMT( ContinuityCounter ); + TS.Write( conn ); + CountinuityCounter = ( ContinuityCounter + 1 ) & 0x0F; +} + std::vector WrapNalus( FLV::Tag tag ) { static int ContinuityCounter = 0; Transport_Packet TS; @@ -69,7 +152,7 @@ std::vector WrapNalus( FLV::Tag tag ) { std::cerr << "Wrapping a tag of length " << tag.len << " into " << PacketAmount << " TS Packet(s)\n"; std::vector Result; char LeadIn[4] = { (char)0x00, (char)0x00, (char)0x00, (char)0x01 }; - TS = Transport_Packet( true ); + TS = Transport_Packet( true, 101 ); TS.SetContinuityCounter( ContinuityCounter ); ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F ); TS.SetPesHeader( ); @@ -78,7 +161,7 @@ std::vector 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, 101 ); TS.SetContinuityCounter( ContinuityCounter ); ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F ); TS.SetPayload( &tag.data[187+(184*i)], 184, 4 ); diff --git a/TS_Analyser/main.cpp b/TS_Analyser/main.cpp index 4e451235..472e56f1 100644 --- a/TS_Analyser/main.cpp +++ b/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( PID != 100 || ( PID == 100 && ((TempChar[3] & 0x30) == 3 ) && (TempChar[4] & 0x10 )) ) { + 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,7 @@ int main( ) { } BlockNo ++; - + */ } else { EmptyBlocks ++; } From b810eccd633e78bc5e80449a26e52d6ae681981f Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Mon, 1 Aug 2011 21:19:04 +0200 Subject: [PATCH 3/3] Testoutput --- Connector_TS/main.cpp | 19 +++++++++++-------- TS_Analyser/main.cpp | 9 ++++----- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Connector_TS/main.cpp b/Connector_TS/main.cpp index fc937f3f..c8771967 100644 --- a/Connector_TS/main.cpp +++ b/Connector_TS/main.cpp @@ -66,10 +66,10 @@ void Transport_Packet::SetPayload( char * Payload, int PayloadLen, int Offset ) void Transport_Packet::CreatePAT( int ContinuityCounter ) { - Buffer[3] = (char)0x30 + ContinuityCounter; + Buffer[3] = (char)0x10 + ContinuityCounter; Buffer[4] = (char)0x00; Buffer[5] = (char)0x00; - Buffer[6] = (char)0xB0; + Buffer[6] = (char)0xD0; Buffer[7] = (char)0x0D; Buffer[8] = (char)0x00; Buffer[9] = (char)0x01; @@ -133,16 +133,16 @@ void SendPAT( Socket::Connection conn ) { TS = Transport_Packet( true, 0 ); TS.CreatePAT( ContinuityCounter ); TS.Write( conn ); - CountinuityCounter = ( ContinuityCounter + 1 ) & 0x0F; + ContinuityCounter = ( ContinuityCounter + 1 ) & 0x0F; } void SendPMT( Socket::Connection conn ) { static int ContinuityCounter = 0; Transport_Packet TS; - TS = Transport_Packet( true, 1000 ); + TS = Transport_Packet( true, 0x1000 ); TS.CreatePMT( ContinuityCounter ); TS.Write( conn ); - CountinuityCounter = ( ContinuityCounter + 1 ) & 0x0F; + ContinuityCounter = ( ContinuityCounter + 1 ) & 0x0F; } std::vector WrapNalus( FLV::Tag tag ) { @@ -152,7 +152,7 @@ std::vector WrapNalus( FLV::Tag tag ) { std::cerr << "Wrapping a tag of length " << tag.len << " into " << PacketAmount << " TS Packet(s)\n"; std::vector Result; char LeadIn[4] = { (char)0x00, (char)0x00, (char)0x00, (char)0x01 }; - TS = Transport_Packet( true, 101 ); + TS = Transport_Packet( true, 0x100 ); TS.SetContinuityCounter( ContinuityCounter ); ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F ); TS.SetPesHeader( ); @@ -161,7 +161,7 @@ std::vector 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, 101 ); + TS = Transport_Packet( false, 0x100 ); TS.SetContinuityCounter( ContinuityCounter ); ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F ); TS.SetPayload( &tag.data[187+(184*i)], 184, 4 ); @@ -175,7 +175,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 ) { @@ -215,6 +216,8 @@ int TS_Handler( Socket::Connection conn ) { if( firstvideo ) { firstvideo = false; } else { + SendPAT( conn ); + SendPMT( conn ); std::vector Meh = WrapNalus( tag ); std::cerr << "Received " << Meh.size( ) << " Transport Packet(s)\n"; for( int i = 0; i < Meh.size( ); i++ ) { diff --git a/TS_Analyser/main.cpp b/TS_Analyser/main.cpp index 472e56f1..c25586d6 100644 --- a/TS_Analyser/main.cpp +++ b/TS_Analyser/main.cpp @@ -409,11 +409,11 @@ int main( ) { } int PID = ( ( TempChar[1] & 0x1F ) << 8 ) + ( TempChar[2] ); - if( PID != 100 || ( PID == 100 && ((TempChar[3] & 0x30) == 3 ) && (TempChar[4] & 0x10 )) ) { - for( int i = 0; i < 188; i++ ) { + 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 ) ); @@ -450,7 +450,6 @@ int main( ) { } BlockNo ++; - */ } else { EmptyBlocks ++; }