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

Commit 04285604 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "NdkWrapper: add missing DRM AMediaFormat keys"

parents f440ca9c 4a84cbb3

media/libmedia/NdkWrapper.cpp

+6 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,10 @@ static const char *AMediaFormatKeyGroupInt32[] = { 
    AMEDIAFORMAT_KEY_COLOR_STANDARD,

    AMEDIAFORMAT_KEY_COLOR_STANDARD,

    AMEDIAFORMAT_KEY_COLOR_TRANSFER,

    AMEDIAFORMAT_KEY_COLOR_TRANSFER,

    AMEDIAFORMAT_KEY_COMPLEXITY,

    AMEDIAFORMAT_KEY_COMPLEXITY,

    AMEDIAFORMAT_KEY_CRYPTO_DEFAULT_IV_SIZE,

    AMEDIAFORMAT_KEY_CRYPTO_ENCRYPTED_BYTE_BLOCK,

    AMEDIAFORMAT_KEY_CRYPTO_MODE,

    AMEDIAFORMAT_KEY_CRYPTO_SKIP_BYTE_BLOCK,

    AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL,

    AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL,

    AMEDIAFORMAT_KEY_GRID_COLUMNS,

    AMEDIAFORMAT_KEY_GRID_COLUMNS,

    AMEDIAFORMAT_KEY_GRID_ROWS,

    AMEDIAFORMAT_KEY_GRID_ROWS,
@@ -102,6 +106,8 @@ static const char *AMediaFormatKeyGroupString[] = { 
};

};





static const char *AMediaFormatKeyGroupBuffer[] = {

static const char *AMediaFormatKeyGroupBuffer[] = {

    AMEDIAFORMAT_KEY_CRYPTO_IV,

    AMEDIAFORMAT_KEY_CRYPTO_KEY,

    AMEDIAFORMAT_KEY_HDR_STATIC_INFO,

    AMEDIAFORMAT_KEY_HDR_STATIC_INFO,

    AMEDIAFORMAT_KEY_SEI,

    AMEDIAFORMAT_KEY_SEI,

    AMEDIAFORMAT_KEY_MPEG_USER_DATA,

    AMEDIAFORMAT_KEY_MPEG_USER_DATA,