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

Commit 3e239410 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "hdr10+: adding C2 params for HDR10+"

parents 45632a11 fe9689ab

media/codec2/core/include/C2Config.h

+9 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ enum C2ParamIndexKind : C2Param::type_index_t { 
    kParamIndexLayerIndex,

    kParamIndexLayerCount,

    kParamIndexIntraRefresh,

    kParamIndexHdr10PlusMetadata,



    /* ------------------------------------ image components ------------------------------------ */
@@ -1560,6 +1561,14 @@ typedef C2StreamParam<C2Info, C2HdrStaticMetadataStruct, kParamIndexHdrStaticMet 
        C2StreamHdrStaticInfo;

constexpr char C2_PARAMKEY_HDR_STATIC_INFO[] = "raw.hdr-static-info";



/**

 * HDR10+ Metadata Info.

 */

typedef C2StreamParam<C2Info, C2BlobValue, kParamIndexHdr10PlusMetadata>

        C2StreamHdr10PlusInfo;

constexpr char C2_PARAMKEY_INPUT_HDR10_PLUS_INFO[] = "input.hdr10-plus-info";

constexpr char C2_PARAMKEY_OUTPUT_HDR10_PLUS_INFO[] = "output.hdr10-plus-info";



/* ------------------------------------ block-based coding ----------------------------------- */



/**

media/libstagefright/include/media/stagefright/MediaCodecConstants.h

+4 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ constexpr int32_t VP9Profile2 = 0x04; 
constexpr int32_t VP9Profile3 = 0x08;

constexpr int32_t VP9Profile2HDR = 0x1000;

constexpr int32_t VP9Profile3HDR = 0x2000;

constexpr int32_t VP9Profile2HDR10Plus = 0x4000;

constexpr int32_t VP9Profile3HDR10Plus = 0x8000;



constexpr int32_t VP9Level1  = 0x1;

constexpr int32_t VP9Level11 = 0x2;
@@ -155,6 +157,7 @@ constexpr int32_t HEVCProfileMain = 0x01; 
constexpr int32_t HEVCProfileMain10      = 0x02;

constexpr int32_t HEVCProfileMainStill   = 0x04;

constexpr int32_t HEVCProfileMain10HDR10 = 0x1000;

constexpr int32_t HEVCProfileMain10HDR10Plus = 0x2000;



constexpr int32_t HEVCMainTierLevel1  = 0x1;

constexpr int32_t HEVCHighTierLevel1  = 0x2;
@@ -343,6 +346,7 @@ constexpr char KEY_FRAME_RATE[] = "frame-rate"; 
constexpr char KEY_GRID_COLUMNS[] = "grid-cols";

constexpr char KEY_GRID_ROWS[] = "grid-rows";

constexpr char KEY_HDR_STATIC_INFO[] = "hdr-static-info";

constexpr char KEY_HDR10_PLUS_INFO[] = "hdr10-plus-info";

constexpr char KEY_HEIGHT[] = "height";

constexpr char KEY_I_FRAME_INTERVAL[] = "i-frame-interval";

constexpr char KEY_INTRA_REFRESH_PERIOD[] = "intra-refresh-period";

media/ndk/NdkMediaFormat.cpp

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ EXPORT const char* AMEDIAFORMAT_KEY_GENRE = "genre"; 
EXPORT const char* AMEDIAFORMAT_KEY_GRID_COLUMNS = "grid-cols";

EXPORT const char* AMEDIAFORMAT_KEY_GRID_ROWS = "grid-rows";

EXPORT const char* AMEDIAFORMAT_KEY_HDR_STATIC_INFO = "hdr-static-info";

EXPORT const char* AMEDIAFORMAT_KEY_HDR10_PLUS_INFO = "hdr10-plus-info";

EXPORT const char* AMEDIAFORMAT_KEY_HEIGHT = "height";

EXPORT const char* AMEDIAFORMAT_KEY_ICC_PROFILE = "icc-profile";

EXPORT const char* AMEDIAFORMAT_KEY_INTRA_REFRESH_PERIOD = "intra-refresh-period";