summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/include
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-07-08 20:56:13 -0700
committerJames Dong <jdong@google.com>2010-07-08 21:37:46 -0700
commita7c14078afb156cc61779de8084c7fdb35aa8f44 (patch)
tree96d8e9cfd87e5f741d397dd63b9965d25a3da98e /media/libstagefright/include
parent929642ee003895b6e4e85ad7e43c7c6f01b29020 (diff)
downloadframeworks_base-a7c14078afb156cc61779de8084c7fdb35aa8f44.zip
frameworks_base-a7c14078afb156cc61779de8084c7fdb35aa8f44.tar.gz
frameworks_base-a7c14078afb156cc61779de8084c7fdb35aa8f44.tar.bz2
Enable the support for decoding audio with AAC+ and eAAC+ features
bug - 282684 Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
Diffstat (limited to 'media/libstagefright/include')
-rw-r--r--media/libstagefright/include/AACDecoder.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/include/AACDecoder.h b/media/libstagefright/include/AACDecoder.h
index f09addd..200f93c 100644
--- a/media/libstagefright/include/AACDecoder.h
+++ b/media/libstagefright/include/AACDecoder.h
@@ -25,6 +25,7 @@ struct tPVMP4AudioDecoderExternal;
namespace android {
struct MediaBufferGroup;
+struct MetaData;
struct AACDecoder : public MediaSource {
AACDecoder(const sp<MediaSource> &source);
@@ -41,6 +42,7 @@ protected:
virtual ~AACDecoder();
private:
+ sp<MetaData> mMeta;
sp<MediaSource> mSource;
bool mStarted;
@@ -50,9 +52,11 @@ private:
void *mDecoderBuf;
int64_t mAnchorTimeUs;
int64_t mNumSamplesOutput;
+ status_t mInitCheck;
MediaBuffer *mInputBuffer;
+ status_t initCheck();
AACDecoder(const AACDecoder &);
AACDecoder &operator=(const AACDecoder &);
};