Merge "MediaCodec: Release lock before calling onFrameRendered()" (c03b91a7) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaCodec.java

+14 −12

Original line number	Diff line number	Diff line
		@@ -1702,20 +1702,22 @@ final public class MediaCodec {
		break;
		}
		case EVENT_FRAME_RENDERED:
		synchronized (mListenerLock) {
		Map<String, Object> map = (Map<String, Object>)msg.obj;
		for (int i = 0; ; ++i) {
		Object mediaTimeUs = map.get(i + "-media-time-us");
		Object systemNano = map.get(i + "-system-nano");
		OnFrameRenderedListener onFrameRenderedListener;
		synchronized (mListenerLock) {
		onFrameRenderedListener = mOnFrameRenderedListener;
		}
		if (mediaTimeUs == null \|\| systemNano == null
		\|\| mOnFrameRenderedListener == null) {
		\|\| onFrameRenderedListener == null) {
		break;
		}
		mOnFrameRenderedListener.onFrameRendered(
		onFrameRenderedListener.onFrameRendered(
		mCodec, (long)mediaTimeUs, (long)systemNano);
		}
		break;
		}
		default:
		{
		break;