commit 5effdf6d9ed17b4ff67a7e1adc56996c01c43383
author Andy Hung <hunga@google.com> Mon Nov 27 13:51:40 2017 -0800
committer Andy Hung <hunga@google.com> Mon Nov 27 14:47:19 2017 -0800
tree 06e5f064d6dc9b5aea55cf9a12c39d9e68091a85
parent cd742b9174eac9f8b6a108512818f2d3a2392ea8

Deprecate ditherAndClamp with memcpy_to_i16_from_q4_27

Test: test-mixer and SoloTester
Bug: 69636805
Change-Id: I5cc04d82f3e46fbfc8188a63eb2a90fb70634c90

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 9717075..e77907a 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -312,16 +312,14 @@
                     float * const pFloat = mConfig.inputCfg.buffer.f32;
                     memcpy_to_float_from_q4_27(pFloat, p32, mConfig.inputCfg.buffer.frameCount);
                 } else {
-                    const size_t pairs = mConfig.inputCfg.buffer.frameCount / 2;
-                    ditherAndClamp(mConfig.inputCfg.buffer.s32,
+                    memcpy_to_i16_from_q4_27(mConfig.inputCfg.buffer.s16,
                             mConfig.inputCfg.buffer.s32,
-                            pairs);
+                            mConfig.inputCfg.buffer.frameCount);
                 }
 #else
-                const size_t pairs = mConfig.inputCfg.buffer.frameCount / 2;
-                ditherAndClamp(mConfig.inputCfg.buffer.s32,
+                memcpy_to_i16_from_q4_27(mConfig.inputCfg.buffer.s16,
                                             mConfig.inputCfg.buffer.s32,
-                                            pairs);
+                                            mConfig.inputCfg.buffer.frameCount);
 #endif
             }
 #ifdef FLOAT_EFFECT_CHAIN