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

Fixed DTSC::File (now actually works) and updated DTSC metadata information in the documentation.

Browse source
This commit is contained in:
Thulinma 2012-08-23 17:05:32 +02:00
parent 8a9d4d6ee1
commit 75a420db2a
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/dtsc.cpp
View file

@ -520,9 +520,10 @@ DTSC::File::File(std::string filename, bool create){
/// Sets the file pointer to the first packet. /// Sets the file pointer to the first packet.
std::string & DTSC::File::getHeader(){ std::string & DTSC::File::getHeader(){
fseek(F, 8, SEEK_SET); fseek(F, 8, SEEK_SET);
strbuffer.reserve(headerSize); strbuffer.resize(headerSize);
fread((void*)strbuffer.c_str(), headerSize, 1, F); fread((void*)strbuffer.c_str(), headerSize, 1, F);
fseek(F, 8+headerSize, SEEK_SET); fseek(F, 8+headerSize, SEEK_SET);
return strbuffer;
} }
/// (Re)writes the given string to the header area if the size is the same as the existing header. /// (Re)writes the given string to the header area if the size is the same as the existing header.
@ -532,9 +533,9 @@ bool DTSC::File::writeHeader(std::string & header, bool force){
fprintf(stderr, "Could not overwrite header - not equal size\n"); fprintf(stderr, "Could not overwrite header - not equal size\n");
return false; return false;
} }
headerSize = header.size() - 8; headerSize = header.size();
fseek(F, 0, SEEK_SET); fseek(F, 8, SEEK_SET);
int ret = fwrite(header.c_str(), 8+headerSize, 1, F); int ret = fwrite(header.c_str(), headerSize, 1, F);
fseek(F, 8+headerSize, SEEK_SET); fseek(F, 8+headerSize, SEEK_SET);
return (ret == 1); return (ret == 1);
} }
@ -558,8 +559,8 @@ std::string & DTSC::File::getPacket(){
return strbuffer; return strbuffer;
} }
long packSize = ntohl(((uint32_t *)buffer)[0]); long packSize = ntohl(((uint32_t *)buffer)[0]);
strbuffer.reserve(packSize); strbuffer.resize(packSize);
if (fread((void*)strbuffer.c_str(), packSize, 1, F)){ if (fread((void*)strbuffer.c_str(), packSize, 1, F) != 1){
fprintf(stderr, "Could not read packet\n"); fprintf(stderr, "Could not read packet\n");
strbuffer = ""; strbuffer = "";
return strbuffer; return strbuffer;

8
lib/dtsc.h
View file

@ -13,15 +13,19 @@
/// Holds all DDVTECH Stream Container classes and parsers. /// Holds all DDVTECH Stream Container classes and parsers.
///Video: ///length (int, length in seconds, if available)
///video:
/// - codec (string: H264, H263, VP6) /// - codec (string: H264, H263, VP6)
/// - width (int, pixels) /// - width (int, pixels)
/// - height (int, pixels) /// - height (int, pixels)
/// - fpks (int, frames per kilosecond (FPS * 1000)) /// - fpks (int, frames per kilosecond (FPS * 1000))
/// - bps (int, bytes per second) /// - bps (int, bytes per second)
/// - init (string, init data) /// - init (string, init data)
/// - keyms (int, average ms per keyframe)
/// - keyvar (int, max ms per keyframe variance)
/// - keys (array of byte position ints - first is first keyframe, last is last keyframe, in between have ~equal spacing)
/// ///
///Audio: ///audio:
/// - codec (string: AAC, MP3) /// - codec (string: AAC, MP3)
/// - rate (int, Hz) /// - rate (int, Hz)
/// - size (int, bitsize) /// - size (int, bitsize)