rename files.

Author: cloudwebrtc

sdk/android/BUILD.gn

@@ -261,7 +261,7 @@ if (is_android) {
       "api/org/webrtc/CryptoOptions.java",
       "api/org/webrtc/DataChannel.java",
       "api/org/webrtc/DtmfSender.java",
-      "api/org/webrtc/ExternalAudioProcessor.java",
+      "api/org/webrtc/ExternalAudioProcessingFactory.java",
       "api/org/webrtc/FecControllerFactoryFactoryInterface.java",
       "api/org/webrtc/FrameCryptor.java",
       "api/org/webrtc/FrameCryptorAlgorithm.java",
@@ -727,10 +727,11 @@ if (current_os == "linux" || is_android) {
       "src/jni/pc/data_channel.cc",
       "src/jni/pc/data_channel.h",
       "src/jni/pc/dtmf_sender.cc",
-      "src/jni/pc/default_audio_processor.cc",
+      "src/jni/pc/external_audio_processing_factory.cc",
+      "src/jni/pc/external_audio_processing_factory.h",
+      "src/jni/pc/external_audio_processing_interface.h",
       "src/jni/pc/external_audio_processor.cc",
       "src/jni/pc/external_audio_processor.h",
-      "src/jni/pc/external_audio_processor_interface.h",
       "src/jni/pc/frame_cryptor.cc",
       "src/jni/pc/frame_cryptor.h",
       "src/jni/pc/frame_cryptor_key_provider.cc",
@@ -1419,7 +1420,7 @@ if (current_os == "linux" || is_android) {
       "api/org/webrtc/CryptoOptions.java",
       "api/org/webrtc/DataChannel.java",
       "api/org/webrtc/DtmfSender.java",
-      "api/org/webrtc/ExternalAudioProcessor.java",
+      "api/org/webrtc/ExternalAudioProcessingFactory.java",
       "api/org/webrtc/FrameCryptor.java",
       "api/org/webrtc/FrameCryptorFactory.java",
       "api/org/webrtc/FrameCryptorKeyProvider.java",

sdk/android/api/org/webrtc/ExternalAudioProcessor.java renamed to sdk/android/api/org/webrtc/ExternalAudioProcessingFactory.java

@@ -22,7 +22,7 @@
 import org.webrtc.AudioProcessingFactory;
 
 
-public class ExternalAudioProcessor implements AudioProcessingFactory {
+public class ExternalAudioProcessingFactory implements AudioProcessingFactory {
 
   public static interface AudioProcessing {
     @CalledByNative("AudioProcessing")
@@ -37,7 +37,7 @@ public static interface AudioProcessing {
   private long capturePostProcessingPtr;
   private long renderPreProcessingPtr;
 
-  public ExternalAudioProcessor() {
+  public ExternalAudioProcessingFactory() {
     apmPtr = nativeGetDefaultApm();
     capturePostProcessingPtr = 0;
     renderPreProcessingPtr = 0;

sdk/android/src/jni/pc/default_audio_processor.cc renamed to sdk/android/src/jni/pc/external_audio_processing_factory.cc

@@ -14,19 +14,18 @@
  * limitations under the License.
  */
 
-#include "sdk/android/src/jni/pc/default_audio_processor.h"
+#include "sdk/android/src/jni/pc/external_audio_processing_factory.h"
 
 #include <jni.h>
 #include <syslog.h>
 
 #include "api/make_ref_counted.h"
 #include "rtc_base/ref_counted_object.h"
-#include "sdk/android/generated_peerconnection_jni/ExternalAudioProcessor_jni.h"
+#include "sdk/android/generated_peerconnection_jni/ExternalAudioProcessingFactory_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 #include "sdk/android/src/jni/pc/external_audio_processor.h"
-#include "sdk/android/src/jni/pc/external_audio_processor_interface.h"
 
 namespace webrtc {
 namespace jni {
@@ -55,7 +54,7 @@ void ExternalAudioProcessingJni::Process(int num_bans, int num_frames, int buffe
   Java_AudioProcessing_Process(env, j_prosessing_global_, num_bans, num_frames, audio_buffer);
 }
 
-DefaultAudioProcessor::DefaultAudioProcessor() {
+ExternalAudioProcessingFactory::ExternalAudioProcessingFactory() {
   capture_post_processor_ = new ExternalAudioProcessor();
   std::unique_ptr<webrtc::CustomProcessing> capture_post_processor(
       capture_post_processor_);
@@ -75,17 +74,17 @@ DefaultAudioProcessor::DefaultAudioProcessor() {
   apm_->ApplyConfig(config);
 }
 
-static DefaultAudioProcessor* default_processor_ptr;
+static ExternalAudioProcessingFactory* default_processor_ptr;
 
-static jlong JNI_ExternalAudioProcessor_GetDefaultApm(JNIEnv* env) {
+static jlong JNI_ExternalAudioProcessingFactory_GetDefaultApm(JNIEnv* env) {
   if (!default_processor_ptr) {
-    auto default_processor = rtc::make_ref_counted<DefaultAudioProcessor>();
+    auto default_processor = rtc::make_ref_counted<ExternalAudioProcessingFactory>();
     default_processor_ptr = default_processor.release();
   }
   return webrtc::jni::jlongFromPointer(default_processor_ptr->apm().get());
 }
 
-static jlong JNI_ExternalAudioProcessor_SetCapturePostProcessing(
+static jlong JNI_ExternalAudioProcessingFactory_SetCapturePostProcessing(
     JNIEnv* env,
     const JavaParamRef<jobject>& j_processing) {
   if (!default_processor_ptr) {
@@ -99,7 +98,7 @@ static jlong JNI_ExternalAudioProcessor_SetCapturePostProcessing(
   return jlongFromPointer(processing.get());
 }
 
-static jlong JNI_ExternalAudioProcessor_SetRenderPreProcessing(
+static jlong JNI_ExternalAudioProcessingFactory_SetRenderPreProcessing(
     JNIEnv* env,
     const JavaParamRef<jobject>& j_processing) {
   if (!default_processor_ptr) {
@@ -113,7 +112,7 @@ static jlong JNI_ExternalAudioProcessor_SetRenderPreProcessing(
   return jlongFromPointer(processing.get());
 }
 
-static void JNI_ExternalAudioProcessor_SetBypassFlagForCapturePost(
+static void JNI_ExternalAudioProcessingFactory_SetBypassFlagForCapturePost(
     JNIEnv* env,
     jboolean bypass) {
   if (!default_processor_ptr) {
@@ -122,7 +121,7 @@ static void JNI_ExternalAudioProcessor_SetBypassFlagForCapturePost(
   default_processor_ptr->capture_post_processor()->SetBypassFlag(bypass);
 }
 
-static void JNI_ExternalAudioProcessor_SetBypassFlagForRenderPre(
+static void JNI_ExternalAudioProcessingFactory_SetBypassFlagForRenderPre(
     JNIEnv* env,
     jboolean bypass) {
   if (!default_processor_ptr) {
@@ -131,7 +130,7 @@ static void JNI_ExternalAudioProcessor_SetBypassFlagForRenderPre(
   default_processor_ptr->render_pre_processor()->SetBypassFlag(bypass);
 }
 
-static void JNI_ExternalAudioProcessor_Destroy(JNIEnv* env) {
+static void JNI_ExternalAudioProcessingFactory_Destroy(JNIEnv* env) {
   if (!default_processor_ptr) {
     return;
   }

sdk/android/src/jni/pc/default_audio_processor.h renamed to sdk/android/src/jni/pc/external_audio_processing_factory.h

@@ -1,68 +1,68 @@
-/*
- * Copyright 2022 LiveKit
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <jni.h>
-
-#define WEBRTC_APM_DEBUG_DUMP 0
-
-#include "rtc_base/ref_counted_object.h"
-#include "sdk/android/native_api/jni/scoped_java_ref.h"
-#include "sdk/android/src/jni/pc/external_audio_processor.h"
-#include "sdk/android/src/jni/pc/external_audio_processor_interface.h"
-
-namespace webrtc {
-namespace jni {
-
-class ExternalAudioProcessingJni
-    : public webrtc::ExternalAudioProcessorInterface,
-      public rtc::RefCountInterface {
- public:
-  ExternalAudioProcessingJni(JNIEnv* jni, const JavaRef<jobject>& j_prosessing);
-  ~ExternalAudioProcessingJni();
-
- protected:
-  virtual void Initialize(int sample_rate_hz, int num_channels) override;
-  virtual void Reset(int new_rate) override;
-  virtual void Process(int num_bans, int num_frames, int buffer_size, float* buffer) override;
-
- private:
-  const ScopedJavaGlobalRef<jobject> j_prosessing_global_;
-  const ScopedJavaGlobalRef<jobject> j_prosessing_;
-};
-
-class DefaultAudioProcessor : public rtc::RefCountInterface {
- public:
-  DefaultAudioProcessor();
-  virtual ~DefaultAudioProcessor() = default;
-
-  ExternalAudioProcessor* capture_post_processor() {
-    return capture_post_processor_;
-  }
-
-  ExternalAudioProcessor* render_pre_processor() {
-    return render_pre_processor_;
-  }
-
-  rtc::scoped_refptr<webrtc::AudioProcessing> apm() { return apm_; }
-
- private:
-  rtc::scoped_refptr<webrtc::AudioProcessing> apm_;
-  ExternalAudioProcessor* capture_post_processor_;
-  ExternalAudioProcessor* render_pre_processor_;
-};
-
-}  // namespace jni
-}  // namespace webrtc
+/*
+ * Copyright 2022 LiveKit
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <jni.h>
+
+#define WEBRTC_APM_DEBUG_DUMP 0
+
+#include "rtc_base/ref_counted_object.h"
+#include "sdk/android/native_api/jni/scoped_java_ref.h"
+#include "sdk/android/src/jni/pc/external_audio_processor.h"
+#include "sdk/android/src/jni/pc/external_audio_processing_interface.h"
+
+namespace webrtc {
+namespace jni {
+
+class ExternalAudioProcessingJni
+    : public webrtc::ExternalAudioProcessingInterface,
+      public rtc::RefCountInterface {
+ public:
+  ExternalAudioProcessingJni(JNIEnv* jni, const JavaRef<jobject>& j_prosessing);
+  ~ExternalAudioProcessingJni();
+
+ protected:
+  virtual void Initialize(int sample_rate_hz, int num_channels) override;
+  virtual void Reset(int new_rate) override;
+  virtual void Process(int num_bans, int num_frames, int buffer_size, float* buffer) override;
+
+ private:
+  const ScopedJavaGlobalRef<jobject> j_prosessing_global_;
+  const ScopedJavaGlobalRef<jobject> j_prosessing_;
+};
+
+class ExternalAudioProcessingFactory : public rtc::RefCountInterface {
+ public:
+  ExternalAudioProcessingFactory();
+  virtual ~ExternalAudioProcessingFactory() = default;
+
+  ExternalAudioProcessor* capture_post_processor() {
+    return capture_post_processor_;
+  }
+
+  ExternalAudioProcessor* render_pre_processor() {
+    return render_pre_processor_;
+  }
+
+  rtc::scoped_refptr<webrtc::AudioProcessing> apm() { return apm_; }
+
+ private:
+  rtc::scoped_refptr<webrtc::AudioProcessing> apm_;
+  ExternalAudioProcessor* capture_post_processor_;
+  ExternalAudioProcessor* render_pre_processor_;
+};
+
+}  // namespace jni
+}  // namespace webrtc

sdk/android/src/jni/pc/external_audio_processor_interface.h renamed to sdk/android/src/jni/pc/external_audio_processing_interface.h

@@ -18,14 +18,14 @@
 
 namespace webrtc {
 
-class ExternalAudioProcessorInterface {
+class ExternalAudioProcessingInterface {
  public:
   virtual void Initialize(int sample_rate_hz, int num_channels) = 0;
   virtual void Reset(int new_rate) = 0;
   virtual void Process(int num_bans, int num_frames, int buffer_size, float* buffer) = 0;
 
  protected:
-  virtual ~ExternalAudioProcessorInterface() = default;
+  virtual ~ExternalAudioProcessingInterface() = default;
 };
 
 }  // namespace webrtc

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

@@ -19,7 +19,7 @@
 namespace webrtc {
 
 void ExternalAudioProcessor::SetExternalAudioProcessing(
-    ExternalAudioProcessorInterface* processor) {
+    ExternalAudioProcessingInterface* processor) {
   webrtc::MutexLock lock(&mutex_);
   external_processor_ = processor;
   if (initialized_) {

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

@@ -22,7 +22,7 @@
 #include "modules/audio_processing/audio_buffer.h"
 #include "modules/audio_processing/audio_processing_impl.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "sdk/android/src/jni/pc/external_audio_processor_interface.h"
+#include "sdk/android/src/jni/pc/external_audio_processing_interface.h"
 
 namespace webrtc {
 
@@ -32,7 +32,7 @@ class ExternalAudioProcessor : public webrtc::CustomProcessing {
   ~ExternalAudioProcessor() override = default;
 
   void SetExternalAudioProcessing(
-      ExternalAudioProcessorInterface* processor);
+      ExternalAudioProcessingInterface* processor);
 
   void SetBypassFlag(bool bypass);
 
@@ -45,7 +45,7 @@ class ExternalAudioProcessor : public webrtc::CustomProcessing {
 
  private:
   mutable webrtc::Mutex mutex_;
-  ExternalAudioProcessorInterface* external_processor_;
+  ExternalAudioProcessingInterface* external_processor_;
   bool bypass_flag_;
   bool initialized_;
   int sample_rate_hz_;