Merge branch 'feature_host_camera' into feature_uvc_plugin_update

Author: nobuo-kobayashi

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/camera/CameraSurfaceDrawingThread.java

@@ -9,6 +9,7 @@
 import org.deviceconnect.android.deviceplugin.host.camera.CameraWrapper;
 import org.deviceconnect.android.deviceplugin.host.recorder.HostMediaRecorder;
 import org.deviceconnect.android.libmedia.streaming.gles.EGLSurfaceDrawingThread;
+import org.deviceconnect.android.libmedia.streaming.gles.SurfaceTextureManager;
 
 public class CameraSurfaceDrawingThread extends EGLSurfaceDrawingThread {
     /**
@@ -77,6 +78,20 @@ public void start() {
         }
     }
 
+    @Override
+    protected SurfaceTextureManager createStManager() {
+        SurfaceTextureManager manager = new SurfaceTextureManager();
+        SurfaceTexture st = manager.getSurfaceTexture();
+        st.setDefaultBufferSize(getWidth(), getHeight());
+        if (getDrawingRange() != null) {
+            // カメラは描画時に端末の向きによって回転するので、ここでは描画範囲の計算も回転してから行う
+            int w = isSwappedDimensions() ? getHeight() : getWidth();
+            int h = isSwappedDimensions() ? getWidth() : getHeight();
+            manager.setDrawingRange(getDrawingRange(), w, h);
+        }
+        return manager;
+    }
+
     private void startCamera(SurfaceTexture surfaceTexture) {
         try {
             HostMediaRecorder.Settings settings = mRecorder.getSettings();

dConnectSDK/dConnectLibStreaming/libmedia/src/main/java/org/deviceconnect/android/libmedia/streaming/gles/EGLSurfaceDrawingThread.java

@@ -94,6 +94,15 @@ public void setTimeout(int timeout) {
         mTimeout = timeout;
     }
 
+    /**
+     * レンダリングのタイムアウトを取得します.
+     *
+     * @return タイムアウト
+     */
+    public int getTimeout() {
+        return mTimeout;
+    }
+
     /**
      * 描画範囲を設定します.
      *
@@ -103,6 +112,15 @@ public void setDrawingRange(Rect rect) {
         mDrawingRange = rect;
     }
 
+    /**
+     * 描画範囲設定を取得します.
+     *
+     * @return 描画範囲
+     */
+    public Rect getDrawingRange() {
+        return mDrawingRange;
+    }
+
     /**
      * 描画を行う Surface のサイズを設定します.
      *
@@ -349,16 +367,12 @@ public synchronized void stop(boolean force) {
      *
      * @return SurfaceTextureManager のインスタンス
      */
-    private SurfaceTextureManager createStManager() {
+    protected SurfaceTextureManager createStManager() {
         SurfaceTextureManager manager = new SurfaceTextureManager();
-        manager.setTimeout(mTimeout);
-        // SurfaceTexture に解像度を設定
         SurfaceTexture st = manager.getSurfaceTexture();
         st.setDefaultBufferSize(mWidth, mHeight);
         if (mDrawingRange != null) {
-            int w = isSwappedDimensions() ? mHeight : mWidth;
-            int h = isSwappedDimensions() ? mWidth : mHeight;
-            manager.setDrawingRange(mDrawingRange, w, h);
+            manager.setDrawingRange(mDrawingRange, mWidth, mHeight);
         }
         return manager;
     }
@@ -509,6 +523,7 @@ public void run() {
                 mEGLCore.makeCurrent();
 
                 mStManager = createStManager();
+                mStManager.setTimeout(mTimeout);
 
                 synchronized (mEGLSurfaceBases) {
                     for (EGLSurfaceBase surfaceBase : mEGLSurfaceBases) {