Merge lp:~phablet-team/media-hub/fix-1596329 into lp:media-hub
Proposed by
Jim Hodapp
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Scott Sweeny | ||||
Approved revision: | 196 | ||||
Merged at revision: | 198 | ||||
Proposed branch: | lp:~phablet-team/media-hub/fix-1596329 | ||||
Merge into: | lp:media-hub | ||||
Diff against target: |
211 lines (+76/-30) 7 files modified
src/core/media/engine.h (+1/-1) src/core/media/gstreamer/engine.cpp (+2/-2) src/core/media/gstreamer/engine.h (+2/-1) src/core/media/gstreamer/playbin.cpp (+49/-19) src/core/media/gstreamer/playbin.h (+7/-3) src/core/media/metadata.cpp (+13/-3) src/core/media/player_implementation.cpp (+2/-1) |
||||
To merge this branch: | bzr merge lp:~phablet-team/media-hub/fix-1596329 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Scott Sweeny (community) | Approve | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email: mp+298829@code.launchpad.net |
Commit message
To avoid deadlocking, make sure that we don't ever change the pipeline's state on the streaming thread. It will always be set from the main thread context thanks to g_idle_add(). The deadlock that this fixes was when calling stop() in player_
Description of the change
To avoid deadlocking, make sure that we don't ever change the pipeline's state on the streaming thread. It will always be set from the main thread context thanks to g_idle_add(). The deadlock that this fixes was when calling stop() in player_
To post a comment you must log in.
LGTM