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

Fixed aspect ratios in MP4.

Browse source
This commit is contained in:
Thulinma 2015-09-29 14:38:28 +02:00
parent 3b92a56707
commit 0c94e17e70
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/input/input_mp4.cpp
View file

@ -374,8 +374,10 @@ namespace Mist {
if (tmpType == "avc1" || tmpType == "h264" || tmpType == "mp4v"){ if (tmpType == "avc1" || tmpType == "h264" || tmpType == "mp4v"){
myMeta.tracks[trackNo].type = "video"; myMeta.tracks[trackNo].type = "video";
myMeta.tracks[trackNo].codec = "H264"; myMeta.tracks[trackNo].codec = "H264";
myMeta.tracks[trackNo].width = ((MP4::VisualSampleEntry&)tmpBox).getWidth(); if (!myMeta.tracks[trackNo].width){
myMeta.tracks[trackNo].height = ((MP4::VisualSampleEntry&)tmpBox).getHeight(); myMeta.tracks[trackNo].width = ((MP4::VisualSampleEntry&)tmpBox).getWidth();
myMeta.tracks[trackNo].height = ((MP4::VisualSampleEntry&)tmpBox).getHeight();
}
MP4::Box tmpBox2 = tmpBox; MP4::Box tmpBox2 = tmpBox;
MP4::Box tmpContent = ((MP4::VisualSampleEntry&)tmpBox2).getCLAP(); MP4::Box tmpContent = ((MP4::VisualSampleEntry&)tmpBox2).getCLAP();
if (tmpContent.getType() == "avcC"){ if (tmpContent.getType() == "avcC"){
@ -388,8 +390,10 @@ namespace Mist {
}else if (tmpType == "hev1"){ }else if (tmpType == "hev1"){
myMeta.tracks[trackNo].type = "video"; myMeta.tracks[trackNo].type = "video";
myMeta.tracks[trackNo].codec = "HEVC"; myMeta.tracks[trackNo].codec = "HEVC";
myMeta.tracks[trackNo].width = ((MP4::VisualSampleEntry&)tmpBox).getWidth(); if (!myMeta.tracks[trackNo].width){
myMeta.tracks[trackNo].height = ((MP4::VisualSampleEntry&)tmpBox).getHeight(); myMeta.tracks[trackNo].width = ((MP4::VisualSampleEntry&)tmpBox).getWidth();
myMeta.tracks[trackNo].height = ((MP4::VisualSampleEntry&)tmpBox).getHeight();
}
MP4::Box tmpBox2 = ((MP4::VisualSampleEntry&)tmpBox).getCLAP(); MP4::Box tmpBox2 = ((MP4::VisualSampleEntry&)tmpBox).getCLAP();
myMeta.tracks[trackNo].init = std::string(tmpBox2.payload(),tmpBox2.payloadSize()); myMeta.tracks[trackNo].init = std::string(tmpBox2.payload(),tmpBox2.payloadSize());
}else if (tmpType == "mp4a" || tmpType == "aac " || tmpType == "ac-3"){ }else if (tmpType == "mp4a" || tmpType == "aac " || tmpType == "ac-3"){