SRTPlayer に通信情報を通知するイベントを追加

Author: nobuo-kobayashi

dConnectSDK/dConnectLibStreaming/libsrt/src/main/java/org/deviceconnect/android/libsrt/client/SRTClient.java

@@ -2,11 +2,11 @@
 
 import android.util.Log;
 
+import org.deviceconnect.android.libsrt.BuildConfig;
 import org.deviceconnect.android.libsrt.SRTSocket;
 import org.deviceconnect.android.libsrt.SRTSocketException;
 import org.deviceconnect.android.libsrt.SRTStats;
 
-import java.io.IOException;
 import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -20,6 +20,11 @@ public class SRTClient {
      */
     static final long DEFAULT_STATS_INTERVAL = 5000;
 
+    /**
+     * デバッグ用タグ.
+     */
+    private static final boolean DEBUG = BuildConfig.DEBUG;
+
     /**
      * タグ.
      */
@@ -199,8 +204,11 @@ public void run() {
                 if (mSRTSessionThread != null) {
                     SRTSocket socket = mSRTSessionThread.mSRTSocket;
                     if (socket != null) {
-                        SRTStats stats = socket.getStats();
-                        Log.d(TAG, "stats: " + stats);
+                        SRTStats srtStats = socket.getStats();
+                        if (DEBUG) {
+                            Log.d(TAG, srtStats.toString());
+                        }
+                        postStats(srtStats);
                     }
                 }
             }
@@ -276,7 +284,7 @@ public void run() {
                 }
 
                 mSRTSocket.connect(mAddress, mPort);
-            } catch (IOException e) {
+            } catch (Exception e) {
                 postOnError(e);
                 return;
             }
@@ -333,12 +341,18 @@ private void postOnDisconnected() {
         }
     }
 
-    private void postOnError(IOException e) {
+    private void postOnError(Exception e) {
         if (mOnEventListener != null) {
             mOnEventListener.onError(e);
         }
     }
 
+    private void postStats(SRTStats stats) {
+        if (mOnEventListener != null) {
+            mOnEventListener.onStats(stats);
+        }
+    }
+
     public interface OnEventListener {
         /**
          * SRT サーバに接続されたことを通知します.
@@ -368,6 +382,13 @@ public interface OnEventListener {
          *
          * @param e 失敗原因の例外
          */
-        void onError(IOException e);
+        void onError(Exception e);
+
+        /**
+         * SRT サーバとの通信状況を通知します.
+         *
+         * @param stats 通信統計情報
+         */
+        void onStats(SRTStats stats);
     }
 }

dConnectSDK/dConnectLibStreaming/libsrt/src/main/java/org/deviceconnect/android/libsrt/client/SRTPlayer.java

@@ -1,18 +1,19 @@
 package org.deviceconnect.android.libsrt.client;
 
 import android.net.Uri;
+import android.util.Log;
 import android.view.Surface;
 
 import org.deviceconnect.android.libmedia.streaming.mpeg2ts.TsConstants;
 import org.deviceconnect.android.libmedia.streaming.mpeg2ts.TsPacketExtractor;
 import org.deviceconnect.android.libsrt.BuildConfig;
+import org.deviceconnect.android.libsrt.SRTStats;
 import org.deviceconnect.android.libsrt.client.decoder.audio.AACDecoder;
 import org.deviceconnect.android.libsrt.client.decoder.audio.AudioDecoder;
 import org.deviceconnect.android.libsrt.client.decoder.video.H264Decoder;
 import org.deviceconnect.android.libsrt.client.decoder.video.H265Decoder;
 import org.deviceconnect.android.libsrt.client.decoder.video.VideoDecoder;
 
-import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -249,6 +250,12 @@ private void postOnError(Exception e) {
         }
     }
 
+    private void postOnStats(SRTStats stats) {
+        if (mOnEventListener != null) {
+            mOnEventListener.onStats(stats);
+        }
+    }
+
     /**
      * デコーダを作成します.
      *
@@ -260,6 +267,16 @@ private synchronized void createDecoder(int streamType) {
             case TsConstants.STREAM_TYPE_VIDEO_H265:
             {
                 if (mVideoDecoder != null) {
+                    if (DEBUG) {
+                        Log.w(TAG, "VideoDecoder has already existed.");
+                    }
+                    return;
+                }
+
+                if (mSurface == null) {
+                    if (DEBUG) {
+                        Log.w(TAG, "Surface is not set.");
+                    }
                     return;
                 }
 
@@ -277,8 +294,12 @@ private synchronized void createDecoder(int streamType) {
             case TsConstants.STREAM_TYPE_AUDIO_AAC:
             {
                 if (mAudioDecoder != null) {
+                    if (DEBUG) {
+                        Log.w(TAG, "AudioEncoder has already existed.");
+                    }
                     return;
                 }
+
                 mAudioDecoder = new AACDecoder();
                 mAudioDecoder.setErrorCallback(SRTPlayer.this::postOnError);
                 mAudioDecoder.onInit();
@@ -330,9 +351,14 @@ public void onDisconnected() {
         }
 
         @Override
-        public void onError(IOException e) {
+        public void onError(Exception e) {
             postOnError(e);
         }
+
+        @Override
+        public void onStats(SRTStats stats) {
+            postOnStats(stats);
+        }
     };
 
     private final TsPacketExtractor.Callback mCallback = new TsPacketExtractor.Callback() {
@@ -386,5 +412,12 @@ public interface OnEventListener {
          * @param e エラー原因の例外
          */
         void onError(Exception e);
+
+        /**
+         * SRT サーバとの通信状況を通知します.
+         *
+         * @param stats 通信統計情報
+         */
+        void onStats(SRTStats stats);
     }
 }

dConnectSDK/dConnectLibStreaming/srt-player-app/src/main/java/org/deviceconnect/android/srt_player_app/SRTPlayerActivity.java

@@ -10,6 +10,7 @@
 import android.widget.ProgressBar;
 
 import org.deviceconnect.android.libsrt.SRT;
+import org.deviceconnect.android.libsrt.SRTStats;
 import org.deviceconnect.android.libsrt.client.SRTPlayer;
 
 import java.util.HashMap;
@@ -105,6 +106,10 @@ public void onError(Exception e) {
                 Log.e("SRT-PLAYER", "Error", e);
                 showErrorDialog("エラー", e.getMessage());
             }
+
+            @Override
+            public void onStats(SRTStats stats) {
+            }
         });
         mSRTPlayer.start();
     }