From 050eb3280d7305b84f723d515be2dc9606dc39d1 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Fri, 9 May 2014 15:10:23 -0700 Subject: Some crypto stuff, error codes Add crypto/drm related functions, define some media errors instead of using magic numbers in the code. Change-Id: I5924cba0bfcdb3623073c9182a646b70f4ead5a5 --- include/ndk/NdkMediaCodec.h | 47 ++++++++++++++++++++++++++++++++--- include/ndk/NdkMediaCrypto.h | 55 +++++++++++++++++++++++++++++++++++++++++ include/ndk/NdkMediaError.h | 48 +++++++++++++++++++++++++++++++++++ include/ndk/NdkMediaExtractor.h | 29 ++++++++++++++++++++++ 4 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 include/ndk/NdkMediaCrypto.h create mode 100644 include/ndk/NdkMediaError.h (limited to 'include') diff --git a/include/ndk/NdkMediaCodec.h b/include/ndk/NdkMediaCodec.h index c35c6b3..5233fe3 100644 --- a/include/ndk/NdkMediaCodec.h +++ b/include/ndk/NdkMediaCodec.h @@ -29,6 +29,7 @@ #include +#include "NdkMediaCrypto.h" #include "NdkMediaFormat.h" #ifdef __cplusplus @@ -46,6 +47,7 @@ struct AMediaCodecBufferInfo { uint32_t flags; }; typedef struct AMediaCodecBufferInfo AMediaCodecBufferInfo; +typedef struct AMediaCodecCryptoInfo AMediaCodecCryptoInfo; enum { AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM = 4, @@ -81,8 +83,12 @@ int AMediaCodec_delete(AMediaCodec*); /** * Configure the codec. For decoding you would typically get the format from an extractor. */ -int AMediaCodec_configure(AMediaCodec*, const AMediaFormat* format, - ANativeWindow* surface, uint32_t flags); // TODO: other args +int 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 @@ -127,6 +133,12 @@ int 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. + */ +int 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); @@ -138,7 +150,6 @@ AMediaFormat* AMediaCodec_getOutputFormat(AMediaCodec*); int AMediaCodec_releaseOutputBuffer(AMediaCodec*, size_t idx, bool render); - typedef void (*OnCodecEvent)(AMediaCodec *codec, void *userdata); /** @@ -150,6 +161,36 @@ typedef void (*OnCodecEvent)(AMediaCodec *codec, void *userdata); int AMediaCodec_setNotificationCallback(AMediaCodec*, OnCodecEvent callback, void *userdata); +enum { + AMEDIACODECRYPTOINFO_MODE_CLEAR = 0, + AMEDIACODECRYPTOINFO_MODE_AES_CTR = 1 +}; + +/** + * create an AMediaCodecCryptoInfo from scratch. Use this if you need to use custom + * crypto info, rather than one obtained from AMediaExtractor. + */ +AMediaCodecCryptoInfo *AMediaCodecCryptoInfo_new( + int numsubsamples, + uint8_t key[16], + uint8_t iv[16], + uint32_t mode, + size_t *clearbytes, + size_t *encryptedbytes); + +/** + * delete an AMediaCodecCryptoInfo create previously with AMediaCodecCryptoInfo_new, or + * obtained from AMediaExtractor + */ +int AMediaCodecCryptoInfo_delete(AMediaCodecCryptoInfo*); + +size_t AMediaCodecCryptoInfo_getNumSubSamples(AMediaCodecCryptoInfo*); +int AMediaCodecCryptoInfo_getKey(AMediaCodecCryptoInfo*, uint8_t *dst); +int AMediaCodecCryptoInfo_getIV(AMediaCodecCryptoInfo*, uint8_t *dst); +uint32_t AMediaCodecCryptoInfo_getMode(AMediaCodecCryptoInfo*); +int AMediaCodecCryptoInfo_getClearBytes(AMediaCodecCryptoInfo*, size_t *dst); +int AMediaCodecCryptoInfo_getEncryptedBytes(AMediaCodecCryptoInfo*, size_t *dst); + #ifdef __cplusplus } // extern "C" #endif diff --git a/include/ndk/NdkMediaCrypto.h b/include/ndk/NdkMediaCrypto.h new file mode 100644 index 0000000..0bcba9f --- /dev/null +++ b/include/ndk/NdkMediaCrypto.h @@ -0,0 +1,55 @@ +/* + * 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_CRYPTO_H +#define _NDK_MEDIA_CRYPTO_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +struct AMediaCrypto; +typedef struct AMediaCrypto AMediaCrypto; + +typedef uint8_t AMediaUUID[16]; + +bool AMediaCrypto_isCryptoSchemeSupport(const AMediaUUID uuid); + +bool AMediaCrypto_requiresSecureDecoderComponent(const char *mime); + +AMediaCrypto* AMediaCrypto_new(const AMediaUUID uuid, const void *initData, size_t initDataSize); + +void AMediaCrypto_delete(AMediaCrypto* crypto); + + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _NDK_MEDIA_CRYPTO_H diff --git a/include/ndk/NdkMediaError.h b/include/ndk/NdkMediaError.h new file mode 100644 index 0000000..b89a10e --- /dev/null +++ b/include/ndk/NdkMediaError.h @@ -0,0 +1,48 @@ +/* + * 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 + +enum { + AMEDIAERROR_BASE = -10000, + + AMEDIAERROR_GENERIC = AMEDIAERROR_BASE, + AMEDIAERROR_MALFORMED = AMEDIAERROR_BASE - 1, + AMEDIAERROR_UNSUPPORTED = AMEDIAERROR_BASE - 2 +}; + + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _NDK_MEDIA_ERROR_H diff --git a/include/ndk/NdkMediaExtractor.h b/include/ndk/NdkMediaExtractor.h index a7c32c4..9e50ec0 100644 --- a/include/ndk/NdkMediaExtractor.h +++ b/include/ndk/NdkMediaExtractor.h @@ -30,7 +30,9 @@ #include +#include "NdkMediaCodec.h" #include "NdkMediaFormat.h" +#include "NdkMediaCrypto.h" #ifdef __cplusplus extern "C" { @@ -112,6 +114,33 @@ int64_t AMediaExtractor_getSampletime(AMediaExtractor*); */ bool AMediaExtractor_advance(AMediaExtractor*); + +/** + * mapping of crypto scheme uuid to the scheme specific data for that scheme + */ +typedef struct PsshEntry { + AMediaUUID uuid; + size_t datalen; + void *data; +} PsshEntry; + +/** + * list of crypto schemes and their data + */ +typedef struct PsshInfo { + size_t numentries; + PsshEntry entries[0]; +} PsshInfo; + +/** + * Get the PSSH info if present. + */ +PsshInfo* AMediaExtractor_getPsshInfo(AMediaExtractor*); + + +AMediaCodecCryptoInfo *AMediaExtractor_getSampleCryptoInfo(AMediaExtractor *); + + enum { AMEDIAEXTRACTOR_SAMPLE_FLAG_SYNC = 1, AMEDIAEXTRACTOR_SAMPLE_FLAG_ENCRYPTED = 2, -- cgit v1.1