diff options
| author | Marco Nelissen <marcone@google.com> | 2014-08-20 09:44:44 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-08-20 11:12:23 -0700 |
| commit | eb645a0d1820b227af287a5309f017afadbab4e3 (patch) | |
| tree | ca86c9068cf2a3ec5eaed29c5cb02c9a93ee2d33 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.h | |
| parent | 5596d7c4ad388d1757398181b3a1453d731a1b41 (diff) | |
| download | frameworks_av-eb645a0d1820b227af287a5309f017afadbab4e3.zip frameworks_av-eb645a0d1820b227af287a5309f017afadbab4e3.tar.gz frameworks_av-eb645a0d1820b227af287a5309f017afadbab4e3.tar.bz2 | |
Fix NuPlayer deadlock
Mutexes can't be locked recursively. This would cause a seek in the prepared
state to deadlock
Bug: 14057920
Change-Id: Ifb5e25f24450b7e5f71611a8ee2bdba45dba70a7
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h index f520395..a006d8f 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.h @@ -69,6 +69,7 @@ struct NuPlayerDriver : public MediaPlayerInterface { void notifyDuration(int64_t durationUs); void notifyPosition(int64_t positionUs); void notifySeekComplete(); + void notifySeekComplete_l(); void notifyFrameStats(int64_t numFramesTotal, int64_t numFramesDropped); void notifyListener(int msg, int ext1 = 0, int ext2 = 0, const Parcel *in = NULL); void notifyFlagsChanged(uint32_t flags); |