Pass variables as reference to LibAvContextHandle and change cursor
handling when loading a new file
This commit is contained in:
1 parent
87cd3fe5e5
commit
72e6ca9643
4 files changed
+4
-5
No files matched your search
@@ -130,7 +130,7 @@ Void InputStream::init( QString filename, UInt width, UInt height, Int input_for
|
||||
m_iPixelFormat = input_format;
|
||||
|
||||
#ifdef USE_FFMPEG
|
||||
Bool avStatus = m_cLibAvContext.initAvFormat( filename, width, height );
|
||||
Bool avStatus = m_cLibAvContext.initAvFormat( filename, width, height, input_format );
|
||||
#endif
|
||||
|
||||
if( m_uiWidth <= 0 || m_uiHeight <= 0 )
|
||||
|
||||
@@ -82,7 +82,7 @@ Void LibAvContextHandle::closeAvFormat()
|
||||
av_free( video_dst_data[0] );
|
||||
}
|
||||
|
||||
Bool LibAvContextHandle::initAvFormat( QString filename, UInt width, UInt height )
|
||||
Bool LibAvContextHandle::initAvFormat( QString filename, UInt& width, UInt& height, Int& pixel_format )
|
||||
{
|
||||
Bool bRet = true;
|
||||
int ret = 0;
|
||||
|
||||
@@ -46,7 +46,7 @@ namespace plaYUVer
|
||||
class LibAvContextHandle
|
||||
{
|
||||
public:
|
||||
Bool initAvFormat( QString filename, UInt width, UInt height );
|
||||
Bool initAvFormat( QString filename, UInt& width, UInt& height, Int& pixel_format );
|
||||
Void closeAvFormat();
|
||||
Bool decodeAvFormat();
|
||||
|
||||
|
||||
@@ -73,9 +73,8 @@ bool SubWindowHandle::loadFile( const QString &fileName )
|
||||
{
|
||||
m_currStream.init( fileName, 0, 0, 0 );
|
||||
}
|
||||
|
||||
QApplication::setOverrideCursor( Qt::WaitCursor );
|
||||
|
||||
QApplication::restoreOverrideCursor();
|
||||
if( m_currStream.getStatus() == 0 )
|
||||
{
|
||||
return false;
|
||||
|
||||
Reference in new issue
Block a user