Successfull build of Instance implementations + Use newer WebRTC version in libtgvoip + Pass supported tgcalls versions in CallProtocol + Do not build two versions of WebRTC

Author: vkryl

app/jni/BuildTelegramVoIP.cmake

@@ -74,11 +74,11 @@ add_library(tgcalls STATIC
 )
 
 target_include_directories(tgcalls PRIVATE
-  "${TGCALLS_DIR}/tgcalls"
   "${CMAKE_HOME_DIRECTORY}"
 )
 target_include_directories(tgcalls PUBLIC
   "${TGCALLS_DIR}"
+  "${TGCALLS_DIR}/tgcalls"
 )
 
 target_compile_options(tgcalls PUBLIC
@@ -87,6 +87,7 @@ target_compile_options(tgcalls PUBLIC
 
 target_link_libraries(tgcalls PRIVATE
   rnnoise
+  z
 )
 
 target_link_libraries(tgcalls PUBLIC

app/jni/BuildTgCalls.cmake

@@ -140,6 +140,7 @@ set(WEBRTC_DIR "${THIRDPARTY_DIR}/webrtc")
 #"${WEBRTC_DIR}/rtc_base/thread.h"
 #"${WEBRTC_DIR}/api/rtp_packet_infos.h"
 #"${WEBRTC_DIR}/api/task_queue/task_queue_base.h"
+#"${WEBRTC_DIR}/api/task_queue/default_task_queue_factory_gcd.cc"
 #"${WEBRTC_DIR}/rtc_base/thread_annotations.h"
 #"${WEBRTC_DIR}/common_audio/signal_processing/dot_product_with_scale.h"
 #"${WEBRTC_DIR}/api/audio/audio_mixer.h"
@@ -1599,7 +1600,6 @@ add_library(webrtc STATIC
   "${WEBRTC_DIR}/api/rtp_transceiver_interface.cc"
   "${WEBRTC_DIR}/api/sctp_transport_interface.cc"
   "${WEBRTC_DIR}/api/stats_types.cc"
-  "${WEBRTC_DIR}/api/task_queue/default_task_queue_factory_gcd.cc"
   "${WEBRTC_DIR}/api/task_queue/task_queue_base.cc"
   "${WEBRTC_DIR}/api/transport/bitrate_settings.cc"
   "${WEBRTC_DIR}/api/transport/field_trial_based_config.cc"

app/jni/BuildWebRTC.cmake

@@ -163,9 +163,6 @@ add_subdirectory(
   "${UTILS_DIR}"
 )
 
-# libtgvoip
-include("${CMAKE_HOME_DIRECTORY}/BuildTelegramVoIP.cmake")
-
 # usrsctp
 include("${CMAKE_HOME_DIRECTORY}/BuildUsrSCTP.cmake")
 
@@ -181,6 +178,9 @@ include("${CMAKE_HOME_DIRECTORY}/BuildAbsl.cmake")
 # webrtc
 include("${CMAKE_HOME_DIRECTORY}/BuildWebRTC.cmake")
 
+# libtgvoip
+include("${CMAKE_HOME_DIRECTORY}/BuildTelegramVoIP.cmake")
+
 # tgcalls
 include("${CMAKE_HOME_DIRECTORY}/BuildTgCalls.cmake")
 
@@ -278,6 +278,7 @@ target_compile_definitions(${NATIVE_LIB} PUBLIC
 )
 target_compile_options(${NATIVE_LIB} PUBLIC
   -Wall -Werror -fno-math-errno -fno-strict-aliasing -ffast-math -funroll-loops
+  -error-limit=0
 )
 
 # == Linking dependencies ==

app/jni/CMakeLists.txt

@@ -13,9 +13,22 @@
  * File created on 16/06/2017
  */
 
+#include <jni_utils.h>
+#include "bridge.h"
+
 #include <libtgvoip/VoIPController.h>
 #include <libtgvoip/client/android/tg_voip_jni.h>
 
+#ifndef DISABLE_TGCALLS
+#include <tgcalls/legacy/InstanceImplLegacy.h>
+#include <tgcalls/InstanceImpl.h>
+//#include <tgcalls/VideoCaptureInterface.h>
+#include <tgcalls/v2/InstanceV2Impl.h>
+#include <tgcalls/v2_4_0_0/InstanceV2_4_0_0Impl.h>
+#include <tgcalls/v2/InstanceV2ReferenceImpl.h>
+
+#else
+
 #ifdef HAVE_TDLIB_CRYPTO
 #include <tdjni/telegram_crypto.h>
 #else
@@ -29,9 +42,6 @@ extern "C" {
 #include <openssl/rand.h>
 }
 
-#include <jni_utils.h>
-#include "bridge.h"
-
 void telegram_aes_ige_encrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t* key, uint8_t* iv){
   AES_KEY akey;
   AES_set_encrypt_key(key, 32*8, &akey);
@@ -77,10 +87,105 @@ void telegram_aes_cbc_decrypt(uint8_t* in, uint8_t* out, size_t length, uint8_t*
   AES_set_decrypt_key(key, 256, &akey);
   AES_cbc_encrypt(in, out, length, &akey, iv, AES_DECRYPT);
 }
+#endif
+#endif
+
+namespace tgcalls {
+  bool isInitialized = false;
+
+  jclass javaTgCallsController = nullptr;
+  jclass javaNetworkStats = nullptr;
+  jclass javaCallConfiguration = nullptr;
+  jclass javaCallOptions = nullptr;
+
+  bool initialize (JNIEnv *env) {
+    if (isInitialized) {
+      return true;
+    }
+
+    // find Java classes
+#define INIT(var_name, path) var_name = jni_class::get(env, path);\
+    if ((var_name) == nullptr) {\
+      jni::throw_new(env, #var_name" not found by path: " path, jni_class::IllegalStateException(env)); \
+      return false;\
+    }
+    INIT(javaTgCallsController, "org/thunderdog/challegram/voip/TgCallsController")
+    INIT(javaNetworkStats, "org/thunderdog/challegram/voip/NetworkStats")
+    INIT(javaCallConfiguration, "org/thunderdog/challegram/voip/CallConfiguration")
+    INIT(javaCallOptions, "org/thunderdog/challegram/voip/CallOptions")
+#undef INIT
+
+#ifndef DISABLE_TGCALLS
+    // register tgcalls implementations
+#define REGISTER(impl) if (!Register<impl>()) { \
+      jni::throw_new(env, #impl" could not be registered", jni_class::IllegalStateException(env)); \
+    }
+    // "2.4.4"
+    REGISTER(InstanceImplLegacy)
+    // "2.7.7", "5.0.0"
+    REGISTER(InstanceImpl)
+    // "6.0.0"
+    REGISTER(InstanceV2_4_0_0Impl)
+    // "7.0.0", "8.0.0", "9.0.0"
+    REGISTER(InstanceV2Impl)
+    // "10.0.0", "11.0.0"
+    REGISTER(InstanceV2ReferenceImpl)
+#undef REGISTER
 #endif
 
+    isInitialized = true;
+    return true;
+  }
+}
+
+JNI_FUNC(jlong, newTgCallsInstance,
+         jstring jVersion,
+         jobject jConfiguration,
+         jobject jOptions) {
+
+  if (!tgcalls::initialize(env)) {
+    return 0;
+  }
+
+  std::string version = jni::from_jstring(env, jVersion);
+  jni::Object configuration (env, jConfiguration, tgcalls::javaCallConfiguration);
+  jni::Object options (env, jOptions, tgcalls::javaCallOptions);
+
+  // TODO create tgcalls instance
+
+  return 0;
+}
+
+JNI_FUNC(jobjectArray, getTgCallsVersions) {
+#ifndef DISABLE_TGCALLS
+  tgcalls::initialize(env);
+  std::vector<std::string> versions (tgcalls::Meta::Versions());
+
+  jobjectArray jArray = env->NewObjectArray(
+    (jsize) versions.size(),
+    jni_class::String(env),
+    nullptr
+  );
+
+  jsize index = 0;
+  for (const auto &version : versions) {
+    jstring jVersion = jni::to_jstring(env, version);
+    env->SetObjectArrayElement(jArray, index, jVersion);
+    env->DeleteLocalRef(jVersion);
+    index++;
+  }
+
+  return jArray;
+#else
+  return env->NewObjectArray(0, jni_class::String(env), nullptr);
+#endif
+}
+
+// JNI initialization
+
 extern "C" {
 int voipOnJNILoad(JavaVM *vm, JNIEnv *env) {
+#ifdef DISABLE_TGCALLS
   tgvoip::VoIPController::crypto.sha1 = &telegram_sha1;
   tgvoip::VoIPController::crypto.sha256 = &telegram_sha256;
   tgvoip::VoIPController::crypto.rand_bytes = &telegram_rand_bytes;
@@ -90,22 +195,9 @@ int voipOnJNILoad(JavaVM *vm, JNIEnv *env) {
 #ifndef HAVE_TDLIB_CRYPTO
   tgvoip::VoIPController::crypto.aes_cbc_decrypt = &telegram_aes_cbc_decrypt;
   tgvoip::VoIPController::crypto.aes_cbc_encrypt = &telegram_aes_cbc_encrypt;
+#endif
 #endif
   tgvoipRegisterNatives(env);
   return 0;
 }
-}
-
-JNI_FUNC(jlong, newTgCallsInstance,
-         jstring jVersion,
-         jobject jConfiguration,
-         jobject jOptions) {
-
-  std::string version = jni::from_jstring(env, jVersion);
-  jni::Object configuration (env, jConfiguration);
-  jni::Object options (env, jOptions);
-
-  // TODO create tgcalls instance
-
-  return 0;
 }

app/jni/tgvoip.cpp

@@ -130,4 +130,5 @@ public static native long newTgCallsInstance (
     @NonNull CallConfiguration configuration,
     @NonNull CallOptions options
   );
+  public static native String[] getTgCallsVersions ();
 }

app/jni/third_party/libtgvoip

@@ -1,69 +1,17 @@
 package org.thunderdog.challegram.voip;
 
-import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 
+import org.thunderdog.challegram.N;
 import org.thunderdog.challegram.voip.annotation.CallNetworkType;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
 public class TgCallsController extends VoIPInstance {
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({
-    Version.LEGACY,
-    Version.V1,
-    Version.V2_4_0_0,
-    Version.V2,
-    Version.V2_REFERENCE
-  })
-  public @interface Version {
-    int
-      LEGACY = 0,
-      V1 = 1,
-      V2_4_0_0 = 2,
-      V2 = 3,
-      V2_REFERENCE = 4;
-  }
-
-  public static class UnknownVersionException extends IllegalArgumentException {
-    public UnknownVersionException (String s) {
-      super(s);
-    }
-  }
-
-  private static @Version int parseVersion (@NonNull String version) throws UnknownVersionException {
-    switch (version) {
-      case "2.4.4":
-        // TODO? InstanceImplLegacy.cpp
-        return Version.LEGACY;
-      case "2.7.7":
-      case "5.0.0":
-        // TODO InstanceImpl.cpp
-        return Version.V1;
-      case "6.0.0":
-        // TODO InstanceV2_4_0_0Impl.cpp
-        return Version.V2_4_0_0;
-      case "7.0.0":
-      case "8.0.0":
-      case "9.0.0":
-        // TODO InstanceV2Impl.cpp
-        return Version.V2;
-      case "10.0.0":
-      case "11.0.0":
-        // TODO InstanceV2ReferenceImpl.cpp
-        return Version.V2_REFERENCE;
-    }
-    throw new IllegalArgumentException(version);
-  }
-
   private final String version;
-  private final @Version int internalVersion;
   private long nativePtr;
   public TgCallsController (@NonNull CallConfiguration configuration, @NonNull CallOptions options, @NonNull ConnectionStateListener stateListener, String version) {
     super(configuration, options, stateListener);
     this.version = version;
-    this.internalVersion = parseVersion(version);
+    this.nativePtr = N.newTgCallsInstance(version, configuration, options);
   }
 
   @Override

app/jni/third_party/tgcalls

@@ -10,25 +10,31 @@
 
 import org.drinkless.td.libcore.telegram.TdApi;
 import org.thunderdog.challegram.Log;
+import org.thunderdog.challegram.N;
 import org.thunderdog.challegram.config.Config;
 import org.thunderdog.challegram.telegram.Tdlib;
 import org.thunderdog.challegram.voip.annotation.CallNetworkType;
 import org.webrtc.ContextUtils;
 
 import java.io.File;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
+import me.vkryl.core.ArrayUtils;
 import me.vkryl.core.StringUtils;
 
 public class VoIP {
   public static TdApi.CallProtocol getProtocol () {
+    Set<String> versions = new LinkedHashSet<>();
+    versions.add(VoIPController.getVersion());
+    Collections.addAll(versions, N.getTgCallsVersions());
     return new TdApi.CallProtocol(
       true,
       true,
       Config.VOIP_CONNECTION_MIN_LAYER,
       VoIPController.getConnectionMaxLayer(),
-      new String[] {
-        VoIPController.getVersion()
-      }
+      versions.toArray(new String[0])
      );
   }
 
@@ -62,6 +68,7 @@ public static VoIPInstance instantiateAndConnect (
     boolean isMicDisabled
   ) throws IllegalArgumentException {
     final String libtgvoipVersion = VoIPController.getVersion();
+    final String[] tgCallsVersions = N.getTgCallsVersions();
 
     final File persistentStateFile = VoIPPersistentConfig.getVoipConfigFile();
     final File callLogFile = VoIPLogs.getNewFile(true);
@@ -103,16 +110,16 @@ public static VoIPInstance instantiateAndConnect (
           options,
           connectionStateListener
         );
-      } else {
+      } else if (ArrayUtils.contains(tgCallsVersions, version)) {
         try {
           tgcalls = new TgCallsController(
             configuration,
             options,
             connectionStateListener,
             version
           );
-        } catch (TgCallsController.UnknownVersionException e) {
-          Log.i("Unknown tgcalls version: %s", version);
+        } catch (Throwable t) {
+          Log.i("Unknown tgcalls %s", t, version);
         }
       }
       if (tgcalls != null) {