commit ab726a1e7ac21a0958f44b7d75a51a5a0273099c
author Shunkai Yao <yaoshunkai@google.com> Tue Jan 09 19:25:19 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 09 19:25:19 2024 +0000
tree 5a3fc5da27420fc9993b8f3458c5655fa5d7b539
parent eb1f9a307e51bbf625ebbaf6d247f46458b26329

Revert "libeffects: Fix processed samples for downmix effect"

This reverts commit eb1f9a307e51bbf625ebbaf6d247f46458b26329.

Reason for revert: b/319278210

Change-Id: Ibab8bb2b553603ca5a64539f4e83b30e7349d8f0

media/libeffects/downmix/aidl/DownmixContext.cpp

diff --git a/media/libeffects/downmix/aidl/DownmixContext.cpp b/media/libeffects/downmix/aidl/DownmixContext.cpp
index e5d8f43..13e0e5a 100644
--- a/media/libeffects/downmix/aidl/DownmixContext.cpp
+++ b/media/libeffects/downmix/aidl/DownmixContext.cpp
@@ -111,12 +111,11 @@
 }
 
 IEffect::Status DownmixContext::downmixProcess(float* in, float* out, int samples) {
-    LOG(VERBOSE) << __func__ << " in " << in << " out " << out << " sample " << samples;
+    LOG(DEBUG) << __func__ << " in " << in << " out " << out << " sample " << samples;
     IEffect::Status status = {EX_ILLEGAL_ARGUMENT, 0, 0};
 
     if (in == nullptr || out == nullptr ||
         getCommon().input.frameCount != getCommon().output.frameCount || getInputFrameSize() == 0) {
-        LOG(ERROR) << __func__ << " either in/out buffer invalid or framecount mismatch";
         return status;
     }
 
@@ -129,7 +128,7 @@
         return status;
     }
 
-    LOG(VERBOSE) << __func__ << " start processing";
+    LOG(DEBUG) << __func__ << " start processing";
     bool accumulate = false;
     int frames = samples * sizeof(float) / getInputFrameSize();
     if (mType == Downmix::Type::STRIP) {
@@ -154,9 +153,8 @@
             return status;
         }
     }
-    int producedSamples = samples * getOutputFrameSize() / getInputFrameSize();
-    LOG(VERBOSE) << __func__ << " done processing generated samples " << producedSamples;
-    return {STATUS_OK, samples, producedSamples};
+    LOG(DEBUG) << __func__ << " done processing";
+    return {STATUS_OK, samples, samples};
 }
 
 void DownmixContext::init_params(const Parameter::Common& common) {