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

Commit 16964a61 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "media.c2 client: fix # of queried param count" into main am: 5d9ef21a 

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



Change-Id: I6242dc6bceda616cf65ea5860c9d0dc0d746b135
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38e38f4c 5d9ef21a

media/codec2/hal/client/client.cpp

+3 −6
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ c2_status_t Codec2ConfigurableClient::AidlImpl::query( 
        return C2_CORRUPTED;

    }

    size_t i = 0;

    size_t numUpdatedStackParams = 0;

    size_t numQueried = 0;

    for (auto it = paramPointers.begin(); it != paramPointers.end(); ) {

        C2Param* paramPointer = *it;

        if (numStackIndices > 0) {
@@ -678,7 +678,7 @@ c2_status_t Codec2ConfigurableClient::AidlImpl::query( 
                continue;

            }

            if (stackParams[i++]->updateFrom(*paramPointer)) {

                ++numUpdatedStackParams;

                ++numQueried;

            } else {

                LOG(WARNING) << "query -- param update failed: "

                                "index = "
@@ -695,14 +695,11 @@ c2_status_t Codec2ConfigurableClient::AidlImpl::query( 
                                "unexpected extra stack param.";

            } else {

                heapParams->emplace_back(C2Param::Copy(*paramPointer));

                ++numQueried;

            }

        }

        ++it;

    }

    size_t numQueried = numUpdatedStackParams;

    if (heapParams) {

        numQueried += heapParams->size();

    }

    if (status == C2_OK && indices.size() != numQueried) {

        status = C2_BAD_INDEX;

    }