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

Several bugfixes (HTTP dynamic seeking!) and updates to the MP4 lib.

Browse source
This commit is contained in:
Thulinma 2012-09-28 18:56:15 +02:00
parent a91e53e0bc
commit 521c19f932
8 changed files with 177 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/converters/dtscfix.cpp
View file

@ -12,10 +12,21 @@ namespace Converters{
/// Reads an DTSC file and attempts to fix the metadata in it.
int DTSCFix(Util::Config & conf) {
DTSC::File F(conf.getString("filename"));
std::string loader = F.getHeader();
JSON::Value meta = JSON::fromDTMI(loader);
JSON::Value oriheader = F.getMeta();
JSON::Value meta = oriheader;
JSON::Value pack;
if (!oriheader.isMember("moreheader")){
std::cerr << "This file is not DTSCFix'able. Please re-convert and try again." << std::endl;
return 1;
}
if (oriheader["moreheader"].asInt() > 0){
std::cerr << "Warning: This file has already been DTSCFix'ed. Doing this multiple times makes the file larger for no reason." << std::endl;
}
meta.removeMember("keytime");
meta.removeMember("keybpos");
meta.removeMember("moreheader");
long long unsigned int firstpack = 0;
long long unsigned int nowpack = 0;
long long unsigned int lastaudio = 0;
@ -54,6 +65,8 @@ namespace Converters{
if (bps > vid_max){vid_max = bps;}
}
if (F.getJSON()["keyframe"].asInt() != 0){
meta["keytime"].append(F.getJSON()["time"]);
meta["keybpos"].append(F.getLastReadPos());
if (lastkey != 0){
bps = nowpack - lastkey;
if (bps < key_min){key_min = bps;}
@ -73,12 +86,10 @@ namespace Converters{
F.seekNext();
}
std::cout << std::endl << "Summary:" << std::endl;
meta["length"] = (long long int)((nowpack - firstpack)/1000);
meta["lastms"] = (long long int)nowpack;
if (meta.isMember("audio")){
meta["audio"]["bps"] = (long long int)(totalaudio / ((lastaudio - firstpack) / 1000));
std::cout << " Audio: " << meta["audio"]["codec"].asString() << std::endl;
std::cout << " Bitrate: " << meta["audio"]["bps"].asInt() << std::endl;
}
if (meta.isMember("video")){
meta["video"]["bps"] = (long long int)(totalvideo / ((lastvideo - firstpack) / 1000));
@ -88,16 +99,20 @@ namespace Converters{
}else{
meta["video"]["keyvar"] = (long long int)(key_max - meta["video"]["keyms"].asInt());
}
std::cout << " Video: " << meta["video"]["codec"].asString() << std::endl;
std::cout << " Bitrate: " << meta["video"]["bps"].asInt() << std::endl;
std::cout << " Keyframes: " << meta["video"]["keyms"].asInt() << "~" << meta["video"]["keyvar"].asInt() << std::endl;
std::cout << " B-frames: " << bfrm_min << " - " << bfrm_max << std::endl;
}
std::cerr << "Appending new header..." << std::endl;
std::string loader = meta.toPacked();
long long int newHPos = F.addHeader(loader);
if (!newHPos){
std::cerr << "Failure appending new header. Cancelling." << std::endl;
return 1;
}
std::cerr << "Re-writing header..." << std::endl;
loader = meta.toPacked();
oriheader["moreheader"] = newHPos;
loader = oriheader.toPacked();
if (F.writeHeader(loader)){
std::cerr << "Metadata is now: " << meta.toPrettyString(0) << std::endl;
return 0;
}else{
return -1;

4
src/converters/flv2dtsc.cpp
View file

@ -36,6 +36,7 @@ namespace Converters{
counter++;
if (counter > 8){
sending = true;
meta_out["moreheader"] = 0LL;
std::string packed_header = meta_out.toPacked();
unsigned int size = htonl(packed_header.size());
std::cout << std::string(DTSC::Magic_Header, 4) << std::string((char*)&size, 4) << packed_header;
@ -59,12 +60,13 @@ namespace Converters{
// if the FLV input is very short, do output it correctly...
if (!sending){
std::cerr << "EOF - outputting buffer..." << std::endl;
meta_out["moreheader"] = 0LL;
std::string packed_header = meta_out.toPacked();
unsigned int size = htonl(packed_header.size());
std::cout << std::string(DTSC::Magic_Header, 4) << std::string((char*)&size, 4) << packed_header;
std::cout << prebuffer.rdbuf();
}
std::cerr << "Done!" << std::endl;
std::cerr << "Done! If you output this data to a file, don't forget to run MistDTSCFix next." << std::endl;
return 0;
}//FLV2DTSC