Merge pull request #506 from TakayukiHoshi1984/modify_livestreaming_check_parameter

LiveStreamingプロファイルのパラメータ処理改善

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/assets/org_deviceconnect_android_deviceplugin_host/api/liveStreaming.json

@@ -29,7 +29,7 @@
                     }, {
                         "name": "video",
                         "in": "query",
-                        "description": "映像リソースURI。<br><ul><li>true(デバイス標準のカメラ)</li><li>false(映像無し)</li><li>camera-front(端末のフロントカメラ)</li><li>camera-back(端末のバックカメラ)</li></ul>省略された場合はfalseを指定した場合と同様。",
+                        "description": "映像リソースURI。<br><ul><li>true(デバイス標準のカメラ)</li><li>false(黒い映像を配信する)</li><li>camera-front(端末のフロントカメラ)</li><li>camera-back(端末のバックカメラ)</li></ul>省略された場合はfalseを指定した場合と同様。",
                         "required": false,
                         "type": "string"
                     }, {

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/profile/HostLiveStreamingProfile.java

@@ -1,6 +1,7 @@
 package org.deviceconnect.android.deviceplugin.host.recorder;
 
 import org.deviceconnect.android.deviceplugin.host.recorder.util.LiveStreamingClient;
+import org.deviceconnect.android.libmedia.streaming.video.VideoEncoder;
 
 /**
  * デバイスのカメラを使用したLive Streaming用のインターフェース
@@ -11,7 +12,7 @@ public interface HostDeviceLiveStreamRecorder {
     void createLiveStreamingClient(final String broadcastURI, LiveStreamingClient.EventListener eventListener);
 
     //ビデオエンコーダーの設定
-    void setVideoEncoder(Integer width, Integer height, Integer bitrate, Integer frameRate);
+    void setVideoEncoder(VideoEncoder encoder, Integer width, Integer height, Integer bitrate, Integer frameRate);
 
     //オーディオエンコーダーの設定
     void setAudioEncoder();

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

@@ -47,6 +47,7 @@
 import org.deviceconnect.android.libmedia.streaming.audio.AudioQuality;
 import org.deviceconnect.android.libmedia.streaming.audio.MicAACLATMEncoder;
 import org.deviceconnect.android.deviceplugin.host.recorder.util.LiveStreamingClient;
+import org.deviceconnect.android.libmedia.streaming.video.VideoEncoder;
 import org.deviceconnect.android.provider.FileManager;
 
 import java.io.File;
@@ -939,7 +940,7 @@ public void stopLiveStreaming() {
     }
 
     @Override
-    public void setVideoEncoder(Integer width, Integer height, Integer bitrate, Integer framerate) {
+    public void setVideoEncoder(VideoEncoder encoder, Integer width, Integer height, Integer bitrate, Integer framerate) {
         if (DEBUG) {
             Log.d(TAG, "setVideoEncoder()");
             Log.d(TAG, "width : " + width);
@@ -949,7 +950,7 @@ public void setVideoEncoder(Integer width, Integer height, Integer bitrate, Inte
             Log.d(TAG, "mLiveStreamingClient : " + mLiveStreamingClient);
         }
         if (mLiveStreamingClient != null) {
-            mLiveStreamingClient.setVideoEncoder(new CameraVideoEncoder(this), width, height, bitrate, framerate);
+            mLiveStreamingClient.setVideoEncoder(encoder, width, height, bitrate, framerate);
         }
     }
 

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

@@ -21,7 +21,7 @@ public class CameraVideoEncoder extends SurfaceVideoEncoder {
      */
     private CameraVideoQuality mVideoQuality;
 
-    CameraVideoEncoder(Camera2Recorder camera2Recorder) {
+    public CameraVideoEncoder(Camera2Recorder camera2Recorder) {
         mCamera2Recorder = camera2Recorder;
         mVideoQuality = new CameraVideoQuality("video/avc");
     }

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

@@ -33,6 +33,7 @@
 import org.deviceconnect.android.libmedia.streaming.audio.AudioEncoder;
 import org.deviceconnect.android.libmedia.streaming.audio.AudioQuality;
 import org.deviceconnect.android.libmedia.streaming.audio.MicAACLATMEncoder;
+import org.deviceconnect.android.libmedia.streaming.video.VideoEncoder;
 import org.deviceconnect.android.provider.FileManager;
 
 import java.io.ByteArrayOutputStream;
@@ -480,7 +481,7 @@ public void createLiveStreamingClient(String broadcastURI, LiveStreamingClient.E
     }
 
     @Override
-    public void setVideoEncoder(Integer width, Integer height, Integer bitrate, Integer frameRate) {
+    public void setVideoEncoder(VideoEncoder encoder, Integer width, Integer height, Integer bitrate, Integer frameRate) {
         if (DEBUG) {
             Log.d(TAG, "setVideoEncoder()");
             Log.d(TAG, "width : " + width);
@@ -490,19 +491,6 @@ public void setVideoEncoder(Integer width, Integer height, Integer bitrate, Inte
             Log.d(TAG, "mLiveStreamingClient : " + mLiveStreamingClient);
         }
         if (mLiveStreamingClient != null) {
-            ScreenCastVideoEncoder encoder = new ScreenCastVideoEncoder(mScreenCastMgr);
-            // widthかheightがnullの場合は、PreviewSizeの最小値を設定する
-            if (width == null || height == null) {
-                PictureSize pSize = mSupportedPreviewSizes.get(0);
-                width = pSize.getWidth();
-                height = pSize.getHeight();
-                for (int i = 1; i < mSupportedPreviewSizes.size(); i++) {
-                    if (pSize.getWidth() < mSupportedPreviewSizes.get(i).getWidth()) {
-                        width = mSupportedPreviewSizes.get(i).getWidth();
-                        height = mSupportedPreviewSizes.get(i).getHeight();
-                    }
-                }
-            }
             mLiveStreamingClient.setVideoEncoder(encoder, width, height, bitrate, frameRate);
         }
     }

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/screen/ScreenCastRecorder.java

@@ -23,7 +23,7 @@ public class ScreenCastVideoEncoder extends VideoEncoder {
      */
     private ScreenCast mScreenCast;
 
-    ScreenCastVideoEncoder(ScreenCastManager screenCastManager) {
+    public ScreenCastVideoEncoder(ScreenCastManager screenCastManager) {
         mScreenCastMgr = screenCastManager;
     }