commit d08debcf42d820fa8ef9916077a7bfc0a36f2db5
author Lajos Molnar <lajos@google.com> Wed Jul 01 16:35:49 2015 -0700
committer Lajos Molnar <lajos@google.com> Thu Jul 16 17:09:20 2015 -0700
tree 4923d9a9db4571a465e7b7b678b621c247b973cb
parent 6f561a24c97d25a858cf98eef5c502ef8d80cfc1

MediaSync: fix flush handling and deadlock

- clear pending video frames
- flush audio track
- reset clock
- restart audio track after flush
- don't hold lock during callback

Bug: 22234976
Change-Id: I681df950b67d7f9f77a9c5783279f1c8c91be856

media/jni/android_media_MediaSync.h

diff --git a/media/jni/android_media_MediaSync.h b/media/jni/android_media_MediaSync.h
index 22c77c7..6f80885 100644
--- a/media/jni/android_media_MediaSync.h
+++ b/media/jni/android_media_MediaSync.h
@@ -49,6 +49,8 @@
     status_t setVideoFrameRateHint(float rate);
     float getVideoFrameRate();
 
+    void flush();
+
     sp<const MediaClock> getMediaClock();
 
 protected: