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

Sync Android AppRTCDemo with internal repo.

Browse Source 
- Fixed some Lint warnings.
- Switch to OPUS by default.
- Add check to WebSocket connection that public methods are called
on correct thread.

R=jiayl@webrtc.org, wzh@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8032 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
glaznev@webrtc.org
2015-01-09 19:34:06 +00:00
parent 9657265f39
commit 80452d70cb
8 changed files with 96 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,7 @@ import java.util.regex.Pattern;
*/
public class PeerConnectionClient {
private static final String TAG = "PCRTCClient";
private static final boolean PREFER_ISAC = false;
public static final String VIDEO_TRACK_ID = "ARDAMSv0";
public static final String AUDIO_TRACK_ID = "ARDAMSa0";
@@ -178,7 +179,8 @@ public class PeerConnectionClient {
Context context,
boolean vp8HwAcceleration,
EGLContext renderEGLContext) {
Log.d(TAG, "Create peer connection factory.");
Log.d(TAG, "Create peer connection factory with EGLContext "
+ renderEGLContext);
isError = false;
if (!PeerConnectionFactory.initializeAndroidGlobals(
context, true, true, vp8HwAcceleration, renderEGLContext)) {
@@ -292,6 +294,7 @@ public class PeerConnectionClient {
@Override
public void run() {
if (pc != null && !isError) {
Log.d(TAG, "PC Create OFFER");
isInitiator = true;
pc.createOffer(sdpObserver, sdpMediaConstraints);
}
@@ -304,6 +307,7 @@ public class PeerConnectionClient {
@Override
public void run() {
if (pc != null && !isError) {
Log.d(TAG, "PC create ANSWER");
isInitiator = false;
pc.createAnswer(sdpObserver, sdpMediaConstraints);
}
@@ -333,7 +337,10 @@ public class PeerConnectionClient {
if (pc == null || isError) {
return;
}
String sdpDescription = preferISAC(sdp.description);
String sdpDescription = sdp.description;
if (PREFER_ISAC) {
sdpDescription = preferISAC(sdpDescription);
}
if (startBitrate > 0) {
sdpDescription = setStartBitrate(sdpDescription, startBitrate);
}
@@ -672,8 +679,12 @@ public class PeerConnectionClient {
reportError("Multiple SDP create.");
return;
}
String sdpDescription = origSdp.description;
if (PREFER_ISAC) {
sdpDescription = preferISAC(sdpDescription);
}
final SessionDescription sdp = new SessionDescription(
origSdp.type, preferISAC(origSdp.description));
origSdp.type, sdpDescription);
localSdp = sdp;
executor.execute(new Runnable() {
@Override