Merge "media.c2 client: fix # of queried param count" into main (5d9ef21a) · Commits · e / devices / smdk4412 / android_frameworks_av

media/codec2/hal/client/client.cpp

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -649,7 +649,7 @@ c2_status_t Codec2ConfigurableClient::AidlImpl::query(
	return C2_CORRUPTED;		return C2_CORRUPTED;
	}		}
	size_t i = 0;		size_t i = 0;
	size_t numUpdatedStackParams = 0;		size_t numQueried = 0;
	for (auto it = paramPointers.begin(); it != paramPointers.end(); ) {		for (auto it = paramPointers.begin(); it != paramPointers.end(); ) {
	C2Param* paramPointer = *it;		C2Param* paramPointer = *it;
	if (numStackIndices > 0) {		if (numStackIndices > 0) {
	@@ -678,7 +678,7 @@ c2_status_t Codec2ConfigurableClient::AidlImpl::query(
	continue;		continue;
	}		}
	if (stackParams[i++]->updateFrom(*paramPointer)) {		if (stackParams[i++]->updateFrom(*paramPointer)) {
	++numUpdatedStackParams;		++numQueried;
	} else {		} else {
	LOG(WARNING) << "query -- param update failed: "		LOG(WARNING) << "query -- param update failed: "
	"index = "		"index = "
	@@ -695,14 +695,11 @@ c2_status_t Codec2ConfigurableClient::AidlImpl::query(
	"unexpected extra stack param.";		"unexpected extra stack param.";
	} else {		} else {
	heapParams->emplace_back(C2Param::Copy(*paramPointer));		heapParams->emplace_back(C2Param::Copy(*paramPointer));
			++numQueried;
	}		}
	}		}
	++it;		++it;
	}		}
	size_t numQueried = numUpdatedStackParams;
	if (heapParams) {
	numQueried += heapParams->size();
	}
	if (status == C2_OK && indices.size() != numQueried) {		if (status == C2_OK && indices.size() != numQueried) {
	status = C2_BAD_INDEX;		status = C2_BAD_INDEX;
	}		}