Fix up the video size details

pinkfish · May 18, 2020 · d1765b8 · d1765b8
1 parent f52565b
commit d1765b8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.6
+
+* Fix the resolution in the android side to correctly stream with the camera
+  size itself.
+
 ## 0.1.5
 
 * Add in retries and disconnect processing for android on errors.

diff --git a/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/Camera.kt b/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/Camera.kt
@@ -98,11 +98,14 @@ class Camera(
 
         rtmpCamera!!.prepareAudio()
         rtmpCamera!!.prepareVideo(
-                streamSize.width,
-                streamSize.height,
+                //1280,
+               // 720,
+                recordingProfile.videoFrameWidth,
+                recordingProfile.videoFrameHeight,
                 recordingProfile.videoFrameRate,
+
                 1200 * 1024,
-                false,
+                true,
                 mediaOrientation)
         publishUrl = url
     }
@@ -456,9 +459,9 @@ class Camera(
             recordingRtmp = true
             result.success(null)
         } catch (e: CameraAccessException) {
-            result.error("videoRecordingFailed", e.message, null)
+            result.error("videoStreamingFailed", e.message, null)
         } catch (e: IOException) {
-            result.error("videoRecordingFailed", e.message, null)
+            result.error("videoStreamingFailed", e.message, null)
         }
     }
 

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -45,7 +45,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
   VoidCallback videoPlayerListener;
   bool enableAudio = true;
   TextEditingController _textFieldController = TextEditingController(
-      text: "rtmp://34.70.40.166:1935/LiveApp/womble");
+      text: "rtmp://34.70.40.166:1935/LiveApp/815794454132232781694481");
 
   Timer _timer;
 
@@ -308,6 +308,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
       if (mounted) setState(() {});
       if (controller.value.hasError) {
         showInSnackBar('Camera error ${controller.value.errorDescription}');
+        _timer.cancel();
       }
     });
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: camera_with_rtmp
 description: Controlling the camera on Android and iOS plus rtmp live streaming support. Based off the Camera plugin.
-version: 0.1.5
+version: 0.1.6
 homepage: https://github.com/pinkfish/flutter_rtmppublisher
 
 environment: