codec2: signal aliases in XML vs. C2Store (c9b4ca0d) · Commits · e / os / android_frameworks_av

media/codec2/vndk/C2Store.cpp

+94 −121

Original line number	Original line	Diff line number	Diff line
	@@ -517,7 +517,6 @@ private:
	*		*
	* \note Only used by ComponentLoader.		* \note Only used by ComponentLoader.
	*		*
	* \param alias[in] module alias
	* \param libPath[in] library path		* \param libPath[in] library path
	*		*
	* \retval C2_OK the component module has been successfully loaded		* \retval C2_OK the component module has been successfully loaded
	@@ -527,7 +526,7 @@ private:
	* \retval C2_REFUSED permission denied to load the component module (unexpected)		* \retval C2_REFUSED permission denied to load the component module (unexpected)
	* \retval C2_TIMED_OUT could not load the module within the time limit (unexpected)		* \retval C2_TIMED_OUT could not load the module within the time limit (unexpected)
	*/		*/
	c2_status_t init(std::string alias, std::string libPath);		c2_status_t init(std::string libPath);

	virtual ~ComponentModule() override;		virtual ~ComponentModule() override;

	@@ -570,7 +569,7 @@ private:
	std::shared_ptr<ComponentModule> localModule = mModule.lock();		std::shared_ptr<ComponentModule> localModule = mModule.lock();
	if (localModule == nullptr) {		if (localModule == nullptr) {
	localModule = std::make_shared<ComponentModule>();		localModule = std::make_shared<ComponentModule>();
	res = localModule->init(mAlias, mLibPath);		res = localModule->init(mLibPath);
	if (res == C2_OK) {		if (res == C2_OK) {
	mModule = localModule;		mModule = localModule;
	}		}
	@@ -582,13 +581,12 @@ private:
	/**		/**
	* Creates a component loader for a specific library path (or name).		* Creates a component loader for a specific library path (or name).
	*/		*/
	ComponentLoader(std::string alias, std::string libPath)		ComponentLoader(std::string libPath)
	: mAlias(alias), mLibPath(libPath) {}		: mLibPath(libPath) {}

	private:		private:
	std::mutex mMutex; ///< mutex guarding the module		std::mutex mMutex; ///< mutex guarding the module
	std::weak_ptr<ComponentModule> mModule; ///< weak reference to the loaded module		std::weak_ptr<ComponentModule> mModule; ///< weak reference to the loaded module
	std::string mAlias; ///< component alias
	std::string mLibPath; ///< library path		std::string mLibPath; ///< library path
	};		};

	@@ -624,9 +622,10 @@ private:
	};		};

	/**		/**
	* Retrieves the component loader for a component.		* Retrieves the component module for a component.
	*		*
	* \return a non-ref-holding pointer to the component loader.		* \param module pointer to a shared_pointer where the component module will be stored on
			* success.
	*		*
	* \retval C2_OK the component loader has been successfully retrieved		* \retval C2_OK the component loader has been successfully retrieved
	* \retval C2_NO_MEMORY not enough memory to locate the component loader		* \retval C2_NO_MEMORY not enough memory to locate the component loader
	@@ -640,16 +639,25 @@ private:
	* component but some components could not be loaded due to lack of		* component but some components could not be loaded due to lack of
	* permissions)		* permissions)
	*/		*/
	c2_status_t findComponent(C2String name, ComponentLoader **loader);		c2_status_t findComponent(C2String name, std::shared_ptr<ComponentModule> *module);

			/**
			* Loads each component module and discover its contents.
			*/
			void visitComponents();

			std::mutex mMutex; ///< mutex guarding the component lists during construction
			bool mVisited; ///< component modules visited
			std::map<C2String, ComponentLoader> mComponents; ///< path -> component module
			std::map<C2String, C2String> mComponentNameToPath; ///< name -> path
			std::vector<std::shared_ptr<const C2Component::Traits>> mComponentList;

	std::map<C2String, ComponentLoader> mComponents; ///< map of name -> components
	std::vector<C2String> mComponentsList; ///< list of components
	std::shared_ptr<C2ReflectorHelper> mReflector;		std::shared_ptr<C2ReflectorHelper> mReflector;
	Interface mInterface;		Interface mInterface;
	};		};

	c2_status_t C2PlatformComponentStore::ComponentModule::init(		c2_status_t C2PlatformComponentStore::ComponentModule::init(
	std::string alias, std::string libPath) {		std::string libPath) {
	ALOGV("in %s", __func__);		ALOGV("in %s", __func__);
	ALOGV("loading dll");		ALOGV("loading dll");
	mLibHandle = dlopen(libPath.c_str(), RTLD_NOW\|RTLD_NODELETE);		mLibHandle = dlopen(libPath.c_str(), RTLD_NOW\|RTLD_NODELETE);
	@@ -684,10 +692,7 @@ c2_status_t C2PlatformComponentStore::ComponentModule::init(

	std::shared_ptr<C2Component::Traits> traits(new (std::nothrow) C2Component::Traits);		std::shared_ptr<C2Component::Traits> traits(new (std::nothrow) C2Component::Traits);
	if (traits) {		if (traits) {
	if (alias != intf->getName()) {		traits->name = intf->getName();
	ALOGV("%s is alias to %s", alias.c_str(), intf->getName().c_str());
	}
	traits->name = alias; // TODO: this needs to be intf->getName() once aliases are supported

	C2ComponentKindSetting kind;		C2ComponentKindSetting kind;
	C2ComponentDomainSetting domain;		C2ComponentDomainSetting domain;
	@@ -825,82 +830,45 @@ std::shared_ptr<const C2Component::Traits> C2PlatformComponentStore::ComponentMo
	}		}

	C2PlatformComponentStore::C2PlatformComponentStore()		C2PlatformComponentStore::C2PlatformComponentStore()
	: mReflector(std::make_shared<C2ReflectorHelper>()),		: mVisited(false),
			mReflector(std::make_shared<C2ReflectorHelper>()),
	mInterface(mReflector) {		mInterface(mReflector) {

	auto emplace = [this](const char alias, const char libPath) {		auto emplace = [this](const char *libPath) {
	// ComponentLoader is neither copiable nor movable, so it must be		mComponents.emplace(libPath, libPath);
	// constructed in-place. Now ComponentLoader takes two arguments in
	// constructor, so we need to use piecewise_construct to achieve this
	// behavior.
	mComponents.emplace(
	std::piecewise_construct,
	std::forward_as_tuple(alias),
	std::forward_as_tuple(alias, libPath));
	mComponentsList.emplace_back(alias);
	};		};

	// TODO: move this also into a .so so it can be updated		// TODO: move this also into a .so so it can be updated
	emplace("c2.android.avc.decoder", "libcodec2_soft_avcdec.so");		emplace("libcodec2_soft_aacdec.so");
	emplace("c2.android.avc.encoder", "libcodec2_soft_avcenc.so");		emplace("libcodec2_soft_aacenc.so");
	emplace("c2.android.aac.decoder", "libcodec2_soft_aacdec.so");		emplace("libcodec2_soft_amrnbdec.so");
	emplace("c2.android.aac.encoder", "libcodec2_soft_aacenc.so");		emplace("libcodec2_soft_amrnbenc.so");
	emplace("c2.android.amrnb.decoder", "libcodec2_soft_amrnbdec.so");		emplace("libcodec2_soft_amrwbdec.so");
	emplace("c2.android.amrnb.encoder", "libcodec2_soft_amrnbenc.so");		emplace("libcodec2_soft_amrwbenc.so");
	emplace("c2.android.amrwb.decoder", "libcodec2_soft_amrwbdec.so");		emplace("libcodec2_soft_av1dec.so");
	emplace("c2.android.amrwb.encoder", "libcodec2_soft_amrwbenc.so");		emplace("libcodec2_soft_avcdec.so");
	emplace("c2.android.hevc.decoder", "libcodec2_soft_hevcdec.so");		emplace("libcodec2_soft_avcenc.so");
	emplace("c2.android.g711.alaw.decoder", "libcodec2_soft_g711alawdec.so");		emplace("libcodec2_soft_flacdec.so");
	emplace("c2.android.g711.mlaw.decoder", "libcodec2_soft_g711mlawdec.so");		emplace("libcodec2_soft_flacenc.so");
	emplace("c2.android.mpeg2.decoder", "libcodec2_soft_mpeg2dec.so");		emplace("libcodec2_soft_g711alawdec.so");
	emplace("c2.android.h263.decoder", "libcodec2_soft_h263dec.so");		emplace("libcodec2_soft_g711mlawdec.so");
	emplace("c2.android.h263.encoder", "libcodec2_soft_h263enc.so");		emplace("libcodec2_soft_gsmdec.so");
	emplace("c2.android.mpeg4.decoder", "libcodec2_soft_mpeg4dec.so");		emplace("libcodec2_soft_h263dec.so");
	emplace("c2.android.mpeg4.encoder", "libcodec2_soft_mpeg4enc.so");		emplace("libcodec2_soft_h263enc.so");
	emplace("c2.android.mp3.decoder", "libcodec2_soft_mp3dec.so");		emplace("libcodec2_soft_hevcdec.so");
	emplace("c2.android.vorbis.decoder", "libcodec2_soft_vorbisdec.so");		emplace("libcodec2_soft_mp3dec.so");
	emplace("c2.android.opus.decoder", "libcodec2_soft_opusdec.so");		emplace("libcodec2_soft_mpeg2dec.so");
	emplace("c2.android.opus.encoder", "libcodec2_soft_opusenc.so");		emplace("libcodec2_soft_mpeg4dec.so");
	emplace("c2.android.vp8.decoder", "libcodec2_soft_vp8dec.so");		emplace("libcodec2_soft_mpeg4enc.so");
	emplace("c2.android.vp9.decoder", "libcodec2_soft_vp9dec.so");		emplace("libcodec2_soft_opusdec.so");
	emplace("c2.android.vp8.encoder", "libcodec2_soft_vp8enc.so");		emplace("libcodec2_soft_opusenc.so");
	emplace("c2.android.vp9.encoder", "libcodec2_soft_vp9enc.so");		emplace("libcodec2_soft_rawdec.so");
	emplace("c2.android.av1.decoder", "libcodec2_soft_av1dec.so");		emplace("libcodec2_soft_vorbisdec.so");
	emplace("c2.android.raw.decoder", "libcodec2_soft_rawdec.so");		emplace("libcodec2_soft_vp8dec.so");
	emplace("c2.android.flac.decoder", "libcodec2_soft_flacdec.so");		emplace("libcodec2_soft_vp8enc.so");
	emplace("c2.android.flac.encoder", "libcodec2_soft_flacenc.so");		emplace("libcodec2_soft_vp9dec.so");
	emplace("c2.android.gsm.decoder", "libcodec2_soft_gsmdec.so");		emplace("libcodec2_soft_vp9enc.so");
	emplace("c2.android.xaac.decoder", "libcodec2_soft_xaacdec.so");		emplace("libcodec2_soft_xaacdec.so");

	// "Aliases"
	// TODO: use aliases proper from C2Component::Traits
	emplace("OMX.google.h264.decoder", "libcodec2_soft_avcdec.so");
	emplace("OMX.google.h264.encoder", "libcodec2_soft_avcenc.so");
	emplace("OMX.google.aac.decoder", "libcodec2_soft_aacdec.so");
	emplace("OMX.google.aac.encoder", "libcodec2_soft_aacenc.so");
	emplace("OMX.google.amrnb.decoder", "libcodec2_soft_amrnbdec.so");
	emplace("OMX.google.amrnb.encoder", "libcodec2_soft_amrnbenc.so");
	emplace("OMX.google.amrwb.decoder", "libcodec2_soft_amrwbdec.so");
	emplace("OMX.google.amrwb.encoder", "libcodec2_soft_amrwbenc.so");
	emplace("OMX.google.hevc.decoder", "libcodec2_soft_hevcdec.so");
	emplace("OMX.google.g711.alaw.decoder", "libcodec2_soft_g711alawdec.so");
	emplace("OMX.google.g711.mlaw.decoder", "libcodec2_soft_g711mlawdec.so");
	emplace("OMX.google.mpeg2.decoder", "libcodec2_soft_mpeg2dec.so");
	emplace("OMX.google.h263.decoder", "libcodec2_soft_h263dec.so");
	emplace("OMX.google.h263.encoder", "libcodec2_soft_h263enc.so");
	emplace("OMX.google.mpeg4.decoder", "libcodec2_soft_mpeg4dec.so");
	emplace("OMX.google.mpeg4.encoder", "libcodec2_soft_mpeg4enc.so");
	emplace("OMX.google.mp3.decoder", "libcodec2_soft_mp3dec.so");
	emplace("OMX.google.vorbis.decoder", "libcodec2_soft_vorbisdec.so");
	emplace("OMX.google.opus.decoder", "libcodec2_soft_opusdec.so");
	emplace("OMX.google.vp8.decoder", "libcodec2_soft_vp8dec.so");
	emplace("OMX.google.vp9.decoder", "libcodec2_soft_vp9dec.so");
	emplace("OMX.google.vp8.encoder", "libcodec2_soft_vp8enc.so");
	emplace("OMX.google.vp9.encoder", "libcodec2_soft_vp9enc.so");
	emplace("OMX.google.raw.decoder", "libcodec2_soft_rawdec.so");
	emplace("OMX.google.flac.decoder", "libcodec2_soft_flacdec.so");
	emplace("OMX.google.flac.encoder", "libcodec2_soft_flacenc.so");
	emplace("OMX.google.gsm.decoder", "libcodec2_soft_gsmdec.so");
	emplace("OMX.google.xaac.decoder", "libcodec2_soft_xaacdec.so");
	}		}

	c2_status_t C2PlatformComponentStore::copyBuffer(		c2_status_t C2PlatformComponentStore::copyBuffer(
	@@ -923,48 +891,57 @@ c2_status_t C2PlatformComponentStore::config_sm(
	return mInterface.config(params, C2_MAY_BLOCK, failures);		return mInterface.config(params, C2_MAY_BLOCK, failures);
	}		}

	std::vector<std::shared_ptr<const C2Component::Traits>> C2PlatformComponentStore::listComponents() {		void C2PlatformComponentStore::visitComponents() {
	// This method SHALL return within 500ms.		std::lock_guard<std::mutex> lock(mMutex);
	std::vector<std::shared_ptr<const C2Component::Traits>> list;		if (mVisited) {
	for (const C2String &alias : mComponentsList) {		return;
	ComponentLoader &loader = mComponents.at(alias);		}
			for (auto &pathAndLoader : mComponents) {
			const C2String &path = pathAndLoader.first;
			ComponentLoader &loader = pathAndLoader.second;
	std::shared_ptr<ComponentModule> module;		std::shared_ptr<ComponentModule> module;
	c2_status_t res = loader.fetchModule(&module);		if (loader.fetchModule(&module) == C2_OK) {
	if (res == C2_OK) {
	std::shared_ptr<const C2Component::Traits> traits = module->getTraits();		std::shared_ptr<const C2Component::Traits> traits = module->getTraits();
	if (traits) {		if (traits) {
	list.push_back(traits);		mComponentList.push_back(traits);
			mComponentNameToPath.emplace(traits->name, path);
			for (const C2String &alias : traits->aliases) {
			mComponentNameToPath.emplace(alias, path);
			}
	}		}
	}		}
	}		}
	return list;		mVisited = true;
	}		}

	c2_status_t C2PlatformComponentStore::findComponent(C2String name, ComponentLoader **loader) {		std::vector<std::shared_ptr<const C2Component::Traits>> C2PlatformComponentStore::listComponents() {
	*loader = nullptr;		// This method SHALL return within 500ms.
	auto pos = mComponents.find(name);		visitComponents();
	// TODO: check aliases		return mComponentList;
	if (pos == mComponents.end()) {
	return C2_NOT_FOUND;
	}		}
	*loader = &pos->second;
	return C2_OK;		c2_status_t C2PlatformComponentStore::findComponent(
			C2String name, std::shared_ptr<ComponentModule> *module) {
			(*module).reset();
			visitComponents();

			auto pos = mComponentNameToPath.find(name);
			if (pos != mComponentNameToPath.end()) {
			return mComponents.at(pos->second).fetchModule(module);
			}
			return C2_NOT_FOUND;
	}		}

	c2_status_t C2PlatformComponentStore::createComponent(		c2_status_t C2PlatformComponentStore::createComponent(
	C2String name, std::shared_ptr<C2Component> *const component) {		C2String name, std::shared_ptr<C2Component> *const component) {
	// This method SHALL return within 100ms.		// This method SHALL return within 100ms.
	component->reset();		component->reset();
	ComponentLoader *loader;
	c2_status_t res = findComponent(name, &loader);
	if (res == C2_OK) {
	std::shared_ptr<ComponentModule> module;		std::shared_ptr<ComponentModule> module;
	res = loader->fetchModule(&module);		c2_status_t res = findComponent(name, &module);
	if (res == C2_OK) {		if (res == C2_OK) {
	// TODO: get a unique node ID		// TODO: get a unique node ID
	res = module->createComponent(0, component);		res = module->createComponent(0, component);
	}		}
	}
	return res;		return res;
	}		}

	@@ -972,16 +949,12 @@ c2_status_t C2PlatformComponentStore::createInterface(
	C2String name, std::shared_ptr<C2ComponentInterface> *const interface) {		C2String name, std::shared_ptr<C2ComponentInterface> *const interface) {
	// This method SHALL return within 100ms.		// This method SHALL return within 100ms.
	interface->reset();		interface->reset();
	ComponentLoader *loader;
	c2_status_t res = findComponent(name, &loader);
	if (res == C2_OK) {
	std::shared_ptr<ComponentModule> module;		std::shared_ptr<ComponentModule> module;
	res = loader->fetchModule(&module);		c2_status_t res = findComponent(name, &module);
	if (res == C2_OK) {		if (res == C2_OK) {
	// TODO: get a unique node ID		// TODO: get a unique node ID
	res = module->createInterface(0, interface);		res = module->createInterface(0, interface);
	}		}
	}
	return res;		return res;
	}		}

media/libstagefright/data/media_codecs_google_c2_audio.xml

+14 −0

media/libstagefright/data/media_codecs_google_c2_telephony.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	<Included>		<Included>
	<Decoders>		<Decoders>
	<MediaCodec name="c2.android.gsm.decoder" type="audio/gsm">		<MediaCodec name="c2.android.gsm.decoder" type="audio/gsm">
			<Alias name="OMX.google.gsm.decoder" />
	<Limit name="channel-count" max="1" />		<Limit name="channel-count" max="1" />
	<Limit name="sample-rate" ranges="8000" />		<Limit name="sample-rate" ranges="8000" />
	<Limit name="bitrate" range="13000" />		<Limit name="bitrate" range="13000" />

media/libstagefright/data/media_codecs_google_c2_tv.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	<Included>		<Included>
	<Decoders>		<Decoders>
	<MediaCodec name="c2.android.mpeg2.decoder" type="video/mpeg2">		<MediaCodec name="c2.android.mpeg2.decoder" type="video/mpeg2">
			<Alias name="OMX.google.mpeg2.decoder" />
	<!-- profiles and levels: ProfileMain : LevelHL -->		<!-- profiles and levels: ProfileMain : LevelHL -->
	<Limit name="size" min="16x16" max="1920x1088" />		<Limit name="size" min="16x16" max="1920x1088" />
	<Limit name="alignment" value="2x2" />		<Limit name="alignment" value="2x2" />

media/libstagefright/data/media_codecs_google_c2_video.xml

+11 −0