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

Commit be9a024b authored by Dichen Zhang's avatar Dichen Zhang Committed by Automerger Merge Worker
Browse files

Merge "move to external/libultrahdr from frameworks/native/libs/ultrahdr" into main am: 6a5b04b2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2850164



Change-Id: I75e24ba7ec441b1f010db0aed2d4182e62dfb6b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2990fb6b 6a5b04b2

libs/hwui/jni/YuvToJpegEncoder.cpp

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include "SkStream.h"

#include "YuvToJpegEncoder.h"

#include <ui/PixelFormat.h>

#include <utils/Errors.h>

#include <hardware/hardware.h>



#include "graphics_jni_helpers.h"
@@ -298,7 +299,7 @@ void Yuv422IToJpegEncoder::configSamplingFactors(jpeg_compress_struct* cinfo) { 
}

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



using namespace android::ultrahdr;

using namespace ultrahdr;



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

    switch (aDataSpace & ADataSpace::STANDARD_MASK) {

libs/hwui/jni/YuvToJpegEncoder.h

+3 −3
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::ultrahdr::ultrahdr_color_gamut findColorGamut(JNIEnv* env, int aDataSpace);

    static ultrahdr::ultrahdr_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,8 +112,8 @@ public: 
     *  @param aDataSpace data space defined in data_space.h.

     *  @return color gamut for JPEG/R.

     */

    static android::ultrahdr::ultrahdr_transfer_function findHdrTransferFunction(

            JNIEnv* env, int aDataSpace);

    static ultrahdr::ultrahdr_transfer_function findHdrTransferFunction(JNIEnv* env,

                                                                        int aDataSpace);

};



#endif  // _ANDROID_GRAPHICS_YUV_TO_JPEG_ENCODER_H_