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

Fixed bugs with regards to NalType

Browse source
This commit is contained in:
Erik Zandvliet 2012-12-11 15:25:08 +01:00 • committed by Thulinma
parent 234f7845de
commit b5368f8b9d
1 changed files with 56 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/converters/dtsc2ts.cpp
View file

@ -9,6 +9,7 @@
#include <signal.h> #include <signal.h>
#include <mist/ts_packet.h> //TS support #include <mist/ts_packet.h> //TS support
#include <mist/dtsc.h> //DTSC support #include <mist/dtsc.h> //DTSC support
#include <mist/mp4.h> //For initdata conversion
int main( ) { int main( ) {
char charBuffer[1024*10]; char charBuffer[1024*10];
@ -27,11 +28,16 @@ int main( ) {
bool IsKeyFrame; bool IsKeyFrame;
bool FirstKeyFrame = true; bool FirstKeyFrame = true;
bool FirstIDRInKeyFrame; bool FirstIDRInKeyFrame;
MP4::AVCC avccbox;
bool haveAvcc = false;
while( std::cin.good() ) { while( std::cin.good() ) {
std::cin.read(charBuffer, 1024*10);
charCount = std::cin.gcount();
StrData.append(charBuffer, charCount);
if ( DTSCStream.parsePacket( StrData ) ) { if ( DTSCStream.parsePacket( StrData ) ) {
if( !haveAvcc ) {
avccbox.setPayload( DTSCStream.metadata["video"]["init"].asString() );
haveAvcc = true;
}
if( DTSCStream.lastType() == DTSC::VIDEO ) { if( DTSCStream.lastType() == DTSC::VIDEO ) {
DTMIData = DTSCStream.lastData(); DTMIData = DTSCStream.lastData();
if( DTSCStream.getPacket(0).isMember("keyframe") ) { if( DTSCStream.getPacket(0).isMember("keyframe") ) {
@ -51,11 +57,10 @@ int main( ) {
ThisNaluSize = (DTMIData[0] << 24) + (DTMIData[1] << 16) + ThisNaluSize = (DTMIData[0] << 24) + (DTMIData[1] << 16) +
(DTMIData[2] << 8) + DTMIData[3]; (DTMIData[2] << 8) + DTMIData[3];
DTMIData.erase(0,4);//Erase the first four characters; DTMIData.erase(0,4);//Erase the first four characters;
TSType = (int)DTMIData[0]; TSType = (int)DTMIData[0] & 0x1F;
if( TSType == 0x25 ) { if( TSType == 0x05 ) {
if( FirstPic ) { if( FirstPic ) {
ToPack.append(TS::PPS,24); ToPack += avccbox.asAnnexB( );
ToPack.append(TS::SPS,8);
FirstPic = false; FirstPic = false;
} }
if( IsKeyFrame ) { if( IsKeyFrame ) {
@ -66,7 +71,7 @@ int main( ) {
ToPack.append(TS::ShortNalHeader,3); ToPack.append(TS::ShortNalHeader,3);
} }
} }
} else if ( TSType == 0x21 ) { } else if ( TSType == 0x01 ) {
if( FirstPic ) { if( FirstPic ) {
ToPack.append(TS::NalHeader,4); ToPack.append(TS::NalHeader,4);
FirstPic = false; FirstPic = false;
@ -84,32 +89,31 @@ int main( ) {
if ( ( PacketNumber % 42 ) == 0 ) { if ( ( PacketNumber % 42 ) == 0 ) {
PackData.DefaultPAT(); PackData.DefaultPAT();
std::cout.write( PackData.ToString(), 188 ); std::cout.write( PackData.ToString(), 188 );
} else if ( ( PacketNumber % 42 ) == 1 ) {
PackData.DefaultPMT(); PackData.DefaultPMT();
std::cout.write( PackData.ToString(), 188 ); std::cout.write( PackData.ToString(), 188 );
} else { PacketNumber += 2;
PackData.Clear();
PackData.PID( 0x100 );
PackData.ContinuityCounter( VideoCounter );
VideoCounter ++;
if( WritePesHeader ) {
PackData.UnitStart( 1 );
if( IsKeyFrame ) {
PackData.RandomAccess( 1 );
PackData.PCR( TimeStamp );
} else {
PackData.AdaptationField( 0x01 );
}
PackData.AddStuffing( 184 - (20+ToPack.size()) );
PackData.PESVideoLeadIn( ToPack.size(), DTSCStream.getPacket(0)["time"].asInt() * 90 );
WritePesHeader = false;
} else {
PackData.AdaptationField( 0x01 );
PackData.AddStuffing( 184 - (ToPack.size()) );
}
PackData.FillFree( ToPack );
std::cout.write( PackData.ToString(), 188 );
} }
PackData.Clear();
PackData.PID( 0x100 );
PackData.ContinuityCounter( VideoCounter );
VideoCounter ++;
if( WritePesHeader ) {
PackData.UnitStart( 1 );
if( IsKeyFrame ) {
PackData.RandomAccess( 1 );
PackData.PCR( TimeStamp );
} else {
PackData.AdaptationField( 1 );
}
PackData.AddStuffing( 184 - (20+ToPack.size()) );
PackData.PESVideoLeadIn( ToPack.size(), DTSCStream.getPacket(0)["time"].asInt() * 90 );
WritePesHeader = false;
} else {
PackData.AdaptationField( 1 );
PackData.AddStuffing( 184 - (ToPack.size()) );
}
PackData.FillFree( ToPack );
std::cout.write( PackData.ToString(), 188 );
PacketNumber ++; PacketNumber ++;
} }
} else if( DTSCStream.lastType() == DTSC::AUDIO ) { } else if( DTSCStream.lastType() == DTSC::AUDIO ) {
@ -122,31 +126,33 @@ int main( ) {
if ( ( PacketNumber % 42 ) == 0 ) { if ( ( PacketNumber % 42 ) == 0 ) {
PackData.DefaultPAT(); PackData.DefaultPAT();
std::cout.write( PackData.ToString(), 188 ); std::cout.write( PackData.ToString(), 188 );
} else if ( ( PacketNumber % 42 ) == 1 ) {
PackData.DefaultPMT(); PackData.DefaultPMT();
std::cout.write( PackData.ToString(), 188 ); std::cout.write( PackData.ToString(), 188 );
} else { PacketNumber += 2;
PackData.Clear();
PackData.PID( 0x101 );
PackData.ContinuityCounter( AudioCounter );
AudioCounter ++;
if( WritePesHeader ) {
PackData.UnitStart( 1 );
//PackData.RandomAccess( 1 );
PackData.AddStuffing( 184 - (14 + ToPack.size()) );
PackData.RandomAccess( 1 );
PackData.PESAudioLeadIn( ToPack.size(), TimeStamp );
WritePesHeader = false;
} else {
PackData.AdaptationField( 0x01 );
PackData.AddStuffing( 184 - (ToPack.size()) );
}
PackData.FillFree( ToPack );
std::cout.write( PackData.ToString(), 188 );
} }
PackData.Clear();
PackData.PID( 0x101 );
PackData.ContinuityCounter( AudioCounter );
AudioCounter ++;
if( WritePesHeader ) {
PackData.UnitStart( 1 );
PackData.RandomAccess( 1 );
PackData.AddStuffing( 184 - (14 + ToPack.size()) );
PackData.PESAudioLeadIn( ToPack.size(), TimeStamp );
WritePesHeader = false;
} else {
PackData.AdaptationField( 1 );
PackData.AddStuffing( 184 - (ToPack.size()) );
}
PackData.FillFree( ToPack );
std::cout.write( PackData.ToString(), 188 );
PacketNumber ++; PacketNumber ++;
} }
} }
} else {
std::cin.read(charBuffer, 1024*10);
charCount = std::cin.gcount();
StrData.append(charBuffer, charCount);
} }
} }
return 0; return 0;