Merge "OMX: Hide OMX components if vendor.media.omx is 0" into rvc-dev am:... (db476b03) · Commits · e / os / android_frameworks_av

media/libstagefright/omx/OMXMaster.cpp

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	//#define LOG_NDEBUG 0		//#define LOG_NDEBUG 0
	#define LOG_TAG "OMXMaster"		#define LOG_TAG "OMXMaster"
			#include <android-base/properties.h>
	#include <utils/Log.h>		#include <utils/Log.h>

	#include <media/stagefright/omx/OMXMaster.h>		#include <media/stagefright/omx/OMXMaster.h>
	@@ -67,6 +68,10 @@ void OMXMaster::addPlatformPlugin() {
	}		}

	void OMXMaster::addPlugin(const char *libname) {		void OMXMaster::addPlugin(const char *libname) {
			if (::android::base::GetIntProperty("vendor.media.omx", int64_t(1)) == 0) {
			return;
			}

	void *libHandle = android_load_sphal_library(libname, RTLD_NOW);		void *libHandle = android_load_sphal_library(libname, RTLD_NOW);

	if (libHandle == NULL) {		if (libHandle == NULL) {