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

Commit d2adf777 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "Use another Vector as a swap to reduce computing complexity" am:... 

Merge "Use another Vector as a swap to reduce computing complexity" am: fa24f1e6 am: 9449edd6 am: 11521a37

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



Change-Id: I7245e626353f5f7636baf1377b0ec03047f139f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08f69954 11521a37

media/module/extractors/ogg/OggExtractor.cpp

+8 −3
Original line number Diff line number Diff line
@@ -1048,16 +1048,21 @@ void MyOggExtractor::buildTableOfContents() { 
    size_t numerator = mTableOfContents.size();



    if (numerator > kMaxNumTOCEntries) {

        size_t denom = numerator - kMaxNumTOCEntries;

        Vector<TOCEntry> maxTOC;

        maxTOC.setCapacity(kMaxNumTOCEntries);



        size_t denom = numerator - kMaxNumTOCEntries;

        size_t accum = 0;

        for (ssize_t i = mTableOfContents.size(); i > 0; --i) {

        for (ssize_t i = 0; i < mTableOfContents.size(); i++) {

            accum += denom;

            if (accum >= numerator) {

                mTableOfContents.removeAt(i);

                accum -= numerator;

            } else {

                maxTOC.push(mTableOfContents.itemAt(i));

            }

        }



        mTableOfContents = maxTOC;

    }

}