Upgrade to Android 6 (#452)

* Upgrade to android v6 * Fix a bunch of issues * Last set of fixes * Switch the events around

Author: slycoder

Example/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:4.0.0'
+ classpath 'com.android.tools.build:gradle:4.0.1'
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files

android/build.gradle

@@ -49,7 +49,7 @@ dependencies {
 
  implementation fileTree(dir: 'libs', include: ['*.jar'])
  implementation "com.android.support:appcompat-v7:$androidSupportVersion"
- implementation "com.twilio:video-android:5.10.1"
+ implementation "com.twilio:video-android:6.2.1"
  implementation 'org.webrtc:google-webrtc:1.0.30039'
  implementation "com.facebook.react:react-native:+" // From node_modules
 }

android/src/main/java/com/twiliorn/library/CustomTwilioVideoView.java

@@ -69,11 +69,13 @@
 import com.twilio.video.TrackPublication;
 import com.twilio.video.TwilioException;
 import com.twilio.video.Video;
-import com.twilio.video.VideoConstraints;
 import com.twilio.video.VideoDimensions;
+import com.twilio.video.VideoFormat;
 
 import org.webrtc.voiceengine.WebRtcAudioManager;
 
+import tvi.webrtc.Camera1Enumerator;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Collections;
@@ -109,6 +111,8 @@ public class CustomTwilioVideoView extends View implements LifecycleEventListene
  private boolean enableNetworkQualityReporting = false;
  private boolean isVideoEnabled = false;
  private boolean dominantSpeakerEnabled = false;
+ private static String frontFacingDevice;
+ private static String backFacingDevice;
  private boolean maintainVideoTrackInBackground = false;
 
  @Retention(RetentionPolicy.SOURCE)
@@ -234,29 +238,27 @@ public CustomTwilioVideoView(ThemedReactContext context) {
 
  // ===== SETUP =================================================================================
 
- private VideoConstraints buildVideoConstraints() {
- return new VideoConstraints.Builder()
- .minVideoDimensions(VideoDimensions.CIF_VIDEO_DIMENSIONS)
- .maxVideoDimensions(VideoDimensions.CIF_VIDEO_DIMENSIONS)
- .minFps(5)
- .maxFps(15)
- .build();
+ private VideoFormat buildVideoFormat() {
+ return new VideoFormat(VideoDimensions.CIF_VIDEO_DIMENSIONS, 15);
  }
 
- private CameraCapturer createCameraCaputer(Context context, CameraCapturer.CameraSource cameraSource) {
+ private CameraCapturer createCameraCaputer(Context context, String cameraId) {
  CameraCapturer newCameraCapturer = null;
  try {
  newCameraCapturer = new CameraCapturer(
  context,
- cameraSource,
+ cameraId,
  new CameraCapturer.Listener() {
  @Override
  public void onFirstFrameAvailable() {
  }
 
  @Override
- public void onCameraSwitched() {
+ public void onCameraSwitched(String newCameraId) {
  setThumbnailMirror();
+ WritableMap event = new WritableNativeMap();
+ event.putBoolean("isBackCamera", isCurrentCameraSourceBackFacing());
+ pushEvent(CustomTwilioVideoView.this, ON_CAMERA_SWITCHED, event);
  }
 
  @Override
@@ -271,27 +273,40 @@ public void onError(int i) {
  }
  }
 
+ private void buildDeviceInfo() {
+ Camera1Enumerator enumerator = new Camera1Enumerator();
+ String[] deviceNames = enumerator.getDeviceNames();
+ backFacingDevice = null;
+ frontFacingDevice = null;
+ for (String deviceName : deviceNames) {
+ if (enumerator.isBackFacing(deviceName) && enumerator.getSupportedFormats(deviceName).size() > 0) {
+ backFacingDevice = deviceName;
+ } else if (enumerator.isFrontFacing(deviceName) && enumerator.getSupportedFormats(deviceName).size() > 0) {
+ frontFacingDevice = deviceName;
+ }
+ }
+ }
+
  private boolean createLocalVideo(boolean enableVideo) {
- isVideoEnabled = enableVideo;
+  isVideoEnabled = enableVideo;
  // Share your camera
- cameraCapturer = this.createCameraCaputer(getContext(), CameraCapturer.CameraSource.FRONT_CAMERA);
- if (cameraCapturer == null){
- cameraCapturer = this.createCameraCaputer(getContext(), CameraCapturer.CameraSource.BACK_CAMERA);
- }
- if (cameraCapturer == null){
+ buildDeviceInfo();
+ if (this.frontFacingDevice != null) {
+ cameraCapturer = this.createCameraCaputer(getContext(), frontFacingDevice);
+ } else if (this.backFacingDevice != null) {
+ cameraCapturer = this.createCameraCaputer(getContext(), backFacingDevice);
+ } else {
  WritableMap event = new WritableNativeMap();
  event.putString("error", "No camera is supported on this device");
  pushEvent(CustomTwilioVideoView.this, ON_CONNECT_FAILURE, event);
  return false;
  }
 
- if (cameraCapturer.getSupportedFormats().size() > 0) {
- localVideoTrack = LocalVideoTrack.create(getContext(), enableVideo, cameraCapturer, buildVideoConstraints());
- if (thumbnailVideoView != null && localVideoTrack != null) {
- localVideoTrack.addRenderer(thumbnailVideoView);
- }
- setThumbnailMirror();
+ localVideoTrack = LocalVideoTrack.create(getContext(), enableVideo, cameraCapturer, buildVideoFormat());
+ if (thumbnailVideoView != null && localVideoTrack != null) {
+ localVideoTrack.addSink(thumbnailVideoView);
  }
+ setThumbnailMirror();
  return true;
  }
 
@@ -308,12 +323,12 @@ public void onHostResume() {
  * If the local video track was released when the app was put in the background, recreate.
  */
  if (cameraCapturer != null && localVideoTrack == null) {
- localVideoTrack = LocalVideoTrack.create(getContext(), isVideoEnabled, cameraCapturer, buildVideoConstraints());
+ localVideoTrack = LocalVideoTrack.create(getContext(), isVideoEnabled, cameraCapturer, buildVideoFormat());
  }
 
  if (localVideoTrack != null) {
  if (thumbnailVideoView != null) {
- localVideoTrack.addRenderer(thumbnailVideoView);
+ localVideoTrack.addSink(thumbnailVideoView);
  }
 
  /*
@@ -545,11 +560,14 @@ public void sendString(String message) {
  }
  }
 
+ private static boolean isCurrentCameraSourceBackFacing() {
+ return cameraCapturer != null && cameraCapturer.getCameraId() == backFacingDevice;
+ }
+
  // ===== BUTTON LISTENERS ======================================================================
  private static void setThumbnailMirror() {
  if (cameraCapturer != null) {
- CameraCapturer.CameraSource cameraSource = cameraCapturer.getCameraSource();
- final boolean isBackCamera = (cameraSource == CameraCapturer.CameraSource.BACK_CAMERA);
+ final boolean isBackCamera = isCurrentCameraSourceBackFacing();
  if (thumbnailVideoView != null && thumbnailVideoView.getVisibility() == View.VISIBLE) {
  thumbnailVideoView.setMirror(!isBackCamera);
  }
@@ -558,12 +576,12 @@ private static void setThumbnailMirror() {
 
  public void switchCamera() {
  if (cameraCapturer != null) {
- cameraCapturer.switchCamera();
- CameraCapturer.CameraSource cameraSource = cameraCapturer.getCameraSource();
- final boolean isBackCamera = cameraSource == CameraCapturer.CameraSource.BACK_CAMERA;
- WritableMap event = new WritableNativeMap();
- event.putBoolean("isBackCamera", isBackCamera);
- pushEvent(CustomTwilioVideoView.this, ON_CAMERA_SWITCHED, event);
+ final boolean isBackCamera = isCurrentCameraSourceBackFacing();
+ if (frontFacingDevice != null && (isBackCamera || backFacingDevice == null)) {
+  cameraCapturer.switchCamera(frontFacingDevice);
+ } else {
+  cameraCapturer.switchCamera(backFacingDevice);
+ }
  }
  }
 
@@ -1145,9 +1163,9 @@ public static void registerPrimaryVideoView(PatchedVideoView v, String trackSid)
  continue;
  }
  if (publication.getTrackSid().equals(trackSid)) {
- track.addRenderer(v);
+ track.addSink(v);
  } else {
- track.removeRenderer(v);
+ track.removeSink(v);
  }
  }
  }
@@ -1157,7 +1175,7 @@ public static void registerPrimaryVideoView(PatchedVideoView v, String trackSid)
  public static void registerThumbnailVideoView(PatchedVideoView v) {
  thumbnailVideoView = v;
  if (localVideoTrack != null) {
- localVideoTrack.addRenderer(v);
+ localVideoTrack.addSink(v);
  }
  setThumbnailMirror();
  }

android/src/main/java/com/twiliorn/library/PatchedVideoView.java

@@ -11,9 +11,10 @@
 import android.os.Looper;
 import android.util.AttributeSet;
 
-import com.twilio.video.I420Frame;
 import com.twilio.video.VideoView;
 
+import tvi.webrtc.VideoFrame;
+
 /*
  * VideoView that notifies Listener of the first frame rendered and the first frame after a reset
  * request.
@@ -33,7 +34,7 @@ public PatchedVideoView(Context context, AttributeSet attrs) {
  }
 
  @Override
- public void renderFrame(I420Frame frame) {
+ public void onFrame(VideoFrame frame) {
  if (notifyFrameRendered) {
  notifyFrameRendered = false;
  mainThreadHandler.post(new Runnable() {
@@ -43,7 +44,7 @@ public void run() {
  }
  });
  }
- super.renderFrame(frame);
+ super.onFrame(frame);
  }
 
  /*

android/src/main/java/com/twiliorn/library/RNVideoViewGroup.java

@@ -16,11 +16,10 @@
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
-import com.twilio.video.VideoFrame;
-import com.twilio.video.VideoRenderer;
 import com.twilio.video.VideoScaleType;
 
-import org.webrtc.RendererCommon;
+import tvi.webrtc.RendererCommon;
+import tvi.webrtc.VideoFrame;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -52,17 +51,16 @@ public RNVideoViewGroup(ThemedReactContext themedReactContext) {
  surfaceViewRenderer.setVideoScaleType(VideoScaleType.ASPECT_FILL);
  addView(surfaceViewRenderer);
  surfaceViewRenderer.setListener(
- new VideoRenderer.Listener() {
+ new RendererCommon.RendererEvents() {
  @Override
- public void onFirstFrame() {
+ public void onFirstFrameRendered() {
 
  }
 
  @Override
- public void onFrameDimensionsChanged(int vw, int vh, int rotation) {
+ public void onFrameResolutionChanged(int vw, int vh, int rotation) {
  synchronized (layoutSync) {
- if (rotation == VideoFrame.RotationAngle.ROTATION_90.getValue() ||
- rotation == VideoFrame.RotationAngle.ROTATION_270.getValue()) {
+ if (rotation == 90 || rotation == 270) {
  videoHeight = vw;
  videoWidth = vh;
  } else {

android/src/main/java/com/twiliorn/library/TwilioRemotePreviewManager.java

@@ -15,7 +15,7 @@
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
-import org.webrtc.RendererCommon;
+import tvi.webrtc.RendererCommon;
 
 import java.util.Map;
 

android/src/main/java/com/twiliorn/library/TwilioVideoPreviewManager.java

@@ -17,7 +17,7 @@
 
 import java.util.Map;
 
-import org.webrtc.RendererCommon;
+import tvi.webrtc.RendererCommon;
 
 import static com.twiliorn.library.RNVideoViewGroup.Events.ON_FRAME_DIMENSIONS_CHANGED;