jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix opening files

Browse Source
This commit is contained in:
jfmcarreira
2015-01-06 18:58:39 +00:00
parent b3a4f913b9
commit f346e5e7fe
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/VideoSubWindow.cpp
+13 -12
View File
@@ -126,19 +126,10 @@ Void VideoSubWindow::reloadFile()
Bool VideoSubWindow::loadFile( QString cFilename, Bool bForceDialog )
{
UInt Width = 0, Height = 0, FrameRate = 30;
Int InputFormat = -1;
Int InputFormat = PlaYUVerFrame::YUV420p;
if( !m_pCurrStream )
{
m_pCurrStream = new PlaYUVerStream;
}
else
{
delete m_pCurrStream;
m_pCurrStream = new PlaYUVerStream;
}
m_pCurrStream->getFormat( Width, Height, InputFormat, FrameRate );
if( m_pCurrStream )
m_pCurrStream->getFormat( Width, Height, InputFormat, FrameRate );
if( m_pCurrStream->guessFormat( cFilename, Width, Height, InputFormat, FrameRate ) || bForceDialog )
{
@@ -151,6 +142,16 @@ Bool VideoSubWindow::loadFile( QString cFilename, Bool bForceDialog )
QApplication::setOverrideCursor( Qt::WaitCursor );
QApplication::restoreOverrideCursor();
if( !m_pCurrStream )
{
m_pCurrStream = new PlaYUVerStream;
}
else
{
delete m_pCurrStream;
m_pCurrStream = new PlaYUVerStream;
}
m_pCurrStream->open( cFilename, Width, Height, InputFormat, FrameRate );
m_sStreamInfo.m_cFilename = cFilename;