Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40d4e2df authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use memmove for overlapping memory blocks in preprocessing." am: bc918b92 

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

Change-Id: I97102af62a988b86419e37251065f6dd1fc42556
parents 622db1d6 bc918b92

media/libeffects/preprocessing/PreProcessing.cpp

+12 −12
Original line number Diff line number Diff line
@@ -1240,7 +1240,7 @@ int PreProcessingFx_Process(effect_handle_t self, 
            memcpy(outBuffer->s16,

                  session->outBuf,

                  fr * session->outChannelCount * sizeof(int16_t));

            memcpy(session->outBuf,

            memmove(session->outBuf,

                    session->outBuf + fr * session->outChannelCount,

                    (session->framesOut - fr) * session->outChannelCount * sizeof(int16_t));

            session->framesOut -= fr;
@@ -1303,7 +1303,7 @@ int PreProcessingFx_Process(effect_handle_t self, 
                                                        session->procFrame->data_,

                                                        &frOut);

            }

            memcpy(session->inBuf,

            memmove(session->inBuf,

                    session->inBuf + frIn * session->inChannelCount,

                    (session->framesIn - frIn) * session->inChannelCount * sizeof(int16_t));

            session->framesIn -= frIn;
@@ -1381,7 +1381,7 @@ int PreProcessingFx_Process(effect_handle_t self, 
        memcpy(outBuffer->s16 + framesWr * session->outChannelCount,

              session->outBuf,

              fr * session->outChannelCount * sizeof(int16_t));

        memcpy(session->outBuf,

        memmove(session->outBuf,

                session->outBuf + fr * session->outChannelCount,

                (session->framesOut - fr) * session->outChannelCount * sizeof(int16_t));

        session->framesOut -= fr;
@@ -1837,7 +1837,7 @@ int PreProcessingFx_ProcessReverse(effect_handle_t self, 
                                                        session->revFrame->data_,

                                                        &frOut);

            }

            memcpy(session->revBuf,

            memmove(session->revBuf,

                    session->revBuf + frIn * session->inChannelCount,

                    (session->framesRev - frIn) * session->inChannelCount * sizeof(int16_t));

            session->framesRev -= frIn;