Merge pull request #7 from ricohapi/bugfix/v1.2.3

Fix Dynamic Stitching and Zenith Correction issue for THETA X

Author: DaisukeHohjoh

.idea/gradle.xml

@@ -1,31 +1,40 @@
-# Wireless Live Streaming plug-in
+# Wireless Live Streaming Plugin
 
-Version: 1.2.2
-
-Wireless Live Streaming plug-in can stream live 360 movie to RTMP server (e.g. YouTube) directly from RICOH THETA.
+## Overview
+Wireless Live Streaming Plugin can stream live 360 movie to YouTube via RTMP directly from RICOH THETA. 
 
 ## History
-* Version 1.2.2 (2022/09/06): Following settings are added for THETA X 1.20 or later.
-                              ・4K (3840 x 2160) 15FPS
-                              ・2K (1920 x 1080) 15FPS
-                              ・1K (1024 x 576) 15FPS
-* Version 1.2.1 (2022/05/26): Support THETA X.
-* Version 1.1.4 (2021/11/02): Removed bitrate measurement function.
-                              RTMPS is supported.
-                              Added 44.8KHz audio sample rate.
-* Version 1.1.1 (2019/05/08): THETA Z1 is supported.
-* Version.1.0.9 (2018/07/23): Initial version.
-
-## Development Environment
-
-* RICOH THETA X  (Version 1.20.0)
-* RICOH THETA Z1 (Version 2.10.3)
-* RICOH THETA V  (Version 3.80.2)
-
-Tips : How to update your RICOH THETA firmware:
-> * [THETA X](https://support.theta360.com/en/manual/x/content/update/update_01.html)
-> * [THETA Z1](https://support.theta360.com/en/manual/z1/content/update/update_01.html)
-> * [THETA V](https://support.theta360.com/en/manual/v/content/update/update_01.html)
+* ver 1.2.3 (2023/04/18): Bugfix related to dynamic stitching and zenith correction for THETA X.
+* ver 1.2.2 (2022/09/06): Following settings are added for THETA X 1.20 or later.  
+    * 4K (3840 x 2160) 15FPS  
+    * 2K (1920 x 1080) 15FPS  
+    * 1K (1024 x 576) 15FPS  
+* ver 1.2.0 (2022/02/21): Support THETA X.
+* ver 1.1.4 (2021/11/02): 
+    * Removed bitrate measurement function.
+    * RTMPS is supported.
+    * Added 44.8KHz audio sample rate.
+* ver 1.1.1 (2019/05/08): THETA Z1 is supported.
+* ver.1.0.9 (2018/07/23): Initial version.
+
+## Requirement
+
+### Supported Device
+
+* RICOH THETA X Version 2.00.0
+* RICOH THETA Z1 Version 2.30.1
+* RICOH THETA V Version 3.82.1
+
+### Development Environment
+
+* Android Studio Chipmunk | 2021.2.1 Patch 2
+    * Windows 10 Version 21H2
+    * macOS Version 13.2.1 Ventura
+* Gradle Plugin Version 4.2.2
+* Gradle Version 6.7.1
+* compileSdkVersion 29
+* minSdkVersion 25
+* targetSdkVersion 25
 
 ## Install
 Android Studio installs apk after building automatically. Or use the following command after build.
@@ -34,14 +43,12 @@ Android Studio installs apk after building automatically. Or use the following c
 adb install -r app-debug.apk
 ```
 
-### Give permissions for this plug-in. (THETA V/Z1 only)
+### Give permissions for this plug-in.
 
   Using desktop viewing with an app as Vysor, open Settings app and turns on the permissions at "Apps"> "Wireless Live Streaming"> "Permissions"
 
 ## How to Use
 
-See also [this article](https://www.thetalab.ricoh/plugin/wireless-live-streaming/) of THETA Lab., how to use Wireless LIVE Streaming plug-in.
-
 If "stream name" can be used repeatedly, plug-in settings (input of "stream name" and "primary server URL") are required only once at the beginning. In this case, you can start streaming just by pressing the shutter button after setting streaming events on YouTube.
 
 The following steps are for the first use.

.idea/modules.xml

@@ -1,15 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "com.theta360.cloudstreaming"
-        minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
-        targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 9
-        versionName "1.2.2"
+        minSdkVersion 25
+        targetSdkVersion 29
+        versionCode 10
+        versionName "1.2.3"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

.idea/runConfigurations.xml

@@ -548,9 +548,6 @@ protected void onStop() {
         if (settingPolling != null) {
             settingPolling.exit();
         }
-        if (scheduleStreaming != null) {
-            scheduleStreaming.exit();
-        }
         if (delayJudgmentService != null) {
             delayJudgmentService.shutdownNow();
         }
@@ -820,52 +817,35 @@ private void createScheduleStreaming() {
         scheduleStreaming = new ScheduleStreaming();
 
         try {
-            scheduleStreamingService = Executors.newSingleThreadExecutor();
-            scheduleStreamingService.execute(scheduleStreaming);
+            scheduleStreaming.run();
         } catch (Exception e) {
             e.printStackTrace();
             unexpectedError("E002");
-        } finally {
-            scheduleStreamingService.shutdown();
         }
     }
 
-    private class ScheduleStreaming implements Runnable {
-        private boolean isScheduleStreaming = false;
-        private String measureServerUrl;
-        private String measureStreamName;
-        private int measureWidth = 0;
-        private int measureHeight = 0;
-        private boolean isExit = false;
+    private class ScheduleStreaming {
+        private boolean isDuringStartStop = false;
 
         // Schedule streaming
         public void setSchedule() {
-            isScheduleStreaming = true;
-        }
-
-        /**
-         * End thread
-         */
-        public void exit() {
-            isExit = true;
+            run();
         }
 
-        @Override
         public void run() {
-            while(!isExit) {
 
-                // Ignore streaming instructions during streaming preparation.
-                if (!isScheduleStreaming) {
-                    continue;
-                }
+            // Ignore streaming instructions during streaming preparation.
+            if (isDuringStartStop) {
+                return;
+            }
 
-                try {
-                    streaming();
-                } catch (Exception e) {
-                    Timber.i("ScheduleStreaming : " + e.getMessage());
-                } finally {
-                    isScheduleStreaming = false;
-                }
+            try {
+                isDuringStartStop = true;
+                streaming();
+            } catch (Exception e) {
+                Timber.i("ScheduleStreaming : " + e.getMessage());
+            } finally {
+                isDuringStartStop = false;
             }
         }
     }

README.md

@@ -9,7 +9,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

app/build.gradle

@@ -22,10 +22,6 @@ android.injected.testOnly=false
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 
-ANDROID_BUILD_SDK_VERSION=27
-ANDROID_BUILD_TOOLS_VERSION=28.0.3
-ANDROID_BUILD_MIN_SDK_VERSION=25
-ANDROID_BUILD_TARGET_SDK_VERSION=25
 ANDROID_SUPPORT_VERSION=27.1.1
 
 TIMBER_VERSION=4.6.0

app/src/main/java/com/theta360/cloudstreaming/MainActivity.java

@@ -1,6 +1,6 @@
-#Thu May 26 16:21:37 JST 2022
+#Tue Apr 18 10:58:17 JST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

build.gradle

@@ -16,7 +16,6 @@ android {
       consumerProguardFiles 'proguard-rules.pro'
     }
   }
-  buildToolsVersion '28.0.3'
 
   afterEvaluate {
     publishing {