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

Minor fixes to HLS code.

Browse source
This commit is contained in:
Thulinma 2013-02-05 16:17:49 +01:00
parent bc3356337e
commit 2f4095d7bc
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/conn_http_live.cpp
View file

@ -32,7 +32,7 @@ namespace Connector_HTTP {
return result; return result;
} }
result.push_back(0); result.push_back(0);
int currentBase = 0; int currentBase = metadata["keytime"][0u].asInt();
for (int i = 0; i < metadata["keytime"].size(); i++){ for (int i = 0; i < metadata["keytime"].size(); i++){
if ((metadata["keytime"][i].asInt() - currentBase) > 10000){ if ((metadata["keytime"][i].asInt() - currentBase) > 10000){
currentBase = metadata["keytime"][i].asInt(); currentBase = metadata["keytime"][i].asInt();
@ -70,9 +70,8 @@ namespace Connector_HTTP {
Result << "#EXT-X-ENDLIST"; Result << "#EXT-X-ENDLIST";
}else{ }else{
Result << "#EXTM3U\r\n" Result << "#EXTM3U\r\n"
"#EXT-X-VERSION:4\r\n"
"#EXT-X-MEDIA-SEQUENCE:0\r\n" "#EXT-X-MEDIA-SEQUENCE:0\r\n"
"#EXT-X-TARGETDURATION:" << ((metadata["video"]["keyms"].asInt() + metadata["video"]["keyvar"].asInt()) / 1000) + 1 << "\r\n"; "#EXT-X-TARGETDURATION:" << (longestFragment / 1000) + 1 << "\r\n";
} }
#if DEBUG >= 8 #if DEBUG >= 8
std::cerr << "Sending this index:" << std::endl << Result.str() << std::endl; std::cerr << "Sending this index:" << std::endl << Result.str() << std::endl;
@ -106,8 +105,6 @@ namespace Connector_HTTP {
char AudioCounter = 0; char AudioCounter = 0;
bool WritePesHeader; bool WritePesHeader;
bool IsKeyFrame; bool IsKeyFrame;
bool FirstKeyFrame = true;
bool FirstIDRInKeyFrame;
MP4::AVCC avccbox; MP4::AVCC avccbox;
bool haveAvcc = false; bool haveAvcc = false;
@ -293,13 +290,7 @@ namespace Connector_HTTP {
if (Strm.lastType() == DTSC::VIDEO || Strm.lastType() == DTSC::AUDIO){ if (Strm.lastType() == DTSC::VIDEO || Strm.lastType() == DTSC::AUDIO){
if (Strm.lastType() == DTSC::VIDEO){ if (Strm.lastType() == DTSC::VIDEO){
DTMIData = Strm.lastData(); DTMIData = Strm.lastData();
if (Strm.getPacket(0).isMember("keyframe")){ IsKeyFrame = Strm.getPacket(0).isMember("keyframe");
IsKeyFrame = true;
FirstIDRInKeyFrame = true;
}else{
IsKeyFrame = false;
FirstKeyFrame = false;
}
if (IsKeyFrame){ if (IsKeyFrame){
TimeStamp = (Strm.getPacket(0)["time"].asInt() * 27000); TimeStamp = (Strm.getPacket(0)["time"].asInt() * 27000);
} }