UVCプラグインに配信処理のリトライ処理を追加

Author: nobuo-kobayashi

dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/java/org/deviceconnect/android/deviceplugin/uvc/recorder/AbstractRTMPBroadcaster.java

@@ -1,5 +1,7 @@
 package org.deviceconnect.android.deviceplugin.uvc.recorder;
 
+import android.util.Log;
+
 import org.deviceconnect.android.libmedia.streaming.MediaEncoderException;
 import org.deviceconnect.android.libmedia.streaming.audio.AudioEncoder;
 import org.deviceconnect.android.libmedia.streaming.audio.AudioQuality;
@@ -68,7 +70,11 @@ public void start(OnStartCallback callback) {
             setAudioQuality(audioEncoder.getAudioQuality());
         }
 
+        MediaRecorder.Settings settings = getRecorder().getSettings();
+
         mRtmpClient = new RtmpClient(getBroadcastURI());
+        mRtmpClient.setMaxRetryCount(settings.getRetryCount());
+        mRtmpClient.setRetryInterval(settings.getRetryInterval());
         mRtmpClient.setVideoEncoder(videoEncoder);
         mRtmpClient.setAudioEncoder(audioEncoder);
         mRtmpClient.setOnEventListener(new RtmpClient.OnEventListener() {
@@ -99,6 +105,8 @@ public void onError(MediaEncoderException e) {
                 if (mOnBroadcasterEventListener != null) {
                     mOnBroadcasterEventListener.onError(e);
                 }
+
+                AbstractRTMPBroadcaster.this.stop();
             }
 
             @Override
@@ -107,7 +115,6 @@ public void onConnected() {
 
             @Override
             public void onDisconnected() {
-                AbstractRTMPBroadcaster.this.stop();
             }
 
             @Override

dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/java/org/deviceconnect/android/deviceplugin/uvc/recorder/AbstractSRTBroadcaster.java

@@ -68,7 +68,11 @@ public void start(OnStartCallback callback) {
             setAudioQuality(audioEncoder.getAudioQuality());
         }
 
+        MediaRecorder.Settings settings = getRecorder().getSettings();
+
         mSrtClient = new SRTClient(getBroadcastURI());
+        mSrtClient.setMaxRetryCount(settings.getRetryCount());
+        mSrtClient.setRetryInterval(settings.getRetryInterval());
         mSrtClient.setVideoEncoder(videoEncoder);
         mSrtClient.setAudioEncoder(audioEncoder);
         mSrtClient.setOnEventListener(new SRTClient.OnEventListener() {
@@ -99,6 +103,7 @@ public void onError(MediaEncoderException e) {
                 if (mOnBroadcasterEventListener != null) {
                     mOnBroadcasterEventListener.onError(e);
                 }
+                AbstractSRTBroadcaster.this.stop();
             }
 
             @Override
@@ -107,7 +112,6 @@ public void onConnected() {
 
             @Override
             public void onDisconnected() {
-                AbstractSRTBroadcaster.this.stop();
             }
 
             @Override

dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/java/org/deviceconnect/android/deviceplugin/uvc/recorder/MediaRecorder.java

@@ -1029,6 +1029,50 @@ public void setBroadcastURI(String broadcastURI) {
             mPref.put("broadcast_uri", broadcastURI);
         }
 
+        /**
+         * リトライ回数を取得します.
+         *
+         * @return リトライ回数
+         */
+        public int getRetryCount() {
+            return mPref.getInteger("broadcast_retry_count", 0);
+        }
+
+        /**
+         * リトライ回数を設定します.
+         *
+         * @param count リトライ回数
+         */
+        public void setRetryCount(int count) {
+            if (count < 0) {
+                mPref.remove("broadcast_retry_count");
+            } else {
+                mPref.put("broadcast_retry_count", count);
+            }
+        }
+
+        /**
+         * リトライのインターバルを取得します.
+         *
+         * @return リトライのインターバル
+         */
+        public int getRetryInterval() {
+            return mPref.getInteger("broadcast_retry_interval", 3000);
+        }
+
+        /**
+         * リトライのインターバルを設定します.
+         *
+         * @param interval リトライのインターバル
+         */
+        public void setRetryInterval(int interval) {
+            if (interval < 0) {
+                mPref.remove("broadcast_retry_interval");
+            } else {
+                mPref.put("broadcast_retry_interval", interval);
+            }
+        }
+
         // ポート番号
 
         /**

dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/res/values/strings.xml

@@ -64,6 +64,8 @@
 
     <!-- 配信設定画面 -->
     <string name="uvc_recorder_settings_broadcast_uri" translatable="false">URL</string>
+    <string name="uvc_recorder_settings_broadcast_retry_count" translatable="false">リトライ回数</string>
+    <string name="uvc_recorder_settings_broadcast_retry_interval" translatable="false">リトライ間隔(ミリ秒)</string>
 
     <!-- 通知用 -->
     <string name="uvc_notification_preview">PREVIEW</string>

dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/res/xml/settings_uvc_recorder_broadcast.xml

@@ -14,6 +14,22 @@
             app:key="broadcast_uri"
             app:useSimpleSummaryProvider="true" />
 
+        <EditTextPreference
+            android:defaultValue="0"
+            android:singleLine="true"
+            android:title="@string/uvc_recorder_settings_broadcast_retry_count"
+            app:iconSpaceReserved="false"
+            app:key="broadcast_retry_count"
+            app:useSimpleSummaryProvider="true" />
+
+        <EditTextPreference
+            android:defaultValue="3000"
+            android:singleLine="true"
+            android:title="@string/uvc_recorder_settings_broadcast_retry_interval"
+            app:iconSpaceReserved="false"
+            app:key="broadcast_retry_interval"
+            app:useSimpleSummaryProvider="true" />
+
     </PreferenceCategory>
 
 </PreferenceScreen>