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

Commit 6962967a authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Annotate remaining AMEDIAFORMAT variables" into pi-dev-plus-aosp

parents 24303974 6da29d49

media/ndk/include/media/NdkMediaFormat.h

+12 −12
Original line number Original line Diff line number Diff line
@@ -107,19 +107,19 @@ 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_STANDARD __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_COLOR_TRANSFER __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_COLOR_TRANSFER __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_COMPLEXITY __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_COMPLEXITY __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_CSD;

extern const char* AMEDIAFORMAT_KEY_CSD __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_CSD_0;

extern const char* AMEDIAFORMAT_KEY_CSD_0 __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_CSD_1;

extern const char* AMEDIAFORMAT_KEY_CSD_1 __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_CSD_2;

extern const char* AMEDIAFORMAT_KEY_CSD_2 __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_DISPLAY_CROP __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_DISPLAY_CROP __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_DISPLAY_HEIGHT;

extern const char* AMEDIAFORMAT_KEY_DISPLAY_HEIGHT __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_DISPLAY_WIDTH;

extern const char* AMEDIAFORMAT_KEY_DISPLAY_WIDTH __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_DURATION __INTRODUCED_IN(21);

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_FLAC_COMPRESSION_LEVEL __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_FRAME_RATE __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_COLUMNS __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_GRID_ROWS __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_HDR_STATIC_INFO __INTRODUCED_IN(28);;

extern const char* AMEDIAFORMAT_KEY_HEIGHT __INTRODUCED_IN(21);

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_INTRA_REFRESH_PERIOD __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_IS_ADTS __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_IS_ADTS __INTRODUCED_IN(21);
@@ -134,7 +134,7 @@ 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_INPUT_SIZE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_MAX_WIDTH __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_MIME __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_MPEG_USER_DATA;

