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

Make MP4 input more consistent and verbose in erroring out during initial read

Browse source
This commit is contained in:
Thulinma 2022-10-25 10:10:36 +02:00
parent 63afd0b72a
commit 0db153b7b9
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/input/input_mp4.cpp
View file

@ -268,6 +268,13 @@ namespace Mist{
} }
} }
if (!hasMoov){
FAIL_MSG("No MOOV box found in source file; aborting!");
if (!inFile){FAIL_MSG("URIReader for source file was disconnected!");}
return false;
}
// See whether a separate header file exists. // See whether a separate header file exists.
if (readExistingHeader()){ if (readExistingHeader()){
bps = 0; bps = 0;
@ -278,11 +285,6 @@ namespace Mist{
INFO_MSG("Not read existing header"); INFO_MSG("Not read existing header");
meta.reInit(isSingular() ? streamName : ""); meta.reInit(isSingular() ? streamName : "");
if (!hasMoov){
FAIL_MSG("No MOOV box found; aborting header creation!");
return false;
}
tNumber = 0; tNumber = 0;
// Create header file from MP4 data // Create header file from MP4 data
MP4::Box moovBox(readBuffer, false); MP4::Box moovBox(readBuffer, false);