From 91e5e043d766e39b0840f2ca2e658e2fe58987e7 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Thu, 26 Mar 2015 14:16:17 -0700 Subject: Fix seek issue The removed code was original added to fix a deadlock, but is no longer needed. Bug: http://b/19947213 Change-Id: I4dd9d6fdf5eb6c0fb654953569dc87b820579f84 --- media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'media') diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 5887e50..1fa9cef 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -356,14 +356,6 @@ status_t NuPlayerDriver::seekTo(int msec) { case STATE_PREPARED: case STATE_STOPPED_AND_PREPARED: { - int curpos = 0; - if (mPositionUs > 0) { - curpos = (mPositionUs + 500ll) / 1000; - } - if (curpos == msec) { - // nothing to do, and doing something anyway could result in deadlock (b/15323063) - break; - } mStartupSeekTimeUs = seekTimeUs; // pretend that the seek completed. It will actually happen when starting playback. // TODO: actually perform the seek here, so the player is ready to go at the new -- cgit v1.1