Merge remote-tracking branch 'upstream/develop-9.6' into merge-develop-9.6-25.02.2021

livecodepanos · livecodepanos · commit 6a4c01a88440 · 2021-02-25T12:33:23.000+02:00
diff --git a/docs/notes/bugfix-23100.md b/docs/notes/bugfix-23100.md
@@ -0,0 +1 @@
+# Fix rendering of mobile player when acceleratedRendering is true
diff --git a/engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java b/engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java
@@ -188,6 +188,10 @@ private void initVideoView() {
         mVideoHeight = 0;
         getHolder().addCallback(mSHCallback);
         getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+
+        /* We always want the video's surface view to sit on top of any OpenGL
+         * surface view, so set this as a media overlay. */
+        setZOrderMediaOverlay(true);
         setFocusable(true);
         setFocusableInTouchMode(true);
         requestFocus();

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix rendering of mobile player when acceleratedRendering is true`