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 | a093f92042cf65060d1474c0fe116c12f8981717 (patch) | |
| tree | 7ac40ccae38fc76002355c8a7a70c96d049e6259 /media/libstagefright/codecs | |
| parent | 00502849dcc54086ad9fabbd90ef3d0e41ae78f5 (diff) | |
| download | frameworks_av-a093f92042cf65060d1474c0fe116c12f8981717.zip frameworks_av-a093f92042cf65060d1474c0fe116c12f8981717.tar.gz frameworks_av-a093f92042cf65060d1474c0fe116c12f8981717.tar.bz2 | |
Proper recovery of timestamp information in the transport stream parser.
Change-Id: I647c73688c95529f54f0bb6af17d109dfe2bb11d
Diffstat (limited to 'media/libstagefright/codecs')
| -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(); |