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

Fix null-array bug in JSON lib as well as flv_tag compile warnings.

Browse source
This commit is contained in:
Thulinma 2012-05-11 15:45:29 +02:00
parent b90c4e2623
commit cd0d79790b
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/flv_tag.cpp
View file

@ -795,25 +795,25 @@ DTSC::DTMI FLV::Tag::toDTSC(DTSC::DTMI & metadata){
} }
} }
if (tmp->getContentP("width")){ if (tmp->getContentP("width")){
Meta_Put(metadata, "video", "width", tmp->getContentP("width")->NumValue()); Meta_Put(metadata, "video", "width", (unsigned long long int)tmp->getContentP("width")->NumValue());
} }
if (tmp->getContentP("height")){ if (tmp->getContentP("height")){
Meta_Put(metadata, "video", "height", tmp->getContentP("height")->NumValue()); Meta_Put(metadata, "video", "height", (unsigned long long int)tmp->getContentP("height")->NumValue());
} }
if (tmp->getContentP("framerate")){ if (tmp->getContentP("framerate")){
Meta_Put(metadata, "video", "fpks", tmp->getContentP("framerate")->NumValue()*1000); Meta_Put(metadata, "video", "fpks", (unsigned long long int)tmp->getContentP("framerate")->NumValue()*1000);
} }
if (tmp->getContentP("videodatarate")){ if (tmp->getContentP("videodatarate")){
Meta_Put(metadata, "video", "bps", (tmp->getContentP("videodatarate")->NumValue()*1024)/8); Meta_Put(metadata, "video", "bps", (unsigned long long int)(tmp->getContentP("videodatarate")->NumValue()*1024)/8);
} }
if (tmp->getContentP("audiodatarate")){ if (tmp->getContentP("audiodatarate")){
Meta_Put(metadata, "audio", "bps", (tmp->getContentP("audiodatarate")->NumValue()*1024)/8); Meta_Put(metadata, "audio", "bps", (unsigned long long int)(tmp->getContentP("audiodatarate")->NumValue()*1024)/8);
} }
if (tmp->getContentP("audiosamplerate")){ if (tmp->getContentP("audiosamplerate")){
Meta_Put(metadata, "audio", "rate", tmp->getContentP("audiosamplerate")->NumValue()); Meta_Put(metadata, "audio", "rate", (unsigned long long int)tmp->getContentP("audiosamplerate")->NumValue());
} }
if (tmp->getContentP("audiosamplesize")){ if (tmp->getContentP("audiosamplesize")){
Meta_Put(metadata, "audio", "size", tmp->getContentP("audiosamplesize")->NumValue()); Meta_Put(metadata, "audio", "size", (unsigned long long int)tmp->getContentP("audiosamplesize")->NumValue());
} }
if (tmp->getContentP("stereo")){ if (tmp->getContentP("stereo")){
if (tmp->getContentP("stereo")->NumValue() == 1){ if (tmp->getContentP("stereo")->NumValue() == 1){

8
lib/json.cpp
View file

@ -98,12 +98,16 @@ JSON::Value::Value(std::istream & fromstream){
c = fromstream.get(); c = fromstream.get();
myType = OBJECT; myType = OBJECT;
break; break;
case '[': case '[':{
reading_array = true; reading_array = true;
c = fromstream.get(); c = fromstream.get();
myType = ARRAY; myType = ARRAY;
append(JSON::Value(fromstream)); Value tmp = JSON::Value(fromstream);
if (tmp.myType != EMPTY){
append(tmp);
}
break; break;
}
case '\'': case '\'':
case '"': case '"':
c = fromstream.get(); c = fromstream.get();