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

Some edits to FLV parsing and RTMP fixes... not quite working yet (in Flash player, that is...)

Browse source
This commit is contained in:
Thulinma 2011-08-13 03:01:33 +02:00
parent d76f7f5c46
commit 353bc8aa66
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
util/flv_tag.cpp
View file

@ -17,7 +17,7 @@ std::string FLV::Error_Str = "";
/// - Not starting with the string "FLV". /// - Not starting with the string "FLV".
/// - The DataOffset is not 9 bytes. /// - The DataOffset is not 9 bytes.
/// - The PreviousTagSize is not 0 bytes. /// - The PreviousTagSize is not 0 bytes.
/// ///
/// Note that we see PreviousTagSize as part of the FLV header, not part of the tag header! /// Note that we see PreviousTagSize as part of the FLV header, not part of the tag header!
bool FLV::check_header(char * header){ bool FLV::check_header(char * header){
if (header[0] != 'F') return false; if (header[0] != 'F') return false;
@ -43,6 +43,27 @@ bool FLV::is_header(char * header){
return true; return true;
}//FLV::is_header }//FLV::is_header
/// True if current tag is init data for this media type.
bool FLV::Tag::isInitData(){
switch (data[0]){
case 0x09:
switch (data[11] & 0xF0){
case 0x50: return true; break;
}
if ((data[11] & 0x0F) == 7){
switch (data[12]){
case 0: return true; break;
}
}
break;
case 0x08:
if ((data[12] == 0) && ((data[11] & 0xF0) == 0xA0)){
return true;
}
break;
}
return false;
}
/// Returns a std::string describing the tag in detail. /// Returns a std::string describing the tag in detail.
/// The string includes information about whether the tag is /// The string includes information about whether the tag is
@ -355,7 +376,7 @@ bool FLV::Tag::FileLoader(FILE * f){
int postflags = preflags | O_NONBLOCK; int postflags = preflags | O_NONBLOCK;
fcntl(fileno(f), F_SETFL, postflags); fcntl(fileno(f), F_SETFL, postflags);
if (buf < 15){data = (char*)realloc(data, 15); buf = 15;} if (buf < 15){data = (char*)realloc(data, 15); buf = 15;}
if (done){ if (done){
//read a header //read a header
if (FileReadUntil(data, 11, sofar, f)){ if (FileReadUntil(data, 11, sofar, f)){

3
util/flv_tag.h
View file

@ -11,7 +11,7 @@ namespace FLV {
extern char Header[13]; ///< Holds the last FLV header parsed. extern char Header[13]; ///< Holds the last FLV header parsed.
extern bool Parse_Error; ///< This variable is set to true if a problem is encountered while parsing the FLV. extern bool Parse_Error; ///< This variable is set to true if a problem is encountered while parsing the FLV.
extern std::string Error_Str; ///< This variable is set if a problem is encountered while parsing the FLV. extern std::string Error_Str; ///< This variable is set if a problem is encountered while parsing the FLV.
//functions //functions
bool check_header(char * header); ///< Checks a FLV Header for validness. bool check_header(char * header); ///< Checks a FLV Header for validness.
bool is_header(char * header); ///< Checks the first 3 bytes for the string "FLV". bool is_header(char * header); ///< Checks the first 3 bytes for the string "FLV".
@ -22,6 +22,7 @@ namespace FLV {
int len; ///< Actual length of tag. int len; ///< Actual length of tag.
bool isKeyframe; ///< True if current tag is a video keyframe. bool isKeyframe; ///< True if current tag is a video keyframe.
char * data; ///< Pointer to tag buffer. char * data; ///< Pointer to tag buffer.
bool isInitData(); ///< True if current tag is init data for this media type.
std::string tagType(); ///< Returns a std::string describing the tag in detail. std::string tagType(); ///< Returns a std::string describing the tag in detail.
unsigned int tagTime(); ///< Returns the 32-bit timestamp of this tag. unsigned int tagTime(); ///< Returns the 32-bit timestamp of this tag.
void tagTime(unsigned int T); ///< Sets the 32-bit timestamp of this tag. void tagTime(unsigned int T); ///< Sets the 32-bit timestamp of this tag.