Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Side by Side Diff: webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java

Issue 1396013004: Android: Replace EGL14 with EGL10 (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add comments for hardcoded EGL constants Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 package org.appspot.apprtc; 11 package org.appspot.apprtc;
12 12
13 import android.content.Context; 13 import android.content.Context;
14 import android.opengl.EGLContext;
15 import android.util.Log; 14 import android.util.Log;
16 15
17 import org.appspot.apprtc.AppRTCClient.SignalingParameters; 16 import org.appspot.apprtc.AppRTCClient.SignalingParameters;
18 import org.appspot.apprtc.util.LooperExecutor; 17 import org.appspot.apprtc.util.LooperExecutor;
19 import org.webrtc.CameraEnumerationAndroid; 18 import org.webrtc.CameraEnumerationAndroid;
20 import org.webrtc.DataChannel; 19 import org.webrtc.DataChannel;
21 import org.webrtc.IceCandidate; 20 import org.webrtc.IceCandidate;
22 import org.webrtc.Logging; 21 import org.webrtc.Logging;
23 import org.webrtc.MediaCodecVideoEncoder; 22 import org.webrtc.MediaCodecVideoEncoder;
24 import org.webrtc.MediaConstraints; 23 import org.webrtc.MediaConstraints;
(...skipping 11 matching lines...) Expand all
36 import org.webrtc.VideoSource; 35 import org.webrtc.VideoSource;
37 import org.webrtc.VideoTrack; 36 import org.webrtc.VideoTrack;
38 37
39 import java.util.EnumSet; 38 import java.util.EnumSet;
40 import java.util.LinkedList; 39 import java.util.LinkedList;
41 import java.util.Timer; 40 import java.util.Timer;
42 import java.util.TimerTask; 41 import java.util.TimerTask;
43 import java.util.regex.Matcher; 42 import java.util.regex.Matcher;
44 import java.util.regex.Pattern; 43 import java.util.regex.Pattern;
45 44
45 import javax.microedition.khronos.egl.EGLContext;
46
46 /** 47 /**
47 * Peer connection client implementation. 48 * Peer connection client implementation.
48 * 49 *
49 * <p>All public methods are routed to local looper thread. 50 * <p>All public methods are routed to local looper thread.
50 * All PeerConnectionEvents callbacks are invoked from the same looper thread. 51 * All PeerConnectionEvents callbacks are invoked from the same looper thread.
51 * This class is a singleton. 52 * This class is a singleton.
52 */ 53 */
53 public class PeerConnectionClient { 54 public class PeerConnectionClient {
54 public static final String VIDEO_TRACK_ID = "ARDAMSv0"; 55 public static final String VIDEO_TRACK_ID = "ARDAMSv0";
55 public static final String AUDIO_TRACK_ID = "ARDAMSa0"; 56 public static final String AUDIO_TRACK_ID = "ARDAMSa0";
(...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 public void onCreateFailure(final String error) { 1033 public void onCreateFailure(final String error) {
1033 reportError("createSDP error: " + error); 1034 reportError("createSDP error: " + error);
1034 } 1035 }
1035 1036
1036 @Override 1037 @Override
1037 public void onSetFailure(final String error) { 1038 public void onSetFailure(final String error) {
1038 reportError("setSDP error: " + error); 1039 reportError("setSDP error: " + error);
1039 } 1040 }
1040 } 1041 }
1041 } 1042 }
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698