From 51eb4db7bdc5c81f1e562f80aa7a1b31d3c37d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Turnel?=
 <mickael.turnel@belledonne-communications.com>
Date: Fri, 30 Nov 2018 13:55:04 +0100
Subject: [PATCH] Replaced surfaceview with textureview

---
 .../linphone/assistant/QrcodeFragment.java    | 44 +++----------------
 app/src/main/res/layout/qrcode.xml            | 11 +++--
 2 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/org/linphone/assistant/QrcodeFragment.java b/app/src/main/java/org/linphone/assistant/QrcodeFragment.java
index eb6f00731..bde210261 100644
--- a/app/src/main/java/org/linphone/assistant/QrcodeFragment.java
+++ b/app/src/main/java/org/linphone/assistant/QrcodeFragment.java
@@ -22,27 +22,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 import android.app.Fragment;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.SurfaceView;
+import android.view.TextureView;
 import android.view.View;
 import android.view.ViewGroup;
 import org.linphone.LinphoneManager;
 import org.linphone.R;
 import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
-import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 
 public class QrcodeFragment extends Fragment {
-    private SurfaceView mQrcodeView;
+    private TextureView mQrcodeView;
     private CoreListenerStub mListener;
-    private AndroidVideoWindowImpl androidVideoWindowImpl;
 
     @Override
     public View onCreateView(
             LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.qrcode, container, false);
 
-        mQrcodeView = (SurfaceView) view.findViewById(R.id.qrcodeCaptureSurface);
+        mQrcodeView = view.findViewById(R.id.qrcodeCaptureSurface);
+
+        LinphoneManager.getLc().setNativePreviewWindowId(mQrcodeView);
 
         mListener =
                 new CoreListenerStub() {
@@ -81,26 +81,6 @@ public class QrcodeFragment extends Fragment {
     private void launchQrcodeReader() {
         setBackCamera(true);
 
-        androidVideoWindowImpl =
-                new AndroidVideoWindowImpl(
-                        null,
-                        mQrcodeView,
-                        new AndroidVideoWindowImpl.VideoWindowListener() {
-                            public void onVideoRenderingSurfaceReady(
-                                    AndroidVideoWindowImpl vw, SurfaceView surface) {}
-
-                            public void onVideoRenderingSurfaceDestroyed(
-                                    AndroidVideoWindowImpl vw) {}
-
-                            public void onVideoPreviewSurfaceReady(
-                                    AndroidVideoWindowImpl vw, SurfaceView surface) {
-                                LinphoneManager.getLc()
-                                        .setNativePreviewWindowId(androidVideoWindowImpl);
-                            }
-
-                            public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) {}
-                        });
-
         enableQrcodeReader(true);
     }
 
@@ -112,21 +92,11 @@ public class QrcodeFragment extends Fragment {
     @Override
     public void onResume() {
         launchQrcodeReader();
-        if (androidVideoWindowImpl != null) {
-            synchronized (androidVideoWindowImpl) {
-                // LinphoneManager.getLc().setNativePreviewWindowId(androidVideoWindowImpl);
-            }
-        }
         super.onResume();
     }
 
     @Override
     public void onPause() {
-        if (androidVideoWindowImpl != null) {
-            synchronized (androidVideoWindowImpl) {
-                // LinphoneManager.getLc().setNativePreviewWindowId(null);
-            }
-        }
         enableQrcodeReader(false);
         // setBackCamera(false);
         super.onPause();
@@ -134,10 +104,6 @@ public class QrcodeFragment extends Fragment {
 
     @Override
     public void onDestroy() {
-        if (androidVideoWindowImpl != null) {
-            androidVideoWindowImpl.release();
-            androidVideoWindowImpl = null;
-        }
         super.onDestroy();
     }
 }
diff --git a/app/src/main/res/layout/qrcode.xml b/app/src/main/res/layout/qrcode.xml
index f92359c03..77e677f49 100644
--- a/app/src/main/res/layout/qrcode.xml
+++ b/app/src/main/res/layout/qrcode.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/qrcode_frame"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:screenOrientation="portrait" >
+    android:id="@+id/qrcode_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:screenOrientation="portrait" >
 
-
-    <SurfaceView
+    <TextureView
         android:id="@+id/qrcodeCaptureSurface"
         android:layout_width="match_parent"
         android:layout_height="match_parent"