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

Merge "MediaCodec: Release lock before calling onFrameRendered()"

Browse Source
This commit is contained in:
Treehugger Robot
2019-11-08 13:34:42 +00:00
committed by Gerrit Code Review
parent 6e914e8baf 5a07fb4e59
commit c03b91a7ef
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/java/android/media/MediaCodec.java
View File

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