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

Commit 84404f06 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Migrate libmediandk to ndk_library."

parents bb38f906 2975a24d

Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -5,6 +5,13 @@ ndk_headers { 
    srcs: ["include/camera/ndk/**/*.h"],

}



ndk_headers {

    name: "libmediandk_headers",

    from: "include/ndk/",

    to: "media",

    srcs: ["include/ndk/**/*.h"],

}



subdirs = [

    "camera/ndk",

    "media/libmedia",

include/ndk/NdkImage.h

+6 −0
Original line number Diff line number Diff line
@@ -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 @@ media_status_t AImage_getPlaneData( 
        const AImage* image, int planeIdx,

        /*out*/uint8_t** data, /*out*/int* dataLength);



#endif /* __ANDROID_API__ >= 24 */



#ifdef __cplusplus

} // extern "C"

#endif

include/ndk/NdkImageReader.h

+6 −0
Original line number Diff line number Diff line
@@ -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 @@ typedef struct AImageReader_ImageListener { 
media_status_t AImageReader_setImageListener(

        AImageReader* reader, AImageReader_ImageListener* listener);



#endif /* __ANDROID_API__ >= 24 */



#ifdef __cplusplus

} // extern "C"

#endif

include/ndk/NdkMediaCodec.h

+5 −0
Original line number Diff line number Diff line
@@ -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_getClearBytes(AMediaCodecCryptoInfo*, size_ 
 */

media_status_t AMediaCodecCryptoInfo_getEncryptedBytes(AMediaCodecCryptoInfo*, size_t *dst);



#endif /* __ANDROID_API__ >= 21 */



#ifdef __cplusplus

} // extern "C"

#endif

include/ndk/NdkMediaCrypto.h

+4 −0
Original line number Diff line number Diff line
@@ -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 @@ AMediaCrypto* AMediaCrypto_new(const AMediaUUID uuid, const void *initData, size 


void AMediaCrypto_delete(AMediaCrypto* crypto);



#endif /* __ANDROID_API__ >= 21 */



#ifdef __cplusplus

} // extern "C"