zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the android AppRTC to use PeerConnection Unified Plan API.

Browse Source 
This updates AppRTC to use addTrack instead of addStream, and removes
the use of onAddStream, because we no longer have to wait for this to be
fired to set the remote track's video renderers.

Bug: webrtc:8869
Change-Id: I1ecae684a9bc4b30512e8c5d717e72b52c589831
Reviewed-on: https://webrtc-review.googlesource.com/57840
Commit-Queue: Seth Hampson <shampson@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22318}
This commit is contained in:
Seth Hampson
2018-03-06 17:24:06 -08:00
committed by Commit Bot
parent c384e14707
commit 9a58cc00e0
6 changed files with 53 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
View File

@ -47,12 +47,15 @@ import org.webrtc.IceCandidate;
import org.webrtc.Logging;
import org.webrtc.MediaConstraints;
import org.webrtc.MediaStream;
import org.webrtc.MediaStreamTrack;
import org.webrtc.MediaStreamTrack.MediaType;
import org.webrtc.PeerConnection;
import org.webrtc.PeerConnection.IceConnectionState;
import org.webrtc.PeerConnectionFactory;
import org.webrtc.RtpParameters;
import org.webrtc.RtpReceiver;
import org.webrtc.RtpSender;
import org.webrtc.RtpTransceiver;
import org.webrtc.SdpObserver;
import org.webrtc.SessionDescription;
import org.webrtc.SoftwareVideoDecoderFactory;
@ -636,6 +639,7 @@ public class PeerConnectionClient {
rtcConfig.keyType = PeerConnection.KeyType.ECDSA;
// Enable DTLS for normal calls and disable for loopback calls.
rtcConfig.enableDtlsSrtp = !peerConnectionParameters.loopback;
rtcConfig.sdpSemantics = PeerConnection.SdpSemantics.UNIFIED_PLAN;
peerConnection = factory.createPeerConnection(rtcConfig, pcObserver);
@ -655,13 +659,18 @@ public class PeerConnectionClient {
// NOTE: this _must_ happen while |factory| is alive!
Logging.enableLogToDebugOutput(Logging.Severity.LS_INFO);
mediaStream = factory.createLocalMediaStream("ARDAMS");
List<String> mediaStreamLabels = Collections.singletonList("ARDAMS");
if (videoCallEnabled) {
mediaStream.addTrack(createVideoTrack(videoCapturer));
peerConnection.addTrack(createVideoTrack(videoCapturer), mediaStreamLabels);
// We can add the renderers right away because we don't need to wait for an
// answer to get the remote track.
remoteVideoTrack = getRemoteVideoTrack();
remoteVideoTrack.setEnabled(renderVideo);
for (VideoRenderer.Callbacks remoteRender : remoteRenders) {
remoteVideoTrack.addRenderer(new VideoRenderer(remoteRender));
}
}
mediaStream.addTrack(createAudioTrack());
peerConnection.addStream(mediaStream);
peerConnection.addTrack(createAudioTrack(), mediaStreamLabels);
if (videoCallEnabled) {
findVideoSender();
}
@ -1024,6 +1033,17 @@ public class PeerConnectionClient {
}
}
// Returns the remote VideoTrack, assuming there is only one.
private VideoTrack getRemoteVideoTrack() {
for (RtpTransceiver transceiver : peerConnection.getTransceivers()) {
MediaStreamTrack track = transceiver.getReceiver().track();
if (track instanceof VideoTrack) {
return (VideoTrack) track;
}
}
return null;
}
@SuppressWarnings("StringSplitter")
private static String setStartBitrate(
String codec, boolean isVideoCodec, String sdpDescription, int bitrateKbps) {
@ -1274,37 +1294,10 @@ public class PeerConnectionClient {
}
@Override
public void onAddStream(final MediaStream stream) {
executor.execute(new Runnable() {
@Override
public void run() {
if (peerConnection == null || isError) {
return;
}
if (stream.audioTracks.size() > 1 || stream.videoTracks.size() > 1) {
reportError("Weird-looking stream: " + stream);
return;
}
if (stream.videoTracks.size() == 1) {
remoteVideoTrack = stream.videoTracks.get(0);
remoteVideoTrack.setEnabled(renderVideo);
for (VideoRenderer.Callbacks remoteRender : remoteRenders) {
remoteVideoTrack.addRenderer(new VideoRenderer(remoteRender));
}
}
}
});
}
public void onAddStream(final MediaStream stream) {}
@Override
public void onRemoveStream(final MediaStream stream) {
executor.execute(new Runnable() {
@Override
public void run() {
remoteVideoTrack = null;
}
});
}
public void onRemoveStream(final MediaStream stream) {}
@Override
public void onDataChannel(final DataChannel dc) {