Skip to content

bug fix: fixed race condition in FFMPEGMovie global state init #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdumusc merged 1 commit into from
Jan 26, 2017
Merged

bug fix: fixed race condition in FFMPEGMovie global state init #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Raphael Dumusc <raphael.dumusc@epfl.ch>

cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
project(Tide VERSION 1.2.1)
project(Tide VERSION 1.2.2)
set(Tide_VERSION_ABI 1)

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake
Expand Down
6 changes: 6 additions & 0 deletions doc/Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog {#changelog}
============

# Release 1.2.2 (25-01-2017)

* [116](https://github.com/BlueBrain/Tide/pull/116):
Bugfix: the application could crash when opening a session containing
multiple video files for the first time.

# Release 1.2.1 (16-12-2016)

* [113](https://github.com/BlueBrain/Tide/pull/113):
Expand Down
29 changes: 12 additions & 17 deletions tide/core/data/FFMPEGMovie.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,21 @@ int ffmpegLockManagerCallback( void** mutex, enum AVLockOp op )
}
}

struct FFMPEGStaticInit
{
FFMPEGStaticInit()
{
av_lockmgr_register( &ffmpegLockManagerCallback );
av_register_all();
}
};
static FFMPEGStaticInit instance;

FFMPEGMovie::FFMPEGMovie( const QString& uri )
: _avFormatContext( 0 )
, _streamPosition( 0.0 )
, _isValid( false )
{
FFMPEGMovie::initGlobalState();
_isValid = _open( uri );
}
, _isValid( _open( uri ))
{}

FFMPEGMovie::~FFMPEGMovie()
{
Expand Down Expand Up @@ -139,18 +146,6 @@ void FFMPEGMovie::_releaseAvFormatContext()
avformat_close_input( &_avFormatContext );
}

void FFMPEGMovie::initGlobalState()
{
static bool initialized = false;

if( !initialized )
{
av_lockmgr_register( &ffmpegLockManagerCallback );
av_register_all();
initialized = true;
}
}

bool FFMPEGMovie::isValid() const
{
return _isValid;
Expand Down
3 changes: 0 additions & 3 deletions tide/core/data/FFMPEGMovie.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@ class FFMPEGMovie
double _streamPosition;
bool _isValid;

/** Init the global FFMPEG context. */
static void initGlobalState();

bool _open( const QString& uri );
bool _createAvFormatContext( const QString& uri );
void _releaseAvFormatContext();
Expand Down
2 changes: 1 addition & 1 deletion tide/master/control/DisplayGroupController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ void DisplayGroupController::hidePanels()
void DisplayGroupController::moveWindowToFront( const QUuid id )
{
const auto window = _group.getContentWindow( id );
if( window->getMode() == ContentWindow::WindowMode::STANDARD )
if( window && window->getMode() == ContentWindow::WindowMode::STANDARD )
_group.moveToFront( window );
}

Expand Down