Merge "Add distortion correction opcodes in DngCreator." into mnc-dev (1c52669d) · Commits · e / os / android_frameworks_base

core/jni/android_hardware_camera2_DngCreator.cpp

+55 −30

Original line number	Diff line number	Diff line
		@@ -371,8 +371,8 @@ ssize_t JniInputByteBuffer::read(uint8_t* buf, size_t offset, size_t count) {
		realCount = count;
		}

		jobject chainingBuf = mEnv->CallObjectMethod(mInBuf, gInputByteBufferClassInfo.mGetMethod, mByteArray, 0,
		realCount);
		jobject chainingBuf = mEnv->CallObjectMethod(mInBuf, gInputByteBufferClassInfo.mGetMethod,
		mByteArray, 0, realCount);
		mEnv->DeleteLocalRef(chainingBuf);

		if (mEnv->ExceptionCheck()) {
		@@ -630,8 +630,10 @@ static bool validateDngHeader(JNIEnv* env, TiffWriter* writer, jint width, jint
		bool hasThumbnail = writer->hasIfd(TIFF_IFD_SUB1);

		// TODO: handle lens shading map, etc. conversions for other raw buffer sizes.
		uint32_t metadataWidth = *(writer->getEntry(TAG_IMAGEWIDTH, (hasThumbnail) ? TIFF_IFD_SUB1 : TIFF_IFD_0)->getData<uint32_t>());
		uint32_t metadataHeight = *(writer->getEntry(TAG_IMAGELENGTH, (hasThumbnail) ? TIFF_IFD_SUB1 : TIFF_IFD_0)->getData<uint32_t>());
		uint32_t metadataWidth = *(writer->getEntry(TAG_IMAGEWIDTH, (hasThumbnail) ? TIFF_IFD_SUB1 :
		TIFF_IFD_0)->getData<uint32_t>());
		uint32_t metadataHeight = *(writer->getEntry(TAG_IMAGELENGTH, (hasThumbnail) ? TIFF_IFD_SUB1 :
		TIFF_IFD_0)->getData<uint32_t>());

		if (width < 0 \|\| metadataWidth != static_cast<uint32_t>(width)) {
		jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException", \
		@@ -641,7 +643,8 @@ static bool validateDngHeader(JNIEnv* env, TiffWriter* writer, jint width, jint

		if (height < 0 \|\| metadataHeight != static_cast<uint32_t>(height)) {
		jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException", \
		"Metadata height %d doesn't match image height %d", metadataHeight, height);
		"Metadata height %d doesn't match image height %d",
		metadataHeight, height);
		return false;
		}

		@@ -1429,6 +1432,10 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt

		{
		// Set up opcode List 2
		OpcodeListBuilder builder;
		status_t err = OK;

		// Set up lens shading map
		camera_metadata_entry entry1 =
		characteristics.find(ANDROID_LENS_INFO_SHADING_MAP_SIZE);

		@@ -1444,9 +1451,7 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt
		results.find(ANDROID_STATISTICS_LENS_SHADING_MAP);

		if (entry2.count > 0 && entry2.count == lsmWidth * lsmHeight * 4) {

		OpcodeListBuilder builder;
		status_t err = builder.addGainMapsForMetadata(lsmWidth,
		err = builder.addGainMapsForMetadata(lsmWidth,
		lsmHeight,
		0,
		0,
		@@ -1454,7 +1459,32 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt
		imageWidth,
		opcodeCfaLayout,
		entry2.data.f);
		if (err == OK) {
		if (err != OK) {
		ALOGE("%s: Could not add Lens shading map.", __FUNCTION__);
		jniThrowRuntimeException(env, "failed to add lens shading map.");
		return;
		}
		}

		// Set up rectilinear distortion correction
		camera_metadata_entry entry3 =
		results.find(ANDROID_LENS_RADIAL_DISTORTION);
		camera_metadata_entry entry4 =
		results.find(ANDROID_LENS_INTRINSIC_CALIBRATION);

		if (entry3.count == 6 && entry4.count == 5) {
		float cx = entry4.data.f[/c_x/2];
		float cy = entry4.data.f[/c_y/3];
		err = builder.addWarpRectilinearForMetadata(entry3.data.f, imageWidth, imageHeight, cx,
		cy);
		if (err != OK) {
		ALOGE("%s: Could not add distortion correction.", __FUNCTION__);
		jniThrowRuntimeException(env, "failed to add distortion correction.");
		return;
		}
		}


		size_t listSize = builder.getSize();
		uint8_t opcodeListBuf[listSize];
		err = builder.buildOpList(opcodeListBuf);
		@@ -1462,16 +1492,11 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt
		BAIL_IF_INVALID(writer->addEntry(TAG_OPCODELIST2, listSize, opcodeListBuf,
		TIFF_IFD_0), env, TAG_OPCODELIST2, writer);
		} else {
		ALOGE("%s: Could not build Lens shading map opcode.", __FUNCTION__);
		jniThrowRuntimeException(env, "failed to construct lens shading map opcode.");
		}
		} else {
		ALOGE("%s: Could not add Lens shading map.", __FUNCTION__);
		jniThrowRuntimeException(env, "failed to add lens shading map.");
		}
		} else {
		ALOGW("%s: No lens shading map found in result metadata. Image quality may be reduced.",
		__FUNCTION__);
		ALOGE("%s: Could not build list of opcodes for distortion correction and lens shading"
		"map.", __FUNCTION__);
		jniThrowRuntimeException(env, "failed to construct opcode list for distortion"
		" correction and lens shading map");
		return;
		}
		}