Timestamp update
This commit is contained in:
Erik Zandvliet
parent
ba61ce2cef
commit
ba56200ecb
3 changed files with 52 additions and 39 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -16,4 +16,5 @@ AMF_Creator/AMFtest
|
|||
ABST_Parser/Box_Parser
|
||||
HTTP_Box_Parser/Box_Parser
|
||||
gearbox/CPP/Client/Gearbox_Client
|
||||
*.ts
|
||||
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@ class Transport_Packet {
|
|||
public:
|
||||
Transport_Packet( bool PacketStart = false, int PID = 0x100 );
|
||||
void SetPayload( char * Payload, int PayloadLen, int Offset = 13 );
|
||||
void SetPesHeader( int Offset = 4 );
|
||||
void SetPesHeader( int Offset = 4, int MsgLen = 0xFFFF, int Current = 0, int Previous = 0 );
|
||||
void Write( );
|
||||
void Write( Socket::Connection conn );
|
||||
void SetContinuityCounter( int Counter );
|
||||
void SetMessageLength( int MsgLen );
|
||||
void SetAdaptationField( );
|
||||
void SetAdaptationField( double TimeStamp = 0 );
|
||||
void CreatePAT( int ContinuityCounter );
|
||||
void CreatePMT( int ContinuityCounter );
|
||||
private:
|
||||
|
|
@ -36,7 +36,7 @@ Transport_Packet::Transport_Packet( bool PacketStart, int PID ) {
|
|||
Buffer[0] = (char)0x47;
|
||||
Buffer[1] = ( PacketStart ? (char)0x40 : 0 ) + (( PID & 0xFF00 ) >> 8 );
|
||||
Buffer[2] = ( PID & 0x00FF );
|
||||
Buffer[3] = (char)0x00;
|
||||
Buffer[3] = (char)0x10;
|
||||
}
|
||||
|
||||
void Transport_Packet::SetMessageLength( int MsgLen ) {
|
||||
|
|
@ -48,28 +48,40 @@ void Transport_Packet::SetContinuityCounter( int Counter ) {
|
|||
Buffer[3] = ( Buffer[3] & 0xF0 ) + ( Counter & 0x0F );
|
||||
}
|
||||
|
||||
void Transport_Packet::SetPesHeader( int Offset ) {
|
||||
void Transport_Packet::SetPesHeader( int Offset, int MsgLen, int Current, int Previous ) {
|
||||
Buffer[Offset] = (char)0x00;
|
||||
Buffer[Offset+1] = (char)0x00;
|
||||
Buffer[Offset+2] = (char)0x01;
|
||||
Buffer[Offset+3] = (char)0xE0;
|
||||
Buffer[Offset+4] = (char)0xFF;
|
||||
Buffer[Offset+5] = (char)0xFF;
|
||||
Buffer[Offset+4] = ( MsgLen & 0xFF00 ) >> 8;
|
||||
Buffer[Offset+5] = ( MsgLen & 0x00FF );
|
||||
Buffer[Offset+6] = (char)0x80;
|
||||
Buffer[Offset+7] = (char)0x00;
|
||||
Buffer[Offset+8] = (char)0x00;
|
||||
Buffer[Offset+7] = (char)0xC0;
|
||||
Buffer[Offset+8] = (char)0x0A;
|
||||
Buffer[Offset+9] = (char)0x30 + ( (Current & 0xC0000000 ) >> 29 ) + (char)0x01;
|
||||
Buffer[Offset+10] = ( ( ( Current & 0x3FFF8000 ) >> 14 ) & 0xFF00 ) >> 8;
|
||||
Buffer[Offset+11] = ( ( ( Current & 0x3FFF8000 ) >> 14 ) & 0x00FF ) + (char)0x01;
|
||||
Buffer[Offset+12] = ( ( ( Current & 0x00007FFF ) << 1 ) & 0xFF00 ) >> 8;
|
||||
Buffer[Offset+13] = ( ( ( Current & 0x00007FFF ) << 1 ) & 0x00FF ) + (char)0x01;
|
||||
Buffer[Offset+14] = (char)0x10 + ( (Previous & 0xC0000000 ) >> 29 ) + (char)0x01;
|
||||
Buffer[Offset+15] = ( ( ( Previous & 0x3FFF8000 ) >> 14 ) & 0xFF00 ) >> 8;
|
||||
Buffer[Offset+16] = ( ( ( Previous & 0x3FFF8000 ) >> 14 ) & 0x00FF ) + (char)0x01;
|
||||
Buffer[Offset+17] = ( ( ( Previous & 0x00007FFF ) << 1 ) & 0xFF00 ) >> 8;
|
||||
Buffer[Offset+18] = ( ( ( Previous & 0x00007FFF ) << 1 ) & 0x00FF ) + (char)0x01;
|
||||
}
|
||||
|
||||
void Transport_Packet::SetAdaptationField( ) {
|
||||
void Transport_Packet::SetAdaptationField( double TimeStamp ) {
|
||||
int Extension = (int)TimeStamp % 300;
|
||||
int Base = (int)TimeStamp / 300;
|
||||
Buffer[3] = ( Buffer[3] & 0x0F ) + 0x30;
|
||||
Buffer[4] = (char)0x07;
|
||||
Buffer[5] = (char)0x10;
|
||||
Buffer[6] = (char)0x00;
|
||||
Buffer[7] = (char)0x00;
|
||||
Buffer[8] = (char)0x80;
|
||||
Buffer[9] = (char)0xD9;
|
||||
Buffer[10] = (char)0x7E;
|
||||
Buffer[11] = (char)0x00;
|
||||
Buffer[6] = ( ( Base >> 1 ) & 0xFF000000 ) >> 24;
|
||||
Buffer[7] = ( ( Base >> 1 ) & 0x00FF0000 ) >> 16;
|
||||
Buffer[8] = ( ( Base >> 1 ) & 0x0000FF00 ) >> 8;
|
||||
Buffer[9] = ( ( Base >> 1 ) & 0x000000FF );
|
||||
Buffer[10] = ( ( Extension & 0x0100) >> 4 ) + ( ( Base & 0x00000001 ) << 7 );
|
||||
Buffer[11] = ( Extension & 0x00FF);
|
||||
}
|
||||
|
||||
void Transport_Packet::SetPayload( char * Payload, int PayloadLen, int Offset ) {
|
||||
|
|
@ -82,7 +94,7 @@ void Transport_Packet::CreatePAT( int ContinuityCounter ) {
|
|||
Buffer[3] = (char)0x10 + ContinuityCounter;
|
||||
Buffer[4] = (char)0x00;
|
||||
Buffer[5] = (char)0x00;
|
||||
Buffer[6] = (char)0xD0;
|
||||
Buffer[6] = (char)0xB0;
|
||||
Buffer[7] = (char)0x0D;
|
||||
Buffer[8] = (char)0x00;
|
||||
Buffer[9] = (char)0x01;
|
||||
|
|
@ -160,25 +172,27 @@ void SendPMT( Socket::Connection conn ) {
|
|||
|
||||
std::vector<Transport_Packet> WrapNalus( FLV::Tag tag ) {
|
||||
static int ContinuityCounter = 0;
|
||||
static int previous = 0;
|
||||
int now;
|
||||
Transport_Packet TS;
|
||||
int PacketAmount = ( ( tag.len - (188 - 25 ) ) / 184 ) + 2;
|
||||
std::cerr << "Wrapping a tag of length " << tag.len << " into " << PacketAmount << " TS Packet(s)\n";
|
||||
int PacketAmount = ( ( tag.len - (188 - 35 ) ) / 184 ) + 2;
|
||||
std::vector<Transport_Packet> Result;
|
||||
char LeadIn[4] = { (char)0x00, (char)0x00, (char)0x00, (char)0x01 };
|
||||
TS = Transport_Packet( true, 0x100 );
|
||||
TS.SetContinuityCounter( ContinuityCounter );
|
||||
ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F );
|
||||
TS.SetAdaptationField( );
|
||||
TS.SetPesHeader( 12 );
|
||||
TS.SetMessageLength( tag.len - 16 );
|
||||
TS.SetPayload( LeadIn, 4, 21 );
|
||||
TS.SetPayload( &tag.data[16], 169, 25 );
|
||||
now = ( (tag.data[4]) << 16) + ( (tag.data[5]) << 8) + tag.data[6] + ( (tag.data[7]) << 24 );
|
||||
TS.SetAdaptationField( now );
|
||||
TS.SetPesHeader( 12, tag.len - 16 , now, previous );
|
||||
previous = now;
|
||||
TS.SetPayload( LeadIn, 12, 31 );
|
||||
TS.SetPayload( &tag.data[16], 149, 35 );
|
||||
Result.push_back( TS );
|
||||
for( int i = 0; i < (PacketAmount - 1); i++ ) {
|
||||
TS = Transport_Packet( false, 0x100 );
|
||||
TS.SetContinuityCounter( ContinuityCounter );
|
||||
ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F );
|
||||
TS.SetPayload( &tag.data[169+(184*i)], 184, 4 );
|
||||
TS.SetPayload( &tag.data[16+149+(184*i)], 184, 4 );
|
||||
Result.push_back( TS );
|
||||
}
|
||||
return Result;
|
||||
|
|
@ -198,6 +212,7 @@ int TS_Handler( Socket::Connection conn ) {
|
|||
bool inited = false;
|
||||
bool firstvideo = true;
|
||||
Socket::Connection ss(-1);
|
||||
int zet = 0;
|
||||
while(conn.connected() && !FLV::Parse_Error) {
|
||||
if( !inited ) {
|
||||
ss = Socket::Connection("/tmp/shared_socket_fifa");
|
||||
|
|
@ -227,17 +242,13 @@ int TS_Handler( Socket::Connection conn ) {
|
|||
if( tag.data[ 0 ] == 0x09 ) {
|
||||
if( ( ( tag.data[ 11 ] & 0x0F ) == 7 ) && ( tag.data[ 12 ] == 1 ) ) {
|
||||
fprintf(stderr, "Video contains NALU\n" );
|
||||
// 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++ ) {
|
||||
Meh[i].Write( conn );
|
||||
}
|
||||
// }
|
||||
std::cerr << "Item: " << ++zet << "\n";
|
||||
}
|
||||
}
|
||||
if( tag.data[ 0 ] == 0x08 ) {
|
||||
|
|
@ -256,3 +267,6 @@ int TS_Handler( Socket::Connection conn ) {
|
|||
#define MAINHANDLER TS_Handler
|
||||
#define CONFIGSECT TS
|
||||
#include "../util/server_setup.cpp"
|
||||
|
||||
|
||||
//TODO::TODO::TODO::Fix Timestamps
|
||||
|
|
|
|||
|
|
@ -342,13 +342,14 @@ void fill_af( adaptation_field & AF, unsigned char * TempChar ) {
|
|||
int CurrentOffset = 6;
|
||||
if( AF.PCR_Flag ) {
|
||||
AF.Program_Clock_Reference_Base_MSB = ( ( ( TempChar[CurrentOffset] ) & 0x80 ) >> 7 );
|
||||
AF.Program_Clock_Reference_Base = ( ( ( TempChar[CurrentOffset] ) & 0x7F ) << 25 );
|
||||
AF.Program_Clock_Reference_Base = ( ( ( TempChar[CurrentOffset] ) & 0x7F ) << 25 );
|
||||
AF.Program_Clock_Reference_Base += ( ( TempChar[CurrentOffset+1] ) << 17 );
|
||||
AF.Program_Clock_Reference_Base += ( ( TempChar[CurrentOffset+2] ) << 9 );
|
||||
AF.Program_Clock_Reference_Base += ( ( ( TempChar[CurrentOffset+3] ) & 0x80 ) >> 7 );
|
||||
AF.PCR_Reserved = ( ( TempChar[CurrentOffset+3] ) & 0x7E ) >> 1;
|
||||
AF.Program_Clock_Reference_Extension = ( ( TempChar[CurrentOffset+3] ) & 0x01 ) << 8 + TempChar[CurrentOffset+4];
|
||||
CurrentOffset += 5;
|
||||
AF.Program_Clock_Reference_Base += ( ( TempChar[CurrentOffset+3] ) << 1 );
|
||||
AF.Program_Clock_Reference_Base += ( ( ( TempChar[CurrentOffset+4] ) & 0x80 ) >> 7 );
|
||||
AF.PCR_Reserved = ( ( TempChar[CurrentOffset+4] ) & 0x7E ) >> 1;
|
||||
AF.Program_Clock_Reference_Extension = ( ( TempChar[CurrentOffset+4] ) & 0x01 ) << 8 + TempChar[CurrentOffset+5];
|
||||
CurrentOffset += 6;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -403,17 +404,13 @@ int main( ) {
|
|||
int ProgramNum;
|
||||
std::ofstream outfile;
|
||||
outfile.open( "out.ts" );
|
||||
while( std::cin.good( ) ) { // && BlockNo <= 1000 ) {
|
||||
while( std::cin.good( ) && BlockNo <= 10000 ) {
|
||||
for( int i = 0; i < 188; i++ ) {
|
||||
if( std::cin.good( ) ){ TempChar[i] = std::cin.get(); }
|
||||
}
|
||||
|
||||
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 ) );
|
||||
|
|
@ -428,6 +425,7 @@ int main( ) {
|
|||
|
||||
//Adaptation Field Exists
|
||||
if( Adaptation == 2 || Adaptation == 3 ) {
|
||||
fprintf( stderr, "Block: %d -> Adaptation == %d\n", BlockNo, Adaptation );
|
||||
fill_af( AF, TempChar );
|
||||
print_af( AF );
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue