- Fix seek using ffmpeg libs
 - Fix close of VideoSubWindow
This commit is contained in:
jfmcarreira committed 2018-01-31 01:32:29 +00:00
1 parent 87156f24b8
commit 0a8a31bce8
4 files changed
+15 -2

No files matched your search

+1 -1
View File
@@ -136,7 +136,7 @@ public:
protected:
void focusInEvent( QFocusEvent* event );
void closeEvent( QCloseEvent* event );
virtual void closeEvent( QCloseEvent* event );
Void setWidget( QWidget* widget );
+10
View File
@@ -196,6 +196,12 @@ VideoSubWindow::~VideoSubWindow()
* Events handlers
*/
Void VideoSubWindow::closeEvent( QCloseEvent* event )
{
stop();
SubWindowAbstract::closeEvent( event );
}
Void VideoSubWindow::keyPressEvent( QKeyEvent* event )
{
if( m_pcCurrentDisplayModule )
@@ -791,6 +797,10 @@ Void VideoSubWindow::seekRelativeEvent( Bool bIsFoward )
Void VideoSubWindow::stop()
{
#ifndef QT_NO_CONCURRENT
m_cRefreshResult.waitForFinished();
m_cReadResult.waitForFinished();
#endif
m_bIsPlaying = false;
seekAbsoluteEvent( 0 );
return;
+1 -1
View File
@@ -204,7 +204,7 @@ private:
protected:
Void keyPressEvent( QKeyEvent* event );
Void resizeEvent( QResizeEvent* event );
// void closeEvent( QCloseEvent *event );
Void closeEvent( QCloseEvent *event );
public Q_SLOTS:
void updateWindowOnTimeout();
+3
View File
@@ -374,6 +374,9 @@ Bool StreamHandlerLibav::write( PlaYUVerFrame* pcFrame )
Bool StreamHandlerLibav::seek( UInt64 iFrameNum )
{
if( m_uiTotalNumberFrames == 1 )
return true;
if( m_uiCurrFrameFileIdx == iFrameNum )
return true;