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

Commit 9d5f9411 authored by Dichen Zhang's avatar Dichen Zhang Committed by Android (Google) Code Review
Browse files

Merge "jpegr refactor: rename namespace"

parents 0fce333c 652f5fd0

libs/hwui/jni/YuvToJpegEncoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ void Yuv422IToJpegEncoder::configSamplingFactors(jpeg_compress_struct* cinfo) { 
}

///////////////////////////////////////////////////////////////////////////////



using namespace android::recoverymap;

using namespace android::jpegrecoverymap;



jpegr_color_gamut P010Yuv420ToJpegREncoder::findColorGamut(JNIEnv* env, int aDataSpace) {

    switch (aDataSpace & ADataSpace::STANDARD_MASK) {

libs/hwui/jni/YuvToJpegEncoder.h

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public: 
     *  @param aDataSpace data space defined in data_space.h.

     *  @return color gamut for JPEG/R.

     */

    static android::recoverymap::jpegr_color_gamut findColorGamut(JNIEnv* env, int aDataSpace);

    static android::jpegrecoverymap::jpegr_color_gamut findColorGamut(JNIEnv* env, int aDataSpace);



    /** Map data space (defined in DataSpace.java and data_space.h) to the transfer function

     *  used in JPEG/R
@@ -112,7 +112,7 @@ public: 
     *  @param aDataSpace data space defined in data_space.h.

     *  @return color gamut for JPEG/R.

     */

    static android::recoverymap::jpegr_transfer_function findHdrTransferFunction(

    static android::jpegrecoverymap::jpegr_transfer_function findHdrTransferFunction(

            JNIEnv* env, int aDataSpace);

};