Merge changes from topic "codec_availability_support" into main am: 19a9042639 (bb9e98e5) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ cc_library_shared {
		"CCodecBufferChannel.cpp",
		"CCodecBuffers.cpp",
		"CCodecConfig.cpp",
		"CCodecResources.cpp",
		"Codec2Buffer.cpp",
		"Codec2InfoBuilder.cpp",
		"FrameReassembler.cpp",

media/codec2/sfplugin/CCodec.cpp

+27 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@
		#include <media/stagefright/omx/OmxGraphicBufferSource.h>
		#include <media/stagefright/CCodec.h>
		#include <media/stagefright/BufferProducerWrapper.h>
		#include <media/stagefright/CCodecResources.h>
		#include <media/stagefright/MediaCodecConstants.h>
		#include <media/stagefright/MediaCodecMetricsConstants.h>
		#include <media/stagefright/PersistentSurface.h>
		@@ -1095,6 +1096,11 @@ void CCodec::allocate(const sp<MediaCodecInfo> &codecInfo) {
		}
		config->queryConfiguration(comp);

		if (android::media::codec::codec_availability_support()) {
		std::string storeName = mClient->getServiceName();
		mCodecResources = std::make_unique<CCodecResources>(storeName);
		}

		mCallback->onComponentAllocated(componentName.c_str());
		}

		@@ -1861,6 +1867,11 @@ void CCodec::configure(const sp<AMessage> &msg) {
		mMetrics = new AMessage;
		mChannel->resetBuffersPixelFormat((config->mDomain & Config::IS_ENCODER) ? true : false);

		// Query required system resources for the current configuration
		if (mCodecResources) {
		// TODO: Should we fail the configuration if this query fails?
		mCodecResources->queryRequiredResources(comp);
		}
		mCallback->onComponentConfigured(config->mInputFormat, config->mOutputFormat);
		}

		@@ -2773,6 +2784,13 @@ status_t CCodec::unsubscribeFromParameters(const std::vector<std::string> &names
		return config->unsubscribeFromVendorConfigUpdate(comp, names);
		}

		std::vector<InstanceResourceInfo> CCodec::getRequiredSystemResources() {
		if (mCodecResources) {
		return mCodecResources->getRequiredResources();
		}
		return std::vector<InstanceResourceInfo>{};
		}

		void CCodec::onWorkDone(std::list<std::unique_ptr<C2Work>> &workItems) {
		if (!workItems.empty()) {
		Mutexed<std::list<std::unique_ptr<C2Work>>>::Locked queue(mWorkDoneQueue);
		@@ -3519,4 +3537,13 @@ std::shared_ptr<C2GraphicBlock> CCodec::FetchGraphicBlock(
		return block;
		}

		//static
		std::vector<GlobalResourceInfo> CCodec::GetGloballyAvailableResources() {
		if (android::media::codec::codec_availability_support()) {
		return CCodecResources::GetGloballyAvailableResources();
		}

		return std::vector<GlobalResourceInfo>{};
		}

		} // namespace android

media/codec2/sfplugin/CCodecResources.cpp

0 → 100644

+188 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <C2Config.h>
		#include <media/stagefright/CCodecResources.h>

		namespace android {

		// Construct the name based on the component store name
		// and the id of the resource.
		// resource name = "componentStoreName-id"
		static inline std::string getResourceName(const std::string& componentStoreName, uint32_t id) {
		return componentStoreName + "-" + std::to_string(id);
		}

		static
		c2_status_t queryGlobalResources(const std::shared_ptr<Codec2Client>& client,
		std::vector<GlobalResourceInfo>& systemAvailableResources) {
		std::vector<std::unique_ptr<C2Param>> heapParams;
		c2_status_t c2err = client->query(
		{},
		{C2ResourcesCapacityTuning::PARAM_TYPE, C2ResourcesExcludedTuning::PARAM_TYPE},
		C2_MAY_BLOCK,
		&heapParams);

		if (c2err == C2_OK \|\| heapParams.size() == 2u) {
		// Construct Globally available resources now.
		// Get the total capacity first.
		std::string storeName = client->getServiceName();
		const C2ResourcesCapacityTuning* systemCapacity =
		C2ResourcesCapacityTuning::From(heapParams[0].get());
		if (systemCapacity && *systemCapacity) {
		for (size_t i = 0; i < systemCapacity->flexCount(); ++i) {
		const C2SystemResourceStruct& resource =
		systemCapacity->m.values[i];
		std::string name = getResourceName(storeName, resource.id);
		uint64_t capacity = (resource.kind == CONST) ? resource.amount : 0;
		systemAvailableResources.push_back({name, capacity, capacity});
		}
		} else {
		ALOGW("Failed to get C2ResourcesCapacityTuning");
		}

		// Get the excluded resource info.
		// The available resource should exclude this, if there are any.
		const C2ResourcesExcludedTuning* systemExcluded =
		C2ResourcesExcludedTuning::From( heapParams[1].get());
		if (systemExcluded && *systemExcluded) {
		for (size_t i = 0; i < systemExcluded->flexCount(); ++i) {
		const C2SystemResourceStruct& resource =
		systemExcluded->m.values[i];
		std::string name = getResourceName(storeName, resource.id);
		uint64_t excluded = (resource.kind == CONST) ? resource.amount : 0;
		auto found = std::find_if(systemAvailableResources.begin(),
		systemAvailableResources.end(),
		[name](const GlobalResourceInfo& item) {
		return item.mName == name; });

		if (found != systemAvailableResources.end()) {
		// Take off excluded resources from available resources.
		if (found->mAvailable >= excluded) {
		found->mAvailable -= excluded;
		} else {
		ALOGW("Excluded resources(%jd) can't be more than Available resources(%jd)",
		excluded, found->mAvailable);
		}
		} else {
		ALOGW("Failed to find the resource [%s]", name.c_str());
		}
		}
		} else {
		ALOGW("Failed to get C2ResourcesExcludedTuning");
		}

		} else {
		ALOGW("Failed to query component store for system resources: %d", c2err);
		}

		return c2err;
		}

		/**
		* A utility function that converts C2ResourcesNeededTuning into
		* a vector of InstanceResourceInfo.
		*
		* Right now, this function is at its simplest form looking into
		* mapping constant and per frame resource kinds,
		* but we need to extend this to address:
		* - Construct the name for each resources
		* (using the resource id and component store)
		* - Devise a unified way of presenting per frame, per input/output block
		* resource requirements.
		*/
		static status_t getSystemResource(const C2ResourcesNeededTuning* systemResourcesInfo,
		const std::string& storeName,
		std::vector<InstanceResourceInfo>& resources) {
		if (systemResourcesInfo && *systemResourcesInfo) {
		for (size_t i = 0; i < systemResourcesInfo->flexCount(); ++i) {
		const C2SystemResourceStruct& resource =
		systemResourcesInfo->m.values[i];
		uint64_t staticCount = 0;
		uint64_t perFrameCount = 0;
		std::string name = getResourceName(storeName, resource.id);

		switch (resource.kind) {
		case CONST:
		staticCount = resource.amount;
		break;
		case PER_FRAME:
		perFrameCount = resource.amount;
		break;
		case PER_INPUT_BLOCK:
		case PER_OUTPUT_BLOCK:
		// TODO: Find a way to pass this info through InstanceResourceInfo
		// For now, we are using this as per frame count.
		perFrameCount = resource.amount;
		break;
		}
		resources.push_back({name, staticCount, perFrameCount});
		}

		return OK;
		}

		return UNKNOWN_ERROR;
		}

		//static
		std::vector<GlobalResourceInfo> CCodecResources::GetGloballyAvailableResources() {
		// Try creating client from "default" service:
		std::shared_ptr<Codec2Client> client = Codec2Client::CreateFromService("default");
		if (client) {
		// Query the system resource capacity from the component store.
		std::vector<GlobalResourceInfo> systemAvailableResources;
		c2_status_t status = queryGlobalResources(client, systemAvailableResources);
		if (status == C2_OK) {
		return systemAvailableResources;
		}
		} else {
		ALOGW("Failed to create client from default component store!");
		}

		return std::vector<GlobalResourceInfo>{};
		}

		CCodecResources::CCodecResources(const std::string& storeName) : mStoreName(storeName) {}

		status_t CCodecResources::queryRequiredResources(
		const std::shared_ptr<Codec2Client::Component>& comp) {
		// Query required/needed system resources for the current configuration.
		std::vector<std::unique_ptr<C2Param>> heapParams;
		c2_status_t c2err = comp->query(
		{},
		{C2ResourcesNeededTuning::PARAM_TYPE},
		C2_MAY_BLOCK,
		&heapParams);
		if (c2err != C2_OK \|\| heapParams.size() != 1u) {
		ALOGE("Failed to query component interface for required system resources: %d", c2err);
		return UNKNOWN_ERROR;
		}

		// Construct Required System Resources.
		Mutexed<std::vector<InstanceResourceInfo>>::Locked resourcesLocked(mResources);
		std::vector<InstanceResourceInfo>& resources = *resourcesLocked;
		return getSystemResource(C2ResourcesNeededTuning::From(heapParams[0].get()),
		mStoreName,
		resources);
		}

		std::vector<InstanceResourceInfo> CCodecResources::getRequiredResources() {
		Mutexed<std::vector<InstanceResourceInfo>>::Locked resourcesLocked(mResources);
		return *resourcesLocked;
		}

		} // namespace android

media/codec2/sfplugin/include/media/stagefright/CCodec.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@
		namespace android {

		class CCodecBufferChannel;
		class CCodecResources;
		class InputSurfaceWrapper;
		struct CCodecConfig;
		struct MediaCodecInfo;
		@@ -71,6 +72,8 @@ public:
		virtual status_t subscribeToParameters(const std::vector<std::string> &names) override;
		virtual status_t unsubscribeFromParameters(const std::vector<std::string> &names) override;

		virtual std::vector<InstanceResourceInfo> getRequiredSystemResources() override;

		void initiateReleaseIfStuck();
		void onWorkDone(std::list<std::unique_ptr<C2Work>> &workItems);
		void onInputBufferDone(uint64_t frameIndex, size_t arrayIndex);
		@@ -93,6 +96,8 @@ public:
		uint64_t usage,
		const std::vector<std::string> &names);

		static std::vector<GlobalResourceInfo> GetGloballyAvailableResources();

		protected:
		virtual ~CCodec();

		@@ -206,6 +211,7 @@ private:
		Mutexed<std::list<std::unique_ptr<C2Work>>> mWorkDoneQueue;

		sp<AMessage> mMetrics;
		std::unique_ptr<CCodecResources> mCodecResources;

		friend class CCodecCallbackImpl;

media/codec2/sfplugin/include/media/stagefright/CCodecResources.h

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef CCODEC_RESOURCES_H_
		#define CCODEC_RESOURCES_H_

		#include <string>
		#include <vector>

		#include <C2Component.h>
		#include <codec2/hidl/client.h>

		#include <media/stagefright/foundation/Mutexed.h>
		#include <media/stagefright/ResourceInfo.h>

		namespace android {

		class CCodecResources {
		public:
		CCodecResources(const std::string& storeName);

		static std::vector<GlobalResourceInfo> GetGloballyAvailableResources();

		status_t queryRequiredResources(
		const std::shared_ptr<Codec2Client::Component>& comp);

		std::vector<InstanceResourceInfo> getRequiredResources();

		private:
		const std::string mStoreName;
		Mutexed<std::vector<InstanceResourceInfo>> mResources;
		};

		} // namespace android

		#endif // CCODEC_RESOURCES_H_