hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Yuy, herkenning door mplayer van de h264-data

Browse source
This commit is contained in:
Erik Zandvliet 2011-08-01 21:42:37 +02:00
parent 9de298ca44
commit 9af2bc0d93
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Connector_TS/main.cpp
View file

@ -66,9 +66,10 @@ void Transport_Packet::SetAdaptationField( ) {
Buffer[5] = (char)0x10; Buffer[5] = (char)0x10;
Buffer[6] = (char)0x00; Buffer[6] = (char)0x00;
Buffer[7] = (char)0x00; Buffer[7] = (char)0x00;
Buffer[8] = (char)0x8C; Buffer[8] = (char)0x80;
Buffer[9] = (char)0xA0; Buffer[9] = (char)0xD9;
Buffer[10] = (char)0x7E; Buffer[10] = (char)0x7E;
Buffer[11] = (char)0x00;
} }
void Transport_Packet::SetPayload( char * Payload, int PayloadLen, int Offset ) { void Transport_Packet::SetPayload( char * Payload, int PayloadLen, int Offset ) {
@ -160,7 +161,7 @@ void SendPMT( Socket::Connection conn ) {
std::vector<Transport_Packet> WrapNalus( FLV::Tag tag ) { std::vector<Transport_Packet> WrapNalus( FLV::Tag tag ) {
static int ContinuityCounter = 0; static int ContinuityCounter = 0;
Transport_Packet TS; Transport_Packet TS;
int PacketAmount = ( ( tag.len - (188 - 17 ) ) / 184 ) + 2; int PacketAmount = ( ( tag.len - (188 - 25 ) ) / 184 ) + 2;
std::cerr << "Wrapping a tag of length " << tag.len << " into " << PacketAmount << " TS Packet(s)\n"; std::cerr << "Wrapping a tag of length " << tag.len << " into " << PacketAmount << " TS Packet(s)\n";
std::vector<Transport_Packet> Result; std::vector<Transport_Packet> Result;
char LeadIn[4] = { (char)0x00, (char)0x00, (char)0x00, (char)0x01 }; char LeadIn[4] = { (char)0x00, (char)0x00, (char)0x00, (char)0x01 };
@ -168,16 +169,16 @@ std::vector<Transport_Packet> WrapNalus( FLV::Tag tag ) {
TS.SetContinuityCounter( ContinuityCounter ); TS.SetContinuityCounter( ContinuityCounter );
ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F ); ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F );
TS.SetAdaptationField( ); TS.SetAdaptationField( );
TS.SetPesHeader( 11 ); TS.SetPesHeader( 12 );
TS.SetMessageLength( tag.len - 16 ); TS.SetMessageLength( tag.len - 16 );
TS.SetPayload( LeadIn, 4, 13 ); TS.SetPayload( LeadIn, 4, 21 );
TS.SetPayload( &tag.data[16], 171, 17 ); TS.SetPayload( &tag.data[16], 169, 25 );
Result.push_back( TS ); Result.push_back( TS );
for( int i = 0; i < (PacketAmount - 1); i++ ) { for( int i = 0; i < (PacketAmount - 1); i++ ) {
TS = Transport_Packet( false, 0x100 ); TS = Transport_Packet( false, 0x100 );
TS.SetContinuityCounter( ContinuityCounter ); TS.SetContinuityCounter( ContinuityCounter );
ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F ); ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F );
TS.SetPayload( &tag.data[187+(184*i)], 184, 4 ); TS.SetPayload( &tag.data[169+(184*i)], 184, 4 );
Result.push_back( TS ); Result.push_back( TS );
} }
return Result; return Result;
@ -226,9 +227,9 @@ int TS_Handler( Socket::Connection conn ) {
if( tag.data[ 0 ] == 0x09 ) { if( tag.data[ 0 ] == 0x09 ) {
if( ( ( tag.data[ 11 ] & 0x0F ) == 7 ) && ( tag.data[ 12 ] == 1 ) ) { if( ( ( tag.data[ 11 ] & 0x0F ) == 7 ) && ( tag.data[ 12 ] == 1 ) ) {
fprintf(stderr, "Video contains NALU\n" ); fprintf(stderr, "Video contains NALU\n" );
if( firstvideo ) { // if( firstvideo ) {
firstvideo = false; // firstvideo = false;
} else { // } else {
SendPAT( conn ); SendPAT( conn );
SendPMT( conn ); SendPMT( conn );
std::vector<Transport_Packet> Meh = WrapNalus( tag ); std::vector<Transport_Packet> Meh = WrapNalus( tag );
@ -236,7 +237,7 @@ int TS_Handler( Socket::Connection conn ) {
for( int i = 0; i < Meh.size( ); i++ ) { for( int i = 0; i < Meh.size( ); i++ ) {
Meh[i].Write( conn ); Meh[i].Write( conn );
} }
} // }
} }
} }
if( tag.data[ 0 ] == 0x08 ) { if( tag.data[ 0 ] == 0x08 ) {

2
TS_Analyser/main.cpp
View file

@ -445,7 +445,7 @@ int main( ) {
} }
if( ( ( TempChar[1] & 0x40 ) ) && ( ( TempChar[1] & 0x1F ) << 8 ) + ( TempChar[2] ) ) { if( ( ( TempChar[1] & 0x40 ) ) && ( ( TempChar[1] & 0x1F ) << 8 ) + ( TempChar[2] ) ) {
fill_pes( PES, TempChar, ( Adaption == 3 ? 4 + TempChar[4] : 4 ) ); fill_pes( PES, TempChar, ( Adaptation == 3 ? 5 + TempChar[4] : 4 ) );
print_pes( PES ); print_pes( PES );
} }