Android: fix more build errors

Author: pblazej

sdk/android/src/jni/pc/external_audio_processing_factory.cc

@@ -19,6 +19,8 @@
 #include <jni.h>
 #include <syslog.h>
 
+#include "api/audio/builtin_audio_processing_builder.h"
+#include "api/environment/environment_factory.h"
 #include "api/make_ref_counted.h"
 #include "rtc_base/ref_counted_object.h"
 #include "sdk/android/generated_peerconnection_jni/ExternalAudioProcessingFactory_jni.h"
@@ -63,10 +65,10 @@ ExternalAudioProcessingFactory::ExternalAudioProcessingFactory() {
   std::unique_ptr<webrtc::CustomProcessing> render_pre_processor(
       render_pre_processor_);
 
-  apm_ = webrtc::AudioProcessingBuilder()
+  apm_ = webrtc::BuiltinAudioProcessingBuilder()
              .SetCapturePostProcessing(std::move(capture_post_processor))
              .SetRenderPreProcessing(std::move(render_pre_processor))
-             .Create();
+             .Build(CreateEnvironment());
 
   webrtc::AudioProcessing::Config config;
   apm_->ApplyConfig(config);

sdk/android/src/jni/pc/external_audio_processing_factory.h

@@ -28,7 +28,7 @@ namespace jni {
 
 class ExternalAudioProcessingJni
     : public webrtc::ExternalAudioProcessingInterface,
-      public rtc::RefCountInterface {
+      public webrtc::RefCountInterface {
  public:
   ExternalAudioProcessingJni(JNIEnv* jni, const JavaRef<jobject>& j_processing);
   ~ExternalAudioProcessingJni();
@@ -43,7 +43,7 @@ class ExternalAudioProcessingJni
   const ScopedJavaGlobalRef<jobject> j_processing_;
 };
 
-class ExternalAudioProcessingFactory : public rtc::RefCountInterface {
+class ExternalAudioProcessingFactory : public webrtc::RefCountInterface {
  public:
   ExternalAudioProcessingFactory();
   virtual ~ExternalAudioProcessingFactory() = default;

sdk/android/src/jni/pc/frame_cryptor.cc

@@ -108,12 +108,12 @@ webrtc::FrameCryptorTransformer::Algorithm AlgorithmFromIndex(int index) {
   }
 }
 
-static base::android::ScopedJavaLocalRef<jobject>
+static ScopedJavaLocalRef<jobject>
 JNI_FrameCryptorFactory_CreateFrameCryptorForRtpReceiver(
     JNIEnv* env,
     jlong native_factory,
     jlong j_rtp_receiver_pointer,
-    const base::android::JavaParamRef<jstring>& participantId,
+    const JavaParamRef<jstring>& participantId,
     jint j_algorithm_index,
     jlong j_key_provider) {
   OwnedFactoryAndThreads* factory =
@@ -140,12 +140,12 @@ JNI_FrameCryptorFactory_CreateFrameCryptorForRtpReceiver(
   return NativeToJavaFrameCryptor(env, frame_crypto_transformer);
 }
 
-static base::android::ScopedJavaLocalRef<jobject>
+static ScopedJavaLocalRef<jobject>
 JNI_FrameCryptorFactory_CreateFrameCryptorForRtpSender(
     JNIEnv* env,
     jlong native_factory,
     jlong j_rtp_sender_pointer,
-    const base::android::JavaParamRef<jstring>& participantId,
+    const JavaParamRef<jstring>& participantId,
     jint j_algorithm_index,
     jlong j_key_provider) {
   OwnedFactoryAndThreads* factory =
@@ -170,13 +170,13 @@ JNI_FrameCryptorFactory_CreateFrameCryptorForRtpSender(
   return NativeToJavaFrameCryptor(env, frame_crypto_transformer);
 }
 
-static base::android::ScopedJavaLocalRef<jobject>
+static ScopedJavaLocalRef<jobject>
 JNI_FrameCryptorFactory_CreateFrameCryptorKeyProvider(
     JNIEnv* env,
     jboolean j_shared,
-    const base::android::JavaParamRef<jbyteArray>& j_ratchetSalt,
+    const JavaParamRef<jbyteArray>& j_ratchetSalt,
     jint j_ratchetWindowSize,
-    const base::android::JavaParamRef<jbyteArray>& j_uncryptedMagicBytes,
+    const JavaParamRef<jbyteArray>& j_uncryptedMagicBytes,
     jint j_failureTolerance,
     jint j_keyRingSize,
     jboolean j_discardFrameWhenCryptorNotReady) {

sdk/android/src/jni/pc/frame_cryptor_key_provider.cc

@@ -37,13 +37,13 @@ static jboolean JNI_FrameCryptorKeyProvider_SetSharedKey(
     JNIEnv* jni,
     jlong j_key_provider,
     jint j_index,
-    const base::android::JavaParamRef<jbyteArray>& j_key) {
+    const JavaParamRef<jbyteArray>& j_key) {
   auto key = JavaToNativeByteArray(jni, j_key);
   return reinterpret_cast<webrtc::DefaultKeyProviderImpl*>(j_key_provider)
       ->SetSharedKey(j_index,std::vector<uint8_t>(key.begin(), key.end()));
 }
 
-static base::android::ScopedJavaLocalRef<jbyteArray>
+static ScopedJavaLocalRef<jbyteArray>
 JNI_FrameCryptorKeyProvider_RatchetSharedKey(
     JNIEnv* env,
     jlong keyProviderPointer,
@@ -56,7 +56,7 @@ JNI_FrameCryptorKeyProvider_RatchetSharedKey(
   return NativeToJavaByteArray(env, rtc::ArrayView<int8_t>(int8tKey));
 }
 
-static base::android::ScopedJavaLocalRef<jbyteArray>
+static ScopedJavaLocalRef<jbyteArray>
 JNI_FrameCryptorKeyProvider_ExportSharedKey(
     JNIEnv* env,
     jlong keyProviderPointer,
@@ -71,21 +71,21 @@ JNI_FrameCryptorKeyProvider_ExportSharedKey(
 static jboolean JNI_FrameCryptorKeyProvider_SetKey(
     JNIEnv* jni,
     jlong j_key_provider,
-    const base::android::JavaParamRef<jstring>& participantId,
+    const JavaParamRef<jstring>& participantId,
     jint j_index,
-    const base::android::JavaParamRef<jbyteArray>& j_key) {
+    const JavaParamRef<jbyteArray>& j_key) {
   auto key = JavaToNativeByteArray(jni, j_key);
   auto participant_id = JavaToStdString(jni, participantId);
   return reinterpret_cast<webrtc::DefaultKeyProviderImpl*>(j_key_provider)
       ->SetKey(participant_id, j_index,
                std::vector<uint8_t>(key.begin(), key.end()));
 }
 
-static base::android::ScopedJavaLocalRef<jbyteArray>
+static ScopedJavaLocalRef<jbyteArray>
 JNI_FrameCryptorKeyProvider_RatchetKey(
     JNIEnv* env,
     jlong keyProviderPointer,
-    const base::android::JavaParamRef<jstring>& participantId,
+    const JavaParamRef<jstring>& participantId,
     jint j_index) {
   auto participant_id = JavaToStdString(env, participantId);
   auto key_provider =
@@ -96,11 +96,11 @@ JNI_FrameCryptorKeyProvider_RatchetKey(
   return NativeToJavaByteArray(env, rtc::ArrayView<int8_t>(int8tKey));
 }
 
-static base::android::ScopedJavaLocalRef<jbyteArray>
+static ScopedJavaLocalRef<jbyteArray>
 JNI_FrameCryptorKeyProvider_ExportKey(
     JNIEnv* env,
     jlong keyProviderPointer,
-    const base::android::JavaParamRef<jstring>& participantId,
+    const JavaParamRef<jstring>& participantId,
     jint j_index) {
   auto participant_id = JavaToStdString(env, participantId);
   auto key_provider =
@@ -113,7 +113,7 @@ JNI_FrameCryptorKeyProvider_ExportKey(
 static void JNI_FrameCryptorKeyProvider_SetSifTrailer(
     JNIEnv* jni,
     jlong j_key_provider,
-    const base::android::JavaParamRef<jbyteArray>& j_trailer) {
+    const JavaParamRef<jbyteArray>& j_trailer) {
   auto trailer = JavaToNativeByteArray(jni, j_trailer);
   reinterpret_cast<webrtc::DefaultKeyProviderImpl*>(j_key_provider)
       ->SetSifTrailer(std::vector<uint8_t>(trailer.begin(), trailer.end()));