Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev

Browse Source
This commit is contained in:
Robert Shih
2016-06-01 17:16:59 +00:00
committed by Android (Google) Code Review
parent 93193135b1 ed78114ffd
commit d579be0cf2
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
media/java/android/media/MediaPlayer.java
View File

@@ -2276,6 +2276,8 @@ public class MediaPlayer extends PlayerBase
Log.w(TAG, "addSubtitleSource called with null InputStream"); Log.w(TAG, "addSubtitleSource called with null InputStream");
} }
getMediaTimeProvider();
// process each subtitle in its own thread // process each subtitle in its own thread
final HandlerThread thread = new HandlerThread("SubtitleReadThread", final HandlerThread thread = new HandlerThread("SubtitleReadThread",
Process.THREAD_PRIORITY_BACKGROUND + Process.THREAD_PRIORITY_MORE_FAVORABLE); Process.THREAD_PRIORITY_BACKGROUND + Process.THREAD_PRIORITY_MORE_FAVORABLE);
@@ -2302,7 +2304,12 @@ public class MediaPlayer extends PlayerBase
synchronized (mIndexTrackPairs) { synchronized (mIndexTrackPairs) {
mIndexTrackPairs.add(Pair.<Integer, SubtitleTrack>create(null, track)); mIndexTrackPairs.add(Pair.<Integer, SubtitleTrack>create(null, track));
} }
track.onData(contents.getBytes(), true /* eos */, ~0 /* runID: keep forever */); Handler h = mTimeProvider.mEventHandler;
int what = TimeProvider.NOTIFY;
int arg1 = TimeProvider.NOTIFY_TRACK_DATA;
Pair<SubtitleTrack, byte[]> trackData = Pair.create(track, contents.getBytes());
Message m = h.obtainMessage(what, arg1, 0, trackData);
h.sendMessage(m);
return MEDIA_INFO_EXTERNAL_METADATA_UPDATE; return MEDIA_INFO_EXTERNAL_METADATA_UPDATE;
} }
@@ -2501,6 +2508,8 @@ public class MediaPlayer extends PlayerBase
mIndexTrackPairs.add(Pair.<Integer, SubtitleTrack>create(null, track)); mIndexTrackPairs.add(Pair.<Integer, SubtitleTrack>create(null, track));
} }
getMediaTimeProvider();
final FileDescriptor fd3 = fd2; final FileDescriptor fd3 = fd2;
final long offset2 = offset; final long offset2 = offset;
final long length2 = length; final long length2 = length;
@@ -2526,7 +2535,12 @@ public class MediaPlayer extends PlayerBase
total += bytes; total += bytes;
} }
} }
track.onData(bos.toByteArray(), true /* eos */, ~0 /* runID: keep forever */); Handler h = mTimeProvider.mEventHandler;
int what = TimeProvider.NOTIFY;
int arg1 = TimeProvider.NOTIFY_TRACK_DATA;
Pair<SubtitleTrack, byte[]> trackData = Pair.create(track, bos.toByteArray());
Message m = h.obtainMessage(what, arg1, 0, trackData);
h.sendMessage(m);
return MEDIA_INFO_EXTERNAL_METADATA_UPDATE; return MEDIA_INFO_EXTERNAL_METADATA_UPDATE;
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, e.getMessage(), e); Log.e(TAG, e.getMessage(), e);
@@ -3528,6 +3542,7 @@ public class MediaPlayer extends PlayerBase
private static final int REFRESH_AND_NOTIFY_TIME = 1; private static final int REFRESH_AND_NOTIFY_TIME = 1;
private static final int NOTIFY_STOP = 2; private static final int NOTIFY_STOP = 2;
private static final int NOTIFY_SEEK = 3; private static final int NOTIFY_SEEK = 3;
private static final int NOTIFY_TRACK_DATA = 4;
private HandlerThread mHandlerThread; private HandlerThread mHandlerThread;
/** @hide */ /** @hide */
@@ -3667,6 +3682,12 @@ public class MediaPlayer extends PlayerBase
} }
} }
private synchronized void notifyTrackData(Pair<SubtitleTrack, byte[]> trackData) {
SubtitleTrack track = trackData.first;
byte[] data = trackData.second;
track.onData(data, true /* eos */, ~0 /* runID: keep forever */);
}
private synchronized void notifyStop() { private synchronized void notifyStop() {
for (MediaTimeProvider.OnMediaTimeListener listener: mListeners) { for (MediaTimeProvider.OnMediaTimeListener listener: mListeners) {
if (listener == null) { if (listener == null) {
@@ -3899,6 +3920,9 @@ public class MediaPlayer extends PlayerBase
case NOTIFY_SEEK: case NOTIFY_SEEK:
notifySeek(); notifySeek();
break; break;
case NOTIFY_TRACK_DATA:
notifyTrackData((Pair<SubtitleTrack, byte[]>)msg.obj);
break;
} }
} }
} }