commit c4c784541b40e094dee50c158f4fdf5ab6945225
author Andy Hung <hunga@google.com> Sat Jan 02 18:22:21 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 02 18:22:21 2021 +0000
tree 312f8ae89dac53187e5ef6b7f96dc8b13f36ba35
parent d13082ef0bc6740e3a7019c1a1c7b1b0144c8935
parent 76e856baa24934d2f220c18a9059119a1c1b5380

Merge "libeffects: use memmove in Copy_Float" am: 76e856baa2

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1538209

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8442d77c22215928b0411f81a4138af899dafe5c

media/libeffects/lvm/lib/Common/src/Copy_16.cpp

diff --git a/media/libeffects/lvm/lib/Common/src/Copy_16.cpp b/media/libeffects/lvm/lib/Common/src/Copy_16.cpp
index 8887890..7bcb7d7 100644
--- a/media/libeffects/lvm/lib/Common/src/Copy_16.cpp
+++ b/media/libeffects/lvm/lib/Common/src/Copy_16.cpp
@@ -18,7 +18,7 @@
 /**********************************************************************************
    INCLUDE FILES
 ***********************************************************************************/
-
+#include <string.h>
 #include "VectorArithmetic.h"
 
 /**********************************************************************************
@@ -47,24 +47,7 @@
     return;
 }
 void Copy_Float(const LVM_FLOAT* src, LVM_FLOAT* dst, LVM_INT16 n) {
-    LVM_INT16 ii;
-
-    if (src > dst) {
-        for (ii = n; ii != 0; ii--) {
-            *dst = *src;
-            dst++;
-            src++;
-        }
-    } else {
-        src += n - 1;
-        dst += n - 1;
-        for (ii = n; ii != 0; ii--) {
-            *dst = *src;
-            dst--;
-            src--;
-        }
-    }
-
+    memmove(dst, src, n * sizeof(LVM_FLOAT));
     return;
 }
 // Extract out the stereo channel pair from multichannel source.