diff --git a/.gitignore b/.gitignore index 51f16f99..36ac5158 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ HTTP_Box_Parser/Box_Parser gearbox/CPP/Client/Gearbox_Client *.ts +/nbproject/private/ \ No newline at end of file diff --git a/Connector_TS/Makefile b/Connector_TS/Makefile index 267fcece..889e385b 100644 --- a/Connector_TS/Makefile +++ b/Connector_TS/Makefile @@ -1,4 +1,4 @@ -SRC = main.cpp ../util/socket.cpp ../util/dtsc.cpp ../util/util.cpp +SRC = main.cpp ../util/socket.cpp ../util/http_parser.cpp ../util/flv_tag.cpp ../util/amf.cpp ../util/dtsc.cpp ../util/config.cpp ../util/base64.cpp OBJ = $(SRC:.cpp=.o) OUT = DDV_Conn_TS INCLUDES = diff --git a/Connector_TS/main.cpp b/Connector_TS/main.cpp index a296aba5..c2d4baea 100644 --- a/Connector_TS/main.cpp +++ b/Connector_TS/main.cpp @@ -335,7 +335,7 @@ int TS_Handler( Socket::Connection conn ) { case 0: break;//not ready yet default: ss.spool(); - if ( stream.parsePacket( conn.Received() ) ) { + if ( stream.parsePacket( ss.Received() ) ) { if( stream.lastType() == DTSC::VIDEO ) { fprintf(stderr, "Video contains NALU\n" ); SendPAT( conn ); diff --git a/tools/TS_Analyser/main.cpp b/tools/TS_Analyser/main.cpp index fc33aa80..a635ca53 100644 --- a/tools/TS_Analyser/main.cpp +++ b/tools/TS_Analyser/main.cpp @@ -347,7 +347,7 @@ void print_pmt( program_mapping_table PMT, bool Pointer_Field = false, std::stri printf( "%s\t\tReserved\t\t%d\n", offset.c_str(), PMT.Entries[i].Reserved_2 ); printf( "%s\t\tES Info Length\t\t%d\n", offset.c_str(), PMT.Entries[i].ES_Info_Length ); } - printf( "%s\tCRC 32\t\t%X\n", offset.c_str(), PMT.CRC_32 ); + printf( "%s\tCRC 32\t\t%8X\n", offset.c_str(), PMT.CRC_32 ); } /// Fills an AF structure with the right data