Migrate libmediandk to ndk_library.
Test: make native
Bug: http://b/30465923
Change-Id: Id62eac2d5cc518465445d87ce204fa918f0ddb68
diff --git a/include/ndk/NdkImage.h b/include/ndk/NdkImage.h
index cd0b11e..9a99287 100644
--- a/include/ndk/NdkImage.h
+++ b/include/ndk/NdkImage.h
@@ -36,12 +36,16 @@
#ifndef _NDK_IMAGE_H
#define _NDK_IMAGE_H
+#include <sys/cdefs.h>
+
#include "NdkMediaError.h"
#ifdef __cplusplus
extern "C" {
#endif
+#if __ANDROID_API__ >= 24
+
/**
* AImage is an opaque type that provides access to image generated by {@link AImageReader}.
*/
@@ -604,6 +608,8 @@
const AImage* image, int planeIdx,
/*out*/uint8_t** data, /*out*/int* dataLength);
+#endif /* __ANDROID_API__ >= 24 */
+
#ifdef __cplusplus
} // extern "C"
#endif
diff --git a/include/ndk/NdkImageReader.h b/include/ndk/NdkImageReader.h
index 7c7ec6a..8d72c28 100644
--- a/include/ndk/NdkImageReader.h
+++ b/include/ndk/NdkImageReader.h
@@ -36,6 +36,8 @@
#ifndef _NDK_IMAGE_READER_H
#define _NDK_IMAGE_READER_H
+#include <sys/cdefs.h>
+
#include <android/native_window.h>
#include "NdkMediaError.h"
#include "NdkImage.h"
@@ -44,6 +46,8 @@
extern "C" {
#endif
+#if __ANDROID_API__ >= 24
+
/**
* AImage is an opaque type that allows direct application access to image data rendered into a
* {@link ANativeWindow}.
@@ -294,6 +298,8 @@
media_status_t AImageReader_setImageListener(
AImageReader* reader, AImageReader_ImageListener* listener);
+#endif /* __ANDROID_API__ >= 24 */
+
#ifdef __cplusplus
} // extern "C"
#endif
diff --git a/include/ndk/NdkMediaCodec.h b/include/ndk/NdkMediaCodec.h
index fcb3a99..ad17321 100644
--- a/include/ndk/NdkMediaCodec.h
+++ b/include/ndk/NdkMediaCodec.h
@@ -27,6 +27,8 @@
#ifndef _NDK_MEDIA_CODEC_H
#define _NDK_MEDIA_CODEC_H
+#include <sys/cdefs.h>
+
#include <android/native_window.h>
#include "NdkMediaCrypto.h"
@@ -37,6 +39,7 @@
extern "C" {
#endif
+#if __ANDROID_API__ >= 21
struct AMediaCodec;
typedef struct AMediaCodec AMediaCodec;
@@ -254,6 +257,8 @@
*/
media_status_t AMediaCodecCryptoInfo_getEncryptedBytes(AMediaCodecCryptoInfo*, size_t *dst);
+#endif /* __ANDROID_API__ >= 21 */
+
#ifdef __cplusplus
} // extern "C"
#endif
diff --git a/include/ndk/NdkMediaCrypto.h b/include/ndk/NdkMediaCrypto.h
index 90374c5..9236765 100644
--- a/include/ndk/NdkMediaCrypto.h
+++ b/include/ndk/NdkMediaCrypto.h
@@ -28,6 +28,7 @@
#ifndef _NDK_MEDIA_CRYPTO_H
#define _NDK_MEDIA_CRYPTO_H
+#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdbool.h>
@@ -35,6 +36,8 @@
extern "C" {
#endif
+#if __ANDROID_API__ >= 21
+
struct AMediaCrypto;
typedef struct AMediaCrypto AMediaCrypto;
@@ -48,6 +51,7 @@
void AMediaCrypto_delete(AMediaCrypto* crypto);
+#endif /* __ANDROID_API__ >= 21 */
#ifdef __cplusplus
} // extern "C"
diff --git a/include/ndk/NdkMediaDrm.h b/include/ndk/NdkMediaDrm.h
index 3c312a9..9dd6283 100644
--- a/include/ndk/NdkMediaDrm.h
+++ b/include/ndk/NdkMediaDrm.h
@@ -27,14 +27,17 @@
#ifndef _NDK_MEDIA_DRM_H
#define _NDK_MEDIA_DRM_H
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/cdefs.h>
+
#include "NdkMediaError.h"
#ifdef __cplusplus
extern "C" {
#endif
-#include <stdint.h>
-#include <stdbool.h>
+#if __ANDROID_API__ >= 21
struct AMediaDrm;
typedef struct AMediaDrm AMediaDrm;
@@ -448,6 +451,8 @@
const char *macAlgorithm, uint8_t *keyId, const uint8_t *message, size_t messageSize,
const uint8_t *signature, size_t signatureSize);
+#endif /* __ANDROID_API__ >= 21 */
+
#ifdef __cplusplus
} // extern "C"
#endif
diff --git a/include/ndk/NdkMediaError.h b/include/ndk/NdkMediaError.h
index 60d401b..fb00b1d 100644
--- a/include/ndk/NdkMediaError.h
+++ b/include/ndk/NdkMediaError.h
@@ -28,10 +28,14 @@
#ifndef _NDK_MEDIA_ERROR_H
#define _NDK_MEDIA_ERROR_H
+#include <sys/cdefs.h>
+
#ifdef __cplusplus
extern "C" {
#endif
+#if __ANDROID_API__ >= 21
+
typedef enum {
AMEDIA_OK = 0,
@@ -59,6 +63,7 @@
} media_status_t;
+#endif /* __ANDROID_API__ >= 21 */
#ifdef __cplusplus
} // extern "C"
diff --git a/include/ndk/NdkMediaExtractor.h b/include/ndk/NdkMediaExtractor.h
index 7324d31..c3180dc 100644
--- a/include/ndk/NdkMediaExtractor.h
+++ b/include/ndk/NdkMediaExtractor.h
@@ -28,6 +28,7 @@
#ifndef _NDK_MEDIA_EXTRACTOR_H
#define _NDK_MEDIA_EXTRACTOR_H
+#include <sys/cdefs.h>
#include <sys/types.h>
#include "NdkMediaCodec.h"
@@ -38,6 +39,8 @@
extern "C" {
#endif
+#if __ANDROID_API__ >= 21
+
struct AMediaExtractor;
typedef struct AMediaExtractor AMediaExtractor;
@@ -158,6 +161,8 @@
AMEDIAEXTRACTOR_SAMPLE_FLAG_ENCRYPTED = 2,
};
+#endif /* __ANDROID_API__ >= 21 */
+
#ifdef __cplusplus
} // extern "C"
#endif
diff --git a/include/ndk/NdkMediaFormat.h b/include/ndk/NdkMediaFormat.h
index ab29791..a2a21d2 100644
--- a/include/ndk/NdkMediaFormat.h
+++ b/include/ndk/NdkMediaFormat.h
@@ -27,6 +27,7 @@
#ifndef _NDK_MEDIA_FORMAT_H
#define _NDK_MEDIA_FORMAT_H
+#include <sys/cdefs.h>
#include <sys/types.h>
#include "NdkMediaError.h"
@@ -35,6 +36,8 @@
extern "C" {
#endif
+#if __ANDROID_API__ >= 21
+
struct AMediaFormat;
typedef struct AMediaFormat AMediaFormat;
@@ -104,6 +107,8 @@
extern const char* AMEDIAFORMAT_KEY_WIDTH;
extern const char* AMEDIAFORMAT_KEY_STRIDE;
+#endif /* __ANDROID_API__ >= 21 */
+
#ifdef __cplusplus
} // extern "C"
#endif
diff --git a/include/ndk/NdkMediaMuxer.h b/include/ndk/NdkMediaMuxer.h
index 90d946c..25987a2 100644
--- a/include/ndk/NdkMediaMuxer.h
+++ b/include/ndk/NdkMediaMuxer.h
@@ -28,6 +28,7 @@
#ifndef _NDK_MEDIA_MUXER_H
#define _NDK_MEDIA_MUXER_H
+#include <sys/cdefs.h>
#include <sys/types.h>
#include "NdkMediaCodec.h"
@@ -38,6 +39,8 @@
extern "C" {
#endif
+#if __ANDROID_API__ >= 21
+
struct AMediaMuxer;
typedef struct AMediaMuxer AMediaMuxer;
@@ -112,6 +115,8 @@
media_status_t AMediaMuxer_writeSampleData(AMediaMuxer *muxer,
size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo *info);
+#endif /* __ANDROID_API__ >= 21 */
+
#ifdef __cplusplus
} // extern "C"
#endif