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

Commit 926256bb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "TargetAudioEncTest: use vector instead of malloc" am: cc628d43 am:... 

Merge "TargetAudioEncTest: use vector instead of malloc" am: cc628d43 am: 02fbff2a am: d6c9b7a7

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



Change-Id: I66afb008c415f5bdb006fe284cc165f37e3dbd26
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1da6c7c d6c9b7a7

media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioEncTest.cpp

+3 −5
Original line number Diff line number Diff line
@@ -372,9 +372,8 @@ void encodeNFrames(const std::shared_ptr<android::Codec2Client::Component>& comp 
            ULock l(queueLock);

            flushedIndices.emplace_back(frameID);

        }

        char* data = (char*)malloc(bytesCount);

        ASSERT_NE(data, nullptr);

        eleStream.read(data, bytesCount);

        std::vector<char> eleData(bytesCount);

        eleStream.read(eleData.data(), bytesCount);

        // if we have reached at the end of input stream, signal eos

        if (eleStream.gcount() < bytesCount) {

            bytesCount = eleStream.gcount();
@@ -396,12 +395,11 @@ void encodeNFrames(const std::shared_ptr<android::Codec2Client::Component>& comp 
        ASSERT_EQ(0u, view.offset());

        ASSERT_EQ((size_t)bytesCount, view.size());



        memcpy(view.base(), data, bytesCount);

        memcpy(view.base(), eleData.data(), bytesCount);

        work->input.buffers.clear();

        work->input.buffers.emplace_back(new LinearBuffer(block));

        work->worklets.clear();

        work->worklets.emplace_back(new C2Worklet);

        free(data);



        std::list<std::unique_ptr<C2Work>> items;

        items.push_back(std::move(work));