Merge "Make sure that loading failure is reported to dropbox." into qt-dev (31647337) · Commits · e / os / android_frameworks_av

media/libstagefright/MediaExtractorFactory.cpp

+12 −14

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <utils/Log.h>

		#include <android/dlext.h>
		#include <android-base/logging.h>
		#include <binder/IPCThreadState.h>
		#include <binder/PermissionCache.h>
		#include <binder/IServiceManager.h>
		@@ -244,20 +245,17 @@ void MediaExtractorFactory::RegisterExtractors(
		void *libHandle = android_dlopen_ext(
		libPath.string(),
		RTLD_NOW \| RTLD_LOCAL, dlextinfo);
		if (libHandle) {
		CHECK(libHandle != nullptr)
		<< "couldn't dlopen(" << libPath.string() << ") " << strerror(errno);

		GetExtractorDef getDef =
		(GetExtractorDef) dlsym(libHandle, "GETEXTRACTORDEF");
		if (getDef) {
		CHECK(getDef != nullptr)
		<< libPath.string() << " does not contain sniffer";

		ALOGV("registering sniffer for %s", libPath.string());
		RegisterExtractor(
		new ExtractorPlugin(getDef(), libHandle, libPath), pluginList);
		} else {
		ALOGW("%s does not contain sniffer", libPath.string());
		dlclose(libHandle);
		}
		} else {
		ALOGW("couldn't dlopen(%s) %s", libPath.string(), strerror(errno));
		}
		}
		closedir(libDir);
		} else {