Merge "Recategorize ALOGE() and other diagnostics" into sc-dev (92d528e4) · Commits · e / os / android_frameworks_av

media/libstagefright/MediaExtractorFactory.cpp

+11 −7

Original line number	Diff line number	Diff line
		@@ -188,11 +188,11 @@ void MediaExtractorFactory::RegisterExtractor(const sp<ExtractorPlugin> &plugin,
		// sanity check check struct version, uuid, name
		if (plugin->def.def_version != EXTRACTORDEF_VERSION_NDK_V1 &&
		plugin->def.def_version != EXTRACTORDEF_VERSION_NDK_V2) {
		ALOGE("don't understand extractor format %u, ignoring.", plugin->def.def_version);
		ALOGW("don't understand extractor format %u, ignoring.", plugin->def.def_version);
		return;
		}
		if (memcmp(&plugin->def.extractor_uuid, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16) == 0) {
		ALOGE("invalid UUID, ignoring");
		ALOGW("invalid UUID, ignoring");
		return;
		}
		if (plugin->def.extractor_name == NULL \|\| strlen(plugin->def.extractor_name) == 0) {
		@@ -244,13 +244,17 @@ void MediaExtractorFactory::RegisterExtractors(
		void *libHandle = android_dlopen_ext(
		libPath.string(),
		RTLD_NOW \| RTLD_LOCAL, dlextinfo);
		CHECK(libHandle != nullptr)
		<< "couldn't dlopen(" << libPath.string() << ") " << strerror(errno);
		if (libHandle == nullptr) {
		ALOGI("dlopen(%s) reported error %s", libPath.string(), strerror(errno));
		continue;
		}

		GetExtractorDef getDef =
		(GetExtractorDef) dlsym(libHandle, "GETEXTRACTORDEF");
		CHECK(getDef != nullptr)
		<< libPath.string() << " does not contain sniffer";
		if (getDef == nullptr) {
		ALOGI("no sniffer found in %s", libPath.string());
		continue;
		}

		ALOGV("registering sniffer for %s", libPath.string());
		RegisterExtractor(
		@@ -258,7 +262,7 @@ void MediaExtractorFactory::RegisterExtractors(
		}
		closedir(libDir);
		} else {
		ALOGE("couldn't opendir(%s)", libDirPath);
		ALOGI("plugin directory not present (%s)", libDirPath);
		}
		}

media/libstagefright/Utils.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -1675,7 +1675,7 @@ status_t convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) {
		if (msg->findString("mime", &mime)) {
		meta->setCString(kKeyMIMEType, mime.c_str());
		} else {
		ALOGE("did not find mime type");
		ALOGI("did not find mime type");
		return BAD_VALUE;
		}

		@@ -1725,7 +1725,7 @@ status_t convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) {
		meta->setInt32(kKeyWidth, width);
		meta->setInt32(kKeyHeight, height);
		} else {
		ALOGE("did not find width and/or height");
		ALOGI("did not find width and/or height");
		return BAD_VALUE;
		}

		@@ -1814,7 +1814,7 @@ status_t convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) {
		int32_t numChannels, sampleRate;
		if (!msg->findInt32("channel-count", &numChannels) \|\|
		!msg->findInt32("sample-rate", &sampleRate)) {
		ALOGE("did not find channel-count and/or sample-rate");
		ALOGI("did not find channel-count and/or sample-rate");
		return BAD_VALUE;
		}
		meta->setInt32(kKeyChannelCount, numChannels);