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

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

Merge "jpegr: encode ICC" into udc-dev am: f6e25b8e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21723536



Change-Id: I6c870bb0747d1090947b5ac3fbe138539f551285
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3c4d2bc f6e25b8e

libs/jpegrecoverymap/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ cc_library { 
    local_include_dirs: ["include"],



    srcs: [

        "icc.cpp",

        "jpegr.cpp",

        "recoverymapmath.cpp",

        "jpegrutils.cpp",
@@ -43,8 +44,6 @@ cc_library { 
        "liblog",

        "libutils",

    ],



    static_libs: ["libskia"],

}



cc_library {

libs/jpegrecoverymap/icc.cpp

0 → 100644
+584 −0

File added.

Preview size limit exceeded, changes collapsed.

libs/jpegrecoverymap/include/jpegrecoverymap/icc.h

0 → 100644
+234 −0

File added.

Preview size limit exceeded, changes collapsed.

libs/jpegrecoverymap/include/jpegrecoverymap/jpegrutils.h

+18 −0
Original line number Diff line number Diff line
@@ -27,6 +27,24 @@ 


namespace android::jpegrecoverymap {



static constexpr uint32_t EndianSwap32(uint32_t value) {

    return ((value & 0xFF) << 24) |

           ((value & 0xFF00) << 8) |

           ((value & 0xFF0000) >> 8) |

           (value >> 24);

}

static inline uint16_t EndianSwap16(uint16_t value) {

    return static_cast<uint16_t>((value >> 8) | ((value & 0xFF) << 8));

}



#if USE_BIG_ENDIAN

    #define Endian_SwapBE32(n) EndianSwap32(n)

    #define Endian_SwapBE16(n) EndianSwap16(n)

#else

    #define Endian_SwapBE32(n) (n)

    #define Endian_SwapBE16(n) (n)

#endif



struct jpegr_metadata;

/*

 * Mutable data structure. Holds information for metadata.

libs/jpegrecoverymap/include/jpegrecoverymap/multipictureformat.h

+4 −16
Original line number Diff line number Diff line
@@ -19,25 +19,13 @@ 


#include <jpegrecoverymap/jpegrutils.h>



namespace android::jpegrecoverymap {

static constexpr uint32_t EndianSwap32(uint32_t value) {

    return ((value & 0xFF) << 24) |

           ((value & 0xFF00) << 8) |

           ((value & 0xFF0000) >> 8) |

           (value >> 24);

}

static inline uint16_t EndianSwap16(uint16_t value) {

    return static_cast<uint16_t>((value >> 8) | ((value & 0xFF) << 8));

}

#ifdef USE_BIG_ENDIAN

#undef USE_BIG_ENDIAN

#define USE_BIG_ENDIAN true

#if USE_BIG_ENDIAN

    #define Endian_SwapBE32(n) EndianSwap32(n)

    #define Endian_SwapBE16(n) EndianSwap16(n)

#else

    #define Endian_SwapBE32(n) (n)

    #define Endian_SwapBE16(n) (n)

#endif



namespace android::jpegrecoverymap {



constexpr size_t kNumPictures = 2;

constexpr size_t kMpEndianSize = 4;

constexpr uint16_t kTagSerializedCount = 3;