generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change back so that Android ApprtcDemo only use one MediaStream containing both audio and video.

Browse Source 
The reason is that the desktop apprtcdemo only handle one MediaStream and this doesn't play audio if it receive two streams.

TEST=Test that a call with audio and video can be setup between an Android device and a desktop client using apprtc.appspot.com.
BUG=4051,3786
R=henrika@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/31069004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7781 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
perkj@webrtc.org 2014-12-02 14:38:18 +00:00
parent 7f1dfa5b61
commit beee9cec22
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
talk/examples/android/src/org/appspot/apprtc/PeerConnectionClient.java
View File

@ -77,7 +77,7 @@ public class PeerConnectionClient {
private boolean isInitiator;
private boolean useFrontFacingCamera = true;
private SessionDescription localSdp = null; // either offer or answer SDP
private MediaStream videoMediaStream = null;
private MediaStream mediaStream = null;
public PeerConnectionClient(
Activity activity,
@ -116,19 +116,17 @@ public class PeerConnectionClient {
// EnumSet.of(Logging.TraceLevel.TRACE_ALL),
// Logging.Severity.LS_SENSITIVE);
mediaStream = factory.createLocalMediaStream("ARDAMS");
if (videoConstraints != null) {
videoMediaStream = factory.createLocalMediaStream("ARDAMSVideo");
videoMediaStream.addTrack(createVideoTrack(useFrontFacingCamera));
pc.addStream(videoMediaStream);
mediaStream.addTrack(createVideoTrack(useFrontFacingCamera));
}
if (signalingParameters.audioConstraints != null) {
MediaStream lMS = factory.createLocalMediaStream("ARDAMSAudio");
lMS.addTrack(factory.createAudioTrack(
mediaStream.addTrack(factory.createAudioTrack(
AUDIO_TRACK_ID,
factory.createAudioSource(signalingParameters.audioConstraints)));
pc.addStream(lMS);
}
pc.addStream(mediaStream);
}
public boolean isHDVideo() {
@ -443,9 +441,9 @@ public class PeerConnectionClient {
return;
}
pc.removeStream(videoMediaStream);
VideoTrack currentTrack = videoMediaStream.videoTracks.get(0);
videoMediaStream.removeTrack(currentTrack);
pc.removeStream(mediaStream);
VideoTrack currentTrack = mediaStream.videoTracks.get(0);
mediaStream.removeTrack(currentTrack);
String trackId = currentTrack.id();
// On Android, there can only be one camera open at the time and we
@ -456,8 +454,8 @@ public class PeerConnectionClient {
useFrontFacingCamera = !useFrontFacingCamera;
VideoTrack newTrack = createVideoTrack(useFrontFacingCamera);
videoMediaStream.addTrack(newTrack);
pc.addStream(videoMediaStream);
mediaStream.addTrack(newTrack);
pc.addStream(mediaStream);
SessionDescription remoteDesc = pc.getRemoteDescription();
if (localSdp == null || remoteDesc == null) {