Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 14:32:35 +01:00
Code Issues Projects Releases Wiki Activity

Avoid throwing exceptions when trying to open an AVI (to make debugging more pleasant).

Browse Source
This commit is contained in:
J.D. Purcell 2015-10-11 16:25:18 -04:00
parent 0d63370c10
commit 210de3b279
2 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libse/ContainerFormats/RiffParser.cs
View File

@ -149,12 +149,12 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats
/// </summary>
/// <param name="filename">File to examine</param>
/// <returns>True if file is a RIFF file</returns>
public void OpenFile(string filename)
public bool TryOpenFile(string filename)
{
// Sanity check
if (null != m_stream)
{
throw new RiffParserException("RIFF file already open " + FileName);
return false;
}
bool errorOccured = false;
@ -184,40 +184,28 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats
// Check for a valid RIFF header
string riff = FromFourCC(FourCC);
if (riff == RIFF4CC || riff == RIFX4CC)
if (riff != RIFF4CC && riff != RIFX4CC)
{
// Good header. Check size
//Console.WriteLine(ShortName + " has a valid type \"" + riff + "\"");
//Console.WriteLine(ShortName + " has a specific type of \"" + FromFourCC(fileType) + "\"");
// Not a valid RIFF file
errorOccured = true;
return false;
}
m_datasize = datasize;
if (m_filesize >= m_datasize + TWODWORDSSIZE)
{
//Console.WriteLine(ShortName + " has a valid size");
}
else
{
m_stream.Close(); m_stream = null;
throw new RiffParserException("Error. Truncated file " + FileName);
}
}
else
// Good header. Check size
//Console.WriteLine(ShortName + " has a valid type \"" + riff + "\"");
//Console.WriteLine(ShortName + " has a specific type of \"" + FromFourCC(fileType) + "\"");
m_datasize = datasize;
if (m_filesize < m_datasize + TWODWORDSSIZE)
{
m_stream.Close();
m_stream.Dispose();
m_stream = null;
throw new RiffParserException("Error. Not a valid RIFF file " + FileName);
// Truncated file
errorOccured = true;
return false;
}
}
catch (RiffParserException)
catch
{
errorOccured = true;
throw;
}
catch (Exception exception)
{
errorOccured = true;
throw new RiffParserException("Error. Problem reading file " + FileName, exception);
}
finally
{
@ -228,6 +216,8 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats
m_stream = null;
}
}
return !errorOccured;
}
/// <summary>

7
libse/Utilities.cs
View File

@ -76,12 +76,11 @@ namespace Nikse.SubtitleEdit.Core
{
using (var rp = new RiffParser())
{
var dh = new RiffDecodeHeader(rp);
rp.OpenFile(fileName);
info.FileType = RiffParser.FromFourCC(rp.FileType);
if (RiffParser.ckidAVI == rp.FileType)
if (rp.TryOpenFile(fileName) && rp.FileType == RiffParser.ckidAVI)
{
var dh = new RiffDecodeHeader(rp);
dh.ProcessMainAVI();
info.FileType = RiffParser.FromFourCC(rp.FileType);
info.Width = dh.Width;
info.Height = dh.Height;
info.FramesPerSecond = dh.FrameRate;