diff options
| author | Andreas Huber <andih@google.com> | 2010-12-15 14:07:50 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-12-15 14:07:50 -0800 |
| commit | 9c5d62a5be43904081575a943fe04d3cfcc2dda8 (patch) | |
| tree | e372a3386a0cdd4745ea4f9e91562ca68fb4c20c /media/libstagefright/codecs/aacdec/AACDecoder.cpp | |
| parent | 08f83a6cd8c03a1a252b1dea13c72cee3def70c0 (diff) | |
| download | frameworks_base-9c5d62a5be43904081575a943fe04d3cfcc2dda8.zip frameworks_base-9c5d62a5be43904081575a943fe04d3cfcc2dda8.tar.gz frameworks_base-9c5d62a5be43904081575a943fe04d3cfcc2dda8.tar.bz2 | |
Proper recovery of timestamp information in the transport stream parser.
Change-Id: I647c73688c95529f54f0bb6af17d109dfe2bb11d
Diffstat (limited to 'media/libstagefright/codecs/aacdec/AACDecoder.cpp')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/AACDecoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/aacdec/AACDecoder.cpp b/media/libstagefright/codecs/aacdec/AACDecoder.cpp index 2171a67..208431c 100644 --- a/media/libstagefright/codecs/aacdec/AACDecoder.cpp +++ b/media/libstagefright/codecs/aacdec/AACDecoder.cpp @@ -21,8 +21,8 @@ #include "pvmp4audiodecoder_api.h" +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/MediaBufferGroup.h> -#include <media/stagefright/MediaDebug.h> #include <media/stagefright/MediaDefs.h> #include <media/stagefright/MetaData.h> @@ -84,7 +84,7 @@ status_t AACDecoder::initCheck() { sp<MetaData> meta = mSource->getFormat(); if (meta->findData(kKeyESDS, &type, &data, &size)) { ESDS esds((const char *)data, size); - CHECK_EQ(esds.InitCheck(), OK); + CHECK_EQ(esds.InitCheck(), (status_t)OK); const void *codec_specific_data; size_t codec_specific_data_size; @@ -197,7 +197,7 @@ status_t AACDecoder::read( } MediaBuffer *buffer; - CHECK_EQ(mBufferGroup->acquire_buffer(&buffer), OK); + CHECK_EQ(mBufferGroup->acquire_buffer(&buffer), (status_t)OK); mConfig->pInputBuffer = (UChar *)mInputBuffer->data() + mInputBuffer->range_offset(); |