Skip to content

Commit 4d9ee39

Browse files
VNAPNICVNAPNIC
committed
No configuration required WOWZA when constructing WOWZCameraView
1 parent 12c433f commit 4d9ee39

File tree

6 files changed

+180
-88
lines changed

6 files changed

+180
-88
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.1.6
2+
3+
* No configuration required WOWZA when constructing WOWZCameraView
4+
15
## 0.1.5
26

37
* fix Android permission not working

‎example/lib/main.dart

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:flutter/foundation.dart';
22
import 'package:flutter/material.dart';
3+
import 'package:flutter/scheduler.dart';
34
import 'package:flutter/services.dart';
45
import 'package:flutter_wowza/gocoder/wowza_gocoder.dart';
56

@@ -18,6 +19,16 @@ class _MyAppState extends State<MyApp> {
1819
@override
1920
void initState() {
2021
super.initState();
22+
SchedulerBinding.instance.addPostFrameCallback((_) {
23+
controller.setWOWZConfig(
24+
hostAddress: "xxx.xxx.xxx.xxx",
25+
portNumber: 1935,
26+
applicationName: "xxxxxx",
27+
streamName: "xxxxx",
28+
username: "xxxx",
29+
password: "xxxx",
30+
scaleMode: ScaleMode.FILL_VIEW);
31+
});
2132
}
2233

2334
@override
@@ -34,17 +45,11 @@ class _MyAppState extends State<MyApp> {
3445
height: 720,
3546
width: 1280,
3647
child: WOWZCameraView(
37-
apiLicenseKey: (defaultTargetPlatform == TargetPlatform.android)
38-
? "GOSK-9C47-010C-2895-D225-9FEF"
39-
: "GOSK-9C47-010C-A9B9-EB78-3FBD",
48+
apiLicenseKey:
49+
(defaultTargetPlatform == TargetPlatform.android)
50+
? "GOSK-9C47-010C-2895-D225-9FEF"
51+
: "GOSK-9C47-010C-A9B9-EB78-3FBD",
4052
controller: controller,
41-
hostAddress: "xxx.xxx.xxx.xxx",
42-
portNumber: 1935,
43-
applicationName: "xxxxxx",
44-
streamName: "xxxxx",
45-
username: "xxxx",
46-
password: "xxxx",
47-
scaleMode: ScaleMode.FILL_VIEW,
4853
statusCallback: (status) {
4954
print(
5055
"status: ${status.mState} | ${status.isStarting()} | ${status.isReady()}");

‎example/pubspec.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ packages:
8080
path: ".."
8181
relative: true
8282
source: path
83-
version: "0.1.4"
83+
version: "0.1.5"
8484
image:
8585
dependency: transitive
8686
description:

‎lib/gocoder/src/wowz_camera_controller.dart

+143
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,155 @@ class CameraControllerValue {
1212
class WOWZCameraController extends ValueNotifier<CameraControllerValue> {
1313
MethodChannel _channel;
1414

15+
// Set the connection properties for the target Wowza Streaming Engine server or Wowza Streaming Cloud live stream
16+
String hostAddress;
17+
int portNumber;
18+
String applicationName;
19+
String streamName;
20+
21+
//authentication
22+
String username;
23+
String password;
24+
25+
WOWZSize wowzSize;
26+
WOWZMediaConfig wowzMediaConfig;
27+
ScaleMode scaleMode;
28+
29+
int fps;
30+
int bps;
31+
int khz;
32+
33+
bool configIsWaiting = false;
34+
1535
_setChannel(MethodChannel channel) {
1636
_channel = channel;
1737
}
1838

1939
WOWZCameraController() : super(CameraControllerValue());
2040

41+
/// It will not execute immediately when the chanel has not been initialized,
42+
/// and it will wait until the channel is initialized and it will automatically execute the config.
43+
setWOWZConfig(
44+
{@required String hostAddress,
45+
@required int portNumber,
46+
@required String applicationName,
47+
@required String streamName,
48+
String username,
49+
String password,
50+
WOWZSize wowzSize,
51+
WOWZMediaConfig wowzMediaConfig,
52+
ScaleMode scaleMode,
53+
int fps,
54+
int bps,
55+
int khz}) {
56+
57+
if (_channel == null) {
58+
this.hostAddress = hostAddress;
59+
this.portNumber = portNumber;
60+
this.applicationName = applicationName;
61+
this.streamName = streamName;
62+
this.username = username;
63+
this.password = password;
64+
this.wowzSize = wowzSize;
65+
this.wowzMediaConfig = wowzMediaConfig;
66+
this.scaleMode = scaleMode;
67+
this.fps = fps;
68+
this.bps = bps;
69+
this.khz = khz;
70+
this.configIsWaiting = true;
71+
return;
72+
}
73+
74+
configIsWaiting = false;
75+
76+
// Set the connection properties for the target Wowza Streaming Engine server or Wowza Streaming Cloud live stream
77+
if (hostAddress != null && hostAddress.isNotEmpty) {
78+
_channel.invokeMethod(_hostAddress, hostAddress);
79+
}
80+
if (portNumber != null) {
81+
_channel.invokeMethod(_portNumber, portNumber);
82+
}
83+
if (applicationName != null && applicationName.isNotEmpty) {
84+
_channel.invokeMethod(_applicationName, applicationName);
85+
}
86+
if (streamName != null && streamName.isNotEmpty) {
87+
_channel.invokeMethod(_streamName, streamName);
88+
}
89+
//authentication
90+
if (username != null) {
91+
_channel.invokeMethod(_username, username);
92+
}
93+
if (password != null) {
94+
_channel.invokeMethod(_password, password);
95+
}
96+
if (wowzSize != null) {
97+
_channel.invokeMethod(_wowzSize, "${wowzSize.width}/${wowzSize.height}");
98+
}
99+
if (wowzMediaConfig != null) {
100+
_channel.invokeMethod(_wowzMediaConfig, wowzMediaConfig.toString());
101+
}
102+
if (scaleMode != null) {
103+
_channel.invokeMethod(_scaleMode, scaleMode.toString());
104+
}
105+
if (fps != null) {
106+
_channel.invokeListMethod(_fps, fps);
107+
}
108+
if (bps != null) {
109+
_channel.invokeListMethod(_bps, bps);
110+
}
111+
if (khz != null) {
112+
_channel.invokeListMethod(_bps, bps);
113+
}
114+
115+
_channel.invokeListMethod(_initGoCoder);
116+
}
117+
118+
/// Restore settings set in the [setWOWZConfig] method
119+
resetConfig(){
120+
configIsWaiting = false;
121+
122+
// Set the connection properties for the target Wowza Streaming Engine server or Wowza Streaming Cloud live stream
123+
if (hostAddress != null && hostAddress.isNotEmpty) {
124+
_channel.invokeMethod(_hostAddress, hostAddress);
125+
}
126+
if (portNumber != null) {
127+
_channel.invokeMethod(_portNumber, portNumber);
128+
}
129+
if (applicationName != null && applicationName.isNotEmpty) {
130+
_channel.invokeMethod(_applicationName, applicationName);
131+
}
132+
if (streamName != null && streamName.isNotEmpty) {
133+
_channel.invokeMethod(_streamName, streamName);
134+
}
135+
//authentication
136+
if (username != null) {
137+
_channel.invokeMethod(_username, username);
138+
}
139+
if (password != null) {
140+
_channel.invokeMethod(_password, password);
141+
}
142+
if (wowzSize != null) {
143+
_channel.invokeMethod(_wowzSize, "${wowzSize.width}/${wowzSize.height}");
144+
}
145+
if (wowzMediaConfig != null) {
146+
_channel.invokeMethod(_wowzMediaConfig, wowzMediaConfig.toString());
147+
}
148+
if (scaleMode != null) {
149+
_channel.invokeMethod(_scaleMode, scaleMode.toString());
150+
}
151+
if (fps != null) {
152+
_channel.invokeListMethod(_fps, fps);
153+
}
154+
if (bps != null) {
155+
_channel.invokeListMethod(_bps, bps);
156+
}
157+
if (khz != null) {
158+
_channel.invokeListMethod(_bps, bps);
159+
}
160+
161+
_channel.invokeListMethod(_initGoCoder);
162+
}
163+
21164
/// Starts the camera preview display.
22165
startPreview() {
23166
value = CameraControllerValue(event: _startPreview);

‎lib/gocoder/src/wowz_camera_view.dart

+16-76
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,16 @@ enum ScaleMode {
5454
typedef WOWZStatusCallback = Function(WOWZStatus);
5555
typedef WOWZBroadcastStatusCallback = Function(WOWZBroadcastStatus);
5656

57-
abstract class OnWOWZBroadcastStatusCallback{
57+
abstract class OnWOWZBroadcastStatusCallback {
5858
void onWZStatus(WOWZBroadcastStatus status);
59+
5960
void onWZError(WOWZBroadcastStatus status);
6061
}
6162

6263
class WOWZCameraView extends StatefulWidget {
6364
WOWZCameraView(
6465
{@required this.controller,
6566
@required this.apiLicenseKey,
66-
@required this.hostAddress,
67-
@required this.portNumber,
68-
@required this.applicationName,
69-
@required this.streamName,
70-
this.username,
71-
this.password,
72-
this.wowzSize,
73-
this.wowzMediaConfig,
74-
this.scaleMode = ScaleMode.RESIZE_TO_ASPECT, this.fps, this.bps, this.khz,
7567
this.statusCallback,
7668
this.broadcastStatusCallback});
7769

@@ -84,24 +76,6 @@ class WOWZCameraView extends StatefulWidget {
8476
final WOWZBroadcastStatusCallback broadcastStatusCallback;
8577

8678
final String apiLicenseKey;
87-
88-
// Set the connection properties for the target Wowza Streaming Engine server or Wowza Streaming Cloud live stream
89-
final String hostAddress;
90-
final int portNumber;
91-
final String applicationName;
92-
final String streamName;
93-
94-
//authentication
95-
final String username;
96-
final String password;
97-
98-
final WOWZSize wowzSize;
99-
final WOWZMediaConfig wowzMediaConfig;
100-
final ScaleMode scaleMode;
101-
102-
final int fps;
103-
final int bps;
104-
final int khz;
10579
}
10680

10781
class _WOWZCameraViewState extends State<WOWZCameraView> {
@@ -116,18 +90,21 @@ class _WOWZCameraViewState extends State<WOWZCameraView> {
11690
print('controller event: ${widget.controller.value.event}');
11791
switch (widget.controller.value.event) {
11892
case _flashlight:
119-
if(defaultTargetPlatform == TargetPlatform.android)
93+
if (defaultTargetPlatform == TargetPlatform.android)
12094
_channel?.invokeMethod(
12195
widget.controller.value.event, widget.controller.value.value);
12296
else
123-
_channel?.invokeMethod(widget.controller.value.value?_flashlightOn:_flashlightOff);
97+
_channel?.invokeMethod(widget.controller.value.value
98+
? _flashlightOn
99+
: _flashlightOff);
124100
break;
125101
case _muted:
126-
if(defaultTargetPlatform == TargetPlatform.android)
102+
if (defaultTargetPlatform == TargetPlatform.android)
127103
_channel?.invokeMethod(
128104
widget.controller.value.event, widget.controller.value.value);
129105
else
130-
_channel?.invokeMethod(widget.controller.value.value?_mutedOn:_mutedOff);
106+
_channel?.invokeMethod(
107+
widget.controller.value.value ? _mutedOn : _mutedOff);
131108
break;
132109
case _startPreview:
133110
case _startPreview:
@@ -169,10 +146,13 @@ class _WOWZCameraViewState extends State<WOWZCameraView> {
169146
'$defaultTargetPlatform is not yet supported by the text_view plugin');
170147
}
171148

172-
_onPlatformViewCreated(int viewId){
149+
_onPlatformViewCreated(int viewId) {
173150
if (_viewId != viewId || _channel == null) {
174151
_viewId = viewId;
152+
175153
_channel = MethodChannel("${_camera_view_channel}_$viewId");
154+
widget.controller?._setChannel(_channel);
155+
176156
_channel.setMethodCallHandler((call) async {
177157
print('wowz: status: ${call.arguments}');
178158
switch (call.method) {
@@ -192,52 +172,12 @@ class _WOWZCameraViewState extends State<WOWZCameraView> {
192172
break;
193173
}
194174
});
195-
widget.controller?._setChannel(_channel);
196-
197175
// license key gocoder sdk
198176
_channel.invokeMethod(_apiLicenseKey, widget.apiLicenseKey);
199-
// Set the connection properties for the target Wowza Streaming Engine server or Wowza Streaming Cloud live stream
200-
if (widget.hostAddress != null && widget.hostAddress.isNotEmpty) {
201-
_channel.invokeMethod(_hostAddress, widget.hostAddress);
202-
}
203-
if (widget.portNumber != null) {
204-
_channel.invokeMethod(_portNumber, widget.portNumber);
205-
}
206-
if (widget.applicationName != null && widget.applicationName.isNotEmpty) {
207-
_channel.invokeMethod(_applicationName, widget.applicationName);
208-
}
209-
if (widget.streamName != null && widget.streamName.isNotEmpty) {
210-
_channel.invokeMethod(_streamName, widget.streamName);
211-
}
212-
//authentication
213-
if (widget.username != null) {
214-
_channel.invokeMethod(_username, widget.username);
215-
}
216-
if (widget.password != null) {
217-
_channel.invokeMethod(_password, widget.password);
218-
}
219-
if (widget.wowzSize != null) {
220-
_channel.invokeMethod(
221-
_wowzSize, "${widget.wowzSize.width}/${widget.wowzSize.height}");
222-
}
223-
if (widget.wowzMediaConfig != null) {
224-
_channel.invokeMethod(
225-
_wowzMediaConfig, widget.wowzMediaConfig.toString());
226-
}
227-
if (widget.scaleMode != null) {
228-
_channel.invokeMethod(_scaleMode, widget.scaleMode.toString());
229-
}
230-
if(widget.fps!=null){
231-
_channel.invokeListMethod(_fps,widget.fps);
232-
}
233-
if(widget.bps !=null){
234-
_channel.invokeListMethod(_bps,widget.bps);
235-
}
236-
if(widget.khz !=null){
237-
_channel.invokeListMethod(_bps,widget.bps);
238-
}
239177

240-
_channel.invokeListMethod(_initGoCoder);
178+
if (widget.controller.configIsWaiting) {
179+
widget.controller.resetConfig();
180+
}
241181
}
242182
}
243183
}

‎pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: flutter_wowza
22
description: Flutter WOWZA plugin for iOS/Android. The project is based on Wowza GoCoder SDK
33
homepage: https://github.com/VNAPNIC/flutter-wowza
4-
version: 0.1.5
4+
version: 0.1.6
55
author: [email protected]
66

77
environment:

0 commit comments

Comments
 (0)