summaryrefslogtreecommitdiffstats
path: root/include/ndk/NdkMediaExtractor.h
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-05-09 15:10:23 -0700
committerMarco Nelissen <marcone@google.com>2014-05-13 15:03:04 -0700
commit050eb3280d7305b84f723d515be2dc9606dc39d1 (patch)
tree110716a883abc7e41f3507f86973224dc4bc0adb /include/ndk/NdkMediaExtractor.h
parent021cf9634ab09c0753a40b7c9ef4ba603be5c3da (diff)
downloadframeworks_av-050eb3280d7305b84f723d515be2dc9606dc39d1.zip
frameworks_av-050eb3280d7305b84f723d515be2dc9606dc39d1.tar.gz
frameworks_av-050eb3280d7305b84f723d515be2dc9606dc39d1.tar.bz2
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
Diffstat (limited to 'include/ndk/NdkMediaExtractor.h')
-rw-r--r--include/ndk/NdkMediaExtractor.h29
1 files changed, 29 insertions, 0 deletions
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 <sys/types.h>
+#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,