MediaStreamer に映像と音声が設定されていない場合にエラーを返すように修正

Author: nobuo-kobayashi

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

@@ -305,11 +305,21 @@ private synchronized void startEncoder() {
         VideoQuality videoQuality = mVideoEncoder != null ? mVideoEncoder.getVideoQuality() : null;
         AudioQuality audioQuality = mAudioEncoder != null ? mAudioEncoder.getAudioQuality() : null;
 
+        if (videoQuality == null && audioQuality == null) {
+            if (DEBUG) {
+                Log.e(TAG, "Video and audio is not set.");
+            }
+            postOnError(new MediaEncoderException("Need to set either video or audio."));
+            stopEncoder();
+            return;
+        }
+
         if (!mMediaMuxer.onPrepare(videoQuality, audioQuality)) {
             if (DEBUG) {
                 Log.e(TAG, "Failed to prepare a media muxer.");
             }
             postOnError(new MediaEncoderException("Failed to prepare a media muxer."));
+            stopEncoder();
             return;
         }
 

dConnectSDK/dConnectLibStreaming/libmedia/src/main/java/org/deviceconnect/android/libmedia/streaming/muxer/RtmpMuxer.java

@@ -7,16 +7,16 @@
 import net.ossrs.rtmp.ConnectCheckerRtmp;
 import net.ossrs.rtmp.SrsFlvMuxer;
 
-import java.nio.ByteBuffer;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.deviceconnect.android.libmedia.BuildConfig;
 import org.deviceconnect.android.libmedia.streaming.IMediaMuxer;
 import org.deviceconnect.android.libmedia.streaming.audio.AudioQuality;
 import org.deviceconnect.android.libmedia.streaming.video.VideoQuality;
 
+import java.nio.ByteBuffer;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * RTMP で指定された URL にデータを送信するためのマルチプレクサ.
  */
@@ -87,7 +87,9 @@ public void onConnectionFailedRtmp(String reason) {
         };
 
         mSrsFlvMuxer = new SrsFlvMuxer(rtmpAdapter);
-        mSrsFlvMuxer.setVideoResolution(videoQuality.getVideoWidth(), videoQuality.getVideoHeight());
+        if (videoQuality != null) {
+            mSrsFlvMuxer.setVideoResolution(videoQuality.getVideoWidth(), videoQuality.getVideoHeight());
+        }
         if (audioQuality != null) {
             mSrsFlvMuxer.setSampleRate(audioQuality.getSamplingRate());
             mSrsFlvMuxer.setIsStereo(audioQuality.getChannelCount() == 2);