8000 Merge branch 'master' into pedantic · wer-mathurin/flutter-webrtc@0829a5f · GitHub
[go: up one dir, main page]
Skip to content

Commit 0829a5f

Browse files
wer-mathurinwer-mathurin
committed
Merge branch 'master' into pedantic
2 parents ebdba45 + ddc7836 commit 0829a5f

File tree

10 files changed

+161
-147
lines changed

10 files changed

+161
-147
lines changed

‎CHANGELOG.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
1-
## Changelog
1+
# Changelog
22

33
--------------------------------------------
4+
[0.3.0+1] - 2020.09.06
5+
6+
* [Dart] FIX - missing null check onIceGatheringState (web)
7+
8+
--------------------------------------------
9+
[0.3.0] - 2020.09.05
10+
11+
* [Dart] Improve RTCVideoView.
12+
* [Android] Refactors Android plugin alongside the embedding V2 migration.
13+
* [Dart] Fix .ownerTag not defined for web.
14+
* [Dart] Added label as read only property.
15+
* [macOS] Updated WebRTC framework to work with AppStoreConnect.
16+
* [Dart] Make 'constraints' argument optional.
17+
* [Dart] Make createOffer constraints optional.
18+
* [iOS/Android/Web] Adding createLocalMediaStream method to PeerConnectionFactory.
19+
* [Web] Fixing multiple video renderers on the same HTML page for Flutter Web.
20+
* [iOS] Add peerConnectionId to data channel EventChannel.
21+
* [Android] Add library module ProGuard configuration file.
22+
* [iOS] Fix typo in render size change check condition
23+
* [README] Add missed Android usage hint.
< 8000 code>24+
425
[0.2.8] - 2020.04.22
526

627
* [macOS/iOS] Fix typo in render size change check condition.

‎android/src/main/java/com/cloudwebrtc/webrtc/FlutterRTCVideoRenderer.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ public void Dispose(){
4040
* The {@code RendererEvents} which listens to rendering events reported by
4141
* {@link #surfaceTextureRenderer}.
4242
*/
43-
private final RendererEvents rendererEvents
44-
= new RendererEvents() {
45-
private int _rotation = 0;
43+
private RendererEvents rendererEvents;
44+
45+
private void listenRendererEvents() {
46+
rendererEvents = new RendererEvents() {
47+
private int _rotation = -1;
4648
private int _width = 0, _height = 0;
4749

4850
@Override
@@ -81,7 +83,7 @@ public void onFrameResolutionChanged(
8183
}
8284
}
8385
};
84-
86+
}
8587
private SurfaceTextureRenderer surfaceTextureRenderer;
8688

8789
/**
@@ -94,6 +96,7 @@ public void onFrameResolutionChanged(
9496

9597
public FlutterRTCVideoRenderer(SurfaceTexture texture, TextureRegistry.SurfaceTextureEntry entry) {
9698
this.surfaceTextureRenderer = new SurfaceTextureRenderer("");
99+
listenRendererEvents();
97100
surfaceTextureRenderer.init(EglUtils.getRootEglBaseContext(), rendererEvents);
98101
surfaceTextureRenderer.surfaceCreated(texture);
99102

@@ -190,6 +193,7 @@ private void tryAddRendererToVideoTrack() {
190193
}
191194

192195
surfaceTextureRenderer.release();
196+
listenRendererEvents();
193197
surfaceTextureRenderer.init(sharedContext, rendererEvents);
194198
surfaceTextureRenderer.surfaceCreated(texture);
195199

‎android/src/main/java/com/cloudwebrtc/webrtc/SurfaceTextureRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void init(final EglBase.Context sharedContext,
5656
isFirstFrameRendered = false;
5757
rotatedFrameWidth = 0;
5858
rotatedFrameHeight = 0;
59-
frameRotation = 0;
59+
frameRotation = -1;
6060
}
6161
super.init(sharedContext, configAttributes, drawer);
6262
}

‎example/lib/src/get_user_media_sample.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ class _GetUserMediaSampleState extends State<GetUserMediaSample> {
6262
var stream = await navigator.getUserMedia(mediaConstraints);
6363
_localStream = stream;
6464
_localRenderer.srcObject = _localStream;
65-
_localRenderer.mirror = true;
6665
} catch (e) {
6766
print(e.toString());
6867
}
@@ -183,7 +182,7 @@ class _GetUserMediaSampleState extends State<GetUserMediaSample> {
183182
margin: new EdgeInsets.fromLTRB(0.0, 0.0, 0.0, 0.0),
184183
width: MediaQuery.of(context).size.width,
185184
height: MediaQuery.of(context).size.height,
186-
child: RTCVideoView(_localRenderer),
185+
child: RTCVideoView(_localRenderer, mirror: true),
187186
decoration: new BoxDecoration(color: Colors.black54),
188187
),
189188
);

‎example/lib/src/get_user_media_sample_web.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ class _GetUserMediaSampleState extends State<GetUserMediaSample> {
6565
var stream = await navigator.getUserMedia(mediaConstraints);
6666
_localStream = stream;
6767
_localRenderer.srcObject = _localStream;
68-
_localRenderer.mirror = true;
6968
} catch (e) {
7069
print(e.toString());
7170
}
@@ -146,7 +145,7 @@ class _GetUserMediaSampleState extends State<GetUserMediaSample> {
146145
margin: new EdgeInsets.fromLTRB(0.0, 0.0, 0.0, 0.0),
147146
width: MediaQuery.of(context).size.width,
148147
height: MediaQuery.of(context).size.height,
149-
child: RTCVideoView(_localRenderer),
148+
child: RTCVideoView(_localRenderer, mirror: true),
150149
decoration: new BoxDecoration(color: Colors.black54),
151150
),
152151
);

‎example/lib/src/loopback_sample.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ class _MyAppState extends State<LoopBackSample> {
130130
try {
131131
_localStream = await navigator.getUserMedia(mediaConstraints);
132132
_localRenderer.srcObject = _localStream;
133-
_localRenderer.mirror = true;
134133
_peerConnection =
135134
await createPeerConnection(configuration, loopbackConstraints);
136135

@@ -182,7 +181,7 @@ class _MyAppState extends State<LoopBackSample> {
182181
Widget build(BuildContext context) {
183182
var widgets = <Widget>[
184183
new Expanded(
185-
child: new RTCVideoView(_localRenderer),
184+
child: new RTCVideoView(_localRenderer, mirror: true),
186185
),
187186
new Expanded(
188187
child: new RTCVideoView(_remoteRenderer),

‎lib/rtc_peerconnection.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ class RTCPeerConnection {
104104
_remoteStreams.firstWhere((it) => it.id == streamId, orElse: () {
105105
var newStream = MediaStream(streamId, _peerConnectionId);
106106
newStream.setMediaTracks(map['audioTracks'], map['videoTracks']);
107-
_remoteStreams.add(newStream);
108107
return newStream;
109108
});
110109

0 commit comments

Comments
 (0)
0