Apply version-script to libmediandk library
This change also remove some redundancies in include file
and actualizes list of exported AMEDIAFORMAT_ variables for 29 sdk
version. Also adds AMediaCodec_getBufferFormat to the list.
Bug: http://b/69603741
Test: make
Change-Id: I1fd7d1d3dfdd567aa7398c48117c60344bd5e109
diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index 8267ba5..e355183 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -104,6 +104,7 @@
enabled: false,
},
},
+ version_script: "libmediandk.map.txt",
}
llndk_library {
diff --git a/media/ndk/include/media/NdkMediaFormat.h b/media/ndk/include/media/NdkMediaFormat.h
index 4be1928..13d9135 100644
--- a/media/ndk/include/media/NdkMediaFormat.h
+++ b/media/ndk/include/media/NdkMediaFormat.h
@@ -184,9 +184,6 @@
extern const char* AMEDIAFORMAT_KEY_AUTHOR __INTRODUCED_IN(29);
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_COLOR_RANGE __INTRODUCED_IN(29);
-extern const char* AMEDIAFORMAT_KEY_COLOR_STANDARD __INTRODUCED_IN(29);
-extern const char* AMEDIAFORMAT_KEY_COLOR_TRANSFER __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_CRYPTO_DEFAULT_IV_SIZE __INTRODUCED_IN(29);
@@ -207,7 +204,6 @@
extern const char* AMEDIAFORMAT_KEY_EXIF_SIZE __INTRODUCED_IN(29);
extern const char* AMEDIAFORMAT_KEY_FRAME_COUNT __INTRODUCED_IN(29);
extern const char* AMEDIAFORMAT_KEY_GENRE __INTRODUCED_IN(29);
-extern const char* AMEDIAFORMAT_KEY_HDR_STATIC_INFO __INTRODUCED_IN(29);
extern const char* AMEDIAFORMAT_KEY_ICC_PROFILE __INTRODUCED_IN(29);
extern const char* AMEDIAFORMAT_KEY_IS_SYNC_FRAME __INTRODUCED_IN(29);
extern const char* AMEDIAFORMAT_KEY_LOCATION __INTRODUCED_IN(29);
diff --git a/media/ndk/libmediandk.map.txt b/media/ndk/libmediandk.map.txt
index d3bdbae..88736ab 100644
--- a/media/ndk/libmediandk.map.txt
+++ b/media/ndk/libmediandk.map.txt
@@ -35,64 +35,110 @@
AMEDIAFORMAT_KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT; # var introduced=28
AMEDIAFORMAT_KEY_AAC_PROFILE; # var introduced=21
AMEDIAFORMAT_KEY_AAC_SBR_MODE; # var introduced=28
+ AMEDIAFORMAT_KEY_ALBUM; # var introduced=29
+ AMEDIAFORMAT_KEY_ALBUMART; # var introduced=29
+ AMEDIAFORMAT_KEY_ALBUMARTIST; # var introduced=29
+ AMEDIAFORMAT_KEY_ARTIST; # var introduced=29
+ AMEDIAFORMAT_KEY_AUDIO_PRESENTATION_INFO; # var introduced=29
AMEDIAFORMAT_KEY_AUDIO_SESSION_ID; # var introduced=28
+ AMEDIAFORMAT_KEY_AUTHOR; # var introduced=29
AMEDIAFORMAT_KEY_BITRATE_MODE; # var introduced=28
AMEDIAFORMAT_KEY_BIT_RATE; # var introduced=21
+ AMEDIAFORMAT_KEY_BITS_PER_SAMPLE; # var introduced=29
AMEDIAFORMAT_KEY_CAPTURE_RATE; # var introduced=28
+ AMEDIAFORMAT_KEY_CDTRACKNUMBER; # var introduced=29
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_COMPILATION; # var introduced=29
AMEDIAFORMAT_KEY_COMPLEXITY; # var introduced=28
+ AMEDIAFORMAT_KEY_COMPOSER; # var introduced=29
+ AMEDIAFORMAT_KEY_CRYPTO_DEFAULT_IV_SIZE; # var introduced=29
+ AMEDIAFORMAT_KEY_CRYPTO_ENCRYPTED_BYTE_BLOCK; # var introduced=29
+ AMEDIAFORMAT_KEY_CRYPTO_IV; # var introduced=29
+ AMEDIAFORMAT_KEY_CRYPTO_KEY; # var introduced=29
+ AMEDIAFORMAT_KEY_CRYPTO_MODE; # var introduced=29
+ AMEDIAFORMAT_KEY_CRYPTO_SKIP_BYTE_BLOCK; # var introduced=29
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_CSD_AVC; # var introduced=29
+ AMEDIAFORMAT_KEY_CSD_HEVC; # var introduced=29
+ AMEDIAFORMAT_KEY_D263; # var introduced=29
+ AMEDIAFORMAT_KEY_DATE; # var introduced=29
+ AMEDIAFORMAT_KEY_DISCNUMBER; # var introduced=29
AMEDIAFORMAT_KEY_DISPLAY_CROP; # var introduced=28
AMEDIAFORMAT_KEY_DISPLAY_HEIGHT; # var introduced=28
AMEDIAFORMAT_KEY_DISPLAY_WIDTH; # var introduced=28
AMEDIAFORMAT_KEY_DURATION; # var introduced=21
+ AMEDIAFORMAT_KEY_ENCODER_DELAY; # var introduced=29
+ AMEDIAFORMAT_KEY_ENCODER_PADDING; # var introduced=29
+ AMEDIAFORMAT_KEY_ESDS; # var introduced=29
+ AMEDIAFORMAT_KEY_EXIF_OFFSET; # var introduced=29
+ AMEDIAFORMAT_KEY_EXIF_SIZE; # var introduced=29
+ AMEDIAFORMAT_KEY_FRAME_COUNT; # var introduced=29
AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL; # var introduced=21
AMEDIAFORMAT_KEY_FRAME_RATE; # var introduced=21
+ AMEDIAFORMAT_KEY_GENRE; # var introduced=29
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 introduced=21
+ AMEDIAFORMAT_KEY_ICC_PROFILE; # var introduced=29
AMEDIAFORMAT_KEY_INTRA_REFRESH_PERIOD; # var introduced=28
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_IS_SYNC_FRAME; # var introduced=29
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_LOCATION; # var introduced=29
+ AMEDIAFORMAT_KEY_LOOP; # var introduced=29
+ AMEDIAFORMAT_KEY_LYRICIST; # var introduced=29
+ AMEDIAFORMAT_KEY_MAX_BIT_RATE; # var introduced=29
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_MPEG_USER_DATA; # var introduced=28
+ AMEDIAFORMAT_KEY_MPEG2_STREAM_HEADER; # var introduced=29
AMEDIAFORMAT_KEY_OPERATING_RATE; # var introduced=28
+ AMEDIAFORMAT_KEY_PCM_BIG_ENDIAN; # var introduced=29
AMEDIAFORMAT_KEY_PCM_ENCODING; # var introduced=28
AMEDIAFORMAT_KEY_PRIORITY; # var introduced=28
AMEDIAFORMAT_KEY_PROFILE; # var introduced=28
+ AMEDIAFORMAT_KEY_PSSH; # var introduced=29
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 introduced=21
+ AMEDIAFORMAT_KEY_SAR_HEIGHT; # var introduced=29
+ AMEDIAFORMAT_KEY_SAR_WIDTH; # var introduced=29
AMEDIAFORMAT_KEY_SEI; # var introduced=28
AMEDIAFORMAT_KEY_SLICE_HEIGHT; # var introduced=28
AMEDIAFORMAT_KEY_STRIDE; # var introduced=21
+ AMEDIAFORMAT_KEY_TEMPORAL_LAYER_COUNT; # var introduced=29
AMEDIAFORMAT_KEY_TEMPORAL_LAYER_ID; # var introduced=28
AMEDIAFORMAT_KEY_TEMPORAL_LAYERING; # var introduced=28
+ AMEDIAFORMAT_KEY_TEXT_FORMAT_DATA; # var introduced=29
+ AMEDIAFORMAT_KEY_THUMBNAIL_HEIGHT; # var introduced=29
+ AMEDIAFORMAT_KEY_THUMBNAIL_TIME; # var introduced=29
+ AMEDIAFORMAT_KEY_THUMBNAIL_WIDTH; # var introduced=29
+ AMEDIAFORMAT_KEY_TITLE; # var introduced=28
AMEDIAFORMAT_KEY_TILE_HEIGHT; # 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_WIDTH; # var introduced=21
+ AMEDIAFORMAT_KEY_YEAR; # var introduced=29
AMediaCodecActionCode_isRecoverable; # introduced=28
AMediaCodecActionCode_isTransient; # introduced=28
AMediaCodecCryptoInfo_delete;
@@ -112,6 +158,7 @@
AMediaCodec_dequeueInputBuffer;
AMediaCodec_dequeueOutputBuffer;
AMediaCodec_flush;
+ AMediaCodec_getBufferFormat; # introduced=21
AMediaCodec_getInputBuffer;
AMediaCodec_getInputFormat; # introduced=28
AMediaCodec_getName; # introduced=28