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

Fixed HLS VoD audio quality and synchronization issues.

Browse source
This commit is contained in:
Thulinma 2013-03-12 02:03:25 +01:00
parent 924cd2342e
commit 6a254806c0
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/conn_http_live.cpp
View file

@ -51,6 +51,7 @@ namespace Connector_HTTP {
/// Returns a m3u or m3u8 index file /// Returns a m3u or m3u8 index file
std::string BuildIndex(std::string & MovieId, JSON::Value & metadata){ std::string BuildIndex(std::string & MovieId, JSON::Value & metadata){
std::stringstream Result; std::stringstream Result;
if ( !metadata.isMember("live")){
std::vector<int> fragIndices = keyframesToFragments(metadata); std::vector<int> fragIndices = keyframesToFragments(metadata);
int longestFragment = 0; int longestFragment = 0;
for (int i = 1; i < fragIndices.size(); i++){ for (int i = 1; i < fragIndices.size(); i++){
@ -59,7 +60,6 @@ namespace Connector_HTTP {
longestFragment = fragDuration; longestFragment = fragDuration;
} }
} }
if (metadata.isMember("vod")){
Result << "#EXTM3U\r\n" Result << "#EXTM3U\r\n"
//"#EXT-X-VERSION:1\r\n" //"#EXT-X-VERSION:1\r\n"
//"#EXT-X-ALLOW-CACHE:YES\r\n" //"#EXT-X-ALLOW-CACHE:YES\r\n"
@ -76,7 +76,7 @@ namespace Connector_HTTP {
}else{ }else{
Result << "#EXTM3U\r\n" Result << "#EXTM3U\r\n"
"#EXT-X-MEDIA-SEQUENCE:" << metadata["missed_frags"].asInt() <<"\r\n" "#EXT-X-MEDIA-SEQUENCE:" << metadata["missed_frags"].asInt() <<"\r\n"
"#EXT-X-TARGETDURATION:10\r\n"; "#EXT-X-TARGETDURATION:30\r\n";
for (JSON::ArrIter ai = metadata["frags"].ArrBegin(); ai != metadata["frags"].ArrEnd(); ai++){ for (JSON::ArrIter ai = metadata["frags"].ArrBegin(); ai != metadata["frags"].ArrEnd(); ai++){
Result << "#EXTINF:" << (*ai)["dur"].asInt() / 1000 << ", no desc\r\n" << (*ai)["num"].asInt() << "_" << (*ai)["len"].asInt() << ".ts\r\n"; Result << "#EXTINF:" << (*ai)["dur"].asInt() / 1000 << ", no desc\r\n" << (*ai)["num"].asInt() << "_" << (*ai)["len"].asInt() << ".ts\r\n";
} }
@ -167,7 +167,7 @@ namespace Connector_HTTP {
int frameCount = atoi(HTTP_R.url.substr(temp, HTTP_R.url.find(".ts", temp) - temp).c_str()); int frameCount = atoi(HTTP_R.url.substr(temp, HTTP_R.url.find(".ts", temp) - temp).c_str());
std::stringstream sstream; std::stringstream sstream;
sstream << "f " << Segment + 1 << "\n"; sstream << "f " << Segment << "\n";
for (int i = 0; i < frameCount; i++){ for (int i = 0; i < frameCount; i++){
sstream << "o \n"; sstream << "o \n";
} }