Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move distortion correction to correct opcode list." into mnc-dev

Browse Source
This commit is contained in:
Ruben Brunk
2015-06-17 06:22:23 +00:00
committed by Android (Google) Code Review
parent f4d225a4b5 fe81662cc5
commit 5e063b1da5
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/jni/android_hardware_camera2_DngCreator.cpp
View File

@@ -1466,6 +1466,26 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt
} }
} }
size_t listSize = builder.getSize();
uint8_t opcodeListBuf[listSize];
err = builder.buildOpList(opcodeListBuf);
if (err == OK) {
BAIL_IF_INVALID(writer->addEntry(TAG_OPCODELIST2, listSize, opcodeListBuf,
TIFF_IFD_0), env, TAG_OPCODELIST2, writer);
} else {
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;
}
}
{
// Set up opcode List 3
OpcodeListBuilder builder;
status_t err = OK;
// Set up rectilinear distortion correction // Set up rectilinear distortion correction
camera_metadata_entry entry3 = camera_metadata_entry entry3 =
results.find(ANDROID_LENS_RADIAL_DISTORTION); results.find(ANDROID_LENS_RADIAL_DISTORTION);
@@ -1484,13 +1504,12 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt
} }
} }
size_t listSize = builder.getSize(); size_t listSize = builder.getSize();
uint8_t opcodeListBuf[listSize]; uint8_t opcodeListBuf[listSize];
err = builder.buildOpList(opcodeListBuf); err = builder.buildOpList(opcodeListBuf);
if (err == OK) { if (err == OK) {
BAIL_IF_INVALID(writer->addEntry(TAG_OPCODELIST2, listSize, opcodeListBuf, BAIL_IF_INVALID(writer->addEntry(TAG_OPCODELIST3, listSize, opcodeListBuf,
TIFF_IFD_0), env, TAG_OPCODELIST2, writer); TIFF_IFD_0), env, TAG_OPCODELIST3, writer);
} else { } else {
ALOGE("%s: Could not build list of opcodes for distortion correction and lens shading" ALOGE("%s: Could not build list of opcodes for distortion correction and lens shading"
"map.", __FUNCTION__); "map.", __FUNCTION__);
@@ -1718,6 +1737,7 @@ static void DngCreator_nativeSetThumbnail(JNIEnv* env, jobject thiz, jobject buf
tagsToMove.add(TAG_DEFAULTCROPORIGIN); tagsToMove.add(TAG_DEFAULTCROPORIGIN);
tagsToMove.add(TAG_DEFAULTCROPSIZE); tagsToMove.add(TAG_DEFAULTCROPSIZE);
tagsToMove.add(TAG_OPCODELIST2); tagsToMove.add(TAG_OPCODELIST2);
tagsToMove.add(TAG_OPCODELIST3);
if (moveEntries(writer, TIFF_IFD_0, TIFF_IFD_SUB1, tagsToMove) != OK) { if (moveEntries(writer, TIFF_IFD_0, TIFF_IFD_SUB1, tagsToMove) != OK) {
jniThrowException(env, "java/lang/IllegalStateException", "Failed to move entries"); jniThrowException(env, "java/lang/IllegalStateException", "Failed to move entries");