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

Remove check for numberOfCameras from AppRTC Mobile PeerConnectionClient.

Browse Source 
Since the class no longer creates its own videoCapturer and it may not
even be a camera, the check doesn't make sense anymore. This also
removes some of the build warnings.

BUG=webrtc:6558

Review-Url: https://codereview.webrtc.org/2434533003
Cr-Commit-Position: refs/heads/master@{#14696}
This commit is contained in:
sakal
2016-10-20 02:34:46 -07:00
committed by Commit bot
parent be4aff76a6
commit c1f8ecb661
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,10 +19,6 @@ import android.util.Log;
import org.webrtc.AudioSource; import org.webrtc.AudioSource;
import org.webrtc.AudioTrack; import org.webrtc.AudioTrack;
import org.webrtc.Camera1Enumerator;
import org.webrtc.Camera2Enumerator;
import org.webrtc.CameraEnumerationAndroid;
import org.webrtc.CameraEnumerator;
import org.webrtc.CameraVideoCapturer; import org.webrtc.CameraVideoCapturer;
import org.webrtc.DataChannel; import org.webrtc.DataChannel;
import org.webrtc.EglBase; import org.webrtc.EglBase;
@ -41,9 +37,6 @@ import org.webrtc.StatsObserver;
import org.webrtc.StatsReport; import org.webrtc.StatsReport;
import org.webrtc.VideoCapturer; import org.webrtc.VideoCapturer;
import org.webrtc.VideoRenderer; import org.webrtc.VideoRenderer;
import org.webrtc.VideoCapturerAndroid;
import org.webrtc.CameraVideoCapturer;
import org.webrtc.FileVideoCapturer;
import org.webrtc.VideoSource; import org.webrtc.VideoSource;
import org.webrtc.VideoTrack; import org.webrtc.VideoTrack;
import org.webrtc.voiceengine.WebRtcAudioManager; import org.webrtc.voiceengine.WebRtcAudioManager;
@ -130,7 +123,6 @@ public class PeerConnectionClient {
private boolean isInitiator; private boolean isInitiator;
private SessionDescription localSdp; // either offer or answer SDP private SessionDescription localSdp; // either offer or answer SDP
private MediaStream mediaStream; private MediaStream mediaStream;
private int numberOfCameras;
private VideoCapturer videoCapturer; private VideoCapturer videoCapturer;
// enableVideo is set to true if video should be rendered and sent. // enableVideo is set to true if video should be rendered and sent.
private boolean renderVideo; private boolean renderVideo;
@ -416,8 +408,7 @@ public class PeerConnectionClient {
} }
// Check if there is a camera on device and disable video call if not. // Check if there is a camera on device and disable video call if not.
numberOfCameras = CameraEnumerationAndroid.getDeviceCount(); if (videoCapturer == null) {
if (numberOfCameras == 0) {
Log.w(TAG, "No camera on device. Switch to audio only call."); Log.w(TAG, "No camera on device. Switch to audio only call.");
videoCallEnabled = false; videoCallEnabled = false;
} }
@ -964,9 +955,8 @@ public class PeerConnectionClient {
private void switchCameraInternal() { private void switchCameraInternal() {
if (videoCapturer instanceof CameraVideoCapturer) { if (videoCapturer instanceof CameraVideoCapturer) {
if (!videoCallEnabled || numberOfCameras < 2 || isError || videoCapturer == null) { if (!videoCallEnabled || isError || videoCapturer == null) {
Log.e(TAG, "Failed to switch camera. Video: " + videoCallEnabled + ". Error : " + isError Log.e(TAG, "Failed to switch camera. Video: " + videoCallEnabled + ". Error : " + isError);
+ ". Number of cameras: " + numberOfCameras);
return; // No video is sent or only one camera is available or error happened. return; // No video is sent or only one camera is available or error happened.
} }
Log.d(TAG, "Switch camera"); Log.d(TAG, "Switch camera");