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

HLS working, dunno why, but it works.

Browse source
This commit is contained in:
Erik Zandvliet 2013-07-10 11:27:26 +02:00 • committed by Thulinma
parent 768282866e
commit db2e630436
5 changed files with 50 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/flv_tag.cpp
View file

@ -1071,6 +1071,7 @@ JSON::Value FLV::Tag::toJSON(JSON::Value & metadata){
}
pack_out["datatype"] = "audio";
pack_out["time"] = tagTime();
pack_out["trackid"] = 2;
metadata["tracks"]["track2"]["trackid"] = 2;
metadata["tracks"]["track2"]["type"] = "audio";
if ( !metadata["tracks"]["track2"].isMember("codec") || metadata["tracks"]["track2"]["codec"].asString() == "?" || metadata["tracks"]["track2"]["codec"].asString() == ""){
@ -1145,6 +1146,7 @@ JSON::Value FLV::Tag::toJSON(JSON::Value & metadata){
metadata["tracks"]["track1"]["codec"] = getVideoCodec();
}
pack_out["datatype"] = "video";
pack_out["trackid"] = 1;
switch (videodata & 0xF0){
case 0x10:
pack_out["keyframe"] = 1;