Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5839834f authored by Sam Hasinoff's avatar Sam Hasinoff
Browse files

Don't write OpcodeList's with no opcodes to DNG 

Also fix up some comments and logging.

Bug: 112080603
Test: build, run on walleye (GCA, Lightroom)
Change-Id: I6f09cb4d0c6c7fb096b9628bdb78196fea70eb64
parent 8eedb5ad

core/jni/android_hardware_camera2_DngCreator.cpp

+28 −25
Original line number Diff line number Diff line
@@ -1748,21 +1748,22 @@ static sp<TiffWriter> DngCreator_setup(JNIEnv* env, jobject thiz, uint32_t image 
            }

        }





        if (builder.getCount() > 0) {

            size_t listSize = builder.getSize();

            uint8_t opcodeListBuf[listSize];

            err = builder.buildOpList(opcodeListBuf);

            if (err == OK) {

            BAIL_IF_INVALID_RET_NULL_SP(writer->addEntry(TAG_OPCODELIST2, listSize, opcodeListBuf,

                    TIFF_IFD_0), env, TAG_OPCODELIST2, writer);

                BAIL_IF_INVALID_RET_NULL_SP(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");

                ALOGE("%s: Could not build list of opcodes for lens shading map and bad pixel "

                        "correction.", __FUNCTION__);

                jniThrowRuntimeException(env, "failed to construct opcode list for lens shading "

                        "map and bad pixel correction");

                return nullptr;

            }

        }

    }



    {

        // Set up opcode List 3
@@ -1846,20 +1847,22 @@ static sp<TiffWriter> DngCreator_setup(JNIEnv* env, jobject thiz, uint32_t image 
            }

        }



        if (builder.getCount() > 0) {

            size_t listSize = builder.getSize();

            uint8_t opcodeListBuf[listSize];

            err = builder.buildOpList(opcodeListBuf);

            if (err == OK) {

            BAIL_IF_INVALID_RET_NULL_SP(writer->addEntry(TAG_OPCODELIST3, listSize, opcodeListBuf,

                    TIFF_IFD_0), env, TAG_OPCODELIST3, writer);

                BAIL_IF_INVALID_RET_NULL_SP(writer->addEntry(TAG_OPCODELIST3, listSize,

                        opcodeListBuf, TIFF_IFD_0), env, TAG_OPCODELIST3, writer);

            } else {

            ALOGE("%s: Could not build list of opcodes for distortion correction and lens shading"

                    "map.", __FUNCTION__);

                ALOGE("%s: Could not build list of opcodes for distortion correction.",

                        __FUNCTION__);

                jniThrowRuntimeException(env, "failed to construct opcode list for distortion"

                    " correction and lens shading map");

                        " correction");

                return nullptr;

            }

        }

    }



    {

        // Set up orientation tags.