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

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

Merge "Expose a few keys that are already used by apps"

parents 157c4677 4a224f59

media/libmedia/NdkWrapper.cpp

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

    AMEDIAFORMAT_KEY_COLOR_TRANSFER,

    AMEDIAFORMAT_KEY_COMPLEXITY,

    AMEDIAFORMAT_KEY_CREATE_INPUT_SURFACE_SUSPENDED,

    AMEDIAFORMAT_KEY_CRYPTO_DEFAULT_IV_SIZE,

    AMEDIAFORMAT_KEY_CRYPTO_ENCRYPTED_BYTE_BLOCK,

    AMEDIAFORMAT_KEY_CRYPTO_MODE,

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

+5 −0
Original line number Diff line number Diff line
@@ -752,6 +752,7 @@ constexpr char KEY_COLOR_RANGE[] = "color-range"; 
constexpr char KEY_COLOR_STANDARD[] = "color-standard";

constexpr char KEY_COLOR_TRANSFER[] = "color-transfer";

constexpr char KEY_COMPLEXITY[] = "complexity";

constexpr char KEY_CREATE_INPUT_SURFACE_SUSPENDED[] = "create-input-buffers-suspended";

constexpr char KEY_DURATION[] = "durationUs";

constexpr char KEY_FEATURE_[] = "feature-";

constexpr char KEY_FLAC_COMPRESSION_LEVEL[] = "flac-compression-level";
@@ -772,8 +773,10 @@ constexpr char KEY_LANGUAGE[] = "language"; 
constexpr char KEY_LATENCY[] = "latency";

constexpr char KEY_LEVEL[] = "level";

constexpr char KEY_MAX_BIT_RATE[] = "max-bitrate";

constexpr char KEY_MAX_FPS_TO_ENCODER[] = "max-fps-to-encoder";

constexpr char KEY_MAX_HEIGHT[] = "max-height";

constexpr char KEY_MAX_INPUT_SIZE[] = "max-input-size";

constexpr char KEY_MAX_PTS_GAP_TO_ENCODER[] = "max-pts-gap-to-encoder";

constexpr char KEY_MAX_WIDTH[] = "max-width";

constexpr char KEY_MIME[] = "mime";

constexpr char KEY_OPERATING_RATE[] = "operating-rate";
@@ -828,8 +831,10 @@ constexpr int32_t INFO_OUTPUT_FORMAT_CHANGED = -2; 
constexpr int32_t INFO_TRY_AGAIN_LATER        = -1;

constexpr int32_t VIDEO_SCALING_MODE_SCALE_TO_FIT               = 1;

constexpr int32_t VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2;

constexpr char PARAMETER_KEY_OFFSET_TIME[] = "time-offset-us";

constexpr char PARAMETER_KEY_REQUEST_SYNC_FRAME[] = "request-sync";

constexpr char PARAMETER_KEY_SUSPEND[] = "drop-input-frames";

constexpr char PARAMETER_KEY_SUSPEND_TIME[] = "drop-start-time-us";

constexpr char PARAMETER_KEY_VIDEO_BITRATE[] = "video-bitrate";



}

media/ndk/NdkMediaFormat.cpp

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ EXPORT const char* AMEDIAFORMAT_KEY_COLOR_TRANSFER = "color-transfer"; 
EXPORT const char* AMEDIAFORMAT_KEY_COMPILATION = "compilation";

EXPORT const char* AMEDIAFORMAT_KEY_COMPLEXITY = "complexity";

EXPORT const char* AMEDIAFORMAT_KEY_COMPOSER = "composer";

EXPORT const char* AMEDIAFORMAT_KEY_CREATE_INPUT_SURFACE_SUSPENDED = "create-input-buffers-suspended";

EXPORT const char* AMEDIAFORMAT_KEY_CRYPTO_DEFAULT_IV_SIZE = "crypto-default-iv-size";

EXPORT const char* AMEDIAFORMAT_KEY_CRYPTO_ENCRYPTED_BYTE_BLOCK = "crypto-encrypted-byte-block";

EXPORT const char* AMEDIAFORMAT_KEY_CRYPTO_ENCRYPTED_SIZES = "crypto-encrypted-sizes";

media/ndk/include/media/NdkMediaFormat.h

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ extern const char* AMEDIAFORMAT_KEY_BITS_PER_SAMPLE __INTRODUCED_IN(29); 
extern const char* AMEDIAFORMAT_KEY_CDTRACKNUMBER __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_COMPILATION __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_COMPOSER __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_CREATE_INPUT_SURFACE_SUSPENDED __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_CRYPTO_DEFAULT_IV_SIZE __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_CRYPTO_ENCRYPTED_BYTE_BLOCK __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_CRYPTO_ENCRYPTED_SIZES __INTRODUCED_IN(29);

media/ndk/libmediandk.map.txt

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ LIBMEDIANDK { 
    AMEDIAFORMAT_KEY_COMPILATION; # var introduced=29

    AMEDIAFORMAT_KEY_COMPLEXITY; # var introduced=28

    AMEDIAFORMAT_KEY_COMPOSER; # var introduced=29

    AMEDIAFORMAT_KEY_CREATE_INPUT_SURFACE_SUSPENDED; # var introduced=29

    AMEDIAFORMAT_KEY_CRYPTO_DEFAULT_IV_SIZE; # var introduced=29

    AMEDIAFORMAT_KEY_CRYPTO_ENCRYPTED_BYTE_BLOCK; # var introduced=29

    AMEDIAFORMAT_KEY_CRYPTO_ENCRYPTED_SIZES; # var introduced=29