extern const char* AMEDIAFORMAT_KEY_MPEG_USER_DATA __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_OPERATING_RATE __INTRODUCED_IN(28);

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_PCM_ENCODING __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_PRIORITY __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_PRIORITY __INTRODUCED_IN(28);
@@ -143,16 +143,16 @@ extern const char* AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP __INTRODUCED_IN(2 
extern const char* AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER __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_ROTATION __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_SAMPLE_RATE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_SAMPLE_RATE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_SEI;

extern const char* AMEDIAFORMAT_KEY_SEI __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_SLICE_HEIGHT __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_SLICE_HEIGHT __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_STRIDE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_STRIDE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_TEMPORAL_LAYER_ID;

extern const char* AMEDIAFORMAT_KEY_TEMPORAL_LAYER_ID __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TEMPORAL_LAYERING __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TEMPORAL_LAYERING __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TILE_HEIGHT __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TILE_HEIGHT __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TILE_WIDTH __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TILE_WIDTH __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TIME_US;

extern const char* AMEDIAFORMAT_KEY_TIME_US __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TRACK_ID __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TRACK_ID __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_TRACK_INDEX;

extern const char* AMEDIAFORMAT_KEY_TRACK_INDEX __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_WIDTH __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_WIDTH __INTRODUCED_IN(21);





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

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

media/ndk/libmediandk.map.txt

+11 −0
Original line number Original line Diff line number Diff line
@@ -45,7 +45,13 @@ LIBMEDIANDK { 
    AMEDIAFORMAT_KEY_COLOR_STANDARD; # var introduced=28

    AMEDIAFORMAT_KEY_COLOR_STANDARD; # var introduced=28

    AMEDIAFORMAT_KEY_COLOR_TRANSFER; # var introduced=28

    AMEDIAFORMAT_KEY_COLOR_TRANSFER; # var introduced=28

    AMEDIAFORMAT_KEY_COMPLEXITY; # var introduced=28

    AMEDIAFORMAT_KEY_COMPLEXITY; # var introduced=28

    AMEDIAFORMAT_KEY_CSD; # var introduced=28

    AMEDIAFORMAT_KEY_CSD_0; # var introduced=28

    AMEDIAFORMAT_KEY_CSD_1; # var introduced=28

    AMEDIAFORMAT_KEY_CSD_2; # var introduced=28

    AMEDIAFORMAT_KEY_DISPLAY_CROP; # var introduced=28

    AMEDIAFORMAT_KEY_DISPLAY_CROP; # var introduced=28

    AMEDIAFORMAT_KEY_DISPLAY_HEIGHT; introduced=28

    AMEDIAFORMAT_KEY_DISPLAY_WIDTH; introduced=28

    AMEDIAFORMAT_KEY_DURATION; # var introduced=21

    AMEDIAFORMAT_KEY_DURATION; # var introduced=21

    AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL; # var introduced=21

    AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL; # var introduced=21

    AMEDIAFORMAT_KEY_FRAME_RATE; # var introduced=21

    AMEDIAFORMAT_KEY_FRAME_RATE; # var introduced=21
@@ -66,6 +72,7 @@ LIBMEDIANDK { 
    AMEDIAFORMAT_KEY_MAX_INPUT_SIZE; # var introduced=21

    AMEDIAFORMAT_KEY_MAX_INPUT_SIZE; # var introduced=21

    AMEDIAFORMAT_KEY_MAX_WIDTH; # var introduced=21

    AMEDIAFORMAT_KEY_MAX_WIDTH; # var introduced=21

    AMEDIAFORMAT_KEY_MIME; # var introduced=21

    AMEDIAFORMAT_KEY_MIME; # var introduced=21

    AMEDIAFORMAT_KEY_MPEG_USER_DATA; # var introduced=28

    AMEDIAFORMAT_KEY_OPERATING_RATE; # var introduced=28

    AMEDIAFORMAT_KEY_OPERATING_RATE; # var introduced=28

    AMEDIAFORMAT_KEY_PCM_ENCODING; # var introduced=28

    AMEDIAFORMAT_KEY_PCM_ENCODING; # var introduced=28

    AMEDIAFORMAT_KEY_PRIORITY; # var introduced=28

    AMEDIAFORMAT_KEY_PRIORITY; # var introduced=28
@@ -74,11 +81,15 @@ LIBMEDIANDK { 
    AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER; # var introduced=21

    AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER; # var introduced=21

    AMEDIAFORMAT_KEY_ROTATION; # var introduced=28

    AMEDIAFORMAT_KEY_ROTATION; # var introduced=28

    AMEDIAFORMAT_KEY_SAMPLE_RATE; # var introduced=21

    AMEDIAFORMAT_KEY_SAMPLE_RATE; # var introduced=21

    AMEDIAFORMAT_KEY_SEI; # var introduced=28

    AMEDIAFORMAT_KEY_SLICE_HEIGHT; # var introduced=28

    AMEDIAFORMAT_KEY_SLICE_HEIGHT; # var introduced=28

    AMEDIAFORMAT_KEY_STRIDE; # var introduced=21

    AMEDIAFORMAT_KEY_STRIDE; # var introduced=21

    AMEDIAFORMAT_KEY_TEMPORAL_LAYER_ID; # var introduced=28

    AMEDIAFORMAT_KEY_TEMPORAL_LAYERING; # var introduced=28

    AMEDIAFORMAT_KEY_TEMPORAL_LAYERING; # var introduced=28

    AMEDIAFORMAT_KEY_TILE_HEIGHT; # var introduced=28

    AMEDIAFORMAT_KEY_TILE_HEIGHT; # var introduced=28

    AMEDIAFORMAT_KEY_TILE_WIDTH; # var introduced=28

    AMEDIAFORMAT_KEY_TILE_WIDTH; # var introduced=28

    AMEDIAFORMAT_KEY_TIME_US; # var introduced=28

    AMEDIAFORMAT_KEY_TRACK_INDEX; # var introduced=28

    AMEDIAFORMAT_KEY_TRACK_ID; # var introduced=28

    AMEDIAFORMAT_KEY_TRACK_ID; # var introduced=28

    AMEDIAFORMAT_KEY_WIDTH; # var introduced=21

    AMEDIAFORMAT_KEY_WIDTH; # var introduced=21

    AMediaCodecActionCode_isRecoverable; # introduced=28

    AMediaCodecActionCode_isRecoverable; # introduced=28