diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-04-24 15:29:49 -0700 |
|---|---|---|
| committer | Ronghua Wu <ronghuawu@google.com> | 2015-04-27 21:22:13 +0000 |
| commit | c721e71f4d7e3cd4fc9332fd55fb6942f54cec39 (patch) | |
| tree | d6dbd9af50ecfb1f8b9f0f1ecf3033920008ca8a /include | |
| parent | 5e95559255d1abd62c78b308731ebe3991186e94 (diff) | |
| download | frameworks_av-c721e71f4d7e3cd4fc9332fd55fb6942f54cec39.zip frameworks_av-c721e71f4d7e3cd4fc9332fd55fb6942f54cec39.tar.gz frameworks_av-c721e71f4d7e3cd4fc9332fd55fb6942f54cec39.tar.bz2 | |
DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.
Bug: 20559813
Change-Id: If231cb44337ca7dc74c39fc3cd73e2b6f3cb85b8
(cherry picked from commit d4c1f6b4ecfef7323422359fc38bd1edb1abf205)
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/MediaResource.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/media/MediaResource.h b/include/media/MediaResource.h index 0b57c84..20f2cad 100644 --- a/include/media/MediaResource.h +++ b/include/media/MediaResource.h @@ -25,6 +25,8 @@ namespace android { extern const char kResourceSecureCodec[]; extern const char kResourceNonSecureCodec[]; +extern const char kResourceAudioCodec[]; +extern const char kResourceVideoCodec[]; extern const char kResourceGraphicMemory[]; class MediaResource { diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index f2b21c9..d89e4c7 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -351,7 +351,7 @@ private: bool isExecuting() const; uint64_t getGraphicBufferSize(); - void addResource(const char *type, uint64_t value); + void addResource(const String8 &type, const String8 &subtype, uint64_t value); /* called to get the last codec error when the sticky flag is set. * if no such codec error is found, returns UNKNOWN_ERROR. |