From 659eff333d3a95851894302b8c66b5ea61d1a1fe Mon Sep 17 00:00:00 2001 From: Yin-Chia Yeh Date: Wed, 11 May 2016 22:02:27 -0700 Subject: [PATCH] Copy libmediandk symbols from android-21 This is to create baseline for next commit. Bug: 27102995 Change-Id: I5497f05d94d7412d2c8eca26d8df72e28a0eae4d --- .../symbols/libmediandk.so.functions.txt | 90 +++++++ .../symbols/libmediandk.so.variables.txt | 24 ++ .../symbols/libmediandk.so.functions.txt | 90 +++++++ .../symbols/libmediandk.so.variables.txt | 24 ++ .../symbols/libmediandk.so.functions.txt | 90 +++++++ .../symbols/libmediandk.so.variables.txt | 24 ++ .../symbols/libmediandk.so.functions.txt | 90 +++++++ .../symbols/libmediandk.so.variables.txt | 24 ++ .../symbols/libmediandk.so.functions.txt | 90 +++++++ .../symbols/libmediandk.so.variables.txt | 24 ++ .../symbols/libmediandk.so.functions.txt | 90 +++++++ .../symbols/libmediandk.so.variables.txt | 24 ++ .../android-24/include/media/NdkMediaCodec.h | 235 ++++++++++++++++++ .../android-24/include/media/NdkMediaError.h | 63 +++++ 14 files changed, 982 insertions(+) create mode 100644 ndk/platforms/android-24/arch-arm/symbols/libmediandk.so.functions.txt create mode 100644 ndk/platforms/android-24/arch-arm/symbols/libmediandk.so.variables.txt create mode 100644 ndk/platforms/android-24/arch-arm64/symbols/libmediandk.so.functions.txt create mode 100644 ndk/platforms/android-24/arch-arm64/symbols/libmediandk.so.variables.txt create mode 100644 ndk/platforms/android-24/arch-mips/symbols/libmediandk.so.functions.txt create mode 100644 ndk/platforms/android-24/arch-mips/symbols/libmediandk.so.variables.txt create mode 100644 ndk/platforms/android-24/arch-mips64/symbols/libmediandk.so.functions.txt create mode 100644 ndk/platforms/android-24/arch-mips64/symbols/libmediandk.so.variables.txt create mode 100644 ndk/platforms/android-24/arch-x86/symbols/libmediandk.so.functions.txt create mode 100644 ndk/platforms/android-24/arch-x86/symbols/libmediandk.so.variables.txt create mode 100644 ndk/platforms/android-24/arch-x86_64/symbols/libmediandk.so.functions.txt create mode 100644 ndk/platforms/android-24/arch-x86_64/symbols/libmediandk.so.variables.txt create mode 100644 ndk/platforms/android-24/include/media/NdkMediaCodec.h create mode 100644 ndk/platforms/android-24/include/media/NdkMediaError.h diff --git a/ndk/platforms/android-24/arch-arm/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-24/arch-arm/symbols/libmediandk.so.functions.txt new file mode 100644 index 000000000..525c8f7ba --- /dev/null +++ b/ndk/platforms/android-24/arch-arm/symbols/libmediandk.so.functions.txt @@ -0,0 +1,90 @@ +AMediaCodecCryptoInfo_delete +AMediaCodecCryptoInfo_getClearBytes +AMediaCodecCryptoInfo_getEncryptedBytes +AMediaCodecCryptoInfo_getIV +AMediaCodecCryptoInfo_getKey +AMediaCodecCryptoInfo_getMode +AMediaCodecCryptoInfo_getNumSubSamples +AMediaCodecCryptoInfo_new +AMediaCodec_configure +AMediaCodec_createCodecByName +AMediaCodec_createDecoderByType +AMediaCodec_createEncoderByType +AMediaCodec_delete +AMediaCodec_dequeueInputBuffer +AMediaCodec_dequeueOutputBuffer +AMediaCodec_flush +AMediaCodec_getInputBuffer +AMediaCodec_getOutputBuffer +AMediaCodec_getOutputFormat +AMediaCodec_queueInputBuffer +AMediaCodec_queueSecureInputBuffer +AMediaCodec_releaseOutputBuffer +AMediaCodec_releaseOutputBufferAtTime +AMediaCodec_start +AMediaCodec_stop +AMediaCrypto_delete +AMediaCrypto_isCryptoSchemeSupported +AMediaCrypto_new +AMediaCrypto_requiresSecureDecoderComponent +AMediaDrm_closeSession +AMediaDrm_createByUUID +AMediaDrm_decrypt +AMediaDrm_encrypt +AMediaDrm_getKeyRequest +AMediaDrm_getPropertyByteArray +AMediaDrm_getPropertyString +AMediaDrm_getProvisionRequest +AMediaDrm_getSecureStops +AMediaDrm_isCryptoSchemeSupported +AMediaDrm_openSession +AMediaDrm_provideKeyResponse +AMediaDrm_provideProvisionResponse +AMediaDrm_queryKeyStatus +AMediaDrm_release +AMediaDrm_releaseSecureStops +AMediaDrm_removeKeys +AMediaDrm_restoreKeys +AMediaDrm_setOnEventListener +AMediaDrm_setPropertyByteArray +AMediaDrm_setPropertyString +AMediaDrm_sign +AMediaDrm_verify +AMediaExtractor_advance +AMediaExtractor_delete +AMediaExtractor_getPsshInfo +AMediaExtractor_getSampleCryptoInfo +AMediaExtractor_getSampleFlags +AMediaExtractor_getSampleTime +AMediaExtractor_getSampleTrackIndex +AMediaExtractor_getTrackCount +AMediaExtractor_getTrackFormat +AMediaExtractor_new +AMediaExtractor_readSampleData +AMediaExtractor_seekTo +AMediaExtractor_selectTrack +AMediaExtractor_setDataSource +AMediaExtractor_setDataSourceFd +AMediaExtractor_unselectTrack +AMediaFormat_delete +AMediaFormat_getBuffer +AMediaFormat_getFloat +AMediaFormat_getInt32 +AMediaFormat_getInt64 +AMediaFormat_getSize +AMediaFormat_getString +AMediaFormat_new +AMediaFormat_setBuffer +AMediaFormat_setFloat +AMediaFormat_setInt32 +AMediaFormat_setInt64 +AMediaFormat_setString +AMediaFormat_toString +AMediaMuxer_addTrack +AMediaMuxer_delete +AMediaMuxer_new +AMediaMuxer_setLocation +AMediaMuxer_setOrientationHint +AMediaMuxer_start +AMediaMuxer_stop +AMediaMuxer_writeSampleData diff --git a/ndk/platforms/android-24/arch-arm/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-24/arch-arm/symbols/libmediandk.so.variables.txt new file mode 100644 index 000000000..6f59e1fc7 --- /dev/null +++ b/ndk/platforms/android-24/arch-arm/symbols/libmediandk.so.variables.txt @@ -0,0 +1,24 @@ +AMEDIAFORMAT_KEY_AAC_PROFILE +AMEDIAFORMAT_KEY_BIT_RATE +AMEDIAFORMAT_KEY_CHANNEL_COUNT +AMEDIAFORMAT_KEY_CHANNEL_MASK +AMEDIAFORMAT_KEY_COLOR_FORMAT +AMEDIAFORMAT_KEY_DURATION +AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL +AMEDIAFORMAT_KEY_FRAME_RATE +AMEDIAFORMAT_KEY_HEIGHT +AMEDIAFORMAT_KEY_IS_ADTS +AMEDIAFORMAT_KEY_IS_AUTOSELECT +AMEDIAFORMAT_KEY_IS_DEFAULT +AMEDIAFORMAT_KEY_IS_FORCED_SUBTITLE +AMEDIAFORMAT_KEY_I_FRAME_INTERVAL +AMEDIAFORMAT_KEY_LANGUAGE +AMEDIAFORMAT_KEY_MAX_HEIGHT +AMEDIAFORMAT_KEY_MAX_INPUT_SIZE +AMEDIAFORMAT_KEY_MAX_WIDTH +AMEDIAFORMAT_KEY_MIME +AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP +AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER +AMEDIAFORMAT_KEY_SAMPLE_RATE +AMEDIAFORMAT_KEY_STRIDE +AMEDIAFORMAT_KEY_WIDTH diff --git a/ndk/platforms/android-24/arch-arm64/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-24/arch-arm64/symbols/libmediandk.so.functions.txt new file mode 100644 index 000000000..525c8f7ba --- /dev/null +++ b/ndk/platforms/android-24/arch-arm64/symbols/libmediandk.so.functions.txt @@ -0,0 +1,90 @@ +AMediaCodecCryptoInfo_delete +AMediaCodecCryptoInfo_getClearBytes +AMediaCodecCryptoInfo_getEncryptedBytes +AMediaCodecCryptoInfo_getIV +AMediaCodecCryptoInfo_getKey +AMediaCodecCryptoInfo_getMode +AMediaCodecCryptoInfo_getNumSubSamples +AMediaCodecCryptoInfo_new +AMediaCodec_configure +AMediaCodec_createCodecByName +AMediaCodec_createDecoderByType +AMediaCodec_createEncoderByType +AMediaCodec_delete +AMediaCodec_dequeueInputBuffer +AMediaCodec_dequeueOutputBuffer +AMediaCodec_flush +AMediaCodec_getInputBuffer +AMediaCodec_getOutputBuffer +AMediaCodec_getOutputFormat +AMediaCodec_queueInputBuffer +AMediaCodec_queueSecureInputBuffer +AMediaCodec_releaseOutputBuffer +AMediaCodec_releaseOutputBufferAtTime +AMediaCodec_start +AMediaCodec_stop +AMediaCrypto_delete +AMediaCrypto_isCryptoSchemeSupported +AMediaCrypto_new +AMediaCrypto_requiresSecureDecoderComponent +AMediaDrm_closeSession +AMediaDrm_createByUUID +AMediaDrm_decrypt +AMediaDrm_encrypt +AMediaDrm_getKeyRequest +AMediaDrm_getPropertyByteArray +AMediaDrm_getPropertyString +AMediaDrm_getProvisionRequest +AMediaDrm_getSecureStops +AMediaDrm_isCryptoSchemeSupported +AMediaDrm_openSession +AMediaDrm_provideKeyResponse +AMediaDrm_provideProvisionResponse +AMediaDrm_queryKeyStatus +AMediaDrm_release +AMediaDrm_releaseSecureStops +AMediaDrm_removeKeys +AMediaDrm_restoreKeys +AMediaDrm_setOnEventListener +AMediaDrm_setPropertyByteArray +AMediaDrm_setPropertyString +AMediaDrm_sign +AMediaDrm_verify +AMediaExtractor_advance +AMediaExtractor_delete +AMediaExtractor_getPsshInfo +AMediaExtractor_getSampleCryptoInfo +AMediaExtractor_getSampleFlags +AMediaExtractor_getSampleTime +AMediaExtractor_getSampleTrackIndex +AMediaExtractor_getTrackCount +AMediaExtractor_getTrackFormat +AMediaExtractor_new +AMediaExtractor_readSampleData +AMediaExtractor_seekTo +AMediaExtractor_selectTrack +AMediaExtractor_setDataSource +AMediaExtractor_setDataSourceFd +AMediaExtractor_unselectTrack +AMediaFormat_delete +AMediaFormat_getBuffer +AMediaFormat_getFloat +AMediaFormat_getInt32 +AMediaFormat_getInt64 +AMediaFormat_getSize +AMediaFormat_getString +AMediaFormat_new +AMediaFormat_setBuffer +AMediaFormat_setFloat +AMediaFormat_setInt32 +AMediaFormat_setInt64 +AMediaFormat_setString +AMediaFormat_toString +AMediaMuxer_addTrack +AMediaMuxer_delete +AMediaMuxer_new +AMediaMuxer_setLocation +AMediaMuxer_setOrientationHint +AMediaMuxer_start +AMediaMuxer_stop +AMediaMuxer_writeSampleData diff --git a/ndk/platforms/android-24/arch-arm64/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-24/arch-arm64/symbols/libmediandk.so.variables.txt new file mode 100644 index 000000000..6f59e1fc7 --- /dev/null +++ b/ndk/platforms/android-24/arch-arm64/symbols/libmediandk.so.variables.txt @@ -0,0 +1,24 @@ +AMEDIAFORMAT_KEY_AAC_PROFILE +AMEDIAFORMAT_KEY_BIT_RATE +AMEDIAFORMAT_KEY_CHANNEL_COUNT +AMEDIAFORMAT_KEY_CHANNEL_MASK +AMEDIAFORMAT_KEY_COLOR_FORMAT +AMEDIAFORMAT_KEY_DURATION +AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL +AMEDIAFORMAT_KEY_FRAME_RATE +AMEDIAFORMAT_KEY_HEIGHT +AMEDIAFORMAT_KEY_IS_ADTS +AMEDIAFORMAT_KEY_IS_AUTOSELECT +AMEDIAFORMAT_KEY_IS_DEFAULT +AMEDIAFORMAT_KEY_IS_FORCED_SUBTITLE +AMEDIAFORMAT_KEY_I_FRAME_INTERVAL +AMEDIAFORMAT_KEY_LANGUAGE +AMEDIAFORMAT_KEY_MAX_HEIGHT +AMEDIAFORMAT_KEY_MAX_INPUT_SIZE +AMEDIAFORMAT_KEY_MAX_WIDTH +AMEDIAFORMAT_KEY_MIME +AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP +AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER +AMEDIAFORMAT_KEY_SAMPLE_RATE +AMEDIAFORMAT_KEY_STRIDE +AMEDIAFORMAT_KEY_WIDTH diff --git a/ndk/platforms/android-24/arch-mips/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-24/arch-mips/symbols/libmediandk.so.functions.txt new file mode 100644 index 000000000..525c8f7ba --- /dev/null +++ b/ndk/platforms/android-24/arch-mips/symbols/libmediandk.so.functions.txt @@ -0,0 +1,90 @@ +AMediaCodecCryptoInfo_delete +AMediaCodecCryptoInfo_getClearBytes +AMediaCodecCryptoInfo_getEncryptedBytes +AMediaCodecCryptoInfo_getIV +AMediaCodecCryptoInfo_getKey +AMediaCodecCryptoInfo_getMode +AMediaCodecCryptoInfo_getNumSubSamples +AMediaCodecCryptoInfo_new +AMediaCodec_configure +AMediaCodec_createCodecByName +AMediaCodec_createDecoderByType +AMediaCodec_createEncoderByType +AMediaCodec_delete +AMediaCodec_dequeueInputBuffer +AMediaCodec_dequeueOutputBuffer +AMediaCodec_flush +AMediaCodec_getInputBuffer +AMediaCodec_getOutputBuffer +AMediaCodec_getOutputFormat +AMediaCodec_queueInputBuffer +AMediaCodec_queueSecureInputBuffer +AMediaCodec_releaseOutputBuffer +AMediaCodec_releaseOutputBufferAtTime +AMediaCodec_start +AMediaCodec_stop +AMediaCrypto_delete +AMediaCrypto_isCryptoSchemeSupported +AMediaCrypto_new +AMediaCrypto_requiresSecureDecoderComponent +AMediaDrm_closeSession +AMediaDrm_createByUUID +AMediaDrm_decrypt +AMediaDrm_encrypt +AMediaDrm_getKeyRequest +AMediaDrm_getPropertyByteArray +AMediaDrm_getPropertyString +AMediaDrm_getProvisionRequest +AMediaDrm_getSecureStops +AMediaDrm_isCryptoSchemeSupported +AMediaDrm_openSession +AMediaDrm_provideKeyResponse +AMediaDrm_provideProvisionResponse +AMediaDrm_queryKeyStatus +AMediaDrm_release +AMediaDrm_releaseSecureStops +AMediaDrm_removeKeys +AMediaDrm_restoreKeys +AMediaDrm_setOnEventListener +AMediaDrm_setPropertyByteArray +AMediaDrm_setPropertyString +AMediaDrm_sign +AMediaDrm_verify +AMediaExtractor_advance +AMediaExtractor_delete +AMediaExtractor_getPsshInfo +AMediaExtractor_getSampleCryptoInfo +AMediaExtractor_getSampleFlags +AMediaExtractor_getSampleTime +AMediaExtractor_getSampleTrackIndex +AMediaExtractor_getTrackCount +AMediaExtractor_getTrackFormat +AMediaExtractor_new +AMediaExtractor_readSampleData +AMediaExtractor_seekTo +AMediaExtractor_selectTrack +AMediaExtractor_setDataSource +AMediaExtractor_setDataSourceFd +AMediaExtractor_unselectTrack +AMediaFormat_delete +AMediaFormat_getBuffer +AMediaFormat_getFloat +AMediaFormat_getInt32 +AMediaFormat_getInt64 +AMediaFormat_getSize +AMediaFormat_getString +AMediaFormat_new +AMediaFormat_setBuffer +AMediaFormat_setFloat +AMediaFormat_setInt32 +AMediaFormat_setInt64 +AMediaFormat_setString +AMediaFormat_toString +AMediaMuxer_addTrack +AMediaMuxer_delete +AMediaMuxer_new +AMediaMuxer_setLocation +AMediaMuxer_setOrientationHint +AMediaMuxer_start +AMediaMuxer_stop +AMediaMuxer_writeSampleData diff --git a/ndk/platforms/android-24/arch-mips/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-24/arch-mips/symbols/libmediandk.so.variables.txt new file mode 100644 index 000000000..6f59e1fc7 --- /dev/null +++ b/ndk/platforms/android-24/arch-mips/symbols/libmediandk.so.variables.txt @@ -0,0 +1,24 @@ +AMEDIAFORMAT_KEY_AAC_PROFILE +AMEDIAFORMAT_KEY_BIT_RATE +AMEDIAFORMAT_KEY_CHANNEL_COUNT +AMEDIAFORMAT_KEY_CHANNEL_MASK +AMEDIAFORMAT_KEY_COLOR_FORMAT +AMEDIAFORMAT_KEY_DURATION +AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL +AMEDIAFORMAT_KEY_FRAME_RATE +AMEDIAFORMAT_KEY_HEIGHT +AMEDIAFORMAT_KEY_IS_ADTS +AMEDIAFORMAT_KEY_IS_AUTOSELECT +AMEDIAFORMAT_KEY_IS_DEFAULT +AMEDIAFORMAT_KEY_IS_FORCED_SUBTITLE +AMEDIAFORMAT_KEY_I_FRAME_INTERVAL +AMEDIAFORMAT_KEY_LANGUAGE +AMEDIAFORMAT_KEY_MAX_HEIGHT +AMEDIAFORMAT_KEY_MAX_INPUT_SIZE +AMEDIAFORMAT_KEY_MAX_WIDTH +AMEDIAFORMAT_KEY_MIME +AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP +AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER +AMEDIAFORMAT_KEY_SAMPLE_RATE +AMEDIAFORMAT_KEY_STRIDE +AMEDIAFORMAT_KEY_WIDTH diff --git a/ndk/platforms/android-24/arch-mips64/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-24/arch-mips64/symbols/libmediandk.so.functions.txt new file mode 100644 index 000000000..525c8f7ba --- /dev/null +++ b/ndk/platforms/android-24/arch-mips64/symbols/libmediandk.so.functions.txt @@ -0,0 +1,90 @@ +AMediaCodecCryptoInfo_delete +AMediaCodecCryptoInfo_getClearBytes +AMediaCodecCryptoInfo_getEncryptedBytes +AMediaCodecCryptoInfo_getIV +AMediaCodecCryptoInfo_getKey +AMediaCodecCryptoInfo_getMode +AMediaCodecCryptoInfo_getNumSubSamples +AMediaCodecCryptoInfo_new +AMediaCodec_configure +AMediaCodec_createCodecByName +AMediaCodec_createDecoderByType +AMediaCodec_createEncoderByType +AMediaCodec_delete +AMediaCodec_dequeueInputBuffer +AMediaCodec_dequeueOutputBuffer +AMediaCodec_flush +AMediaCodec_getInputBuffer +AMediaCodec_getOutputBuffer +AMediaCodec_getOutputFormat +AMediaCodec_queueInputBuffer +AMediaCodec_queueSecureInputBuffer +AMediaCodec_releaseOutputBuffer +AMediaCodec_releaseOutputBufferAtTime +AMediaCodec_start +AMediaCodec_stop +AMediaCrypto_delete +AMediaCrypto_isCryptoSchemeSupported +AMediaCrypto_new +AMediaCrypto_requiresSecureDecoderComponent +AMediaDrm_closeSession +AMediaDrm_createByUUID +AMediaDrm_decrypt +AMediaDrm_encrypt +AMediaDrm_getKeyRequest +AMediaDrm_getPropertyByteArray +AMediaDrm_getPropertyString +AMediaDrm_getProvisionRequest +AMediaDrm_getSecureStops +AMediaDrm_isCryptoSchemeSupported +AMediaDrm_openSession +AMediaDrm_provideKeyResponse +AMediaDrm_provideProvisionResponse +AMediaDrm_queryKeyStatus +AMediaDrm_release +AMediaDrm_releaseSecureStops +AMediaDrm_removeKeys +AMediaDrm_restoreKeys +AMediaDrm_setOnEventListener +AMediaDrm_setPropertyByteArray +AMediaDrm_setPropertyString +AMediaDrm_sign +AMediaDrm_verify +AMediaExtractor_advance +AMediaExtractor_delete +AMediaExtractor_getPsshInfo +AMediaExtractor_getSampleCryptoInfo +AMediaExtractor_getSampleFlags +AMediaExtractor_getSampleTime +AMediaExtractor_getSampleTrackIndex +AMediaExtractor_getTrackCount +AMediaExtractor_getTrackFormat +AMediaExtractor_new +AMediaExtractor_readSampleData +AMediaExtractor_seekTo +AMediaExtractor_selectTrack +AMediaExtractor_setDataSource +AMediaExtractor_setDataSourceFd +AMediaExtractor_unselectTrack +AMediaFormat_delete +AMediaFormat_getBuffer +AMediaFormat_getFloat +AMediaFormat_getInt32 +AMediaFormat_getInt64 +AMediaFormat_getSize +AMediaFormat_getString +AMediaFormat_new +AMediaFormat_setBuffer +AMediaFormat_setFloat +AMediaFormat_setInt32 +AMediaFormat_setInt64 +AMediaFormat_setString +AMediaFormat_toString +AMediaMuxer_addTrack +AMediaMuxer_delete +AMediaMuxer_new +AMediaMuxer_setLocation +AMediaMuxer_setOrientationHint +AMediaMuxer_start +AMediaMuxer_stop +AMediaMuxer_writeSampleData diff --git a/ndk/platforms/android-24/arch-mips64/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-24/arch-mips64/symbols/libmediandk.so.variables.txt new file mode 100644 index 000000000..6f59e1fc7 --- /dev/null +++ b/ndk/platforms/android-24/arch-mips64/symbols/libmediandk.so.variables.txt @@ -0,0 +1,24 @@ +AMEDIAFORMAT_KEY_AAC_PROFILE +AMEDIAFORMAT_KEY_BIT_RATE +AMEDIAFORMAT_KEY_CHANNEL_COUNT +AMEDIAFORMAT_KEY_CHANNEL_MASK +AMEDIAFORMAT_KEY_COLOR_FORMAT +AMEDIAFORMAT_KEY_DURATION +AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL +AMEDIAFORMAT_KEY_FRAME_RATE +AMEDIAFORMAT_KEY_HEIGHT +AMEDIAFORMAT_KEY_IS_ADTS +AMEDIAFORMAT_KEY_IS_AUTOSELECT +AMEDIAFORMAT_KEY_IS_DEFAULT +AMEDIAFORMAT_KEY_IS_FORCED_SUBTITLE +AMEDIAFORMAT_KEY_I_FRAME_INTERVAL +AMEDIAFORMAT_KEY_LANGUAGE +AMEDIAFORMAT_KEY_MAX_HEIGHT +AMEDIAFORMAT_KEY_MAX_INPUT_SIZE +AMEDIAFORMAT_KEY_MAX_WIDTH +AMEDIAFORMAT_KEY_MIME +AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP +AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER +AMEDIAFORMAT_KEY_SAMPLE_RATE +AMEDIAFORMAT_KEY_STRIDE +AMEDIAFORMAT_KEY_WIDTH diff --git a/ndk/platforms/android-24/arch-x86/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-24/arch-x86/symbols/libmediandk.so.functions.txt new file mode 100644 index 000000000..525c8f7ba --- /dev/null +++ b/ndk/platforms/android-24/arch-x86/symbols/libmediandk.so.functions.txt @@ -0,0 +1,90 @@ +AMediaCodecCryptoInfo_delete +AMediaCodecCryptoInfo_getClearBytes +AMediaCodecCryptoInfo_getEncryptedBytes +AMediaCodecCryptoInfo_getIV +AMediaCodecCryptoInfo_getKey +AMediaCodecCryptoInfo_getMode +AMediaCodecCryptoInfo_getNumSubSamples +AMediaCodecCryptoInfo_new +AMediaCodec_configure +AMediaCodec_createCodecByName +AMediaCodec_createDecoderByType +AMediaCodec_createEncoderByType +AMediaCodec_delete +AMediaCodec_dequeueInputBuffer +AMediaCodec_dequeueOutputBuffer +AMediaCodec_flush +AMediaCodec_getInputBuffer +AMediaCodec_getOutputBuffer +AMediaCodec_getOutputFormat +AMediaCodec_queueInputBuffer +AMediaCodec_queueSecureInputBuffer +AMediaCodec_releaseOutputBuffer +AMediaCodec_releaseOutputBufferAtTime +AMediaCodec_start +AMediaCodec_stop +AMediaCrypto_delete +AMediaCrypto_isCryptoSchemeSupported +AMediaCrypto_new +AMediaCrypto_requiresSecureDecoderComponent +AMediaDrm_closeSession +AMediaDrm_createByUUID +AMediaDrm_decrypt +AMediaDrm_encrypt +AMediaDrm_getKeyRequest +AMediaDrm_getPropertyByteArray +AMediaDrm_getPropertyString +AMediaDrm_getProvisionRequest +AMediaDrm_getSecureStops +AMediaDrm_isCryptoSchemeSupported +AMediaDrm_openSession +AMediaDrm_provideKeyResponse +AMediaDrm_provideProvisionResponse +AMediaDrm_queryKeyStatus +AMediaDrm_release +AMediaDrm_releaseSecureStops +AMediaDrm_removeKeys +AMediaDrm_restoreKeys +AMediaDrm_setOnEventListener +AMediaDrm_setPropertyByteArray +AMediaDrm_setPropertyString +AMediaDrm_sign +AMediaDrm_verify +AMediaExtractor_advance +AMediaExtractor_delete +AMediaExtractor_getPsshInfo +AMediaExtractor_getSampleCryptoInfo +AMediaExtractor_getSampleFlags +AMediaExtractor_getSampleTime +AMediaExtractor_getSampleTrackIndex +AMediaExtractor_getTrackCount +AMediaExtractor_getTrackFormat +AMediaExtractor_new +AMediaExtractor_readSampleData +AMediaExtractor_seekTo +AMediaExtractor_selectTrack +AMediaExtractor_setDataSource +AMediaExtractor_setDataSourceFd +AMediaExtractor_unselectTrack +AMediaFormat_delete +AMediaFormat_getBuffer +AMediaFormat_getFloat +AMediaFormat_getInt32 +AMediaFormat_getInt64 +AMediaFormat_getSize +AMediaFormat_getString +AMediaFormat_new +AMediaFormat_setBuffer +AMediaFormat_setFloat +AMediaFormat_setInt32 +AMediaFormat_setInt64 +AMediaFormat_setString +AMediaFormat_toString +AMediaMuxer_addTrack +AMediaMuxer_delete +AMediaMuxer_new +AMediaMuxer_setLocation +AMediaMuxer_setOrientationHint +AMediaMuxer_start +AMediaMuxer_stop +AMediaMuxer_writeSampleData diff --git a/ndk/platforms/android-24/arch-x86/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-24/arch-x86/symbols/libmediandk.so.variables.txt new file mode 100644 index 000000000..6f59e1fc7 --- /dev/null +++ b/ndk/platforms/android-24/arch-x86/symbols/libmediandk.so.variables.txt @@ -0,0 +1,24 @@ +AMEDIAFORMAT_KEY_AAC_PROFILE +AMEDIAFORMAT_KEY_BIT_RATE +AMEDIAFORMAT_KEY_CHANNEL_COUNT +AMEDIAFORMAT_KEY_CHANNEL_MASK +AMEDIAFORMAT_KEY_COLOR_FORMAT +AMEDIAFORMAT_KEY_DURATION +AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL +AMEDIAFORMAT_KEY_FRAME_RATE +AMEDIAFORMAT_KEY_HEIGHT +AMEDIAFORMAT_KEY_IS_ADTS +AMEDIAFORMAT_KEY_IS_AUTOSELECT +AMEDIAFORMAT_KEY_IS_DEFAULT +AMEDIAFORMAT_KEY_IS_FORCED_SUBTITLE +AMEDIAFORMAT_KEY_I_FRAME_INTERVAL +AMEDIAFORMAT_KEY_LANGUAGE +AMEDIAFORMAT_KEY_MAX_HEIGHT +AMEDIAFORMAT_KEY_MAX_INPUT_SIZE +AMEDIAFORMAT_KEY_MAX_WIDTH +AMEDIAFORMAT_KEY_MIME +AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP +AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER +AMEDIAFORMAT_KEY_SAMPLE_RATE +AMEDIAFORMAT_KEY_STRIDE +AMEDIAFORMAT_KEY_WIDTH diff --git a/ndk/platforms/android-24/arch-x86_64/symbols/libmediandk.so.functions.txt b/ndk/platforms/android-24/arch-x86_64/symbols/libmediandk.so.functions.txt new file mode 100644 index 000000000..525c8f7ba --- /dev/null +++ b/ndk/platforms/android-24/arch-x86_64/symbols/libmediandk.so.functions.txt @@ -0,0 +1,90 @@ +AMediaCodecCryptoInfo_delete +AMediaCodecCryptoInfo_getClearBytes +AMediaCodecCryptoInfo_getEncryptedBytes +AMediaCodecCryptoInfo_getIV +AMediaCodecCryptoInfo_getKey +AMediaCodecCryptoInfo_getMode +AMediaCodecCryptoInfo_getNumSubSamples +AMediaCodecCryptoInfo_new +AMediaCodec_configure +AMediaCodec_createCodecByName +AMediaCodec_createDecoderByType +AMediaCodec_createEncoderByType +AMediaCodec_delete +AMediaCodec_dequeueInputBuffer +AMediaCodec_dequeueOutputBuffer +AMediaCodec_flush +AMediaCodec_getInputBuffer +AMediaCodec_getOutputBuffer +AMediaCodec_getOutputFormat +AMediaCodec_queueInputBuffer +AMediaCodec_queueSecureInputBuffer +AMediaCodec_releaseOutputBuffer +AMediaCodec_releaseOutputBufferAtTime +AMediaCodec_start +AMediaCodec_stop +AMediaCrypto_delete +AMediaCrypto_isCryptoSchemeSupported +AMediaCrypto_new +AMediaCrypto_requiresSecureDecoderComponent +AMediaDrm_closeSession +AMediaDrm_createByUUID +AMediaDrm_decrypt +AMediaDrm_encrypt +AMediaDrm_getKeyRequest +AMediaDrm_getPropertyByteArray +AMediaDrm_getPropertyString +AMediaDrm_getProvisionRequest +AMediaDrm_getSecureStops +AMediaDrm_isCryptoSchemeSupported +AMediaDrm_openSession +AMediaDrm_provideKeyResponse +AMediaDrm_provideProvisionResponse +AMediaDrm_queryKeyStatus +AMediaDrm_release +AMediaDrm_releaseSecureStops +AMediaDrm_removeKeys +AMediaDrm_restoreKeys +AMediaDrm_setOnEventListener +AMediaDrm_setPropertyByteArray +AMediaDrm_setPropertyString +AMediaDrm_sign +AMediaDrm_verify +AMediaExtractor_advance +AMediaExtractor_delete +AMediaExtractor_getPsshInfo +AMediaExtractor_getSampleCryptoInfo +AMediaExtractor_getSampleFlags +AMediaExtractor_getSampleTime +AMediaExtractor_getSampleTrackIndex +AMediaExtractor_getTrackCount +AMediaExtractor_getTrackFormat +AMediaExtractor_new +AMediaExtractor_readSampleData +AMediaExtractor_seekTo +AMediaExtractor_selectTrack +AMediaExtractor_setDataSource +AMediaExtractor_setDataSourceFd +AMediaExtractor_unselectTrack +AMediaFormat_delete +AMediaFormat_getBuffer +AMediaFormat_getFloat +AMediaFormat_getInt32 +AMediaFormat_getInt64 +AMediaFormat_getSize +AMediaFormat_getString +AMediaFormat_new +AMediaFormat_setBuffer +AMediaFormat_setFloat +AMediaFormat_setInt32 +AMediaFormat_setInt64 +AMediaFormat_setString +AMediaFormat_toString +AMediaMuxer_addTrack +AMediaMuxer_delete +AMediaMuxer_new +AMediaMuxer_setLocation +AMediaMuxer_setOrientationHint +AMediaMuxer_start +AMediaMuxer_stop +AMediaMuxer_writeSampleData diff --git a/ndk/platforms/android-24/arch-x86_64/symbols/libmediandk.so.variables.txt b/ndk/platforms/android-24/arch-x86_64/symbols/libmediandk.so.variables.txt new file mode 100644 index 000000000..6f59e1fc7 --- /dev/null +++ b/ndk/platforms/android-24/arch-x86_64/symbols/libmediandk.so.variables.txt @@ -0,0 +1,24 @@ +AMEDIAFORMAT_KEY_AAC_PROFILE +AMEDIAFORMAT_KEY_BIT_RATE +AMEDIAFORMAT_KEY_CHANNEL_COUNT +AMEDIAFORMAT_KEY_CHANNEL_MASK +AMEDIAFORMAT_KEY_COLOR_FORMAT +AMEDIAFORMAT_KEY_DURATION +AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL +AMEDIAFORMAT_KEY_FRAME_RATE +AMEDIAFORMAT_KEY_HEIGHT +AMEDIAFORMAT_KEY_IS_ADTS +AMEDIAFORMAT_KEY_IS_AUTOSELECT +AMEDIAFORMAT_KEY_IS_DEFAULT +AMEDIAFORMAT_KEY_IS_FORCED_SUBTITLE +AMEDIAFORMAT_KEY_I_FRAME_INTERVAL +AMEDIAFORMAT_KEY_LANGUAGE +AMEDIAFORMAT_KEY_MAX_HEIGHT +AMEDIAFORMAT_KEY_MAX_INPUT_SIZE +AMEDIAFORMAT_KEY_MAX_WIDTH +AMEDIAFORMAT_KEY_MIME +AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP +AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER +AMEDIAFORMAT_KEY_SAMPLE_RATE +AMEDIAFORMAT_KEY_STRIDE +AMEDIAFORMAT_KEY_WIDTH diff --git a/ndk/platforms/android-24/include/media/NdkMediaCodec.h b/ndk/platforms/android-24/include/media/NdkMediaCodec.h new file mode 100644 index 000000000..c07f4c9f6 --- /dev/null +++ b/ndk/platforms/android-24/include/media/NdkMediaCodec.h @@ -0,0 +1,235 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * This file defines an NDK API. + * Do not remove methods. + * Do not change method signatures. + * Do not change the value of constants. + * Do not change the size of any of the classes defined in here. + * Do not reference types that are not part of the NDK. + * Do not #include files that aren't part of the NDK. + */ + +#ifndef _NDK_MEDIA_CODEC_H +#define _NDK_MEDIA_CODEC_H + +#include + +#include "NdkMediaCrypto.h" +#include "NdkMediaError.h" +#include "NdkMediaFormat.h" + +#ifdef __cplusplus +extern "C" { +#endif + + +struct AMediaCodec; +typedef struct AMediaCodec AMediaCodec; + +struct AMediaCodecBufferInfo { + int32_t offset; + int32_t size; + int64_t presentationTimeUs; + uint32_t flags; +}; +typedef struct AMediaCodecBufferInfo AMediaCodecBufferInfo; +typedef struct AMediaCodecCryptoInfo AMediaCodecCryptoInfo; + +enum { + AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM = 4, + AMEDIACODEC_CONFIGURE_FLAG_ENCODE = 1, + AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED = -3, + AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED = -2, + AMEDIACODEC_INFO_TRY_AGAIN_LATER = -1 +}; + +/** + * Create codec by name. Use this if you know the exact codec you want to use. + * When configuring, you will need to specify whether to use the codec as an + * encoder or decoder. + */ +AMediaCodec* AMediaCodec_createCodecByName(const char *name); + +/** + * Create codec by mime type. Most applications will use this, specifying a + * mime type obtained from media extractor. + */ +AMediaCodec* AMediaCodec_createDecoderByType(const char *mime_type); + +/** + * Create encoder by name. + */ +AMediaCodec* AMediaCodec_createEncoderByType(const char *mime_type); + +/** + * delete the codec and free its resources + */ +media_status_t AMediaCodec_delete(AMediaCodec*); + +/** + * Configure the codec. For decoding you would typically get the format from an extractor. + */ +media_status_t AMediaCodec_configure( + AMediaCodec*, + const AMediaFormat* format, + ANativeWindow* surface, + AMediaCrypto *crypto, + uint32_t flags); + +/** + * Start the codec. A codec must be configured before it can be started, and must be started + * before buffers can be sent to it. + */ +media_status_t AMediaCodec_start(AMediaCodec*); + +/** + * Stop the codec. + */ +media_status_t AMediaCodec_stop(AMediaCodec*); + +/* + * Flush the codec's input and output. All indices previously returned from calls to + * AMediaCodec_dequeueInputBuffer and AMediaCodec_dequeueOutputBuffer become invalid. + */ +media_status_t AMediaCodec_flush(AMediaCodec*); + +/** + * Get an input buffer. The specified buffer index must have been previously obtained from + * dequeueInputBuffer, and not yet queued. + */ +uint8_t* AMediaCodec_getInputBuffer(AMediaCodec*, size_t idx, size_t *out_size); + +/** + * Get an output buffer. The specified buffer index must have been previously obtained from + * dequeueOutputBuffer, and not yet queued. + */ +uint8_t* AMediaCodec_getOutputBuffer(AMediaCodec*, size_t idx, size_t *out_size); + +/** + * Get the index of the next available input buffer. An app will typically use this with + * getInputBuffer() to get a pointer to the buffer, then copy the data to be encoded or decoded + * into the buffer before passing it to the codec. + */ +ssize_t AMediaCodec_dequeueInputBuffer(AMediaCodec*, int64_t timeoutUs); + +/** + * Send the specified buffer to the codec for processing. + */ +media_status_t AMediaCodec_queueInputBuffer(AMediaCodec*, + size_t idx, off_t offset, size_t size, uint64_t time, uint32_t flags); + +/** + * Send the specified buffer to the codec for processing. + */ +media_status_t AMediaCodec_queueSecureInputBuffer(AMediaCodec*, + size_t idx, off_t offset, AMediaCodecCryptoInfo*, uint64_t time, uint32_t flags); + +/** + * Get the index of the next available buffer of processed data. + */ +ssize_t AMediaCodec_dequeueOutputBuffer(AMediaCodec*, AMediaCodecBufferInfo *info, int64_t timeoutUs); +AMediaFormat* AMediaCodec_getOutputFormat(AMediaCodec*); + +/** + * If you are done with a buffer, use this call to return the buffer to + * the codec. If you previously specified a surface when configuring this + * video decoder you can optionally render the buffer. + */ +media_status_t AMediaCodec_releaseOutputBuffer(AMediaCodec*, size_t idx, bool render); + +/** + * If you are done with a buffer, use this call to update its surface timestamp + * and return it to the codec to render it on the output surface. If you + * have not specified an output surface when configuring this video codec, + * this call will simply return the buffer to the codec. + * + * For more details, see the Java documentation for MediaCodec.releaseOutputBuffer. + */ +media_status_t AMediaCodec_releaseOutputBufferAtTime( + AMediaCodec *mData, size_t idx, int64_t timestampNs); + + +typedef enum { + AMEDIACODECRYPTOINFO_MODE_CLEAR = 0, + AMEDIACODECRYPTOINFO_MODE_AES_CTR = 1 +} cryptoinfo_mode_t; + +/** + * Create an AMediaCodecCryptoInfo from scratch. Use this if you need to use custom + * crypto info, rather than one obtained from AMediaExtractor. + * + * AMediaCodecCryptoInfo describes the structure of an (at least + * partially) encrypted input sample. + * A buffer's data is considered to be partitioned into "subsamples", + * each subsample starts with a (potentially empty) run of plain, + * unencrypted bytes followed by a (also potentially empty) run of + * encrypted bytes. + * numBytesOfClearData can be null to indicate that all data is encrypted. + * This information encapsulates per-sample metadata as outlined in + * ISO/IEC FDIS 23001-7:2011 "Common encryption in ISO base media file format files". + */ +AMediaCodecCryptoInfo *AMediaCodecCryptoInfo_new( + int numsubsamples, + uint8_t key[16], + uint8_t iv[16], + cryptoinfo_mode_t mode, + size_t *clearbytes, + size_t *encryptedbytes); + +/** + * delete an AMediaCodecCryptoInfo created previously with AMediaCodecCryptoInfo_new, or + * obtained from AMediaExtractor + */ +media_status_t AMediaCodecCryptoInfo_delete(AMediaCodecCryptoInfo*); + +/** + * The number of subsamples that make up the buffer's contents. + */ +size_t AMediaCodecCryptoInfo_getNumSubSamples(AMediaCodecCryptoInfo*); + +/** + * A 16-byte opaque key + */ +media_status_t AMediaCodecCryptoInfo_getKey(AMediaCodecCryptoInfo*, uint8_t *dst); + +/** + * A 16-byte initialization vector + */ +media_status_t AMediaCodecCryptoInfo_getIV(AMediaCodecCryptoInfo*, uint8_t *dst); + +/** + * The type of encryption that has been applied, + * one of AMEDIACODECRYPTOINFO_MODE_CLEAR or AMEDIACODECRYPTOINFO_MODE_AES_CTR. + */ +cryptoinfo_mode_t AMediaCodecCryptoInfo_getMode(AMediaCodecCryptoInfo*); + +/** + * The number of leading unencrypted bytes in each subsample. + */ +media_status_t AMediaCodecCryptoInfo_getClearBytes(AMediaCodecCryptoInfo*, size_t *dst); + +/** + * The number of trailing encrypted bytes in each subsample. + */ +media_status_t AMediaCodecCryptoInfo_getEncryptedBytes(AMediaCodecCryptoInfo*, size_t *dst); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif //_NDK_MEDIA_CODEC_H diff --git a/ndk/platforms/android-24/include/media/NdkMediaError.h b/ndk/platforms/android-24/include/media/NdkMediaError.h new file mode 100644 index 000000000..12613eb1d --- /dev/null +++ b/ndk/platforms/android-24/include/media/NdkMediaError.h @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +/* + * This file defines an NDK API. + * Do not remove methods. + * Do not change method signatures. + * Do not change the value of constants. + * Do not change the size of any of the classes defined in here. + * Do not reference types that are not part of the NDK. + * Do not #include files that aren't part of the NDK. + */ + +#ifndef _NDK_MEDIA_ERROR_H +#define _NDK_MEDIA_ERROR_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum { + AMEDIA_OK = 0, + + AMEDIA_ERROR_BASE = -10000, + AMEDIA_ERROR_UNKNOWN = AMEDIA_ERROR_BASE, + AMEDIA_ERROR_MALFORMED = AMEDIA_ERROR_BASE - 1, + AMEDIA_ERROR_UNSUPPORTED = AMEDIA_ERROR_BASE - 2, + AMEDIA_ERROR_INVALID_OBJECT = AMEDIA_ERROR_BASE - 3, + AMEDIA_ERROR_INVALID_PARAMETER = AMEDIA_ERROR_BASE - 4, + + AMEDIA_DRM_ERROR_BASE = -20000, + AMEDIA_DRM_NOT_PROVISIONED = AMEDIA_DRM_ERROR_BASE - 1, + AMEDIA_DRM_RESOURCE_BUSY = AMEDIA_DRM_ERROR_BASE - 2, + AMEDIA_DRM_DEVICE_REVOKED = AMEDIA_DRM_ERROR_BASE - 3, + AMEDIA_DRM_SHORT_BUFFER = AMEDIA_DRM_ERROR_BASE - 4, + AMEDIA_DRM_SESSION_NOT_OPENED = AMEDIA_DRM_ERROR_BASE - 5, + AMEDIA_DRM_TAMPER_DETECTED = AMEDIA_DRM_ERROR_BASE - 6, + AMEDIA_DRM_VERIFY_FAILED = AMEDIA_DRM_ERROR_BASE - 7, + AMEDIA_DRM_NEED_KEY = AMEDIA_DRM_ERROR_BASE - 8, + AMEDIA_DRM_LICENSE_EXPIRED = AMEDIA_DRM_ERROR_BASE - 9, + +} media_status_t; + + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _NDK_MEDIA_ERROR_H