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

Get width and height from sps when incorrect in mp4 file

Browse source
This commit is contained in:
Erik Zandvliet 2016-04-08 11:06:51 +02:00
parent 939924439d
commit 90419e15eb
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/flv_tag.cpp
View file

@ -1110,7 +1110,6 @@ JSON::Value FLV::Tag::toJSON(DTSC::Meta & metadata, AMF::Object & amf_storage, u
metadata.tracks[reTrack].width = spsChar.width; metadata.tracks[reTrack].width = spsChar.width;
metadata.tracks[reTrack].height = spsChar.height; metadata.tracks[reTrack].height = spsChar.height;
metadata.tracks[reTrack].fpks = spsChar.fps * 1000; metadata.tracks[reTrack].fpks = spsChar.fps * 1000;
} }
pack_out.null(); pack_out.null();
return pack_out; //skip rest of parsing, get next tag. return pack_out; //skip rest of parsing, get next tag.

9
src/input/input_mp4.cpp
View file

@ -8,6 +8,7 @@
#include <mist/stream.h> #include <mist/stream.h>
#include <mist/flv_tag.h> #include <mist/flv_tag.h>
#include <mist/defines.h> #include <mist/defines.h>
#include <mist/h264.h>
#include "input_mp4.h" #include "input_mp4.h"
@ -387,6 +388,14 @@ namespace Mist {
if (tmpContent.getType() == "avcC"){ if (tmpContent.getType() == "avcC"){
myMeta.tracks[trackNo].init = std::string(tmpContent.payload(),tmpContent.payloadSize()); myMeta.tracks[trackNo].init = std::string(tmpContent.payload(),tmpContent.payloadSize());
} }
///this is a hacky way around invalid FLV data (since it gets ignored nearly everywhere, but we do need correct data...
if (!myMeta.tracks[trackNo].width || !myMeta.tracks[trackNo].height || !myMeta.tracks[trackNo].fpks){
h264::sequenceParameterSet sps;
sps.fromDTSCInit(myMeta.tracks[trackNo].init);
h264::SPSMeta spsChar = sps.getCharacteristics();
myMeta.tracks[trackNo].width = spsChar.width;
myMeta.tracks[trackNo].height = spsChar.height;
}
}else if (tmpType == "hev1" || tmpType == "hvc1"){ }else if (tmpType == "hev1" || tmpType == "hvc1"){
myMeta.tracks[trackNo].type = "video"; myMeta.tracks[trackNo].type = "video";
myMeta.tracks[trackNo].codec = "HEVC"; myMeta.tracks[trackNo].codec = "HEVC";