commit f54ef11f727c26327342ef97a49543bffedb029b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Feb 06 19:44:05 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 06 19:44:05 2024 +0000
tree b389740bc13ef9dc86f977769b4598b1003aa287
parent 5c7ce95d7e9c1d0b6a92a3c26b97af36727475e9
parent 57e5eb546d762fce89ef50dd9e7f01fd77c97f2a

Merge "PreProcessing: Data conversions for webrtc module and AEC check" into main

media/libeffects/preprocessing/aidl/PreProcessingContext.cpp

diff --git a/media/libeffects/preprocessing/aidl/PreProcessingContext.cpp b/media/libeffects/preprocessing/aidl/PreProcessingContext.cpp
index 6f671f0..7bb0cc3 100644
--- a/media/libeffects/preprocessing/aidl/PreProcessingContext.cpp
+++ b/media/libeffects/preprocessing/aidl/PreProcessingContext.cpp
@@ -16,6 +16,7 @@
 
 #include <cstddef>
 #define LOG_TAG "PreProcessingContext"
+#include <audio_utils/primitives.h>
 #include <Utils.h>
 
 #include "PreProcessingContext.h"
@@ -141,7 +142,7 @@
 }
 
 RetCode PreProcessingContext::setCommon(const Parameter::Common& common) {
-    if(auto ret = updateIOFrameSize(common); ret != RetCode::SUCCESS) {
+    if (auto ret = updateIOFrameSize(common); ret != RetCode::SUCCESS) {
         return ret;
     }
     mCommon = common;
@@ -152,10 +153,10 @@
 void PreProcessingContext::updateConfigs(const Parameter::Common& common) {
     mInputConfig.set_sample_rate_hz(common.input.base.sampleRate);
     mInputConfig.set_num_channels(::aidl::android::hardware::audio::common::getChannelCount(
-                    common.input.base.channelMask));
+            common.input.base.channelMask));
     mOutputConfig.set_sample_rate_hz(common.input.base.sampleRate);
     mOutputConfig.set_num_channels(::aidl::android::hardware::audio::common::getChannelCount(
-                    common.output.base.channelMask));
+            common.output.base.channelMask));
 }
 
 RetCode PreProcessingContext::setAcousticEchoCancelerEchoDelay(int echoDelayUs) {
@@ -281,33 +282,40 @@
     LOG(DEBUG) << __func__ << " start processing";
     std::lock_guard lg(mMutex);
 
-    mProcessedMsk |= (1 << int(mType));
-
     // webrtc implementation clear out was_stream_delay_set every time after ProcessStream() call
     mAudioProcessingModule->set_stream_delay_ms(mEchoDelayUs / 1000);
 
+    std::vector<int16_t> in16(samples);
+    std::vector<int16_t> out16(samples);
+    memcpy_to_i16_from_float(in16.data(), in, samples);
+
+    mProcessedMsk |= (1 << int(mType));
+
     if ((mProcessedMsk & mEnabledMsk) == mEnabledMsk) {
         mProcessedMsk = 0;
-        int processStatus = mAudioProcessingModule->ProcessStream(
-                (const int16_t* const)in, mInputConfig, mOutputConfig, (int16_t* const)out);
+        int processStatus = mAudioProcessingModule->ProcessStream(in16.data(), mInputConfig,
+                                                                  mOutputConfig, out16.data());
         if (processStatus != 0) {
             LOG(ERROR) << "Process stream failed with error " << processStatus;
             return status;
         }
     }
 
-    mRevProcessedMsk |= (1 << int(mType));
-
-    if ((mRevProcessedMsk & mRevEnabledMsk) == mRevEnabledMsk) {
-        mRevProcessedMsk = 0;
-        int revProcessStatus = mAudioProcessingModule->ProcessReverseStream(
-                (const int16_t* const)in, mInputConfig, mInputConfig, (int16_t* const)out);
-        if (revProcessStatus != 0) {
-            LOG(ERROR) << "Process reverse stream failed with error " << revProcessStatus;
-            return status;
+    if (mType == PreProcessingEffectType::ACOUSTIC_ECHO_CANCELLATION) {
+        mRevProcessedMsk |= (1 << int(mType));
+        if ((mRevProcessedMsk & mRevEnabledMsk) == mRevEnabledMsk) {
+            mRevProcessedMsk = 0;
+            int revProcessStatus = mAudioProcessingModule->ProcessReverseStream(
+                    in16.data(), mInputConfig, mInputConfig, out16.data());
+            if (revProcessStatus != 0) {
+                LOG(ERROR) << "Process reverse stream failed with error " << revProcessStatus;
+                return status;
+            }
         }
     }
 
+    memcpy_to_float_from_i16(out, out16.data(), samples);
+
     return {STATUS_OK, samples, samples};
 }