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

Commit ce72854c authored by Marco Nelissen's avatar Marco Nelissen Committed by Ryan Prichard
Browse files

Add __INTRODUCED_IN to more NdkMediaFormat.h variables 

Annotate the ones that were added when the NDK media APIs were first
added in API 21

Test: build
Bug: 113052379
Change-Id: Id60039944981f3af56571f2de31e7989e4d377a2
Merged-In: Id60039944981f3af56571f2de31e7989e4d377a2
(cherry picked from commit e2d5f7bc)
parent c8d5c163

media/ndk/include/media/NdkMediaFormat.h

+24 −24
Original line number Diff line number Diff line
@@ -94,15 +94,15 @@ extern const char* AMEDIAFORMAT_KEY_AAC_DRC_HEAVY_COMPRESSION __INTRODUCED_IN(28 
extern const char* AMEDIAFORMAT_KEY_AAC_DRC_TARGET_REFERENCE_LEVEL __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_AAC_ENCODED_TARGET_LEVEL __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_AAC_PROFILE;

extern const char* AMEDIAFORMAT_KEY_AAC_PROFILE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_AAC_SBR_MODE __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_AUDIO_SESSION_ID __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_BITRATE_MODE __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_BIT_RATE;

extern const char* AMEDIAFORMAT_KEY_BIT_RATE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_CAPTURE_RATE __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_CHANNEL_COUNT;

extern const char* AMEDIAFORMAT_KEY_CHANNEL_MASK;

extern const char* AMEDIAFORMAT_KEY_COLOR_FORMAT;

extern const char* AMEDIAFORMAT_KEY_CHANNEL_COUNT __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_CHANNEL_MASK __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_COLOR_FORMAT __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_COLOR_RANGE __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_COLOR_STANDARD __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_COLOR_TRANSFER __INTRODUCED_IN(28);
@@ -114,38 +114,38 @@ extern const char* AMEDIAFORMAT_KEY_CSD_2; 
extern const char* AMEDIAFORMAT_KEY_DISPLAY_CROP __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_DISPLAY_HEIGHT;

extern const char* AMEDIAFORMAT_KEY_DISPLAY_WIDTH;

extern const char* AMEDIAFORMAT_KEY_DURATION;

extern const char* AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL;

extern const char* AMEDIAFORMAT_KEY_FRAME_RATE;

extern const char* AMEDIAFORMAT_KEY_DURATION __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_FRAME_RATE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_GRID_COLUMNS __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_GRID_ROWS __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_HDR_STATIC_INFO;

extern const char* AMEDIAFORMAT_KEY_HEIGHT;

extern const char* AMEDIAFORMAT_KEY_HEIGHT __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_INTRA_REFRESH_PERIOD __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_IS_ADTS;

extern const char* AMEDIAFORMAT_KEY_IS_AUTOSELECT;

extern const char* AMEDIAFORMAT_KEY_IS_DEFAULT;

extern const char* AMEDIAFORMAT_KEY_IS_FORCED_SUBTITLE;

extern const char* AMEDIAFORMAT_KEY_I_FRAME_INTERVAL;

extern const char* AMEDIAFORMAT_KEY_LANGUAGE;

extern const char* AMEDIAFORMAT_KEY_IS_ADTS __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_IS_AUTOSELECT __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_IS_DEFAULT __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_IS_FORCED_SUBTITLE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_I_FRAME_INTERVAL __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_LANGUAGE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_LATENCY __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_LEVEL __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_MAX_HEIGHT;

extern const char* AMEDIAFORMAT_KEY_MAX_INPUT_SIZE;

extern const char* AMEDIAFORMAT_KEY_MAX_WIDTH;

extern const char* AMEDIAFORMAT_KEY_MIME;

extern const char* AMEDIAFORMAT_KEY_MAX_HEIGHT __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_MAX_INPUT_SIZE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_MAX_WIDTH __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_MIME __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_MPEG_USER_DATA;

extern const char* AMEDIAFORMAT_KEY_OPERATING_RATE __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_PCM_ENCODING __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_PRIORITY __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_PROFILE __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP;

extern const char* AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER;

extern const char* AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_ROTATION __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_SAMPLE_RATE;

extern const char* AMEDIAFORMAT_KEY_SAMPLE_RATE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_SEI;

extern const char* AMEDIAFORMAT_KEY_SLICE_HEIGHT __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_STRIDE;

extern const char* AMEDIAFORMAT_KEY_STRIDE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_TEMPORAL_LAYER_ID;

extern const char* AMEDIAFORMAT_KEY_TEMPORAL_LAYERING __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TILE_HEIGHT __INTRODUCED_IN(28);
@@ -153,7 +153,7 @@ extern const char* AMEDIAFORMAT_KEY_TILE_WIDTH __INTRODUCED_IN(28); 
extern const char* AMEDIAFORMAT_KEY_TIME_US;

extern const char* AMEDIAFORMAT_KEY_TRACK_ID __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TRACK_INDEX;

extern const char* AMEDIAFORMAT_KEY_WIDTH;

extern const char* AMEDIAFORMAT_KEY_WIDTH __INTRODUCED_IN(21);



bool AMediaFormat_getDouble(AMediaFormat*, const char *name, double *out) __INTRODUCED_IN(28);

bool AMediaFormat_getRect(AMediaFormat*, const char *name,

media/ndk/libmediandk.map.txt

+24 −24
Original line number Diff line number Diff line
@@ -32,55 +32,55 @@ LIBMEDIANDK { 
    AMEDIAFORMAT_KEY_AAC_DRC_TARGET_REFERENCE_LEVEL; # var introduced=28

    AMEDIAFORMAT_KEY_AAC_ENCODED_TARGET_LEVEL; # var introduced=28

    AMEDIAFORMAT_KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT; # var introduced=28

    AMEDIAFORMAT_KEY_AAC_PROFILE; # var

    AMEDIAFORMAT_KEY_AAC_PROFILE; # var introduced=21

    AMEDIAFORMAT_KEY_AAC_SBR_MODE; # var introduced=28

    AMEDIAFORMAT_KEY_AUDIO_SESSION_ID; # var introduced=28

    AMEDIAFORMAT_KEY_BITRATE_MODE; # var introduced=28

    AMEDIAFORMAT_KEY_BIT_RATE; # var

    AMEDIAFORMAT_KEY_BIT_RATE; # var introduced=21

    AMEDIAFORMAT_KEY_CAPTURE_RATE; # var introduced=28

    AMEDIAFORMAT_KEY_CHANNEL_COUNT; # var

    AMEDIAFORMAT_KEY_CHANNEL_MASK; # var

    AMEDIAFORMAT_KEY_COLOR_FORMAT; # var

    AMEDIAFORMAT_KEY_CHANNEL_COUNT; # var introduced=21

    AMEDIAFORMAT_KEY_CHANNEL_MASK; # var introduced=21

    AMEDIAFORMAT_KEY_COLOR_FORMAT; # var introduced=21

    AMEDIAFORMAT_KEY_COLOR_RANGE; # var introduced=28

    AMEDIAFORMAT_KEY_COLOR_STANDARD; # var introduced=28

    AMEDIAFORMAT_KEY_COLOR_TRANSFER; # var introduced=28

    AMEDIAFORMAT_KEY_COMPLEXITY; # var introduced=28

    AMEDIAFORMAT_KEY_DISPLAY_CROP; # var introduced=28

    AMEDIAFORMAT_KEY_DURATION; # var

    AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL; # var

    AMEDIAFORMAT_KEY_FRAME_RATE; # var

    AMEDIAFORMAT_KEY_DURATION; # var introduced=21

    AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL; # var introduced=21

    AMEDIAFORMAT_KEY_FRAME_RATE; # var introduced=21

    AMEDIAFORMAT_KEY_GRID_COLUMNS; # var introduced=28

    AMEDIAFORMAT_KEY_GRID_ROWS; # var introduced=28

    AMEDIAFORMAT_KEY_HDR_STATIC_INFO; # var introduced=28

    AMEDIAFORMAT_KEY_HEIGHT; # var

    AMEDIAFORMAT_KEY_HEIGHT; # var introduced=21

    AMEDIAFORMAT_KEY_INTRA_REFRESH_PERIOD; # var introduced=28

    AMEDIAFORMAT_KEY_IS_ADTS; # var

    AMEDIAFORMAT_KEY_IS_AUTOSELECT; # var

    AMEDIAFORMAT_KEY_IS_DEFAULT; # var

    AMEDIAFORMAT_KEY_IS_FORCED_SUBTITLE; # var

    AMEDIAFORMAT_KEY_I_FRAME_INTERVAL; # var

    AMEDIAFORMAT_KEY_LANGUAGE; # var

    AMEDIAFORMAT_KEY_IS_ADTS; # var introduced=21

    AMEDIAFORMAT_KEY_IS_AUTOSELECT; # var introduced=21

    AMEDIAFORMAT_KEY_IS_DEFAULT; # var introduced=21

    AMEDIAFORMAT_KEY_IS_FORCED_SUBTITLE; # var introduced=21

    AMEDIAFORMAT_KEY_I_FRAME_INTERVAL; # var introduced=21

    AMEDIAFORMAT_KEY_LANGUAGE; # var introduced=21

    AMEDIAFORMAT_KEY_LATENCY; # var introduced=28

    AMEDIAFORMAT_KEY_LEVEL; # var introduced=28

    AMEDIAFORMAT_KEY_MAX_HEIGHT; # var

    AMEDIAFORMAT_KEY_MAX_INPUT_SIZE; # var

    AMEDIAFORMAT_KEY_MAX_WIDTH; # var

    AMEDIAFORMAT_KEY_MIME; # var

    AMEDIAFORMAT_KEY_MAX_HEIGHT; # var introduced=21

    AMEDIAFORMAT_KEY_MAX_INPUT_SIZE; # var introduced=21

    AMEDIAFORMAT_KEY_MAX_WIDTH; # var introduced=21

    AMEDIAFORMAT_KEY_MIME; # var introduced=21

    AMEDIAFORMAT_KEY_OPERATING_RATE; # var introduced=28

    AMEDIAFORMAT_KEY_PCM_ENCODING; # var introduced=28

    AMEDIAFORMAT_KEY_PRIORITY; # var introduced=28

    AMEDIAFORMAT_KEY_PROFILE; # var introduced=28

    AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP; # var

    AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER; # var

    AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP; # var introduced=21

    AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER; # var introduced=21

    AMEDIAFORMAT_KEY_ROTATION; # var introduced=28

    AMEDIAFORMAT_KEY_SAMPLE_RATE; # var

    AMEDIAFORMAT_KEY_SAMPLE_RATE; # var introduced=21

    AMEDIAFORMAT_KEY_SLICE_HEIGHT; # var introduced=28

    AMEDIAFORMAT_KEY_STRIDE; # var

    AMEDIAFORMAT_KEY_STRIDE; # var introduced=21

    AMEDIAFORMAT_KEY_TEMPORAL_LAYERING; # var introduced=28

    AMEDIAFORMAT_KEY_TILE_HEIGHT; # var introduced=28

    AMEDIAFORMAT_KEY_TILE_WIDTH; # var introduced=28

    AMEDIAFORMAT_KEY_TRACK_ID; # var introduced=28

    AMEDIAFORMAT_KEY_WIDTH; # var

    AMEDIAFORMAT_KEY_WIDTH; # var introduced=21

    AMediaCodecActionCode_isRecoverable; # introduced=28

    AMediaCodecActionCode_isTransient; # introduced=28

    AMediaCodecCryptoInfo_delete;