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

Fixed FLV framerate -> videoframerate in metadata.

Browse source
This commit is contained in:
Thulinma 2015-01-15 10:10:54 +01:00
parent 79fdf3f2c9
commit b988431aff
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/flv_tag.cpp
View file

@ -1064,8 +1064,8 @@ JSON::Value FLV::Tag::toJSON(DTSC::Meta & metadata) {
} else { } else {
metadata.tracks[1].height = 0; metadata.tracks[1].height = 0;
} }
if (tmp->getContentP("framerate")) { if (tmp->getContentP("videoframerate")) {
metadata.tracks[1].fpks = (long long int)(tmp->getContentP("framerate")->NumValue() * 1000.0); metadata.tracks[1].fpks = (long long int)(tmp->getContentP("videoframerate")->NumValue() * 1000.0);
} else { } else {
metadata.tracks[1].fpks = 0; metadata.tracks[1].fpks = 0;
} }
@ -1099,7 +1099,7 @@ JSON::Value FLV::Tag::toJSON(DTSC::Meta & metadata) {
metadata.tracks[2].channels = 1; metadata.tracks[2].channels = 1;
} }
for (int i = 0; i < tmp->hasContent(); ++i) { for (int i = 0; i < tmp->hasContent(); ++i) {
if (tmp->getContentP(i)->Indice() == "videocodecid" || tmp->getContentP(i)->Indice() == "audiocodecid" || tmp->getContentP(i)->Indice() == "width" || tmp->getContentP(i)->Indice() == "height" || tmp->getContentP(i)->Indice() == "framerate" || tmp->getContentP(i)->Indice() == "videodatarate" || tmp->getContentP(i)->Indice() == "audiodatarate" || tmp->getContentP(i)->Indice() == "audiosamplerate" || tmp->getContentP(i)->Indice() == "audiosamplesize" || tmp->getContentP(i)->Indice() == "audiochannels") { if (tmp->getContentP(i)->Indice() == "videocodecid" || tmp->getContentP(i)->Indice() == "audiocodecid" || tmp->getContentP(i)->Indice() == "width" || tmp->getContentP(i)->Indice() == "height" || tmp->getContentP(i)->Indice() == "videodatarate" || tmp->getContentP(i)->Indice() == "videoframerate" || tmp->getContentP(i)->Indice() == "audiodatarate" || tmp->getContentP(i)->Indice() == "audiosamplerate" || tmp->getContentP(i)->Indice() == "audiosamplesize" || tmp->getContentP(i)->Indice() == "audiochannels") {
continue; continue;
} }
if (tmp->getContentP(i)->NumValue()) { if (tmp->getContentP(i)->NumValue()) {