Merge "Graceful handling of missing extractor metadata" into sc-dev (e433c73d) · Commits · e / os / android_frameworks_av

media/libstagefright/NuMediaExtractor.cpp

+14 −1

Original line number	Diff line number	Diff line
		@@ -307,8 +307,16 @@ status_t NuMediaExtractor::getFileFormat(sp<AMessage> *format) const {

		sp<MetaData> meta = mImpl->getMetaData();

		if (meta == nullptr) {
		//extractor did not publish file metadata
		return -EINVAL;
		}

		const char *mime;
		CHECK(meta->findCString(kKeyMIMEType, &mime));
		if (!meta->findCString(kKeyMIMEType, &mime)) {
		// no mime type maps to invalid
		return -EINVAL;
		}
		*format = new AMessage();
		(*format)->setString("mime", mime);

		@@ -354,6 +362,11 @@ status_t NuMediaExtractor::getExifOffsetSize(off64_t offset, size_t size) cons

		sp<MetaData> meta = mImpl->getMetaData();

		if (meta == nullptr) {
		//extractor did not publish file metadata
		return -EINVAL;
		}

		int64_t exifOffset, exifSize;
		if (meta->findInt64(kKeyExifOffset, &exifOffset)
		&& meta->findInt64(kKeyExifSize, &exifSize)) {