From f9f13a1fa1d48181315cce34a8782f9ffa42d564 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 13 Sep 2011 00:32:35 +0200 Subject: [PATCH 01/21] First compiling version of DTSC-powered Buffer. Merged DTSC and DTMI into DTSC for ease of use. Todo: FLV2DTSC executable, DTSC support in all connectors... --- Buffer/Makefile | 2 +- Buffer/main.cpp | 197 ++++++------------------ util/dtmi.cpp | 248 ------------------------------- util/dtmi.h | 58 -------- util/dtsc.cpp | 388 ++++++++++++++++++++++++++++++++++++++++++++++-- util/dtsc.h | 111 +++++++++++--- util/socket.cpp | 8 +- util/socket.h | 8 +- 8 files changed, 520 insertions(+), 500 deletions(-) delete mode 100644 util/dtmi.cpp delete mode 100644 util/dtmi.h diff --git a/Buffer/Makefile b/Buffer/Makefile index 20469803..604cd26d 100644 --- a/Buffer/Makefile +++ b/Buffer/Makefile @@ -1,4 +1,4 @@ -SRC = main.cpp ../util/json/json_reader.cpp ../util/json/json_value.cpp ../util/json/json_writer.cpp ../util/socket.cpp ../util/flv_tag.cpp +SRC = main.cpp ../util/json/json_reader.cpp ../util/json/json_value.cpp ../util/json/json_writer.cpp ../util/socket.cpp ../util/dtsc.cpp OBJ = $(SRC:.cpp=.o) OUT = DDV_Buffer INCLUDES = diff --git a/Buffer/main.cpp b/Buffer/main.cpp index b822f067..e5e8caea 100644 --- a/Buffer/main.cpp +++ b/Buffer/main.cpp @@ -10,8 +10,7 @@ #include #include #include -#include -#include "../util/flv_tag.h" //FLV format parser +#include "../util/dtsc.h" //DTSC support #include "../util/socket.h" //Socket lib #include "../util/json/json.h" @@ -28,11 +27,7 @@ namespace Buffer{ } } - ///holds FLV::Tag objects and their numbers - struct buffer{ - int number; - FLV::Tag FLV; - };//buffer + DTSC::Stream * Strm = 0; /// Converts a stats line to up, down, host, connector and conntime values. class Stats{ @@ -76,9 +71,7 @@ namespace Buffer{ /// Keeps track of what buffer users are using and the connection status. class user{ public: - int MyBuffer; ///< Index of currently used buffer. - int MyBuffer_num; ///< Number of currently used buffer. - int MyBuffer_len; ///< Length in bytes of currently used buffer. + DTSC::Ring * myRing; ///< Ring of the buffer for this user. int MyNum; ///< User ID of this user. std::string MyStr; ///< User ID of this user as a string. int currsend; ///< Current amount of bytes sent. @@ -97,11 +90,16 @@ namespace Buffer{ std::stringstream st; st << MyNum; MyStr = st.str(); - gotproperaudio = false; curr_up = 0; curr_down = 0; + currsend = 0; + myRing = Strm->getRing(); std::cout << "User " << MyNum << " connected" << std::endl; }//constructor + /// Drops held DTSC::Ring class, if one is held. + ~user(){ + Strm->dropRing(myRing); + }//destructor /// Disconnects the current user. Doesn't do anything if already disconnected. /// Prints "Disconnected user" to stdout if disconnect took place. void Disconnect(std::string reason) { @@ -119,70 +117,41 @@ namespace Buffer{ }//Disconnect /// Tries to send the current buffer, returns true if success, false otherwise. /// Has a side effect of dropping the connection if send will never complete. - bool doSend(){ - int r = S.iwrite((char*)lastpointer+currsend, MyBuffer_len-currsend); + bool doSend(const char * ptr, int len){ + int r = S.iwrite(ptr+currsend, len-currsend); if (r <= 0){ if (errno == EWOULDBLOCK){return false;} Disconnect(S.getError()); return false; } currsend += r; - return (currsend == MyBuffer_len); + return (currsend == len); }//doSend /// Try to send data to this user. Disconnects if any problems occur. /// \param ringbuf Array of buffers (FLV:Tag with ID attached) /// \param buffers Count of elements in ringbuf - void Send(buffer ** ringbuf, int buffers){ - /// \todo For MP3: gotproperaudio - if false, only send if first byte is 0xFF and set to true + void Send(){ if (!S.connected()){return;}//cancel if not connected - - //still waiting for next buffer? check it - if (MyBuffer_num < 0){ - MyBuffer_num = ringbuf[MyBuffer]->number; - if (MyBuffer_num < 0){ - return; //still waiting? don't crash - wait longer. - }else{ - MyBuffer_len = ringbuf[MyBuffer]->FLV.len; - lastpointer = ringbuf[MyBuffer]->FLV.data; - } - } - - //do check for buffer resizes - if (lastpointer != ringbuf[MyBuffer]->FLV.data){ - Disconnect("Buffer resize at wrong time... had to disconnect"); - return; - } + if (myRing->waiting){return;}//still waiting for next buffer? //try to complete a send - if (doSend()){ + if (doSend(Strm->outPacket(myRing->b).c_str(), Strm->outPacket(myRing->b).length())){ //switch to next buffer - if ((ringbuf[MyBuffer]->number != MyBuffer_num)){ - //if corrupt data, warn and find keyframe - std::cout << "Warning: User " << MyNum << " was send corrupt video data and send to the next keyframe!" << std::endl; - int nocrashcount = 0; - do{ - MyBuffer++; - nocrashcount++; - MyBuffer %= buffers; - }while(!ringbuf[MyBuffer]->FLV.isKeyframe && (nocrashcount < buffers)); - //if keyframe not available, try again later - if (nocrashcount >= buffers){ - std::cout << "Warning: No keyframe found in buffers! Skipping search for now..." << std::endl; - return; - } - }else{ - MyBuffer++; - MyBuffer %= buffers; + if (myRing->b <= 0){myRing->waiting = true; return;}//no next buffer? go in waiting mode. + myRing->b--; + if (myRing->starved){ + //if corrupt data, warn and get new DTSC::Ring + std::cout << "Warning: User was send corrupt video data and send to the next keyframe!" << std::endl; + Strm->dropRing(myRing); + myRing = Strm->getRing(); } - MyBuffer_num = -1; - lastpointer = 0; currsend = 0; }//completed a send }//send }; int user::UserCount = 0; - /// Starts a loop, waiting for connections to send video data to. + /// Starts a loop, waiting for connections to send data to. int Start(int argc, char ** argv) { //first make sure no segpipe signals will kill us struct sigaction new_action; @@ -193,31 +162,26 @@ namespace Buffer{ //then check and parse the commandline if (argc < 3) { - std::cout << "usage: " << argv[0] << " buffers_count streamname [awaiting_IP]" << std::endl; + std::cout << "usage: " << argv[0] << " streamname [awaiting_IP]" << std::endl; return 1; } std::string waiting_ip = ""; bool ip_waiting = false; Socket::Connection ip_input; if (argc >= 4){ - waiting_ip += argv[3]; + waiting_ip += argv[2]; ip_waiting = true; } std::string shared_socket = "/tmp/shared_socket_"; - shared_socket += argv[2]; + shared_socket += argv[1]; Socket::Server SS(shared_socket, true); - FLV::Tag metadata; - FLV::Tag video_init; - FLV::Tag audio_init; - int buffers = atoi(argv[1]); - buffer ** ringbuf = (buffer**) calloc (buffers,sizeof(buffer*)); + Strm = new DTSC::Stream(5); std::vector users; std::vector::iterator usersIt; - for (int i = 0; i < buffers; ++i) ringbuf[i] = new buffer; - int current_buffer = 0; - int lastproper = 0;//last properly finished buffer number - unsigned int loopcount = 0; + std::string inBuffer; + char charBuffer[1024*10]; + unsigned int charCount; unsigned int stattimer = 0; Socket::Connection incoming; Socket::Connection std_input(fileno(stdin)); @@ -226,11 +190,7 @@ namespace Buffer{ Storage["log"] = Json::Value(Json::objectValue); Storage["curr"] = Json::Value(Json::objectValue); Storage["totals"] = Json::Value(Json::objectValue); - - unsigned char packtype; - bool gotVideoInfo = false; - bool gotAudioInfo = false; - bool gotData = false; + while((!feof(stdin) || ip_waiting) && !FLV::Parse_Error){ usleep(1000); //sleep for 1 ms, to prevent 100% CPU time @@ -259,89 +219,21 @@ namespace Buffer{ } } //invalidate the current buffer - ringbuf[current_buffer]->number = -1; - if ( - (!ip_waiting && - (std_input.canRead()) && ringbuf[current_buffer]->FLV.FileLoader(stdin) - ) || (ip_waiting && (ip_input.connected()) && - ringbuf[current_buffer]->FLV.SockLoader(ip_input) - ) - ){ - loopcount++; - packtype = ringbuf[current_buffer]->FLV.data[0]; - //store metadata, if available - if (packtype == 0x12){ - metadata = ringbuf[current_buffer]->FLV; - std::cout << "Received metadata!" << std::endl; - if (gotVideoInfo && gotAudioInfo){ - FLV::Parse_Error = true; - std::cout << "... after proper video and audio? Cancelling broadcast!" << std::endl; - } - gotVideoInfo = false; - gotAudioInfo = false; - } - //store video init data, if available - if (!gotVideoInfo && ringbuf[current_buffer]->FLV.isKeyframe){ - if ((ringbuf[current_buffer]->FLV.data[11] & 0x0f) == 7){//avc packet - if (ringbuf[current_buffer]->FLV.data[12] == 0){ - ringbuf[current_buffer]->FLV.tagTime(0);//timestamp to zero - video_init = ringbuf[current_buffer]->FLV; - gotVideoInfo = true; - std::cout << "Received video configuration!" << std::endl; - } - }else{gotVideoInfo = true;}//non-avc = no config... - } - //store audio init data, if available - if (!gotAudioInfo && (packtype == 0x08)){ - if (((ringbuf[current_buffer]->FLV.data[11] & 0xf0) >> 4) == 10){//aac packet - ringbuf[current_buffer]->FLV.tagTime(0);//timestamp to zero - audio_init = ringbuf[current_buffer]->FLV; - gotAudioInfo = true; - std::cout << "Received audio configuration!" << std::endl; - }else{gotAudioInfo = true;}//no aac = no config... - } - //on keyframe set possible start point - if (packtype == 0x09){ - if (((ringbuf[current_buffer]->FLV.data[11] & 0xf0) >> 4) == 1){ - lastproper = current_buffer; - } - } - if (loopcount > 5){gotData = true;} - //keep track of buffers - ringbuf[current_buffer]->number = loopcount; - current_buffer++; - current_buffer %= buffers; + if ( (!ip_waiting && std_input.canRead()) || (ip_waiting && ip_input.connected()) ){ + std::cin.read(charBuffer, 1024*10); + charCount = std::cin.gcount(); + inBuffer.append(charBuffer, charCount); + Strm->parsePacket(inBuffer); } //check for new connections, accept them if there are any incoming = SS.accept(true); if (incoming.connected()){ users.push_back(incoming); - //send the FLV header - users.back().currsend = 0; - users.back().MyBuffer = lastproper; - users.back().MyBuffer_num = -1; - /// \todo Do this more nicely? - if (gotData){ - if (!users.back().S.write(FLV::Header, 13)){ - users.back().Disconnect("failed to receive the header!"); - }else{ - if (metadata.len > 0){ - if (!users.back().S.write(metadata.data, metadata.len)){ - users.back().Disconnect("failed to receive metadata!"); - } - } - if (audio_init.len > 0){ - if (!users.back().S.write(audio_init.data, audio_init.len)){ - users.back().Disconnect("failed to receive audio init!"); - } - } - if (video_init.len > 0){ - if (!users.back().S.write(video_init.data, video_init.len)){ - users.back().Disconnect("failed to receive video init!"); - } - } - } + //send the header + if (!users.back().S.write(Strm->outHeader())){ + /// \todo Do this more nicely? + users.back().Disconnect("failed to receive the header!"); } } @@ -391,18 +283,15 @@ namespace Buffer{ } } } - (*usersIt).Send(ringbuf, buffers); + (*usersIt).Send(); } } } }//main loop // disconnect listener - if (FLV::Parse_Error){ - std::cout << "FLV parse error" << std::endl; - }else{ - std::cout << "Reached EOF of input" << std::endl; - } + /// \todo Deal with EOF more nicely - doesn't send the end of the stream to all users! + std::cout << "Reached EOF of input" << std::endl; SS.close(); while (users.size() > 0){ for (usersIt = users.begin(); usersIt != users.end(); usersIt++){ diff --git a/util/dtmi.cpp b/util/dtmi.cpp deleted file mode 100644 index a9d38299..00000000 --- a/util/dtmi.cpp +++ /dev/null @@ -1,248 +0,0 @@ -/// \file dtmi.cpp -/// Holds all code for DDVTECH MediaInfo parsing/generation. - -#include "dtmi.h" -#include //needed for stderr only - -/// Returns the std::string Indice for the current object, if available. -/// Returns an empty string if no indice exists. -std::string DTSC::DTMI::Indice(){return myIndice;}; - -/// Returns the DTSC::DTMItype AMF0 object type for this object. -DTSC::DTMItype DTSC::DTMI::GetType(){return myType;}; - -/// Returns the numeric value of this object, if available. -/// If this object holds no numeric value, 0 is returned. -uint64_t DTSC::DTMI::NumValue(){return numval;}; - -/// Returns the std::string value of this object, if available. -/// If this object holds no string value, an empty string is returned. -std::string DTSC::DTMI::StrValue(){return strval;}; - -/// Returns the C-string value of this object, if available. -/// If this object holds no string value, an empty C-string is returned. -const char * DTSC::DTMI::Str(){return strval.c_str();}; - -/// Returns a count of the amount of objects this object currently holds. -/// If this object is not a container type, this function will always return 0. -int DTSC::DTMI::hasContent(){return contents.size();}; - -/// Adds an DTSC::DTMI to this object. Works for all types, but only makes sense for container types. -void DTSC::DTMI::addContent(DTSC::DTMI c){contents.push_back(c);}; - -/// Returns a pointer to the object held at indice i. -/// Returns AMF::AMF0_DDV_CONTAINER of indice "error" if no object is held at this indice. -/// \param i The indice of the object in this container. -DTSC::DTMI* DTSC::DTMI::getContentP(int i){return &contents.at(i);}; - -/// Returns a copy of the object held at indice i. -/// Returns a AMF::AMF0_DDV_CONTAINER of indice "error" if no object is held at this indice. -/// \param i The indice of the object in this container. -DTSC::DTMI DTSC::DTMI::getContent(int i){return contents.at(i);}; - -/// Returns a pointer to the object held at indice s. -/// Returns NULL if no object is held at this indice. -/// \param s The indice of the object in this container. -DTSC::DTMI* DTSC::DTMI::getContentP(std::string s){ - for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){ - if (it->Indice() == s){return &(*it);} - } - return 0; -}; - -/// Returns a copy of the object held at indice s. -/// Returns a AMF::AMF0_DDV_CONTAINER of indice "error" if no object is held at this indice. -/// \param s The indice of the object in this container. -DTSC::DTMI DTSC::DTMI::getContent(std::string s){ - for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){ - if (it->Indice() == s){return *it;} - } - return DTSC::DTMI("error", DTMI::DTMI_ROOT); -}; - -/// Default constructor. -/// Simply fills the data with DTSC::DTMI("error", AMF0_DDV_CONTAINER) -DTSC::DTMI::DTMI(){ - *this = DTSC::DTMI("error", DTMI::DTMI_ROOT); -};//default constructor - -/// Constructor for numeric objects. -/// The object type is by default AMF::AMF0_NUMBER, but this can be forced to a different value. -/// \param indice The string indice of this object in its container, or empty string if none. Numeric indices are automatic. -/// \param val The numeric value of this object. Numeric AMF0 objects only support double-type values. -/// \param setType The object type to force this object to. -DTSC::DTMI::DTMI(std::string indice, double val, DTSC::DTMItype setType){//num type initializer - myIndice = indice; - myType = setType; - strval = ""; - numval = val; -}; - -/// Constructor for string objects. -/// The object type is by default AMF::AMF0_STRING, but this can be forced to a different value. -/// There is no need to manually change the type to AMF::AMF0_LONGSTRING, this will be done automatically. -/// \param indice The string indice of this object in its container, or empty string if none. Numeric indices are automatic. -/// \param val The string value of this object. -/// \param setType The object type to force this object to. -DTSC::DTMI::DTMI(std::string indice, std::string val, DTSC::DTMItype setType){//str type initializer - myIndice = indice; - myType = setType; - strval = val; - numval = 0; -}; - -/// Constructor for container objects. -/// The object type is by default AMF::AMF0_OBJECT, but this can be forced to a different value. -/// \param indice The string indice of this object in its container, or empty string if none. Numeric indices are automatic. -/// \param setType The object type to force this object to. -DTSC::DTMI::DTMI(std::string indice, DTSC::DTMItype setType){//object type initializer - myIndice = indice; - myType = setType; - strval = ""; - numval = 0; -}; - -/// Prints the contents of this object to std::cerr. -/// If this object contains other objects, it will call itself recursively -/// and print all nested content in a nice human-readable format. -void DTSC::DTMI::Print(std::string indent){ - std::cerr << indent; - // print my type - switch (myType){ - case DTMItype::DTMI_INT: std::cerr << "Integer"; break; - case DTMItype::DTMI_STRING: std::cerr << "String"; break; - case DTMItype::DTMI_OBJECT: std::cerr << "Object"; break; - case DTMItype::DTMI_OBJ_END: std::cerr << "Object end"; break; - case DTMItype::DTMI_ROOT: std::cerr << "Root Node"; break; - } - // print my string indice, if available - std::cerr << " " << myIndice << " "; - // print my numeric or string contents - switch (myType){ - case DTMItype::DTMI_INT: std::cerr << numval; break; - case DTMItype::DTMI_STRING: std::cerr << strval; break; - default: break;//we don't care about the rest, and don't want a compiler warning... - } - std::cerr << std::endl; - // if I hold other objects, print those too, recursively. - if (contents.size() > 0){ - for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){it->Print(indent+" ");} - } -};//print - -/// Packs the AMF object to a std::string for transfer over the network. -/// If the object is a container type, this function will call itself recursively and contain all contents. -std::string DTSC::DTMI::Pack(){ - std::string r = ""; - //skip output of DDV container types, they do not exist. Only output their contents. - if (myType != DTMItype::DTMI_ROOT){r += myType;} - //output the properly formatted data stream for this object's contents. - switch (myType){ - case DTMItype::DTMI_INT: - r += *(((char*)&numval)+7); r += *(((char*)&numval)+6); - r += *(((char*)&numval)+5); r += *(((char*)&numval)+4); - r += *(((char*)&numval)+3); r += *(((char*)&numval)+2); - r += *(((char*)&numval)+1); r += *(((char*)&numval)); - break; - case DTMItype::DTMI_STRING: - r += strval.size() / (256*256*256); - r += strval.size() / (256*256); - r += strval.size() / 256; - r += strval.size() % 256; - r += strval; - break; - case DTMItype::DTMI_OBJECT: - if (contents.size() > 0){ - for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){ - r += it->Indice().size() / 256; - r += it->Indice().size() % 256; - r += it->Indice(); - r += it->Pack(); - } - } - r += (char)0; r += (char)0; r += (char)9; - break; - case DTMItype::DTMI_ROOT://only send contents - if (contents.size() > 0){ - for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){ - r += it->Pack(); - } - } - break; - } - return r; -};//pack - -/// Parses a single AMF0 type - used recursively by the AMF::parse() functions. -/// This function updates i every call with the new position in the data. -/// \param data The raw data to parse. -/// \param len The size of the raw data. -/// \param i Current parsing position in the raw data. -/// \param name Indice name for any new object created. -/// \returns A single DTSC::DTMI, parsed from the raw data. -DTSC::DTMI DTSC::parseOneDTMI(const unsigned char *& data, unsigned int &len, unsigned int &i, std::string name){ - std::string tmpstr; - unsigned int tmpi = 0; - unsigned char tmpdbl[8]; - #if DEBUG >= 10 - fprintf(stderr, "Note: AMF type %hhx found. %i bytes left\n", data[i], len-i); - #endif - switch (data[i]){ - case DTMI::DTMI_INT: - tmpdbl[7] = data[i+1]; - tmpdbl[6] = data[i+2]; - tmpdbl[5] = data[i+3]; - tmpdbl[4] = data[i+4]; - tmpdbl[3] = data[i+5]; - tmpdbl[2] = data[i+6]; - tmpdbl[1] = data[i+7]; - tmpdbl[0] = data[i+8]; - i+=9;//skip 8(a double)+1 forwards - return DTSC::DTMI(name, *(uint64_t*)tmpdbl, AMF::AMF0_NUMBER); - break; - case DTMI::DTMI_STRING: - tmpi = data[i+1]*256*256*256+data[i+2]*256*256+data[i+3]*256+data[i+4];//set tmpi to UTF-8-long length - tmpstr.clear();//clean tmpstr, just to be sure - tmpstr.append((const char *)data+i+5, (size_t)tmpi);//add the string data - i += tmpi + 5;//skip length+size+1 forwards - return DTSC::DTMI(name, tmpstr, AMF::AMF0_LONGSTRING); - break; - case DTMI::DTMI_OBJECT:{ - ++i; - DTSC::DTMI ret(name, DTMI::DTMI_OBJECT); - while (data[i] + data[i+1] != 0){//while not encountering 0x0000 (we assume 0x000009) - tmpi = data[i]*256+data[i+1];//set tmpi to the UTF-8 length - tmpstr.clear();//clean tmpstr, just to be sure - tmpstr.append((const char*)data+i+2, (size_t)tmpi);//add the string data - i += tmpi + 2;//skip length+size forwards - ret.addContent(AMF::parseOne(data, len, i, tmpstr));//add content, recursively parsed, updating i, setting indice to tmpstr - } - i += 3;//skip 0x000009 - return ret; - } break; - } - #if DEBUG >= 2 - fprintf(stderr, "Error: Unimplemented DTMI type %hhx - returning.\n", data[i]); - #endif - return DTSC::DTMI("error", DTMI::DTMI_ROOT); -}//parseOne - -/// Parses a C-string to a valid DTSC::DTMI. -/// This function will find all AMF objects in the string and return -/// them all packed in a single AMF::AMF0_DDV_CONTAINER DTSC::DTMI. -DTSC::DTMI DTSC::parseDTMI(const unsigned char * data, unsigned int len){ - DTSC::DTMI ret("returned", DTMI::DTMI_ROOT);//container type - unsigned int i = 0, j = 0; - while (i < len){ - ret.addContent(AMF::parseOne(data, len, i, "")); - if (i > j){j = i;}else{return ret;} - } - return ret; -}//parse - -/// Parses a std::string to a valid DTSC::DTMI. -/// This function will find all AMF objects in the string and return -/// them all packed in a single AMF::AMF0_DDV_CONTAINER DTSC::DTMI. -DTSC::DTMI DTSC::parseDTMI(std::string data){ - return parse((const unsigned char*)data.c_str(), data.size()); -}//parse diff --git a/util/dtmi.h b/util/dtmi.h deleted file mode 100644 index 410df97d..00000000 --- a/util/dtmi.h +++ /dev/null @@ -1,58 +0,0 @@ -/// \file dtmi.h -/// Holds all headers for DDVTECH MediaInfo parsing/generation. - -#pragma once -#include -#include -//#include -#include - -/// Holds all DDVTECH Stream Container classes and parsers. -namespace DTSC{ - - /// Enumerates all possible DTMI types. - enum DTMItype { - DTMI_INT = 0x01, ///< Unsigned 64-bit integer. - DTMI_STRING = 0x02, ///< String, equivalent to the AMF longstring type. - DTMI_OBJECT = 0xE0, ///< Object, equivalent to the AMF object type. - DTMI_OBJ_END = 0xEE, ///< End of object marker. - DTMI_ROOT = 0xFF ///< Root node for all DTMI data. - }; - - /// Recursive class that holds DDVTECH MediaInfo. - class DTMI { - public: - std::string Indice(); - DTMItype GetType(); - uint64_t NumValue(); - std::string StrValue(); - const char * Str(); - int hasContent(); - void addContent(DTMI c); - DTMI* getContentP(int i); - DTMI getContent(int i); - DTMI* getContentP(std::string s); - DTMI getContent(std::string s); - DTMI(); - DTMI(std::string indice, double val, DTMItype setType = DTMI_INT); - DTMI(std::string indice, std::string val, DTMItype setType = DTMI_STRING); - DTMI(std::string indice, DTMItype setType = DTMI_OBJECT); - void Print(std::string indent = ""); - std::string Pack(); - protected: - std::string myIndice; ///< Holds this objects indice, if any. - DTMItype myType; ///< Holds this objects AMF0 type. - std::string strval; ///< Holds this objects string value, if any. - uint64_t numval; ///< Holds this objects numeric value, if any. - std::vector contents; ///< Holds this objects contents, if any (for container types). - };//AMFType - - /// Parses a C-string to a valid DTSC::DTMI. - DTMI parseDTMI(const unsigned char * data, unsigned int len); - /// Parses a std::string to a valid DTSC::DTMI. - DTMI parseDTMI(std::string data); - /// Parses a single DTMI type - used recursively by the DTSC::parseDTMI() functions. - DTMI parseOneDTMI(const unsigned char *& data, unsigned int &len, unsigned int &i, std::string name); - -};//DTSC namespace - diff --git a/util/dtsc.cpp b/util/dtsc.cpp index bc722ecf..9d046287 100644 --- a/util/dtsc.cpp +++ b/util/dtsc.cpp @@ -2,33 +2,50 @@ /// Holds all code for DDVTECH Stream Container parsing/generation. #include "dtsc.h" -#include "string.h" //for memcmp -#include "arpa/inet.h" //for htonl/ntohl +#include //for memcmp +#include //for htonl/ntohl +#include //for fprint, stderr -char * DTSC::Magic_Header = "DTSC"; -char * DTSC::Magic_Packet = "DTPD"; +char DTSC::Magic_Header[] = "DTSC"; +char DTSC::Magic_Packet[] = "DTPD"; +/// Initializes a DTSC::Stream with only one packet buffer. DTSC::Stream::Stream(){ datapointer = 0; + buffercount = 1; } +/// Initializes a DTSC::Stream with a minimum of rbuffers packet buffers. +/// The actual buffer count may not at all times be the requested amount. +DTSC::Stream::Stream(unsigned int rbuffers){ + datapointer = 0; + if (rbuffers < 1){rbuffers = 1;} + buffercount = rbuffers; +} + +/// Attempts to parse a packet from the given std::string buffer. +/// Returns true if successful, removing the parsed part from the buffer string. +/// Returns false if invalid or not enough data is in the buffer. +/// \arg buffer The std::string buffer to attempt to parse. bool DTSC::Stream::parsePacket(std::string & buffer){ uint32_t len; if (buffer.length() > 8){ if (memcmp(buffer.c_str(), DTSC::Magic_Header, 4) == 0){ len = ntohl(((uint32_t *)buffer.c_str())[1]); if (buffer.length() < len+8){return false;} - metadata = DTSC::parseDTMI(buffer.c_str() + 8, len); + metadata = DTSC::parseDTMI((unsigned char*)buffer.c_str() + 8, len); + buffer.erase(0, len+8); } if (memcmp(buffer.c_str(), DTSC::Magic_Packet, 4) == 0){ len = ntohl(((uint32_t *)buffer.c_str())[1]); if (buffer.length() < len+8){return false;} - lastPacket = DTSC::parseDTMI(buffer.c_str() + 8, len); + buffers.push_front(DTSC::DTMI("empty", DTMI_ROOT)); + buffers.front() = DTSC::parseDTMI((unsigned char*)buffer.c_str() + 8, len); datapointertype = INVALID; - if (lastPacket.getContentP("data")){ - datapointer = lastPacket.getContentP("data")->StrValue.c_str(); - if (lastPacket.getContentP("datatype")){ - std::string tmp = lastPacket.getContentP("datatype")->StrValue(); + if (buffers.front().getContentP("data")){ + datapointer = buffers.front().getContentP("data")->StrValue().c_str(); + if (buffers.front().getContentP("datatype")){ + std::string tmp = buffers.front().getContentP("datatype")->StrValue(); if (tmp == "video"){datapointertype = VIDEO;} if (tmp == "audio"){datapointertype = AUDIO;} if (tmp == "meta"){datapointertype = META;} @@ -36,23 +53,372 @@ bool DTSC::Stream::parsePacket(std::string & buffer){ }else{ datapointer = 0; } + buffer.erase(0, len+8); + while (buffers.size() > buffercount){buffers.pop_back();} + advanceRings(); } + #if DEBUG >= 2 + std::cerr << "Error: Invalid DTMI data! I *will* get stuck!" << std::endl; + #endif } return false; } -char * DTSC::Stream::lastData(){ +/// Returns a direct pointer to the data attribute of the last received packet, if available. +/// Returns NULL if no valid pointer or packet is available. +const char * DTSC::Stream::lastData(){ return datapointer; } +/// Returns the packed in this buffer number. +/// \arg num Buffer number. +DTSC::DTMI & DTSC::Stream::getPacket(unsigned int num){ + return buffers[num]; +} + +/// Returns the type of the last received packet. DTSC::datatype DTSC::Stream::lastType(){ return datapointertype; } +/// Returns true if the current stream contains at least one video track. bool DTSC::Stream::hasVideo(){ return (metadata.getContentP("video") != 0); } +/// Returns true if the current stream contains at least one audio track. bool DTSC::Stream::hasAudio(){ return (metadata.getContentP("audio") != 0); } + +/// Returns a packed DTSC packet, ready to sent over the network. +std::string DTSC::Stream::outPacket(unsigned int num){ + std::string tmp; + unsigned int size; + tmp = Magic_Packet; + size = htonl(buffers[num].Pack().length()); + tmp.append((char*)&size, 4); + tmp.append(buffers[num].Pack()); + return tmp; +} + +/// Returns a packed DTSC header, ready to sent over the network. +std::string DTSC::Stream::outHeader(){ + std::string tmp; + unsigned int size; + tmp = Magic_Header; + size = htonl(metadata.Pack().length()); + tmp.append((char*)&size, 4); + tmp.append(metadata.Pack()); + return tmp; +} + +/// advances all given out and internal Ring classes to point to the new buffer, after one has been added. +/// Also updates the internal keyframes ring, as well as marking rings as starved if they are. +/// Unsets waiting rings, updating them with their new buffer number. +void DTSC::Stream::advanceRings(){ + std::deque::iterator dit; + std::set::iterator sit; + for (sit = rings.begin(); sit != rings.end(); sit++){ + (*sit)->b++; + if ((*sit)->waiting){(*sit)->waiting = false; (*sit)->b = 0;} + if ((*sit)->b >= buffers.size()){(*sit)->starved = true;} + } + for (dit = keyframes.begin(); dit != keyframes.end(); dit++){ + dit->b++; + if (dit->b >= buffers.size()){keyframes.erase(dit); break;} + } + if ((lastType() == VIDEO) && (buffers.front().getContentP("keyframe"))){ + keyframes.push_front(DTSC::Ring(0)); + } + //increase buffer size if no keyframes available + if ((buffercount > 1) && (keyframes.size() < 1)){buffercount++;} +} + +/// Constructs a new Ring, at the given buffer position. +/// \arg v Position for buffer. +DTSC::Ring::Ring(unsigned int v){ + b = v; + waiting = false; + starved = false; +} + +/// Requests a new Ring, which will be created and added to the internal Ring list. +/// This Ring will be kept updated so it always points to valid data or has the starved boolean set. +/// Don't forget to call dropRing() for all requested Ring classes that are no longer neccessary! +DTSC::Ring * DTSC::Stream::getRing(){ + DTSC::Ring * tmp; + if (keyframes.size() == 0){ + tmp = new DTSC::Ring(0); + }else{ + tmp = new DTSC::Ring(keyframes[0].b); + } + rings.insert(tmp); + return tmp; +} + +/// Deletes a given out Ring class from memory and internal Ring list. +/// Checks for NULL pointers and invalid pointers, silently discarding them. +void DTSC::Stream::dropRing(DTSC::Ring * ptr){ + if (rings.find(ptr) != rings.end()){ + rings.erase(ptr); + delete ptr; + } +} + +/// Properly cleans up the object for erasing. +/// Drops all Ring classes that have been given out. +DTSC::Stream::~Stream(){ + std::set::iterator sit; + for (sit = rings.begin(); sit != rings.end(); sit++){delete (*sit);} +} + +/// Returns the std::string Indice for the current object, if available. +/// Returns an empty string if no indice exists. +std::string DTSC::DTMI::Indice(){return myIndice;}; + +/// Returns the DTSC::DTMItype AMF0 object type for this object. +DTSC::DTMItype DTSC::DTMI::GetType(){return myType;}; + +/// Returns the numeric value of this object, if available. +/// If this object holds no numeric value, 0 is returned. +uint64_t DTSC::DTMI::NumValue(){return numval;}; + +/// Returns the std::string value of this object, if available. +/// If this object holds no string value, an empty string is returned. +std::string DTSC::DTMI::StrValue(){return strval;}; + +/// Returns the C-string value of this object, if available. +/// If this object holds no string value, an empty C-string is returned. +const char * DTSC::DTMI::Str(){return strval.c_str();}; + +/// Returns a count of the amount of objects this object currently holds. +/// If this object is not a container type, this function will always return 0. +int DTSC::DTMI::hasContent(){return contents.size();}; + +/// Adds an DTSC::DTMI to this object. Works for all types, but only makes sense for container types. +/// This function resets DTMI::packed to an empty string, forcing a repack on the next call to DTMI::Pack. +void DTSC::DTMI::addContent(DTSC::DTMI c){contents.push_back(c); packed = "";}; + +/// Returns a pointer to the object held at indice i. +/// Returns AMF::AMF0_DDV_CONTAINER of indice "error" if no object is held at this indice. +/// \param i The indice of the object in this container. +DTSC::DTMI* DTSC::DTMI::getContentP(int i){return &contents.at(i);}; + +/// Returns a copy of the object held at indice i. +/// Returns a AMF::AMF0_DDV_CONTAINER of indice "error" if no object is held at this indice. +/// \param i The indice of the object in this container. +DTSC::DTMI DTSC::DTMI::getContent(int i){return contents.at(i);}; + +/// Returns a pointer to the object held at indice s. +/// Returns NULL if no object is held at this indice. +/// \param s The indice of the object in this container. +DTSC::DTMI* DTSC::DTMI::getContentP(std::string s){ + for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){ + if (it->Indice() == s){return &(*it);} + } + return 0; +}; + +/// Returns a copy of the object held at indice s. +/// Returns a AMF::AMF0_DDV_CONTAINER of indice "error" if no object is held at this indice. +/// \param s The indice of the object in this container. +DTSC::DTMI DTSC::DTMI::getContent(std::string s){ + for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){ + if (it->Indice() == s){return *it;} + } + return DTSC::DTMI("error", DTMI_ROOT); +}; + +/// Default constructor. +/// Simply fills the data with DTSC::DTMI("error", AMF0_DDV_CONTAINER) +DTSC::DTMI::DTMI(){ + *this = DTSC::DTMI("error", DTMI_ROOT); +};//default constructor + +/// Constructor for numeric objects. +/// The object type is by default AMF::AMF0_NUMBER, but this can be forced to a different value. +/// \param indice The string indice of this object in its container, or empty string if none. Numeric indices are automatic. +/// \param val The numeric value of this object. Numeric AMF0 objects only support double-type values. +/// \param setType The object type to force this object to. +DTSC::DTMI::DTMI(std::string indice, double val, DTSC::DTMItype setType){//num type initializer + myIndice = indice; + myType = setType; + strval = ""; + numval = val; +}; + +/// Constructor for string objects. +/// The object type is by default AMF::AMF0_STRING, but this can be forced to a different value. +/// There is no need to manually change the type to AMF::AMF0_LONGSTRING, this will be done automatically. +/// \param indice The string indice of this object in its container, or empty string if none. Numeric indices are automatic. +/// \param val The string value of this object. +/// \param setType The object type to force this object to. +DTSC::DTMI::DTMI(std::string indice, std::string val, DTSC::DTMItype setType){//str type initializer + myIndice = indice; + myType = setType; + strval = val; + numval = 0; +}; + +/// Constructor for container objects. +/// The object type is by default AMF::AMF0_OBJECT, but this can be forced to a different value. +/// \param indice The string indice of this object in its container, or empty string if none. Numeric indices are automatic. +/// \param setType The object type to force this object to. +DTSC::DTMI::DTMI(std::string indice, DTSC::DTMItype setType){//object type initializer + myIndice = indice; + myType = setType; + strval = ""; + numval = 0; +}; + +/// Prints the contents of this object to std::cerr. +/// If this object contains other objects, it will call itself recursively +/// and print all nested content in a nice human-readable format. +void DTSC::DTMI::Print(std::string indent){ + std::cerr << indent; + // print my type + switch (myType){ + case DTMI_INT: std::cerr << "Integer"; break; + case DTMI_STRING: std::cerr << "String"; break; + case DTMI_OBJECT: std::cerr << "Object"; break; + case DTMI_OBJ_END: std::cerr << "Object end"; break; + case DTMI_ROOT: std::cerr << "Root Node"; break; + } + // print my string indice, if available + std::cerr << " " << myIndice << " "; + // print my numeric or string contents + switch (myType){ + case DTMI_INT: std::cerr << numval; break; + case DTMI_STRING: std::cerr << strval; break; + default: break;//we don't care about the rest, and don't want a compiler warning... + } + std::cerr << std::endl; + // if I hold other objects, print those too, recursively. + if (contents.size() > 0){ + for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){it->Print(indent+" ");} + } +};//print + +/// Packs the DTMI to a std::string for transfer over the network. +/// If a packed version already exists, does not regenerate it. +/// If the object is a container type, this function will call itself recursively and contain all contents. +std::string DTSC::DTMI::Pack(){ + if (packed != ""){return packed;} + std::string r = ""; + //skip output of DDV container types, they do not exist. Only output their contents. + if (myType != DTMI_ROOT){r += myType;} + //output the properly formatted data stream for this object's contents. + switch (myType){ + case DTMI_INT: + r += *(((char*)&numval)+7); r += *(((char*)&numval)+6); + r += *(((char*)&numval)+5); r += *(((char*)&numval)+4); + r += *(((char*)&numval)+3); r += *(((char*)&numval)+2); + r += *(((char*)&numval)+1); r += *(((char*)&numval)); + break; + case DTMI_STRING: + r += strval.size() / (256*256*256); + r += strval.size() / (256*256); + r += strval.size() / 256; + r += strval.size() % 256; + r += strval; + break; + case DTMI_OBJECT: + if (contents.size() > 0){ + for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){ + r += it->Indice().size() / 256; + r += it->Indice().size() % 256; + r += it->Indice(); + r += it->Pack(); + } + } + r += (char)0; r += (char)0; r += (char)9; + break; + case DTMI_ROOT://only send contents + if (contents.size() > 0){ + for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){ + r += it->Pack(); + } + } + break; + case DTMI_OBJ_END: + break; + } + packed = r; + return r; +};//pack + +/// Parses a single AMF0 type - used recursively by the AMF::parse() functions. +/// This function updates i every call with the new position in the data. +/// \param data The raw data to parse. +/// \param len The size of the raw data. +/// \param i Current parsing position in the raw data. +/// \param name Indice name for any new object created. +/// \returns A single DTSC::DTMI, parsed from the raw data. +DTSC::DTMI DTSC::parseOneDTMI(const unsigned char *& data, unsigned int &len, unsigned int &i, std::string name){ + std::string tmpstr; + unsigned int tmpi = 0; + unsigned char tmpdbl[8]; + #if DEBUG >= 10 + fprintf(stderr, "Note: AMF type %hhx found. %i bytes left\n", data[i], len-i); + #endif + switch (data[i]){ + case DTMI_INT: + tmpdbl[7] = data[i+1]; + tmpdbl[6] = data[i+2]; + tmpdbl[5] = data[i+3]; + tmpdbl[4] = data[i+4]; + tmpdbl[3] = data[i+5]; + tmpdbl[2] = data[i+6]; + tmpdbl[1] = data[i+7]; + tmpdbl[0] = data[i+8]; + i+=9;//skip 8(a double)+1 forwards + return DTSC::DTMI(name, *(uint64_t*)tmpdbl, DTMI_INT); + break; + case DTMI_STRING: + tmpi = data[i+1]*256*256*256+data[i+2]*256*256+data[i+3]*256+data[i+4];//set tmpi to UTF-8-long length + tmpstr.clear();//clean tmpstr, just to be sure + tmpstr.append((const char *)data+i+5, (size_t)tmpi);//add the string data + i += tmpi + 5;//skip length+size+1 forwards + return DTSC::DTMI(name, tmpstr, DTMI_STRING); + break; + case DTMI_OBJECT:{ + ++i; + DTSC::DTMI ret(name, DTMI_OBJECT); + while (data[i] + data[i+1] != 0){//while not encountering 0x0000 (we assume 0x000009) + tmpi = data[i]*256+data[i+1];//set tmpi to the UTF-8 length + tmpstr.clear();//clean tmpstr, just to be sure + tmpstr.append((const char*)data+i+2, (size_t)tmpi);//add the string data + i += tmpi + 2;//skip length+size forwards + ret.addContent(parseOneDTMI(data, len, i, tmpstr));//add content, recursively parsed, updating i, setting indice to tmpstr + } + i += 3;//skip 0x000009 + return ret; + } break; + } + #if DEBUG >= 2 + fprintf(stderr, "Error: Unimplemented DTMI type %hhx - returning.\n", data[i]); + #endif + return DTSC::DTMI("error", DTMI_ROOT); +}//parseOne + +/// Parses a C-string to a valid DTSC::DTMI. +/// This function will find all AMF objects in the string and return +/// them all packed in a single AMF::AMF0_DDV_CONTAINER DTSC::DTMI. +DTSC::DTMI DTSC::parseDTMI(const unsigned char * data, unsigned int len){ + DTSC::DTMI ret("returned", DTMI_ROOT);//container type + unsigned int i = 0, j = 0; + while (i < len){ + ret.addContent(parseOneDTMI(data, len, i, "")); + if (i > j){j = i;}else{return ret;} + } + ret.packed = std::string((char*)data, (size_t)len); + return ret; +}//parse + +/// Parses a std::string to a valid DTSC::DTMI. +/// This function will find all AMF objects in the string and return +/// them all packed in a single AMF::AMF0_DDV_CONTAINER DTSC::DTMI. +DTSC::DTMI DTSC::parseDTMI(std::string data){ + return parseDTMI((const unsigned char*)data.c_str(), data.size()); +}//parse diff --git a/util/dtsc.h b/util/dtsc.h index 6b918f30..3a025753 100644 --- a/util/dtsc.h +++ b/util/dtsc.h @@ -2,46 +2,117 @@ /// Holds all headers for DDVTECH Stream Container parsing/generation. #pragma once -#include "dtmi.h" +#include +#include +#include //for uint64_t +#include +#include +#include -// Video: -// Codec (string) +// video +// codec (string) -// Audio: -// Codec (string) -// Samping rate (int, Hz) -// Sample Size (int, bytesize) -// Channels (int, channelcount) +// audio +// codec (string) +// sampingrate (int, Hz) +// samplesize (int, bytesize) +// channels (int, channelcount) +/// Holds all DDVTECH Stream Container classes and parsers. namespace DTSC{ + /// Enumerates all possible DTMI types. + enum DTMItype { + DTMI_INT = 0x01, ///< Unsigned 64-bit integer. + DTMI_STRING = 0x02, ///< String, equivalent to the AMF longstring type. + DTMI_OBJECT = 0xE0, ///< Object, equivalent to the AMF object type. + DTMI_OBJ_END = 0xEE, ///< End of object marker. + DTMI_ROOT = 0xFF ///< Root node for all DTMI data. + }; + + /// Recursive class that holds DDVTECH MediaInfo. + class DTMI { + public: + std::string Indice(); + DTMItype GetType(); + uint64_t NumValue(); + std::string StrValue(); + const char * Str(); + int hasContent(); + void addContent(DTMI c); + DTMI* getContentP(int i); + DTMI getContent(int i); + DTMI* getContentP(std::string s); + DTMI getContent(std::string s); + DTMI(); + DTMI(std::string indice, double val, DTMItype setType = DTMI_INT); + DTMI(std::string indice, std::string val, DTMItype setType = DTMI_STRING); + DTMI(std::string indice, DTMItype setType = DTMI_OBJECT); + void Print(std::string indent = ""); + std::string Pack(); + std::string packed; + protected: + std::string myIndice; ///< Holds this objects indice, if any. + DTMItype myType; ///< Holds this objects AMF0 type. + std::string strval; ///< Holds this objects string value, if any. + uint64_t numval; ///< Holds this objects numeric value, if any. + std::vector contents; ///< Holds this objects contents, if any (for container types). + };//AMFType + + /// Parses a C-string to a valid DTSC::DTMI. + DTMI parseDTMI(const unsigned char * data, unsigned int len); + /// Parses a std::string to a valid DTSC::DTMI. + DTMI parseDTMI(std::string data); + /// Parses a single DTMI type - used recursively by the DTSC::parseDTMI() functions. + DTMI parseOneDTMI(const unsigned char *& data, unsigned int &len, unsigned int &i, std::string name); + /// This enum holds all possible datatypes for DTSC packets. enum datatype { AUDIO, ///< Stream Audio data VIDEO, ///< Stream Video data META, ///< Stream Metadata INVALID ///< Anything else or no data available. - } + }; - char * Magic_Header; ///< The magic bytes for a DTSC header - char * Magic_Packet; ///< The magic bytes for a DTSC packet + extern char Magic_Header[]; ///< The magic bytes for a DTSC header + extern char Magic_Packet[]; ///< The magic bytes for a DTSC packet - /// Holds temporary data for a DTSC stream and provides functions to access/store it. + /// A part from the DTSC::Stream ringbuffer. + /// Holds information about a buffer that will stay consistent + class Ring { + public: + Ring(unsigned int v); + unsigned int b; ///< Holds current number of buffer. May and is intended to change unexpectedly! + bool waiting; ///< If true, this Ring is currently waiting for a buffer fill. + bool starved; ///< If true, this Ring can no longer receive valid data. + }; + + /// Holds temporary data for a DTSC stream and provides functions to utilize it. + /// Optionally also acts as a ring buffer of a certain requested size. + /// If ring buffering mode is enabled, it will automatically grow in size to always contain at least one keyframe. class Stream { public: Stream(); + ~Stream(); + Stream(unsigned int buffers); DTSC::DTMI metadata; - DRSC::DTMI lastPacket; + DTSC::DTMI & getPacket(unsigned int num = 0); datatype lastType(); - char * lastData(); + const char * lastData(); bool hasVideo(); bool hasAudio(); bool parsePacket(std::string & buffer); - private: - char * datapointer; + std::string outPacket(unsigned int num); + std::string outHeader(); + Ring * getRing(); + void dropRing(Ring * ptr); + private: + std::deque buffers; + std::set rings; + std::deque keyframes; + void advanceRings(); + const char * datapointer; datatype datapointertype; - } - - - + unsigned int buffercount; + }; }; diff --git a/util/socket.cpp b/util/socket.cpp index 4fdaceec..ed669e75 100644 --- a/util/socket.cpp +++ b/util/socket.cpp @@ -270,7 +270,7 @@ bool Socket::Connection::write(const void * buffer, int len){ /// \param buffer Location of the buffer to read to. /// \param len Amount of bytes to read. /// \returns True if the whole read was succesfull, false otherwise. -bool Socket::Connection::read(void * buffer, int len){ +bool Socket::Connection::read(const void * buffer, int len){ int sofar = 0; if (sock < 0){return false;} while (sofar != len){ @@ -309,9 +309,9 @@ bool Socket::Connection::read(void * buffer, int len){ }//Socket::Connection::read /// Read call that is compatible with file access syntax. This function simply calls the other read function. -bool Socket::Connection::read(void * buffer, int width, int count){return read(buffer, width*count);} +bool Socket::Connection::read(const void * buffer, int width, int count){return read(buffer, width*count);} /// Write call that is compatible with file access syntax. This function simply calls the other write function. -bool Socket::Connection::write(void * buffer, int width, int count){return write(buffer, width*count);} +bool Socket::Connection::write(const void * buffer, int width, int count){return write(buffer, width*count);} /// Write call that is compatible with std::string. This function simply calls the other write function. bool Socket::Connection::write(const std::string data){return write(data.c_str(), data.size());} @@ -320,7 +320,7 @@ bool Socket::Connection::write(const std::string data){return write(data.c_str() /// \param buffer Location of the buffer to write from. /// \param len Amount of bytes to write. /// \returns The amount of bytes actually written. -int Socket::Connection::iwrite(void * buffer, int len){ +int Socket::Connection::iwrite(const void * buffer, int len){ if (sock < 0){return 0;} int r = send(sock, buffer, len, 0); if (r < 0){ diff --git a/util/socket.h b/util/socket.h index bfe824e5..747c861b 100644 --- a/util/socket.h +++ b/util/socket.h @@ -37,12 +37,12 @@ namespace Socket{ bool canWrite(); ///< Calls poll() on the socket, checking if data can be written. signed int ready(); ///< Returns the ready-state for this socket. bool connected(); ///< Returns the connected-state for this socket. - bool read(void * buffer, int len); ///< Reads data from socket. - bool read(void * buffer, int width, int count); ///< Read call that is compatible with file access syntax. + bool read(const void * buffer, int len); ///< Reads data from socket. + bool read(const void * buffer, int width, int count); ///< Read call that is compatible with file access syntax. bool write(const void * buffer, int len); ///< Writes data to socket. - bool write(void * buffer, int width, int count); ///< Write call that is compatible with file access syntax. + bool write(const void * buffer, int width, int count); ///< Write call that is compatible with file access syntax. bool write(const std::string data); ///< Write call that is compatible with std::string. - int iwrite(void * buffer, int len); ///< Incremental write call. + int iwrite(const void * buffer, int len); ///< Incremental write call. int iread(void * buffer, int len); ///< Incremental read call. bool read(std::string & buffer); ///< Read call that is compatible with std::string. bool swrite(std::string & buffer); ///< Read call that is compatible with std::string. From e23fbfd109c6876a291c6f813fd396159a00a986 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 13 Sep 2011 00:35:16 +0200 Subject: [PATCH 02/21] Fixed docs, oops. --- Buffer/main.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Buffer/main.cpp b/Buffer/main.cpp index e5e8caea..1cc8e708 100644 --- a/Buffer/main.cpp +++ b/Buffer/main.cpp @@ -128,8 +128,6 @@ namespace Buffer{ return (currsend == len); }//doSend /// Try to send data to this user. Disconnects if any problems occur. - /// \param ringbuf Array of buffers (FLV:Tag with ID attached) - /// \param buffers Count of elements in ringbuf void Send(){ if (!S.connected()){return;}//cancel if not connected if (myRing->waiting){return;}//still waiting for next buffer? From 1b7ab627b56758212231ee0a70314e4b7ce25a10 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 13 Sep 2011 17:20:39 +0200 Subject: [PATCH 03/21] Finished FLV2DTSC code, fixed a lot of bugs in new code, added DTSC info tool. --- DTSC_Analyser/Makefile | 23 ++++ DTSC_Analyser/main.cpp | 38 ++++++ FLV2DTSC/Makefile | 23 ++++ FLV2DTSC/main.cpp | 261 +++++++++++++++++++++++++++++++++++++++++ util/dtsc.cpp | 134 ++++++++++++--------- util/dtsc.h | 9 +- util/flv_tag.cpp | 2 +- 7 files changed, 432 insertions(+), 58 deletions(-) create mode 100644 DTSC_Analyser/Makefile create mode 100644 DTSC_Analyser/main.cpp create mode 100644 FLV2DTSC/Makefile create mode 100644 FLV2DTSC/main.cpp diff --git a/DTSC_Analyser/Makefile b/DTSC_Analyser/Makefile new file mode 100644 index 00000000..2d12ca7e --- /dev/null +++ b/DTSC_Analyser/Makefile @@ -0,0 +1,23 @@ +SRC = main.cpp ../util/dtsc.cpp +OBJ = $(SRC:.cpp=.o) +OUT = DTSC_Info +INCLUDES = +DEBUG = 4 +OPTIMIZE = -g +CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) +CC = $(CROSS)g++ +LD = $(CROSS)ld +AR = $(CROSS)ar +LIBS = +.SUFFIXES: .cpp +.PHONY: clean default +default: $(OUT) +.cpp.o: + $(CC) $(INCLUDES) $(CCFLAGS) $(LIBS) -c $< -o $@ +$(OUT): $(OBJ) + $(CC) $(LIBS) -o $(OUT) $(OBJ) +clean: + rm -rf $(OBJ) $(OUT) Makefile.bak *~ +install: $(OUT) + cp -f ./$(OUT) /usr/bin/ + diff --git a/DTSC_Analyser/main.cpp b/DTSC_Analyser/main.cpp new file mode 100644 index 00000000..81176bac --- /dev/null +++ b/DTSC_Analyser/main.cpp @@ -0,0 +1,38 @@ +/// \file DTSC_Analyser/main.cpp +/// Contains the code for the DTSC Analysing tool. + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../util/dtsc.h" //DTSC support + +/// Reads DTSC from stdin and outputs human-readable information to stderr. +int main() { + DTSC::Stream Strm; + + std::string inBuffer; + char charBuffer[1024*10]; + unsigned int charCount; + bool doneheader = false; + + while(std::cin.good()){ + //invalidate the current buffer + std::cin.read(charBuffer, 1024*10); + charCount = std::cin.gcount(); + inBuffer.append(charBuffer, charCount); + if (Strm.parsePacket(inBuffer)){ + if (!doneheader){ + doneheader = true; + Strm.metadata.Print(); + } + Strm.getPacket().Print(); + } + } + return 0; +} diff --git a/FLV2DTSC/Makefile b/FLV2DTSC/Makefile new file mode 100644 index 00000000..8787c723 --- /dev/null +++ b/FLV2DTSC/Makefile @@ -0,0 +1,23 @@ +SRC = main.cpp ../util/flv_tag.cpp ../util/dtsc.cpp ../util/amf.cpp ../util/socket.cpp +OBJ = $(SRC:.cpp=.o) +OUT = DDV_FLV2DTSC +INCLUDES = +DEBUG = 4 +OPTIMIZE = -g +CCFLAGS = -Wall -Wextra -funsigned-char $(OPTIMIZE) -DDEBUG=$(DEBUG) +CC = $(CROSS)g++ +LD = $(CROSS)ld +AR = $(CROSS)ar +LIBS = +.SUFFIXES: .cpp +.PHONY: clean default +default: $(OUT) +.cpp.o: + $(CC) $(INCLUDES) $(CCFLAGS) $(LIBS) -c $< -o $@ +$(OUT): $(OBJ) + $(CC) $(LIBS) -o $(OUT) $(OBJ) +clean: + rm -rf $(OBJ) $(OUT) Makefile.bak *~ +install: $(OUT) + cp -f ./$(OUT) /usr/bin/ + diff --git a/FLV2DTSC/main.cpp b/FLV2DTSC/main.cpp new file mode 100644 index 00000000..0c3008fe --- /dev/null +++ b/FLV2DTSC/main.cpp @@ -0,0 +1,261 @@ +/// \file FLV2DTSC/main.cpp +/// Contains the code that will transform any valid FLV input into valid DTSC. + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../util/flv_tag.h" //FLV support +#include "../util/dtsc.h" //DTSC support +#include "../util/amf.h" //AMF support + +// String onMetaData +// ECMA Array +// Bool hasVideo 1 +// Number videocodecid 4 (2 = H263, 4 = VP6, 7 = H264) +// Number width 320 +// Number height 240 +// Number framerate 23.976 (/ 1000) +// Number videodatarate 500.349 (kbps) +// Bool hasAudio 1 +// Bool stereo 1 +// Number audiodelay 0 +// Number audiosamplerate 11025 +// Number audiosamplesize 16 +// Number audiocodecid 2 (2 = MP3, 10 = AAC) +// Number audiodatarate 64.3269 (kbps) + + +/// Holds all code that converts filetypes to DTSC. +namespace Converters{ + + /// Inserts std::string type metadata into the passed DTMI object. + /// \arg meta The DTMI object to put the metadata into. + /// \arg cat Metadata category to insert into. + /// \arg elem Element name to put into the category. + /// \arg val Value to put into the element name. + void Meta_Put(DTSC::DTMI & meta, std::string cat, std::string elem, std::string val){ + if (meta.getContentP(cat) == 0){meta.addContent(DTSC::DTMI(cat));} + meta.getContentP(cat)->addContent(DTSC::DTMI(elem, val)); + std::cerr << "Metadata " << cat << "." << elem << " = " << val << std::endl; + } + + /// Inserts uint64_t type metadata into the passed DTMI object. + /// \arg meta The DTMI object to put the metadata into. + /// \arg cat Metadata category to insert into. + /// \arg elem Element name to put into the category. + /// \arg val Value to put into the element name. + void Meta_Put(DTSC::DTMI & meta, std::string cat, std::string elem, uint64_t val){ + if (meta.getContentP(cat) == 0){meta.addContent(DTSC::DTMI(cat));} + meta.getContentP(cat)->addContent(DTSC::DTMI(elem, val)); + std::cerr << "Metadata " << cat << "." << elem << " = " << val << std::endl; + } + + /// Returns true if the named category and elementname are available in the metadata. + /// \arg meta The DTMI object to check. + /// \arg cat Metadata category to check. + /// \arg elem Element name to check. + bool Meta_Has(DTSC::DTMI & meta, std::string cat, std::string elem){ + if (meta.getContentP(cat) == 0){return false;} + if (meta.getContentP(cat)->getContentP(elem) == 0){return false;} + return true; + } + + /// Reads FLV from STDIN, outputs DTSC to STDOUT. + int FLV2DTSC() { + FLV::Tag FLV_in; // Temporary storage for incoming FLV data. + AMF::Object meta_in; // Temporary storage for incoming metadata. + DTSC::DTMI meta_out; // Storage for outgoing DTMI header data. + DTSC::DTMI pack_out; // Storage for outgoing DTMI data. + std::stringstream prebuffer; // Temporary buffer before sending real data + bool sending = false; + unsigned int counter = 0; + + while (!feof(stdin)){ + if (FLV_in.FileLoader(stdin)){ + if (!sending){ + counter++; + if (counter > 10){ + sending = true; + meta_out.Pack(true); + meta_out.packed.replace(0, 4, DTSC::Magic_Header); + std::cout << meta_out.packed; + std::cout << prebuffer.rdbuf(); + prebuffer.str(""); + std::cerr << "Buffer done, starting real-time output..." << std::endl; + } + } + if (FLV_in.data[0] == 0x12){ + meta_in = AMF::parse((unsigned char*)FLV_in.data+11, FLV_in.len-15); + if (meta_in.getContentP(0) && (meta_in.getContentP(0)->StrValue() == "onMetaData") && meta_in.getContentP(1)){ + AMF::Object * tmp = meta_in.getContentP(1); + if (tmp->getContentP("videocodecid")){ + switch ((unsigned int)tmp->getContentP("videocodecid")->NumValue()){ + case 2: Meta_Put(meta_out, "video", "codec", "H263"); break; + case 4: Meta_Put(meta_out, "video", "codec", "VP6"); break; + case 7: Meta_Put(meta_out, "video", "codec", "H264"); break; + default: Meta_Put(meta_out, "video", "codec", "?"); break; + } + } + if (tmp->getContentP("audiocodecid")){ + switch ((unsigned int)tmp->getContentP("audiocodecid")->NumValue()){ + case 2: Meta_Put(meta_out, "audio", "codec", "MP3"); break; + case 10: Meta_Put(meta_out, "audio", "codec", "AAC"); break; + default: Meta_Put(meta_out, "audio", "codec", "?"); break; + } + } + if (tmp->getContentP("width")){ + Meta_Put(meta_out, "video", "width", tmp->getContentP("width")->NumValue()); + } + if (tmp->getContentP("height")){ + Meta_Put(meta_out, "video", "height", tmp->getContentP("height")->NumValue()); + } + if (tmp->getContentP("framerate")){ + Meta_Put(meta_out, "video", "fpks", tmp->getContentP("framerate")->NumValue()*1000); + } + if (tmp->getContentP("videodatarate")){ + Meta_Put(meta_out, "video", "bps", (tmp->getContentP("videodatarate")->NumValue()*1024)/8); + } + if (tmp->getContentP("audiodatarate")){ + Meta_Put(meta_out, "audio", "bps", (tmp->getContentP("audiodatarate")->NumValue()*1024)/8); + } + if (tmp->getContentP("audiosamplerate")){ + Meta_Put(meta_out, "audio", "rate", tmp->getContentP("audiosamplerate")->NumValue()); + } + if (tmp->getContentP("audiosamplesize")){ + Meta_Put(meta_out, "audio", "size", tmp->getContentP("audiosamplesize")->NumValue()); + } + if (tmp->getContentP("stereo")){ + if (tmp->getContentP("stereo")->NumValue() == 1){ + Meta_Put(meta_out, "audio", "channels", 2); + }else{ + Meta_Put(meta_out, "audio", "channels", 1); + } + } + } + } + if (FLV_in.data[0] == 0x08){ + char audiodata = FLV_in.data[11]; + if (FLV_in.needsInitData() && FLV_in.isInitData()){ + if ((audiodata & 0xF0) == 0xA0){ + Meta_Put(meta_out, "audio", "init", std::string((char*)FLV_in.data+13, (size_t)FLV_in.len-17)); + }else{ + Meta_Put(meta_out, "audio", "init", std::string((char*)FLV_in.data+12, (size_t)FLV_in.len-16)); + } + continue;//skip rest of parsing, get next tag. + } + pack_out = DTSC::DTMI("audio", DTSC::DTMI_ROOT); + pack_out.addContent(DTSC::DTMI("datatype", "audio")); + pack_out.addContent(DTSC::DTMI("time", FLV_in.tagTime())); + if (!Meta_Has(meta_out, "audio", "codec")){ + switch (audiodata & 0xF0){ + case 0x20: Meta_Put(meta_out, "audio", "codec", "MP3"); break; + case 0xA0: Meta_Put(meta_out, "audio", "codec", "AAC"); break; + default: Meta_Put(meta_out, "audio", "codec", "?"); break; + } + } + if (!Meta_Has(meta_out, "audio", "rate")){ + switch (audiodata & 0x0C){ + case 0x0: Meta_Put(meta_out, "audio", "rate", 5500); break; + case 0x4: Meta_Put(meta_out, "audio", "rate", 11000); break; + case 0x8: Meta_Put(meta_out, "audio", "rate", 22000); break; + case 0xC: Meta_Put(meta_out, "audio", "rate", 44000); break; + } + } + if (!Meta_Has(meta_out, "audio", "size")){ + switch (audiodata & 0x02){ + case 0x0: Meta_Put(meta_out, "audio", "size", 8); break; + case 0x2: Meta_Put(meta_out, "audio", "size", 16); break; + } + } + if (!Meta_Has(meta_out, "audio", "channels")){ + switch (audiodata & 0x01){ + case 0x0: Meta_Put(meta_out, "audio", "channels", 1); break; + case 0x1: Meta_Put(meta_out, "audio", "channels", 2); break; + } + } + if ((audiodata & 0xF0) == 0xA0){ + pack_out.addContent(DTSC::DTMI("data", std::string((char*)FLV_in.data+13, (size_t)FLV_in.len-17))); + }else{ + pack_out.addContent(DTSC::DTMI("data", std::string((char*)FLV_in.data+12, (size_t)FLV_in.len-16))); + } + if (sending){ + std::cout << pack_out.Pack(true); + }else{ + prebuffer << pack_out.Pack(true); + } + } + if (FLV_in.data[0] == 0x09){ + char videodata = FLV_in.data[11]; + if (FLV_in.needsInitData() && FLV_in.isInitData()){ + if ((videodata & 0x0F) == 7){ + Meta_Put(meta_out, "video", "init", std::string((char*)FLV_in.data+16, (size_t)FLV_in.len-20)); + }else{ + Meta_Put(meta_out, "video", "init", std::string((char*)FLV_in.data+12, (size_t)FLV_in.len-16)); + } + continue;//skip rest of parsing, get next tag. + } + if (!Meta_Has(meta_out, "video", "codec")){ + switch (videodata & 0x0F){ + case 2: Meta_Put(meta_out, "video", "codec", "H263"); break; + case 4: Meta_Put(meta_out, "video", "codec", "VP6"); break; + case 7: Meta_Put(meta_out, "video", "codec", "H264"); break; + default: Meta_Put(meta_out, "video", "codec", "?"); break; + } + } + pack_out = DTSC::DTMI("video", DTSC::DTMI_ROOT); + pack_out.addContent(DTSC::DTMI("datatype", "video")); + switch (videodata & 0xF0){ + case 0x10: pack_out.addContent(DTSC::DTMI("keyframe", 1)); break; + case 0x20: pack_out.addContent(DTSC::DTMI("interframe", 1)); break; + case 0x30: pack_out.addContent(DTSC::DTMI("disposableframe", 1)); break; + case 0x40: pack_out.addContent(DTSC::DTMI("keyframe", 1)); break; + case 0x50: continue; break;//the video info byte we just throw away - useless to us... + } + if ((videodata & 0x0F) == 7){ + switch (FLV_in.data[12]){ + case 1: pack_out.addContent(DTSC::DTMI("nalu", 1)); break; + case 2: pack_out.addContent(DTSC::DTMI("nalu_end", 1)); break; + } + int offset = 0; + ((char*)(&offset))[0] = FLV_in.data[13]; + ((char*)(&offset))[1] = FLV_in.data[14]; + ((char*)(&offset))[2] = FLV_in.data[15]; + offset >>= 8; + pack_out.addContent(DTSC::DTMI("offset", offset)); + } + pack_out.addContent(DTSC::DTMI("time", FLV_in.tagTime())); + pack_out.addContent(DTSC::DTMI("data", std::string((char*)FLV_in.data+12, (size_t)FLV_in.len-16))); + if (sending){ + std::cout << pack_out.Pack(true); + }else{ + prebuffer << pack_out.Pack(true); + } + } + } + } + + // if the FLV input is very short, do output it correctly... + if (!sending){ + std::cerr << "EOF - outputting buffer..." << std::endl; + meta_out.Pack(true); + meta_out.packed.replace(0, 4, DTSC::Magic_Header); + std::cout << meta_out.packed; + std::cout << prebuffer.rdbuf(); + } + std::cerr << "Done!" << std::endl; + + return 0; + }//FLV2DTSC + +};//Buffer namespace + +/// Entry point for FLV2DTSC, simply calls Converters::FLV2DTSC(). +int main(){ + return Converters::FLV2DTSC(); +}//main diff --git a/util/dtsc.cpp b/util/dtsc.cpp index 9d046287..8301e5b3 100644 --- a/util/dtsc.cpp +++ b/util/dtsc.cpp @@ -35,6 +35,7 @@ bool DTSC::Stream::parsePacket(std::string & buffer){ if (buffer.length() < len+8){return false;} metadata = DTSC::parseDTMI((unsigned char*)buffer.c_str() + 8, len); buffer.erase(0, len+8); + return false; } if (memcmp(buffer.c_str(), DTSC::Magic_Packet, 4) == 0){ len = ntohl(((uint32_t *)buffer.c_str())[1]); @@ -56,6 +57,7 @@ bool DTSC::Stream::parsePacket(std::string & buffer){ buffer.erase(0, len+8); while (buffers.size() > buffercount){buffers.pop_back();} advanceRings(); + return true; } #if DEBUG >= 2 std::cerr << "Error: Invalid DTMI data! I *will* get stuck!" << std::endl; @@ -92,25 +94,18 @@ bool DTSC::Stream::hasAudio(){ } /// Returns a packed DTSC packet, ready to sent over the network. -std::string DTSC::Stream::outPacket(unsigned int num){ - std::string tmp; - unsigned int size; - tmp = Magic_Packet; - size = htonl(buffers[num].Pack().length()); - tmp.append((char*)&size, 4); - tmp.append(buffers[num].Pack()); - return tmp; +std::string & DTSC::Stream::outPacket(unsigned int num){ + buffers[num].Pack(true); + return buffers[num].packed; } /// Returns a packed DTSC header, ready to sent over the network. -std::string DTSC::Stream::outHeader(){ - std::string tmp; - unsigned int size; - tmp = Magic_Header; - size = htonl(metadata.Pack().length()); - tmp.append((char*)&size, 4); - tmp.append(metadata.Pack()); - return tmp; +std::string & DTSC::Stream::outHeader(){ + if ((metadata.packed.length() < 4) || !metadata.netpacked){ + metadata.Pack(true); + metadata.packed.replace(0, 4, Magic_Header); + } + return metadata.packed; } /// advances all given out and internal Ring classes to point to the new buffer, after one has been added. @@ -198,7 +193,17 @@ int DTSC::DTMI::hasContent(){return contents.size();}; /// Adds an DTSC::DTMI to this object. Works for all types, but only makes sense for container types. /// This function resets DTMI::packed to an empty string, forcing a repack on the next call to DTMI::Pack. -void DTSC::DTMI::addContent(DTSC::DTMI c){contents.push_back(c); packed = "";}; +/// If the indice name already exists, replaces the indice. +void DTSC::DTMI::addContent(DTSC::DTMI c){ + std::vector::iterator it; + for (it = contents.begin(); it != contents.end(); it++){ + if (it->Indice() == c.Indice()){ + contents.erase(it); + break; + } + } + contents.push_back(c); packed = ""; +}; /// Returns a pointer to the object held at indice i. /// Returns AMF::AMF0_DDV_CONTAINER of indice "error" if no object is held at this indice. @@ -237,11 +242,11 @@ DTSC::DTMI::DTMI(){ };//default constructor /// Constructor for numeric objects. -/// The object type is by default AMF::AMF0_NUMBER, but this can be forced to a different value. +/// The object type is by default DTMItype::DTMI_INT, but this can be forced to a different value. /// \param indice The string indice of this object in its container, or empty string if none. Numeric indices are automatic. -/// \param val The numeric value of this object. Numeric AMF0 objects only support double-type values. +/// \param val The numeric value of this object. Numeric objects only support uint64_t values. /// \param setType The object type to force this object to. -DTSC::DTMI::DTMI(std::string indice, double val, DTSC::DTMItype setType){//num type initializer +DTSC::DTMI::DTMI(std::string indice, uint64_t val, DTSC::DTMItype setType){//num type initializer myIndice = indice; myType = setType; strval = ""; @@ -249,8 +254,6 @@ DTSC::DTMI::DTMI(std::string indice, double val, DTSC::DTMItype setType){//num t }; /// Constructor for string objects. -/// The object type is by default AMF::AMF0_STRING, but this can be forced to a different value. -/// There is no need to manually change the type to AMF::AMF0_LONGSTRING, this will be done automatically. /// \param indice The string indice of this object in its container, or empty string if none. Numeric indices are automatic. /// \param val The string value of this object. /// \param setType The object type to force this object to. @@ -262,8 +265,7 @@ DTSC::DTMI::DTMI(std::string indice, std::string val, DTSC::DTMItype setType){// }; /// Constructor for container objects. -/// The object type is by default AMF::AMF0_OBJECT, but this can be forced to a different value. -/// \param indice The string indice of this object in its container, or empty string if none. Numeric indices are automatic. +/// \param indice The string indice of this object in its container, or empty string if none. /// \param setType The object type to force this object to. DTSC::DTMI::DTMI(std::string indice, DTSC::DTMItype setType){//object type initializer myIndice = indice; @@ -290,7 +292,13 @@ void DTSC::DTMI::Print(std::string indent){ // print my numeric or string contents switch (myType){ case DTMI_INT: std::cerr << numval; break; - case DTMI_STRING: std::cerr << strval; break; + case DTMI_STRING: + if (strval.length() > 200 || ((strval.length() > 1) && ( (strval[0] < 'A') || (strval[0] > 'z') ) )){ + std::cerr << strval.length() << " bytes of data"; + }else{ + std::cerr << strval; + } + break; default: break;//we don't care about the rest, and don't want a compiler warning... } std::cerr << std::endl; @@ -303,11 +311,22 @@ void DTSC::DTMI::Print(std::string indent){ /// Packs the DTMI to a std::string for transfer over the network. /// If a packed version already exists, does not regenerate it. /// If the object is a container type, this function will call itself recursively and contain all contents. -std::string DTSC::DTMI::Pack(){ - if (packed != ""){return packed;} +/// \arg netpack If true, will pack as a full DTMI packet, if false only as the contents without header. +std::string DTSC::DTMI::Pack(bool netpack){ + if (packed != ""){ + if (netpacked == netpack){return packed;} + if (netpacked){ + packed.erase(0, 8); + }else{ + unsigned int size = htonl(packed.length()); + packed.insert(0, (char*)&size, 4); + packed.insert(0, Magic_Packet); + } + netpacked = !netpacked; + return packed; + } std::string r = ""; - //skip output of DDV container types, they do not exist. Only output their contents. - if (myType != DTMI_ROOT){r += myType;} + r += myType; //output the properly formatted data stream for this object's contents. switch (myType){ case DTMI_INT: @@ -324,6 +343,7 @@ std::string DTSC::DTMI::Pack(){ r += strval; break; case DTMI_OBJECT: + case DTMI_ROOT: if (contents.size() > 0){ for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){ r += it->Indice().size() / 256; @@ -332,20 +352,19 @@ std::string DTSC::DTMI::Pack(){ r += it->Pack(); } } - r += (char)0; r += (char)0; r += (char)9; - break; - case DTMI_ROOT://only send contents - if (contents.size() > 0){ - for (std::vector::iterator it = contents.begin(); it != contents.end(); it++){ - r += it->Pack(); - } - } + r += (char)0x0; r += (char)0x0; r += (char)0xEE; break; case DTMI_OBJ_END: break; } packed = r; - return r; + netpacked = netpack; + if (netpacked){ + unsigned int size = htonl(packed.length()); + packed.insert(0, (char*)&size, 4); + packed.insert(0, Magic_Packet); + } + return packed; };//pack /// Parses a single AMF0 type - used recursively by the AMF::parse() functions. @@ -372,7 +391,7 @@ DTSC::DTMI DTSC::parseOneDTMI(const unsigned char *& data, unsigned int &len, un tmpdbl[2] = data[i+6]; tmpdbl[1] = data[i+7]; tmpdbl[0] = data[i+8]; - i+=9;//skip 8(a double)+1 forwards + i+=9;//skip 8(an uint64_t)+1 forwards return DTSC::DTMI(name, *(uint64_t*)tmpdbl, DTMI_INT); break; case DTMI_STRING: @@ -382,17 +401,30 @@ DTSC::DTMI DTSC::parseOneDTMI(const unsigned char *& data, unsigned int &len, un i += tmpi + 5;//skip length+size+1 forwards return DTSC::DTMI(name, tmpstr, DTMI_STRING); break; - case DTMI_OBJECT:{ + case DTMI_ROOT:{ ++i; - DTSC::DTMI ret(name, DTMI_OBJECT); - while (data[i] + data[i+1] != 0){//while not encountering 0x0000 (we assume 0x000009) + DTSC::DTMI ret(name, DTMI_ROOT); + while (data[i] + data[i+1] != 0){//while not encountering 0x0000 (we assume 0x0000EE) tmpi = data[i]*256+data[i+1];//set tmpi to the UTF-8 length tmpstr.clear();//clean tmpstr, just to be sure tmpstr.append((const char*)data+i+2, (size_t)tmpi);//add the string data i += tmpi + 2;//skip length+size forwards ret.addContent(parseOneDTMI(data, len, i, tmpstr));//add content, recursively parsed, updating i, setting indice to tmpstr } - i += 3;//skip 0x000009 + i += 3;//skip 0x0000EE + return ret; + } break; + case DTMI_OBJECT:{ + ++i; + DTSC::DTMI ret(name, DTMI_OBJECT); + while (data[i] + data[i+1] != 0){//while not encountering 0x0000 (we assume 0x0000EE) + tmpi = data[i]*256+data[i+1];//set tmpi to the UTF-8 length + tmpstr.clear();//clean tmpstr, just to be sure + tmpstr.append((const char*)data+i+2, (size_t)tmpi);//add the string data + i += tmpi + 2;//skip length+size forwards + ret.addContent(parseOneDTMI(data, len, i, tmpstr));//add content, recursively parsed, updating i, setting indice to tmpstr + } + i += 3;//skip 0x0000EE return ret; } break; } @@ -403,22 +435,18 @@ DTSC::DTMI DTSC::parseOneDTMI(const unsigned char *& data, unsigned int &len, un }//parseOne /// Parses a C-string to a valid DTSC::DTMI. -/// This function will find all AMF objects in the string and return -/// them all packed in a single AMF::AMF0_DDV_CONTAINER DTSC::DTMI. +/// This function will find one DTMI object in the string and return it. DTSC::DTMI DTSC::parseDTMI(const unsigned char * data, unsigned int len){ - DTSC::DTMI ret("returned", DTMI_ROOT);//container type - unsigned int i = 0, j = 0; - while (i < len){ - ret.addContent(parseOneDTMI(data, len, i, "")); - if (i > j){j = i;}else{return ret;} - } + DTSC::DTMI ret;//container type + unsigned int i = 0; + ret = parseOneDTMI(data, len, i, ""); ret.packed = std::string((char*)data, (size_t)len); + ret.netpacked = false; return ret; }//parse /// Parses a std::string to a valid DTSC::DTMI. -/// This function will find all AMF objects in the string and return -/// them all packed in a single AMF::AMF0_DDV_CONTAINER DTSC::DTMI. +/// This function will find one DTMI object in the string and return it. DTSC::DTMI DTSC::parseDTMI(std::string data){ return parseDTMI((const unsigned char*)data.c_str(), data.size()); }//parse diff --git a/util/dtsc.h b/util/dtsc.h index 3a025753..7d5827df 100644 --- a/util/dtsc.h +++ b/util/dtsc.h @@ -45,11 +45,12 @@ namespace DTSC{ DTMI* getContentP(std::string s); DTMI getContent(std::string s); DTMI(); - DTMI(std::string indice, double val, DTMItype setType = DTMI_INT); + DTMI(std::string indice, uint64_t val, DTMItype setType = DTMI_INT); DTMI(std::string indice, std::string val, DTMItype setType = DTMI_STRING); DTMI(std::string indice, DTMItype setType = DTMI_OBJECT); void Print(std::string indent = ""); - std::string Pack(); + std::string Pack(bool netpack = false); + bool netpacked; std::string packed; protected: std::string myIndice; ///< Holds this objects indice, if any. @@ -102,8 +103,8 @@ namespace DTSC{ bool hasVideo(); bool hasAudio(); bool parsePacket(std::string & buffer); - std::string outPacket(unsigned int num); - std::string outHeader(); + std::string & outPacket(unsigned int num); + std::string & outHeader(); Ring * getRing(); void dropRing(Ring * ptr); private: diff --git a/util/flv_tag.cpp b/util/flv_tag.cpp index 526de7d0..2a7b671c 100644 --- a/util/flv_tag.cpp +++ b/util/flv_tag.cpp @@ -109,7 +109,7 @@ std::string FLV::Tag::tagType(){ case 4: R += "VP6"; break; case 5: R += "VP6Alpha"; break; case 6: R += "ScreenVideo2"; break; - case 7: R += "AVC"; break; + case 7: R += "H264"; break; default: R += "unknown"; break; } R += " video "; From 46bfeefb03fafe8ff9e65b7a4f6ccf4ac6307d33 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Tue, 13 Sep 2011 20:37:16 +0200 Subject: [PATCH 04/21] Buffer stabilized --- Buffer/main.cpp | 23 ++++++++++++++--------- util/dtsc.cpp | 16 ++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Buffer/main.cpp b/Buffer/main.cpp index 1cc8e708..992e9f17 100644 --- a/Buffer/main.cpp +++ b/Buffer/main.cpp @@ -93,7 +93,7 @@ namespace Buffer{ curr_up = 0; curr_down = 0; currsend = 0; - myRing = Strm->getRing(); + myRing = 0; std::cout << "User " << MyNum << " connected" << std::endl; }//constructor /// Drops held DTSC::Ring class, if one is held. @@ -129,20 +129,23 @@ namespace Buffer{ }//doSend /// Try to send data to this user. Disconnects if any problems occur. void Send(){ + if (!myRing){return;}//no ring! if (!S.connected()){return;}//cancel if not connected if (myRing->waiting){return;}//still waiting for next buffer? + if (myRing->starved){ + //if corrupt data, warn and get new DTSC::Ring + std::cout << "Warning: User was send corrupt video data and send to the next keyframe!" << std::endl; + Strm->dropRing(myRing); + myRing = Strm->getRing(); + } + currsend = 0; + //try to complete a send if (doSend(Strm->outPacket(myRing->b).c_str(), Strm->outPacket(myRing->b).length())){ //switch to next buffer if (myRing->b <= 0){myRing->waiting = true; return;}//no next buffer? go in waiting mode. myRing->b--; - if (myRing->starved){ - //if corrupt data, warn and get new DTSC::Ring - std::cout << "Warning: User was send corrupt video data and send to the next keyframe!" << std::endl; - Strm->dropRing(myRing); - myRing = Strm->getRing(); - } currsend = 0; }//completed a send }//send @@ -159,8 +162,8 @@ namespace Buffer{ sigaction (SIGPIPE, &new_action, NULL); //then check and parse the commandline - if (argc < 3) { - std::cout << "usage: " << argv[0] << " streamname [awaiting_IP]" << std::endl; + if (argc < 2) { + std::cout << "usage: " << argv[0] << " streamName [awaiting_IP]" << std::endl; return 1; } std::string waiting_ip = ""; @@ -229,6 +232,7 @@ namespace Buffer{ if (incoming.connected()){ users.push_back(incoming); //send the header + users.back().myRing = Strm->getRing(); if (!users.back().S.write(Strm->outHeader())){ /// \todo Do this more nicely? users.back().Disconnect("failed to receive the header!"); @@ -297,6 +301,7 @@ namespace Buffer{ if (!(*usersIt).S.connected()){users.erase(usersIt);break;} } } + delete Strm; return 0; } diff --git a/util/dtsc.cpp b/util/dtsc.cpp index 8301e5b3..9e2a5ba4 100644 --- a/util/dtsc.cpp +++ b/util/dtsc.cpp @@ -117,7 +117,7 @@ void DTSC::Stream::advanceRings(){ for (sit = rings.begin(); sit != rings.end(); sit++){ (*sit)->b++; if ((*sit)->waiting){(*sit)->waiting = false; (*sit)->b = 0;} - if ((*sit)->b >= buffers.size()){(*sit)->starved = true;} + if ((*sit)->starved || ((*sit)->b >= buffers.size())){(*sit)->starved = true; (*sit)->b = 0;} } for (dit = keyframes.begin(); dit != keyframes.end(); dit++){ dit->b++; @@ -375,7 +375,6 @@ std::string DTSC::DTMI::Pack(bool netpack){ /// \param name Indice name for any new object created. /// \returns A single DTSC::DTMI, parsed from the raw data. DTSC::DTMI DTSC::parseOneDTMI(const unsigned char *& data, unsigned int &len, unsigned int &i, std::string name){ - std::string tmpstr; unsigned int tmpi = 0; unsigned char tmpdbl[8]; #if DEBUG >= 10 @@ -394,20 +393,18 @@ DTSC::DTMI DTSC::parseOneDTMI(const unsigned char *& data, unsigned int &len, un i+=9;//skip 8(an uint64_t)+1 forwards return DTSC::DTMI(name, *(uint64_t*)tmpdbl, DTMI_INT); break; - case DTMI_STRING: + case DTMI_STRING:{ tmpi = data[i+1]*256*256*256+data[i+2]*256*256+data[i+3]*256+data[i+4];//set tmpi to UTF-8-long length - tmpstr.clear();//clean tmpstr, just to be sure - tmpstr.append((const char *)data+i+5, (size_t)tmpi);//add the string data + std::string tmpstr = std::string((const char *)data+i+5, (size_t)tmpi);//set the string data i += tmpi + 5;//skip length+size+1 forwards return DTSC::DTMI(name, tmpstr, DTMI_STRING); - break; + } break; case DTMI_ROOT:{ ++i; DTSC::DTMI ret(name, DTMI_ROOT); while (data[i] + data[i+1] != 0){//while not encountering 0x0000 (we assume 0x0000EE) tmpi = data[i]*256+data[i+1];//set tmpi to the UTF-8 length - tmpstr.clear();//clean tmpstr, just to be sure - tmpstr.append((const char*)data+i+2, (size_t)tmpi);//add the string data + std::string tmpstr = std::string((const char *)data+i+2, (size_t)tmpi);//set the string data i += tmpi + 2;//skip length+size forwards ret.addContent(parseOneDTMI(data, len, i, tmpstr));//add content, recursively parsed, updating i, setting indice to tmpstr } @@ -419,8 +416,7 @@ DTSC::DTMI DTSC::parseOneDTMI(const unsigned char *& data, unsigned int &len, un DTSC::DTMI ret(name, DTMI_OBJECT); while (data[i] + data[i+1] != 0){//while not encountering 0x0000 (we assume 0x0000EE) tmpi = data[i]*256+data[i+1];//set tmpi to the UTF-8 length - tmpstr.clear();//clean tmpstr, just to be sure - tmpstr.append((const char*)data+i+2, (size_t)tmpi);//add the string data + std::string tmpstr = std::string((const char *)data+i+2, (size_t)tmpi);//set the string data i += tmpi + 2;//skip length+size forwards ret.addContent(parseOneDTMI(data, len, i, tmpstr));//add content, recursively parsed, updating i, setting indice to tmpstr } From 78fc9f8ab28e75e5ab8f35eec9e3b58586b5223a Mon Sep 17 00:00:00 2001 From: Thulinma Date: Wed, 14 Sep 2011 00:05:54 +0200 Subject: [PATCH 05/21] Almost working HTTP connector - mid-rewrite, running into some issues, sleepy, going to bed... --- Connector_HTTP/Makefile | 2 +- Connector_HTTP/main.cpp | 213 ++++++++++++++++++---------------- FLV2DTSC/main.cpp | 15 +-- util/dtsc.cpp | 10 +- util/dtsc.h | 45 +++++-- util/flv_tag.cpp | 251 ++++++++++++++++++++++++++++++++++++++++ util/flv_tag.h | 5 + util/socket.h | 2 +- 8 files changed, 414 insertions(+), 129 deletions(-) diff --git a/Connector_HTTP/Makefile b/Connector_HTTP/Makefile index 4b296653..a57fa022 100644 --- a/Connector_HTTP/Makefile +++ b/Connector_HTTP/Makefile @@ -1,4 +1,4 @@ -SRC = main.cpp ../util/socket.cpp ../util/http_parser.cpp ../util/flv_tag.cpp ../util/amf.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/util.cpp OBJ = $(SRC:.cpp=.o) OUT = DDV_Conn_HTTP INCLUDES = diff --git a/Connector_HTTP/main.cpp b/Connector_HTTP/main.cpp index 24d03510..da297cf8 100644 --- a/Connector_HTTP/main.cpp +++ b/Connector_HTTP/main.cpp @@ -13,6 +13,7 @@ #include #include "../util/socket.h" #include "../util/http_parser.h" +#include "../util/dtsc.h" #include "../util/flv_tag.h" #include "../util/MP4/interface.cpp" #include "../util/amf.h" @@ -149,26 +150,110 @@ namespace Connector_HTTP{ return Result; }//BuildManifest + /// Handles Progressive download streaming requests + void Progressive(FLV::Tag & tag, HTTP::Parser HTTP_S, Socket::Connection & conn, DTSC::Stream & Strm){ + static bool progressive_has_sent_header = false; + if (!progressive_has_sent_header){ + HTTP_S.Clean();//troep opruimen die misschien aanwezig is... + HTTP_S.SetHeader("Content-Type", "video/x-flv");//FLV files hebben altijd dit content-type. + //HTTP_S.SetHeader("Transfer-Encoding", "chunked"); + HTTP_S.protocol = "HTTP/1.0"; + HTTP_S.SendResponse(conn, "200", "OK");//geen SetBody = unknown length! Dat willen we hier. + //HTTP_S.SendBodyPart(CONN_fd, FLVHeader, 13);//schrijf de FLV header + conn.write(FLV::Header, 13); + FLV::Tag tmp; + tmp.DTSCMetaInit(Strm); + conn.write(tmp.data, tmp.len); + if (Strm.metadata.getContentP("audio") && Strm.metadata.getContentP("audio")->getContentP("init")){ + tmp.DTSCAudioInit(Strm); + conn.write(tmp.data, tmp.len); + } + if (Strm.metadata.getContentP("video") && Strm.metadata.getContentP("video")->getContentP("init")){ + tmp.DTSCVideoInit(Strm); + conn.write(tmp.data, tmp.len); + } + progressive_has_sent_header = true; + #if DEBUG >= 1 + fprintf(stderr, "Sent progressive FLV header\n"); + #endif + } + //HTTP_S.SendBodyPart(CONN_fd, tag->data, tag->len);//schrijf deze FLV tag onbewerkt weg + conn.write(tag.data, tag.len); + } + + /// Handles Flash Dynamic HTTP streaming requests + void FlashDynamic(FLV::Tag & tag, HTTP::Parser HTTP_S, Socket::Connection & conn, DTSC::Stream & Strm){ + static std::queue Flash_FragBuffer; + static unsigned int Flash_StartTime = 0; + static std::string FlashBuf; + static std::string FlashMeta; + static bool FlashFirstVideo = false; + static bool FlashFirstAudio = false; + static bool Flash_ManifestSent = false; + static int Flash_RequestPending = 0; + if (tag.tagTime() > 0){ + if (Flash_StartTime == 0){ + Flash_StartTime = tag.tagTime(); + } + tag.tagTime(tag.tagTime() - Flash_StartTime); + } + if (tag.data[0] != 0x12 ) { + if (tag.isKeyframe){ + if (FlashBuf != "" && !FlashFirstVideo && !FlashFirstAudio){ + Flash_FragBuffer.push(FlashBuf); + #if DEBUG >= 4 + fprintf(stderr, "Received a fragment. Now %i in buffer.\n", (int)Flash_FragBuffer.size()); + #endif + } + FlashBuf.clear(); + FlashFirstVideo = true; + FlashFirstAudio = true; + } + /// \todo Check metadata for video/audio, append if needed. + /* + if (FlashFirstVideo && (tag.data[0] == 0x09) && (Video_Init.len > 0)){ + Video_Init.tagTime(tag.tagTime()); + FlashBuf.append(Video_Init.data, Video_Init.len); + FlashFirstVideo = false; + } + if (FlashFirstAudio && (tag.data[0] == 0x08) && (Audio_Init.len > 0)){ + Audio_Init.tagTime(tag.tagTime()); + FlashBuf.append(Audio_Init.data, Audio_Init.len); + FlashFirstAudio = false; + } + #if DEBUG >= 5 + fprintf(stderr, "Received a tag of type %2hhu and length %i\n", tag.data[0], tag.len); + #endif + if ((Video_Init.len > 0) && (Audio_Init.len > 0)){ + FlashBuf.append(tag.data,tag.len); + } + */ + } else { + /* + FlashMeta = ""; + FlashMeta.append(tag.data+11,tag.len-15); + if( !Flash_ManifestSent ) { + HTTP_S.Clean(); + HTTP_S.SetHeader("Content-Type","text/xml"); + HTTP_S.SetHeader("Cache-Control","no-cache"); + HTTP_S.SetBody(BuildManifest(FlashMeta, Movie, tag.tagTime())); + HTTP_S.SendResponse(conn, "200", "OK"); + } + */ + } + } + + /// Main function for Connector_HTTP int Connector_HTTP(Socket::Connection conn){ int handler = HANDLER_PROGRESSIVE;///< The handler used for processing this request. bool ready4data = false;///< Set to true when streaming is to begin. bool inited = false; - bool progressive_has_sent_header = false; Socket::Connection ss(-1); std::string streamname; - std::string extension; - std::string FlashBuf; - std::string FlashMeta; - bool Flash_ManifestSent = false; - int Flash_RequestPending = 0; - unsigned int Flash_StartTime; - std::queue Flash_FragBuffer; - FLV::Tag tag;///< Temporary tag buffer for incoming video data. - FLV::Tag Audio_Init;///< Audio initialization data, if available. - FLV::Tag Video_Init;///< Video initialization data, if available. - bool FlashFirstVideo = false; - bool FlashFirstAudio = false; + FLV::Tag tag;///< Temporary tag buffer. + std::string recBuffer = ""; + DTSC::Stream Strm;///< Incoming stream buffer. HTTP::Parser HTTP_R, HTTP_S;//HTTP Receiver en HTTP Sender. std::string Movie = ""; @@ -179,7 +264,7 @@ namespace Connector_HTTP{ unsigned int lastStats = 0; //int CurrentFragment = -1; later herbruiken? - while (conn.connected() && !FLV::Parse_Error){ + while (conn.connected()){ //only parse input if available or not yet init'ed if (HTTP_R.Read(conn, ready4data)){ handler = HANDLER_PROGRESSIVE; @@ -209,8 +294,11 @@ namespace Connector_HTTP{ printf( "URL: %s\n", HTTP_R.url.c_str()); printf( "Movie: %s, Quality: %s, Seg %d Frag %d\n", Movie.c_str(), Quality.c_str(), Segment, ReqFragment); #endif + /// \todo Handle these requests properly... + /* Flash_ManifestSent = true;//stop manifest from being sent multiple times Flash_RequestPending++; + */ }else{ Movie = HTTP_R.url.substr(1); Movie = Movie.substr(0,Movie.find("/")); @@ -255,6 +343,8 @@ namespace Connector_HTTP{ #endif inited = true; } + /// \todo Send pending flash requests... + /* if ((Flash_RequestPending > 0) && !Flash_FragBuffer.empty()){ HTTP_S.Clean(); HTTP_S.SetHeader("Content-Type","video/mp4"); @@ -284,97 +374,16 @@ namespace Connector_HTTP{ break; case 0: break;//not ready yet default: - if (tag.SockLoader(ss)){//able to read a full packet? - if (handler == HANDLER_FLASH){ - if (tag.tagTime() > 0){ - if (Flash_StartTime == 0){ - Flash_StartTime = tag.tagTime(); - } - tag.tagTime(tag.tagTime() - Flash_StartTime); + if (ss.iread(recBuffer)){ + if (Strm.parsePacket(recBuffer)){ + tag.DTSCLoader(Strm); + if (handler == HANDLER_FLASH){ + FlashDynamic(tag, HTTP_S, conn, Strm); } - if (tag.data[0] != 0x12 ) { - if ( (tag.data[0] == 0x09) && tag.isInitData()){ - if (((tag.data[11] & 0x0f) == 7) && (tag.data[12] == 0)){ - tag.tagTime(0);//timestamp to zero - Video_Init = tag; - break; - } - } - if ((tag.data[0] == 0x08) && tag.isInitData()){ - if (((tag.data[11] & 0xf0) >> 4) == 10){//aac packet - tag.tagTime(0);//timestamp to zero - Audio_Init = tag; - break; - } - } - if (tag.isKeyframe){ - if (FlashBuf != "" && !FlashFirstVideo && !FlashFirstAudio){ - Flash_FragBuffer.push(FlashBuf); - #if DEBUG >= 4 - fprintf(stderr, "Received a fragment. Now %i in buffer.\n", (int)Flash_FragBuffer.size()); - #endif - } - FlashBuf.clear(); - FlashFirstVideo = true; - FlashFirstAudio = true; - } - if (FlashFirstVideo){ - if (Video_Init.len > 0){ - Video_Init.tagTime(tag.tagTime()); - FlashBuf.append(Video_Init.data, Video_Init.len); - } - FlashFirstVideo = false; - if (Audio_Init.len > 0){ - Audio_Init.tagTime(tag.tagTime()); - FlashBuf.append(Audio_Init.data, Audio_Init.len); - } - FlashFirstAudio = false; - } - #if DEBUG >= 5 - fprintf(stderr, "Received a tag of type %2hhu and length %i\n", tag.data[0], tag.len); - #endif - if (!FlashFirstVideo && !FlashFirstAudio){ - FlashBuf.append(tag.data,tag.len); - } - } else { - FlashMeta = ""; - FlashMeta.append(tag.data+11,tag.len-15); - if( !Flash_ManifestSent ) { - HTTP_S.Clean(); - HTTP_S.SetHeader("Content-Type","text/xml"); - HTTP_S.SetHeader("Cache-Control","no-cache"); - HTTP_S.SetBody(BuildManifest(FlashMeta, Movie, tag.tagTime())); - HTTP_S.SendResponse(conn, "200", "OK"); - } + if (handler == HANDLER_PROGRESSIVE){ + Progressive(tag, HTTP_S, conn, Strm); } } - if (handler == HANDLER_PROGRESSIVE){ - if (!progressive_has_sent_header){ - HTTP_S.Clean();//troep opruimen die misschien aanwezig is... - if (extension == ".mp3"){ - HTTP_S.SetHeader("Content-Type", "audio/mpeg3");//MP3 files hebben dit content-type. - HTTP_S.protocol = "HTTP/1.0"; - HTTP_S.SendResponse(conn, "200", "OK");//geen SetBody = unknown length! Dat willen we hier. - }else{ - HTTP_S.SetHeader("Content-Type", "video/x-flv");//FLV files hebben altijd dit content-type. - //HTTP_S.SetHeader("Transfer-Encoding", "chunked"); - HTTP_S.protocol = "HTTP/1.0"; - HTTP_S.SendResponse(conn, "200", "OK");//geen SetBody = unknown length! Dat willen we hier. - //HTTP_S.SendBodyPart(CONN_fd, FLVHeader, 13);//schrijf de FLV header - conn.write(FLV::Header, 13); - } - progressive_has_sent_header = true; - } - if (extension == ".mp3"){ - if (tag.data[0] == 0x08){ - if (((tag.data[11] & 0xf0) >> 4) == 2){//mp3 packet - conn.write(tag.data+12, tag.len-16);//write only the MP3 data of the tag - } - } - }else{ - conn.write(tag.data, tag.len); - } - }//PROGRESSIVE handler } break; } diff --git a/FLV2DTSC/main.cpp b/FLV2DTSC/main.cpp index 0c3008fe..5b17f381 100644 --- a/FLV2DTSC/main.cpp +++ b/FLV2DTSC/main.cpp @@ -161,10 +161,10 @@ namespace Converters{ } if (!Meta_Has(meta_out, "audio", "rate")){ switch (audiodata & 0x0C){ - case 0x0: Meta_Put(meta_out, "audio", "rate", 5500); break; - case 0x4: Meta_Put(meta_out, "audio", "rate", 11000); break; - case 0x8: Meta_Put(meta_out, "audio", "rate", 22000); break; - case 0xC: Meta_Put(meta_out, "audio", "rate", 44000); break; + case 0x0: Meta_Put(meta_out, "audio", "rate", 5512); break; + case 0x4: Meta_Put(meta_out, "audio", "rate", 11025); break; + case 0x8: Meta_Put(meta_out, "audio", "rate", 22050); break; + case 0xC: Meta_Put(meta_out, "audio", "rate", 44100); break; } } if (!Meta_Has(meta_out, "audio", "size")){ @@ -222,11 +222,8 @@ namespace Converters{ case 1: pack_out.addContent(DTSC::DTMI("nalu", 1)); break; case 2: pack_out.addContent(DTSC::DTMI("nalu_end", 1)); break; } - int offset = 0; - ((char*)(&offset))[0] = FLV_in.data[13]; - ((char*)(&offset))[1] = FLV_in.data[14]; - ((char*)(&offset))[2] = FLV_in.data[15]; - offset >>= 8; + int offset = (FLV_in.data[13] << 16) + (FLV_in.data[14] << 8) + FLV_in.data[15]; + offset = (offset << 8) >> 8; pack_out.addContent(DTSC::DTMI("offset", offset)); } pack_out.addContent(DTSC::DTMI("time", FLV_in.tagTime())); diff --git a/util/dtsc.cpp b/util/dtsc.cpp index 9e2a5ba4..85e1ce47 100644 --- a/util/dtsc.cpp +++ b/util/dtsc.cpp @@ -44,7 +44,7 @@ bool DTSC::Stream::parsePacket(std::string & buffer){ buffers.front() = DTSC::parseDTMI((unsigned char*)buffer.c_str() + 8, len); datapointertype = INVALID; if (buffers.front().getContentP("data")){ - datapointer = buffers.front().getContentP("data")->StrValue().c_str(); + datapointer = &(buffers.front().getContentP("data")->StrValue()); if (buffers.front().getContentP("datatype")){ std::string tmp = buffers.front().getContentP("datatype")->StrValue(); if (tmp == "video"){datapointertype = VIDEO;} @@ -68,8 +68,8 @@ bool DTSC::Stream::parsePacket(std::string & buffer){ /// Returns a direct pointer to the data attribute of the last received packet, if available. /// Returns NULL if no valid pointer or packet is available. -const char * DTSC::Stream::lastData(){ - return datapointer; +std::string & DTSC::Stream::lastData(){ + return *datapointer; } /// Returns the packed in this buffer number. @@ -177,11 +177,11 @@ DTSC::DTMItype DTSC::DTMI::GetType(){return myType;}; /// Returns the numeric value of this object, if available. /// If this object holds no numeric value, 0 is returned. -uint64_t DTSC::DTMI::NumValue(){return numval;}; +uint64_t & DTSC::DTMI::NumValue(){return numval;}; /// Returns the std::string value of this object, if available. /// If this object holds no string value, an empty string is returned. -std::string DTSC::DTMI::StrValue(){return strval;}; +std::string & DTSC::DTMI::StrValue(){return strval;}; /// Returns the C-string value of this object, if available. /// If this object holds no string value, an empty C-string is returned. diff --git a/util/dtsc.h b/util/dtsc.h index 7d5827df..30bbc092 100644 --- a/util/dtsc.h +++ b/util/dtsc.h @@ -9,16 +9,39 @@ #include #include -// video -// codec (string) -// audio -// codec (string) -// sampingrate (int, Hz) -// samplesize (int, bytesize) -// channels (int, channelcount) /// Holds all DDVTECH Stream Container classes and parsers. +///Video: +/// - codec (string: AAC, MP3) +/// - width (int, pixels) +/// - height (int, pixels) +/// - fpks (int, frames per kilosecond (FPS * 1000)) +/// - bps (int, bytes per second) +/// - init (string, init data) +/// +///Audio: +/// - codec (string: H264, H263, VP6) +/// - rate (int, Hz) +/// - size (int, bitsize) +/// - bps (int, bytes per second) +/// - channels (int, channelcount) +/// - init (string, init data) +/// +///All packets: +/// - datatype (string: audio, video, meta (unused)) +/// - data (string: data) +/// - time (int: ms into video) +/// +///Video packets: +/// - keyframe (int, if set, is a seekable keyframe) +/// - interframe (int, if set, is a non-seekable interframe) +/// - disposableframe (int, if set, is a disposable interframe) +/// +///H264 video packets: +/// - nalu (int, if set, is a nalu) +/// - nalu_end (int, if set, is a end-of-sequence) +/// - offset (int, unsigned version of signed int! Holds the ms offset between timestamp and proper display time for B-frames) namespace DTSC{ /// Enumerates all possible DTMI types. @@ -35,8 +58,8 @@ namespace DTSC{ public: std::string Indice(); DTMItype GetType(); - uint64_t NumValue(); - std::string StrValue(); + uint64_t & NumValue(); + std::string & StrValue(); const char * Str(); int hasContent(); void addContent(DTMI c); @@ -99,7 +122,7 @@ namespace DTSC{ DTSC::DTMI metadata; DTSC::DTMI & getPacket(unsigned int num = 0); datatype lastType(); - const char * lastData(); + std::string & lastData(); bool hasVideo(); bool hasAudio(); bool parsePacket(std::string & buffer); @@ -112,7 +135,7 @@ namespace DTSC{ std::set rings; std::deque keyframes; void advanceRings(); - const char * datapointer; + std::string * datapointer; datatype datapointertype; unsigned int buffercount; }; diff --git a/util/flv_tag.cpp b/util/flv_tag.cpp index 2a7b671c..3af96eea 100644 --- a/util/flv_tag.cpp +++ b/util/flv_tag.cpp @@ -2,6 +2,7 @@ /// Holds all code for the FLV namespace. #include "flv_tag.h" +#include "amf.h" #include "rtmpchunks.h" #include //for Tag::FileLoader #include //for Tag::FileLoader @@ -245,6 +246,256 @@ FLV::Tag & FLV::Tag::operator= (const FLV::Tag& O){ return *this; }//assignment operator +/// FLV loader function from DTSC. +/// Takes the DTSC data and makes it into FLV. +bool FLV::Tag::DTSCLoader(DTSC::Stream & S){ + switch (S.lastType()){ + case DTSC::VIDEO: + len = S.lastData().length() + 16; + if (S.metadata.getContentP("video") && S.metadata.getContentP("video")->getContentP("codec")){ + if (S.metadata.getContentP("video")->getContentP("codec")->StrValue() == "H264"){len += 4;} + } + break; + case DTSC::AUDIO: + len = S.lastData().length() + 16; + if (S.metadata.getContentP("audio") && S.metadata.getContentP("audio")->getContentP("codec")){ + if (S.metadata.getContentP("audio")->getContentP("codec")->StrValue() == "AAC"){len += 1;} + } + break; + case DTSC::META: + len = S.lastData().length() + 15; + break; + default://ignore all other types (there are currently no other types...) + break; + } + if (len > 0){ + if (!data){ + data = (char*)malloc(len); + buf = len; + }else{ + if (buf < len){ + data = (char*)realloc(data, len); + buf = len; + } + } + switch (S.lastType()){ + case DTSC::VIDEO: + if ((unsigned int)len == S.lastData().length() + 16){ + memcpy(data+12, S.lastData().c_str(), S.lastData().length()); + }else{ + memcpy(data+16, S.lastData().c_str(), S.lastData().length()); + if (S.getPacket().getContentP("nalu")){data[12] = 1;}else{data[12] = 2;} + int offset = S.getPacket().getContentP("offset")->NumValue(); + data[13] = (offset >> 16) & 0xFF; + data[14] = (offset >> 8) & 0XFF; + data[15] = offset & 0xFF; + } + data[11] = 0; + if (S.metadata.getContentP("video")->getContentP("codec")->StrValue() == "H264"){data[11] += 7;} + if (S.metadata.getContentP("video")->getContentP("codec")->StrValue() == "H263"){data[11] += 2;} + if (S.getPacket().getContentP("keyframe")){data[11] += 0x10;} + if (S.getPacket().getContentP("interframe")){data[11] += 0x20;} + if (S.getPacket().getContentP("disposableframe")){data[11] += 0x30;} + break; + case DTSC::AUDIO: + if ((unsigned int)len == S.lastData().length() + 16){ + memcpy(data+12, S.lastData().c_str(), S.lastData().length()); + }else{ + memcpy(data+13, S.lastData().c_str(), S.lastData().length()); + data[12] = 1;//raw AAC data, not sequence header + } + data[11] = 0; + if (S.metadata.getContentP("audio")->getContentP("codec")->StrValue() == "AAC"){data[11] += 0xA0;} + if (S.metadata.getContentP("audio")->getContentP("codec")->StrValue() == "MP3"){data[11] += 0x20;} + if (S.metadata.getContentP("audio")->getContentP("rate")->NumValue() == 11025){data[11] += 0x04;} + if (S.metadata.getContentP("audio")->getContentP("rate")->NumValue() == 22050){data[11] += 0x08;} + if (S.metadata.getContentP("audio")->getContentP("rate")->NumValue() == 44100){data[11] += 0x0C;} + if (S.metadata.getContentP("audio")->getContentP("size")->NumValue() == 16){data[11] += 0x02;} + if (S.metadata.getContentP("audio")->getContentP("channels")->NumValue() > 1){data[11] += 0x01;} + break; + case DTSC::META: + memcpy(data+11, S.lastData().c_str(), S.lastData().length()); + break; + default: break; + } + } + ((unsigned int *)(data+len-4))[0] = len-15; + switch (S.lastType()){ + case DTSC::VIDEO: data[0] = 0x09; break; + case DTSC::AUDIO: data[0] = 0x08; break; + case DTSC::META: data[0] = 0x12; break; + default: break; + } + data[1] = ((len-15) >> 16) & 0xFF; + data[2] = ((len-15) >> 8) & 0xFF; + data[3] = (len-15) & 0xFF; + tagTime(S.getPacket().getContentP("time")->NumValue()); + return true; +} + +/// FLV Video init data loader function from DTSC. +/// Takes the DTSC Video init data and makes it into FLV. +/// Assumes init data is available - so check before calling! +bool FLV::Tag::DTSCVideoInit(DTSC::Stream & S){ + if (S.metadata.getContentP("video")->getContentP("codec")->StrValue() == "H264"){ + len = S.metadata.getContentP("video")->getContentP("init")->StrValue().length() + 20; + } + if (len > 0){ + if (!data){ + data = (char*)malloc(len); + buf = len; + }else{ + if (buf < len){ + data = (char*)realloc(data, len); + buf = len; + } + } + memcpy(data+16, S.metadata.getContentP("video")->getContentP("init")->StrValue().c_str(), len-20); + data[12] = 0;//H264 sequence header + data[13] = 0; + data[14] = 0; + data[15] = 0; + data[11] = 0x57;//H264 init data (0x07 & 0x50) + } + ((unsigned int *)(data+len-4))[0] = len-15; + switch (S.lastType()){ + case DTSC::VIDEO: data[0] = 0x09; break; + case DTSC::AUDIO: data[0] = 0x08; break; + case DTSC::META: data[0] = 0x12; break; + default: break; + } + data[1] = ((len-15) >> 16) & 0xFF; + data[2] = ((len-15) >> 8) & 0xFF; + data[3] = (len-15) & 0xFF; + tagTime(0); + return true; +} + +/// FLV Audio init data loader function from DTSC. +/// Takes the DTSC Audio init data and makes it into FLV. +/// Assumes init data is available - so check before calling! +bool FLV::Tag::DTSCAudioInit(DTSC::Stream & S){ + len = 0; + if (S.metadata.getContentP("audio")->getContentP("codec")->StrValue() == "AAC"){ + len = S.metadata.getContentP("audio")->getContentP("init")->StrValue().length() + 17; + } + if (len > 0){ + if (!data){ + data = (char*)malloc(len); + buf = len; + }else{ + if (buf < len){ + data = (char*)realloc(data, len); + buf = len; + } + } + memcpy(data+13, S.metadata.getContentP("audio")->getContentP("init")->StrValue().c_str(), len-17); + data[12] = 0;//AAC sequence header + data[11] = 0; + if (S.metadata.getContentP("audio")->getContentP("codec")->StrValue() == "AAC"){data[11] += 0xA0;} + if (S.metadata.getContentP("audio")->getContentP("codec")->StrValue() == "MP3"){data[11] += 0x20;} + if (S.metadata.getContentP("audio")->getContentP("rate")->NumValue() == 11000){data[11] += 0x04;} + if (S.metadata.getContentP("audio")->getContentP("rate")->NumValue() == 22000){data[11] += 0x08;} + if (S.metadata.getContentP("audio")->getContentP("rate")->NumValue() == 44000){data[11] += 0x0C;} + if (S.metadata.getContentP("audio")->getContentP("size")->NumValue() == 16){data[11] += 0x02;} + if (S.metadata.getContentP("audio")->getContentP("channels")->NumValue() > 1){data[11] += 0x01;} + } + ((unsigned int *)(data+len-4))[0] = len-15; + switch (S.lastType()){ + case DTSC::VIDEO: data[0] = 0x09; break; + case DTSC::AUDIO: data[0] = 0x08; break; + case DTSC::META: data[0] = 0x12; break; + default: break; + } + data[1] = ((len-15) >> 16) & 0xFF; + data[2] = ((len-15) >> 8) & 0xFF; + data[3] = (len-15) & 0xFF; + tagTime(0); + return true; +} + +/// FLV metadata loader function from DTSC. +/// Takes the DTSC metadata and makes it into FLV. +/// Assumes metadata is available - so check before calling! +bool FLV::Tag::DTSCMetaInit(DTSC::Stream & S){ + AMF::Object amfdata("root", AMF::AMF0_DDV_CONTAINER); + + amfdata.addContent(AMF::Object("", "onMetaData")); + amfdata.addContent(AMF::Object("", AMF::AMF0_ECMA_ARRAY)); + if (S.metadata.getContentP("video")){ + amfdata.getContentP(1)->addContent(AMF::Object("hasVideo", 1, AMF::AMF0_BOOL)); + if (S.metadata.getContentP("video")->getContentP("codec")->StrValue() == "H264"){ + amfdata.getContentP(1)->addContent(AMF::Object("videocodecid", 7, AMF::AMF0_NUMBER)); + } + if (S.metadata.getContentP("video")->getContentP("codec")->StrValue() == "VP6"){ + amfdata.getContentP(1)->addContent(AMF::Object("videocodecid", 4, AMF::AMF0_NUMBER)); + } + if (S.metadata.getContentP("video")->getContentP("codec")->StrValue() == "H263"){ + amfdata.getContentP(1)->addContent(AMF::Object("videocodecid", 2, AMF::AMF0_NUMBER)); + } + if (S.metadata.getContentP("video")->getContentP("width")){ + amfdata.getContentP(1)->addContent(AMF::Object("width", S.metadata.getContentP("video")->getContentP("width")->NumValue(), AMF::AMF0_NUMBER)); + } + if (S.metadata.getContentP("video")->getContentP("height")){ + amfdata.getContentP(1)->addContent(AMF::Object("height", S.metadata.getContentP("video")->getContentP("height")->NumValue(), AMF::AMF0_NUMBER)); + } + if (S.metadata.getContentP("video")->getContentP("fpks")){ + amfdata.getContentP(1)->addContent(AMF::Object("framerate", (double)S.metadata.getContentP("video")->getContentP("fpks")->NumValue() / 1000.0, AMF::AMF0_NUMBER)); + } + if (S.metadata.getContentP("video")->getContentP("bps")){ + amfdata.getContentP(1)->addContent(AMF::Object("videodatarate", ((double)S.metadata.getContentP("video")->getContentP("bps")->NumValue() * 8.0) / 1024.0, AMF::AMF0_NUMBER)); + } + } + if (S.metadata.getContentP("audio")){ + amfdata.getContentP(1)->addContent(AMF::Object("hasAudio", 1, AMF::AMF0_BOOL)); + amfdata.getContentP(1)->addContent(AMF::Object("audiodelay", 0, AMF::AMF0_NUMBER)); + if (S.metadata.getContentP("audio")->getContentP("codec")->StrValue() == "AAC"){ + amfdata.getContentP(1)->addContent(AMF::Object("audiocodecid", 10, AMF::AMF0_NUMBER)); + } + if (S.metadata.getContentP("audio")->getContentP("codec")->StrValue() == "MP3"){ + amfdata.getContentP(1)->addContent(AMF::Object("audiocodecid", 2, AMF::AMF0_NUMBER)); + } + if (S.metadata.getContentP("audio")->getContentP("channels")){ + if (S.metadata.getContentP("audio")->getContentP("channels")->NumValue() > 1){ + amfdata.getContentP(1)->addContent(AMF::Object("stereo", 1, AMF::AMF0_BOOL)); + }else{ + amfdata.getContentP(1)->addContent(AMF::Object("stereo", 0, AMF::AMF0_BOOL)); + } + } + if (S.metadata.getContentP("audio")->getContentP("rate")){ + amfdata.getContentP(1)->addContent(AMF::Object("audiosamplerate", S.metadata.getContentP("audio")->getContentP("rate")->NumValue(), AMF::AMF0_NUMBER)); + } + if (S.metadata.getContentP("audio")->getContentP("size")){ + amfdata.getContentP(1)->addContent(AMF::Object("audiosamplesize", S.metadata.getContentP("audio")->getContentP("size")->NumValue(), AMF::AMF0_NUMBER)); + } + if (S.metadata.getContentP("audio")->getContentP("bps")){ + amfdata.getContentP(1)->addContent(AMF::Object("audiodatarate", ((double)S.metadata.getContentP("audio")->getContentP("bps")->NumValue() * 8.0) / 1024.0, AMF::AMF0_NUMBER)); + } + } + + std::string tmp = amfdata.Pack(); + len = tmp.length() + 15; + if (len > 0){ + if (!data){ + data = (char*)malloc(len); + buf = len; + }else{ + if (buf < len){ + data = (char*)realloc(data, len); + buf = len; + } + } + memcpy(data+11, tmp.c_str(), len-15); + } + ((unsigned int *)(data+len-4))[0] = len-15; + data[0] = 0x12; + data[1] = ((len-15) >> 16) & 0xFF; + data[2] = ((len-15) >> 8) & 0xFF; + data[3] = (len-15) & 0xFF; + tagTime(0); + return true; +} + /// FLV loader function from chunk. /// Copies the contents and wraps it in a FLV header. bool FLV::Tag::ChunkLoader(const RTMPStream::Chunk& O){ diff --git a/util/flv_tag.h b/util/flv_tag.h index 1350c870..d349d533 100644 --- a/util/flv_tag.h +++ b/util/flv_tag.h @@ -3,6 +3,7 @@ #pragma once #include "socket.h" +#include "dtsc.h" #include //forward declaration of RTMPStream::Chunk to avoid circular dependencies. @@ -38,6 +39,10 @@ namespace FLV { Tag(const RTMPStream::Chunk& O); /// Date: Thu, 15 Sep 2011 18:48:57 +0200 Subject: [PATCH 06/21] Attempt to fix FLV --- util/flv_tag.cpp | 33 +++++++++++++++++++++------------ util/flv_tag.h | 1 + 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/util/flv_tag.cpp b/util/flv_tag.cpp index 3af96eea..f0fb956f 100644 --- a/util/flv_tag.cpp +++ b/util/flv_tag.cpp @@ -319,7 +319,7 @@ bool FLV::Tag::DTSCLoader(DTSC::Stream & S){ default: break; } } - ((unsigned int *)(data+len-4))[0] = len-15; + setLen(); switch (S.lastType()){ case DTSC::VIDEO: data[0] = 0x09; break; case DTSC::AUDIO: data[0] = 0x08; break; @@ -333,6 +333,19 @@ bool FLV::Tag::DTSCLoader(DTSC::Stream & S){ return true; } +/// Helper function that properly sets the tag length from the internal len variable. +void FLV::Tag::setLen(){ + int len4 = len - 4; + int i = data+len-1; + data[--i] = (len4) & 0xFF; + len4 >>= 8; + data[--i] = (len4) & 0xFF; + len4 >>= 8; + data[--i] = (len4) & 0xFF; + len4 >>= 8; + data[--i] = (len4) & 0xFF; +} + /// FLV Video init data loader function from DTSC. /// Takes the DTSC Video init data and makes it into FLV. /// Assumes init data is available - so check before calling! @@ -355,15 +368,10 @@ bool FLV::Tag::DTSCVideoInit(DTSC::Stream & S){ data[13] = 0; data[14] = 0; data[15] = 0; - data[11] = 0x57;//H264 init data (0x07 & 0x50) - } - ((unsigned int *)(data+len-4))[0] = len-15; - switch (S.lastType()){ - case DTSC::VIDEO: data[0] = 0x09; break; - case DTSC::AUDIO: data[0] = 0x08; break; - case DTSC::META: data[0] = 0x12; break; - default: break; + data[11] = 0x17;//H264 keyframe (0x07 & 0x10) } + setLen(); + data[0] = 0x09; data[1] = ((len-15) >> 16) & 0xFF; data[2] = ((len-15) >> 8) & 0xFF; data[3] = (len-15) & 0xFF; @@ -400,13 +408,14 @@ bool FLV::Tag::DTSCAudioInit(DTSC::Stream & S){ if (S.metadata.getContentP("audio")->getContentP("size")->NumValue() == 16){data[11] += 0x02;} if (S.metadata.getContentP("audio")->getContentP("channels")->NumValue() > 1){data[11] += 0x01;} } - ((unsigned int *)(data+len-4))[0] = len-15; + setLen(); switch (S.lastType()){ case DTSC::VIDEO: data[0] = 0x09; break; case DTSC::AUDIO: data[0] = 0x08; break; case DTSC::META: data[0] = 0x12; break; default: break; } + data[0] = 0x08; data[1] = ((len-15) >> 16) & 0xFF; data[2] = ((len-15) >> 8) & 0xFF; data[3] = (len-15) & 0xFF; @@ -487,7 +496,7 @@ bool FLV::Tag::DTSCMetaInit(DTSC::Stream & S){ } memcpy(data+11, tmp.c_str(), len-15); } - ((unsigned int *)(data+len-4))[0] = len-15; + setLen(); data[0] = 0x12; data[1] = ((len-15) >> 16) & 0xFF; data[2] = ((len-15) >> 8) & 0xFF; @@ -512,7 +521,7 @@ bool FLV::Tag::ChunkLoader(const RTMPStream::Chunk& O){ } memcpy(data+11, &(O.data[0]), O.len); } - ((unsigned int *)(data+len-4))[0] = O.len; + setLen(); data[0] = O.msg_type_id; data[3] = O.len & 0xFF; data[2] = (O.len >> 8) & 0xFF; diff --git a/util/flv_tag.h b/util/flv_tag.h index d349d533..6f1f7da7 100644 --- a/util/flv_tag.h +++ b/util/flv_tag.h @@ -51,6 +51,7 @@ namespace FLV { int buf; ///< Maximum length of buffer space. bool done; ///< Body reading done? unsigned int sofar; ///< How many bytes are read sofar? + void setLen(); //loader helper functions bool MemReadUntil(char * buffer, unsigned int count, unsigned int & sofar, char * D, unsigned int S, unsigned int & P); bool SockReadUntil(char * buffer, unsigned int count, unsigned int & sofar, Socket::Connection & sock); From d063e1ce962d95b17ddfbe487cabacd4870f3f6d Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 5 Dec 2011 15:05:01 +0100 Subject: [PATCH 07/21] Move DTSC tools to tools directory. --- {DTSC_Analyser => tools/DTSC_Analyser}/Makefile | 0 {DTSC_Analyser => tools/DTSC_Analyser}/main.cpp | 0 {FLV2DTSC => tools/FLV2DTSC}/Makefile | 0 {FLV2DTSC => tools/FLV2DTSC}/main.cpp | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {DTSC_Analyser => tools/DTSC_Analyser}/Makefile (100%) rename {DTSC_Analyser => tools/DTSC_Analyser}/main.cpp (100%) rename {FLV2DTSC => tools/FLV2DTSC}/Makefile (100%) rename {FLV2DTSC => tools/FLV2DTSC}/main.cpp (100%) diff --git a/DTSC_Analyser/Makefile b/tools/DTSC_Analyser/Makefile similarity index 100% rename from DTSC_Analyser/Makefile rename to tools/DTSC_Analyser/Makefile diff --git a/DTSC_Analyser/main.cpp b/tools/DTSC_Analyser/main.cpp similarity index 100% rename from DTSC_Analyser/main.cpp rename to tools/DTSC_Analyser/main.cpp diff --git a/FLV2DTSC/Makefile b/tools/FLV2DTSC/Makefile similarity index 100% rename from FLV2DTSC/Makefile rename to tools/FLV2DTSC/Makefile diff --git a/FLV2DTSC/main.cpp b/tools/FLV2DTSC/main.cpp similarity index 100% rename from FLV2DTSC/main.cpp rename to tools/FLV2DTSC/main.cpp From ec84fac33ee36aa86ff1b85bd2387089306b9f0b Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 5 Dec 2011 15:30:51 +0100 Subject: [PATCH 08/21] Buffer now compiles again --- Buffer/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Buffer/main.cpp b/Buffer/main.cpp index 992e9f17..ae03edd4 100644 --- a/Buffer/main.cpp +++ b/Buffer/main.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include "../util/dtsc.h" //DTSC support #include "../util/socket.h" //Socket lib #include "../util/json/json.h" @@ -193,7 +194,7 @@ namespace Buffer{ Storage["totals"] = Json::Value(Json::objectValue); - while((!feof(stdin) || ip_waiting) && !FLV::Parse_Error){ + while (!feof(stdin) || ip_waiting){ usleep(1000); //sleep for 1 ms, to prevent 100% CPU time unsigned int now = time(0); if (now != stattimer){ From 05364aad2edc886f8d15e0180518d01cbd4ada4e Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 5 Dec 2011 15:35:10 +0100 Subject: [PATCH 09/21] Fix DTSC tools compiling --- tools/DTSC_Analyser/Makefile | 2 +- tools/DTSC_Analyser/main.cpp | 2 +- tools/FLV2DTSC/Makefile | 2 +- tools/FLV2DTSC/main.cpp | 6 +++--- util/flv_tag.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/DTSC_Analyser/Makefile b/tools/DTSC_Analyser/Makefile index 2d12ca7e..ad834129 100644 --- a/tools/DTSC_Analyser/Makefile +++ b/tools/DTSC_Analyser/Makefile @@ -1,4 +1,4 @@ -SRC = main.cpp ../util/dtsc.cpp +SRC = main.cpp ../../util/dtsc.cpp OBJ = $(SRC:.cpp=.o) OUT = DTSC_Info INCLUDES = diff --git a/tools/DTSC_Analyser/main.cpp b/tools/DTSC_Analyser/main.cpp index 81176bac..e9c5463d 100644 --- a/tools/DTSC_Analyser/main.cpp +++ b/tools/DTSC_Analyser/main.cpp @@ -10,7 +10,7 @@ #include #include #include -#include "../util/dtsc.h" //DTSC support +#include "../../util/dtsc.h" //DTSC support /// Reads DTSC from stdin and outputs human-readable information to stderr. int main() { diff --git a/tools/FLV2DTSC/Makefile b/tools/FLV2DTSC/Makefile index 8787c723..6598d44a 100644 --- a/tools/FLV2DTSC/Makefile +++ b/tools/FLV2DTSC/Makefile @@ -1,4 +1,4 @@ -SRC = main.cpp ../util/flv_tag.cpp ../util/dtsc.cpp ../util/amf.cpp ../util/socket.cpp +SRC = main.cpp ../../util/flv_tag.cpp ../../util/dtsc.cpp ../../util/amf.cpp ../../util/socket.cpp OBJ = $(SRC:.cpp=.o) OUT = DDV_FLV2DTSC INCLUDES = diff --git a/tools/FLV2DTSC/main.cpp b/tools/FLV2DTSC/main.cpp index 5b17f381..3655432e 100644 --- a/tools/FLV2DTSC/main.cpp +++ b/tools/FLV2DTSC/main.cpp @@ -10,9 +10,9 @@ #include #include #include -#include "../util/flv_tag.h" //FLV support -#include "../util/dtsc.h" //DTSC support -#include "../util/amf.h" //AMF support +#include "../../util/flv_tag.h" //FLV support +#include "../../util/dtsc.h" //DTSC support +#include "../../util/amf.h" //AMF support // String onMetaData // ECMA Array diff --git a/util/flv_tag.cpp b/util/flv_tag.cpp index f0fb956f..c5b4b964 100644 --- a/util/flv_tag.cpp +++ b/util/flv_tag.cpp @@ -336,7 +336,7 @@ bool FLV::Tag::DTSCLoader(DTSC::Stream & S){ /// Helper function that properly sets the tag length from the internal len variable. void FLV::Tag::setLen(){ int len4 = len - 4; - int i = data+len-1; + int i = len-1; data[--i] = (len4) & 0xFF; len4 >>= 8; data[--i] = (len4) & 0xFF; From 09cb6b3c317380d354c8212ff9b4cc1450005e29 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Fri, 2 Mar 2012 17:48:20 +0100 Subject: [PATCH 10/21] Fixed DTSC info comment. --- util/dtsc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/dtsc.h b/util/dtsc.h index 30bbc092..3d690d53 100644 --- a/util/dtsc.h +++ b/util/dtsc.h @@ -13,7 +13,7 @@ /// Holds all DDVTECH Stream Container classes and parsers. ///Video: -/// - codec (string: AAC, MP3) +/// - codec (string: H264, H263, VP6) /// - width (int, pixels) /// - height (int, pixels) /// - fpks (int, frames per kilosecond (FPS * 1000)) @@ -21,7 +21,7 @@ /// - init (string, init data) /// ///Audio: -/// - codec (string: H264, H263, VP6) +/// - codec (string: AAC, MP3) /// - rate (int, Hz) /// - size (int, bitsize) /// - bps (int, bytes per second) From c63e018105793ff6e47b8d63af365e7fd855d118 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Mon, 12 Mar 2012 15:47:29 +0100 Subject: [PATCH 11/21] Fix bug in buffer, new stuff for TS #16 5.5h --- Buffer/main.cpp | 4 ++- Connector_TS/Makefile | 2 +- Connector_TS/main.cpp | 70 +++++++++++++++++++++---------------------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Buffer/main.cpp b/Buffer/main.cpp index ae03edd4..6476a778 100644 --- a/Buffer/main.cpp +++ b/Buffer/main.cpp @@ -211,7 +211,9 @@ namespace Buffer{ Storage["totals"]["up"] = tot_up; Storage["totals"]["count"] = tot_count; Storage["totals"]["now"] = now; - Storage["totals"]["buffer"] = argv[2]; + if( argc >= 4 ) { + Storage["totals"]["buffer"] = argv[2]; + } if (!StatsSocket.connected()){ StatsSocket = Socket::Connection("/tmp/ddv_statistics", true); } diff --git a/Connector_TS/Makefile b/Connector_TS/Makefile index a248e725..267fcece 100644 --- a/Connector_TS/Makefile +++ b/Connector_TS/Makefile @@ -1,4 +1,4 @@ -SRC = main.cpp ../util/socket.cpp ../util/flv_tag.cpp +SRC = main.cpp ../util/socket.cpp ../util/dtsc.cpp ../util/util.cpp OBJ = $(SRC:.cpp=.o) OUT = DDV_Conn_TS INCLUDES = diff --git a/Connector_TS/main.cpp b/Connector_TS/main.cpp index 2d800430..a296aba5 100644 --- a/Connector_TS/main.cpp +++ b/Connector_TS/main.cpp @@ -18,7 +18,7 @@ #include #include #include "../util/socket.h" -#include "../util/flv_tag.h" +#include "../util/dtsc.h" /// A simple class to create a single Transport Packet class Transport_Packet { @@ -216,37 +216,39 @@ void SendPMT( Socket::Connection conn ) { /// Wraps one or more NALU packets into transport packets /// \param tag The FLV Tag -std::vector WrapNalus( FLV::Tag tag ) { +std::vector WrapNalus( DTSC::DTMI Tag ) { static int ContinuityCounter = 0; static int Previous_Tag = 0; static int First_PCR = getNowMS(); static int Previous_PCR = 0; + static char LeadIn[4] = { (char)0x00, (char)0x00, (char)0x00, (char)0x001 }; int Current_PCR; int Current_Tag; - + std::string Data = Tag.getContentP("data")->StrValue(); + int Offset = 0; Transport_Packet TS; int Sent = 0; - int PacketAmount = ( ( tag.len - (188 - 35 ) ) / 184 ) + 2; + + int PacketAmount = ceil( ( ( Data.size() - (188 - 35 ) ) / 184 ) + 1 );//Minus first packet, + round up and first packet. std::vector Result; - char LeadIn[4] = { (char)0x00, (char)0x00, (char)0x00, (char)0x01 }; TS = Transport_Packet( true, 0x100 ); TS.SetContinuityCounter( ContinuityCounter ); ContinuityCounter = ( ( ContinuityCounter + 1 ) & 0x0F ); Current_PCR = getNowMS(); - Current_Tag = ( tag.data[7] << 24 ) + ( tag.data[4] << 16 ) + ( tag.data[5] << 8 ) + ( tag.data[6] ); + Current_Tag = Tag.getContentP("time")->NumValue(); if( true ) { //Current_PCR - Previous_PCR >= 1 ) { TS.SetAdaptationField( Current_PCR - First_PCR ); Offset = 8; Previous_PCR = Current_PCR; } - TS.SetPesHeader( 4 + Offset, tag.len - 16 , Current_Tag, Previous_Tag ); + TS.SetPesHeader( 4 + Offset, Data.size() , Current_Tag, Previous_Tag ); Previous_Tag = Current_Tag; - TS.SetPayload( LeadIn, 31, 23 + Offset ); - TS.SetPayload( &tag.data[16], 157 - Offset, 27 + Offset ); + TS.SetPayload( LeadIn, 4, 23 + Offset ); + TS.SetPayload( &Data[16], 157 - Offset, 27 + Offset ); Sent = 157 - Offset; Result.push_back( TS ); - while( Sent + 176 < tag.len - 16 ) { + while( Sent + 176 < Data.size() ) { // for( int i = 0; i < (PacketAmount - 1); i++ ) { TS = Transport_Packet( false, 0x100 ); TS.SetContinuityCounter( ContinuityCounter ); @@ -258,11 +260,11 @@ std::vector WrapNalus( FLV::Tag tag ) { Offset = 8; Previous_PCR = Current_PCR; } - TS.SetPayload( &tag.data[16 + Sent], 184 - Offset, 4 + Offset ); + TS.SetPayload( &Data[16 + Sent], 184 - Offset, 4 + Offset ); Sent += 184 - Offset; Result.push_back( TS ); } - if( Sent < ( tag.len - 16 ) ) { + if( Sent < ( Data.size() ) ) { Current_PCR = getNowMS(); Offset = 0; if( true ) { //now - Previous_PCR >= 5 ) { @@ -271,16 +273,16 @@ std::vector WrapNalus( FLV::Tag tag ) { Previous_PCR = Current_PCR; } std::cerr << "Wrapping packet: last packet length\n"; - std::cerr << "\tTotal:\t\t" << tag.len - 16 << "\n"; + std::cerr << "\tTotal:\t\t" << Data.size() << "\n"; std::cerr << "\tSent:\t\t" << Sent << "\n"; - int To_Send = ( tag.len - 16 ) - Sent; + int To_Send = ( Data.size() ) - Sent; std::cerr << "\tTo Send:\t" << To_Send << "\n"; std::cerr << "\tStuffing:\t" << 176 - To_Send << "\n"; char Stuffing = (char)0xFF; for( int i = 0; i < ( 176 - To_Send ); i++ ) { TS.SetPayload( &Stuffing, 1, 4 + Offset + i ); } - TS.SetPayload( &tag.data[16 + Sent], 176 - To_Send , 4 + Offset + ( 176 - To_Send ) ); + TS.SetPayload( &Data[16 + Sent], 176 - To_Send , 4 + Offset + ( 176 - To_Send ) ); Result.push_back( TS ); } return Result; @@ -301,12 +303,13 @@ void Transport_Packet::Write( Socket::Connection conn ) { /// The main function of the connector /// \param conn A connection with the client int TS_Handler( Socket::Connection conn ) { - FLV::Tag tag;///< Temporary tag buffer for incoming video data. + DTSC::Stream stream; +// FLV::Tag tag;///< Temporary tag buffer for incoming video data. bool inited = false; bool firstvideo = true; Socket::Connection ss(-1); int zet = 0; - while(conn.connected() && !FLV::Parse_Error) { + while(conn.connected()) {// && !FLV::Parse_Error) { if( !inited ) { ss = Socket::Connection("/tmp/shared_socket_fifa"); if (!ss.connected()){ @@ -331,27 +334,22 @@ int TS_Handler( Socket::Connection conn ) { break; case 0: break;//not ready yet default: - if (tag.SockLoader(ss)){//able to read a full packet? - 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 Meh = WrapNalus( tag ); - for( int i = 0; i < Meh.size( ); i++ ) { - Meh[i].Write( conn ); - } - std::cerr << "Item: " << ++zet << "\n"; - // } - } + ss.spool(); + if ( stream.parsePacket( conn.Received() ) ) { + if( stream.lastType() == DTSC::VIDEO ) { + fprintf(stderr, "Video contains NALU\n" ); + SendPAT( conn ); + SendPMT( conn ); + std::vector AllNalus = WrapNalus( stream.getPacket(0) ); + for( int i = 0; i < AllNalus.size( ); i++ ) { + AllNalus[i].Write( conn ); + } + std::cerr << "Item: " << ++zet << "\n"; } - if( tag.data[ 0 ] == 0x08 ) { - if( ( tag.data[ 11 ] == 0xAF ) && ( tag.data[ 12 ] == 0x01 ) ) { + if( stream.lastType() == DTSC::AUDIO ) { +// if( ( tag.data[ 11 ] == 0xAF ) && ( tag.data[ 12 ] == 0x01 ) ) { fprintf(stderr, "Audio Contains Raw AAC\n"); - } +// } } } break; From ff15e6c1a662a5efc710aa714596e1ecbead8f14 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Tue, 13 Mar 2012 08:42:37 +0100 Subject: [PATCH 12/21] "Added documentation to Connector_RTSP/main.cpp for #8" --- Connector_RTSP/main.cpp | 81 ++++++++++++++++++++++++++++++++++------- 1 file changed, 68 insertions(+), 13 deletions(-) diff --git a/Connector_RTSP/main.cpp b/Connector_RTSP/main.cpp index a861aec7..b0b0edd4 100644 --- a/Connector_RTSP/main.cpp +++ b/Connector_RTSP/main.cpp @@ -23,7 +23,9 @@ #include "rtp.h" /// Reads a single NALU from std::cin. Expected is H.264 Bytestream format. +/// Function was used as a way of debugging data. FLV does not contain all the metadata we need, so we had to try different approaches. /// \return The Nalu data. +/// \todo Throw this function away when everything works, it is not needed. std::string ReadNALU( ) { static char Separator[3] = { (char)0x00, (char)0x00, (char)0x01 }; std::string Buffer; @@ -38,62 +40,95 @@ std::string ReadNALU( ) { return Result; } -/// The main function of the connector -/// \param conn A connection with the client +/// The main function of the connector. +/// Used by server_setup.cpp in the bottom of the file, to start up the Connector. +/// This function contains the while loop the accepts connections, and sends them data. +/// \param conn A connection with the client. int RTSP_Handler( Socket::Connection conn ) { - FLV::Tag tag;///< Temporary tag buffer for incoming video data. + /// \todo Convert this to DTSC::DTMI, with an additional DTSC::Stream/ + FLV::Tag tag;// Temporary tag buffer for incoming video data. bool PlayVideo = false; bool PlayAudio = true; + //JRTPlib Objects to handle the RTP connection, which runs "parallel" to RTSP. jrtplib::RTPSession VideoSession; jrtplib::RTPSessionParams VideoParams; jrtplib::RTPUDPv6TransmissionParams VideoTransParams; std::string PreviousRequest = ""; Socket::Connection ss(-1); HTTP::Parser HTTP_R, HTTP_S; + //Some clients appear to expect a single request per connection. Don't know which ones. bool PerRequest = false; + //The main loop of the function while(conn.connected() && !FLV::Parse_Error) { if( HTTP_R.Read(conn ) ) { + //send Debug info to stderr. + //send the appropriate responses on RTSP Commands. fprintf( stderr, "REQUEST:\n%s\n", HTTP_R.BuildRequest().c_str() ); HTTP_S.protocol = "RTSP/1.0"; if( HTTP_R.method == "OPTIONS" ) { + //Always return the requested CSeq value. HTTP_S.SetHeader( "CSeq", HTTP_R.GetHeader( "CSeq" ).c_str() ); + //The minimal set of options required for RTSP, add new options here as well if we want to support these. HTTP_S.SetHeader( "Public", "OPTIONS, DESCRIBE, SETUP, TEARDOWN, PLAY" ); + //End the HTTP body, IMPORTANT!! Connection hangs otherwise!! HTTP_S.SetBody( "\r\n\r\n" ); fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() ); conn.write( HTTP_S.BuildResponse( "200", "OK" ) ); } else if ( HTTP_R.method == "DESCRIBE" ) { + ///\todo Implement DESCRIBE option. + //Don't know if a 501 response is seen as valid. If it is, don't bother changing it. if( HTTP_R.GetHeader( "Accept" ).find( "application/sdp" ) == std::string::npos ) { fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "501", "Not Implemented" ).c_str() ); conn.write( HTTP_S.BuildResponse( "501", "Not Implemented" ) ); } else { HTTP_S.SetHeader( "CSeq", HTTP_R.GetHeader( "CSeq" ).c_str() ); HTTP_S.SetHeader( "Content-Type", "application/sdp" ); - /// \todo Retrieve presence of video and audio data, and process into response - /// \todo Retrieve Packetization mode ( is 0 for now ). Where can I retrieve this? + /// \todo Retrieve presence of video and audio data, and process into response. Can now easily be done through DTSC::DTMI + /// \todo Retrieve Packetization mode ( is 0 for now ). I suppose this is the H264 packetization mode. Can maybe be retrieved from the docs on H64. + /// \todo Send a valid SDP file. + /// \todo Add audio to SDP file. + //This is just a dummy with data that was supposedly right for our teststream. + //SDP Docs: http://tools.ietf.org/html/rfc4566 + //v=0 + //o=- 0 0 IN IP4 ddvtech.com + //s=Fifa Test + //c=IN IP4 127.0.0.1 + //t=0 0 + //a=recvonly + //m=video 0 RTP/AVP 98 + //a=control:rtsp://localhost/fifa/video + //a=rtpmap:98 H264/90000 + //a=fmtp:98 packetization-mode=0 HTTP_S.SetBody( "v=0\r\no=- 0 0 IN IP4 ddvtech.com\r\ns=Fifa Test\r\nc=IN IP4 127.0.0.1\r\nt=0 0\r\na=recvonly\r\nm=video 0 RTP/AVP 98\r\na=control:rtsp://localhost/fifa/video\r\na=rtpmap:98 H264/90000\r\na=fmtp:98 packetization-mode=0\r\n\r\n");//m=audio 0 RTP/AAP 96\r\na=control:rtsp://localhost/fifa/audio\r\na=rtpmap:96 mpeg4-generic/16000/2\r\n\r\n"); fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() ); conn.write( HTTP_S.BuildResponse( "200", "OK" ) ); } } else if ( HTTP_R.method == "SETUP" ) { std::string temp = HTTP_R.GetHeader("Transport"); + //Extract the random UTP pair for video data ( RTP/RTCP) int ClientRTPLoc = temp.find( "client_port=" ) + 12; int PortSpacer = temp.find( "-", ClientRTPLoc ); int RTPClientPort = atoi( temp.substr( ClientRTPLoc, ( PortSpacer - ClientRTPLoc ) ).c_str() ); if( HTTP_S.GetHeader( "Session" ) != "" ) { + //Return an error if a second client tries to connect with an already running stream. fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "459", "Aggregate Operation Not Allowed" ).c_str() ); conn.write( HTTP_S.BuildResponse( "459", "Aggregate Operation Not Allowed" ) ); } else { HTTP_S.SetHeader( "CSeq", HTTP_R.GetHeader( "CSeq" ).c_str() ); HTTP_S.SetHeader( "Session", time(NULL) ); /// \todo "Random" generation of server_ports - if( HTTP_R.url.find( "audio" ) != std::string::npos ) { - HTTP_S.SetHeader( "Transport", HTTP_R.GetHeader( "Transport" ) + ";server_port=50002-50003" ); - } else { + /// \todo Add support for audio +// if( HTTP_R.url.find( "audio" ) != std::string::npos ) { +// HTTP_S.SetHeader( "Transport", HTTP_R.GetHeader( "Transport" ) + ";server_port=50002-50003" ); +// } else { + //send video data HTTP_S.SetHeader( "Transport", HTTP_R.GetHeader( "Transport" ) + ";server_port=50000-50001" ); + //Stub data for testing purposes. This should now be extracted somehow from DTSC::DTMI VideoParams.SetOwnTimestampUnit( ( 1.0 / 29.917 ) * 90000.0 ); VideoParams.SetMaximumPacketSize( 10000 ); - //pick the right port here + //pick the right port here VideoTransParams.SetPortbase( 50000 ); + //create a JRTPlib session int VideoStatus = VideoSession.Create( VideoParams, &VideoTransParams, jrtplib::RTPTransmitter::IPv6UDPProto ); if( VideoStatus < 0 ) { std::cerr << jrtplib::RTPGetErrorString( VideoStatus ) << std::endl; @@ -101,13 +136,15 @@ int RTSP_Handler( Socket::Connection conn ) { } else { std::cerr << "Created video session\n"; } - /// \todo retrieve other client than localhost --> Socket::Connection has no support for this yet? - + + /// \todo Connect with clients other than localhost uint8_t localip[32]; int status = inet_pton( AF_INET6, conn.getHost().c_str(), localip ) ; + //Debug info std::cerr << "Status: " << status << "\n"; jrtplib::RTPIPv6Address addr(localip,RTPClientPort); + //add the destination address to the VideoSession VideoStatus = VideoSession.AddDestination(addr); if (VideoStatus < 0) { std::cerr << jrtplib::RTPGetErrorString(VideoStatus) << std::endl; @@ -115,19 +152,24 @@ int RTSP_Handler( Socket::Connection conn ) { } else { std::cerr << "Destination Set\n"; } + //Stub data for testing purposes. + //Payload type should confirm with the SDP File. 98 == H264 / AVC VideoSession.SetDefaultPayloadType(98); VideoSession.SetDefaultMark(false); + //We have no idea if this timestamp has to correspond with the OwnTimeStampUnit() above. VideoSession.SetDefaultTimestampIncrement( ( 1.0 / 29.917 ) * 90000 ); - } +// } HTTP_S.SetBody( "\r\n\r\n" ); fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() ); conn.write( HTTP_S.BuildResponse( "200", "OK" ) ); } } else if( HTTP_R.method == "PLAY" ) { if( HTTP_R.GetHeader( "Range" ).substr(0,4) != "npt=" ) { + //We do not support this, whatever it is. Not needed for minimal compliance. fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "501", "Not Implemented" ).c_str() ); conn.write( HTTP_S.BuildResponse( "501", "Not Implemented" ) ); } else { + //Initializes for actual streaming over the SETUP connection. HTTP_S.SetHeader( "CSeq", HTTP_R.GetHeader( "CSeq" ).c_str() ); HTTP_S.SetHeader( "Session", HTTP_R.GetHeader( "Session" ) ); HTTP_S.SetHeader( "Range", HTTP_R.GetHeader( "Range" ) ); @@ -135,15 +177,20 @@ int RTSP_Handler( Socket::Connection conn ) { HTTP_S.SetBody( "\r\n\r\n" ); fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() ); conn.write( HTTP_S.BuildResponse( "200", "OK" ) ); + //Used further down, to start streaming video. + //PlayAudio = true; PlayVideo = true; } } else if( HTTP_R.method == "TEARDOWN" ) { + //If we were sending any stream data at this point, stop it, but keep the setup. HTTP_S.SetHeader( "CSeq", HTTP_R.GetHeader( "CSeq" ).c_str() ); HTTP_S.SetBody( "\r\n\r\n" ); fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "200", "OK" ).c_str() ); conn.write( HTTP_S.BuildResponse( "200", "OK" ) ); + //PlayAudio = false; PlayVideo = false; } else { + //We do not implement other commands ( yet ) fprintf( stderr, "RESPONSE:\n%s\n", HTTP_S.BuildResponse( "501", "Not Implemented" ).c_str() ); conn.write( HTTP_S.BuildResponse( "501", "Not Implemented" ) ); } @@ -154,14 +201,18 @@ int RTSP_Handler( Socket::Connection conn ) { } } if( PlayVideo ) { - /// \todo Select correct source + /// \todo Select correct source. This should become the DTSC::DTMI or the DTSC::Stream, whatever seems more natural. std::string VideoBuf = ReadNALU( ); if( VideoBuf == "" ) { + //videobuffer is empty, no more data. jrtplib::RTPTime delay = jrtplib::RTPTime(10.0); VideoSession.BYEDestroy(delay,"Out of data",11); conn.close(); } else { + //Send a single NALU (H264 block) here. VideoSession.SendPacket( VideoBuf.c_str(), VideoBuf.size(), 98, false, ( 1.0 / 29.917 ) * 90000 ); + //we can add delays here as follows: + //don't know if these are nescecary or not, but good for testing nonetheless // jrtplib::RTPTime delay( ( 1.0 / 29.917 ) * 90000 ); // jrtplib::RTPTime::Wait( delay ); } @@ -170,7 +221,11 @@ int RTSP_Handler( Socket::Connection conn ) { return 0; } +//Set Default Port #define DEFAULT_PORT 554 +//Set the function that should be forked for each client #define MAINHANDLER RTSP_Handler +//Set the section in the Config file, though we will not use this yet #define CONFIGSECT RTSP +//Include the main functionality, as well as fork support and everything. #include "../util/server_setup.cpp" From 5c2623ae48f409eab4e9c18b0966548dab73eb83 Mon Sep 17 00:00:00 2001 From: That-Guy Date: Sun, 18 Mar 2012 21:27:28 +0100 Subject: [PATCH 13/21] added log reader to server.html and fixed stream group bug (#17, done, 0.5h) --- server.html | 85 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 14 deletions(-) diff --git a/server.html b/server.html index 743cbc33..42b94b22 100644 --- a/server.html +++ b/server.html @@ -25,7 +25,7 @@ h2 { margin: 0 0 10px 0; - background-color: #000; + background-color: #333; color: #fff; font-size: 1.2em; padding: 5px; @@ -52,13 +52,13 @@ width: 25%; } - #stream-limit-table + #stream-limit-table, #logs table { width: 100%; margin: 10px 0 20px 15px; } - #stream-limit-table th + #stream-limit-table th, #logs th, #limits-table th { text-align: left; } @@ -69,12 +69,6 @@ width: 100%; } - #limits-table th - { - text-align: left; - } - - #limits p, #protocols p { margin: 20px 0 5px 15px; @@ -307,6 +301,24 @@ +
+ +

Logs

+ + + + + + + + + +
DateTypeMessage
+ +
+ + + From b58742e24d10f01d8e2a2249df406ab47690ff27 Mon Sep 17 00:00:00 2001 From: That-Guy Date: Thu, 22 Mar 2012 15:22:57 +0100 Subject: [PATCH 14/21] server.html check commit --- server.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.html b/server.html index 42b94b22..315c2ea2 100644 --- a/server.html +++ b/server.html @@ -193,7 +193,7 @@ From f3372b9e51f53831d9b35d5320955e87dedb6d16 Mon Sep 17 00:00:00 2001 From: That-Guy Date: Thu, 22 Mar 2012 16:06:39 +0100 Subject: [PATCH 15/21] several fixes for non-complete JSON settings file (#17, 1h) --- server.html | 78 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 20 deletions(-) diff --git a/server.html b/server.html index 315c2ea2..fb91ae12 100644 --- a/server.html +++ b/server.html @@ -164,6 +164,16 @@ margin: 10px 0 5px 15px; } + .errorlogin + { + color: #c33; + } + + .correctlogin + { + color: #393; + } + @@ -183,12 +193,12 @@