diff options
| author | Andreas Huber <andih@google.com> | 2011-05-26 08:52:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-26 08:52:55 -0700 |
| commit | 8d91237333c60c4a6839358109265e8847df23f3 (patch) | |
| tree | 85f6a3b1c12b1b5785d8889923e72e10f9b71746 /media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp | |
| parent | ecc0840163093942f3418aa4b27e9279c187b173 (diff) | |
| parent | 386d609dc513e838c7e7c4c46c604493ccd560be (diff) | |
| download | frameworks_av-8d91237333c60c4a6839358109265e8847df23f3.zip frameworks_av-8d91237333c60c4a6839358109265e8847df23f3.tar.gz frameworks_av-8d91237333c60c4a6839358109265e8847df23f3.tar.bz2 | |
Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams."
Diffstat (limited to 'media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp')
| -rw-r--r-- | media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp b/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp index dfec47f..8250ad1 100644 --- a/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp +++ b/media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp @@ -175,7 +175,7 @@ void MPEG2TSExtractor::init() { if (!haveVideo) { sp<AnotherPacketSource> impl = (AnotherPacketSource *)mParser->getSource( - ATSParser::AVC_VIDEO).get(); + ATSParser::VIDEO).get(); if (impl != NULL) { haveVideo = true; @@ -186,7 +186,7 @@ void MPEG2TSExtractor::init() { if (!haveAudio) { sp<AnotherPacketSource> impl = (AnotherPacketSource *)mParser->getSource( - ATSParser::MPEG2ADTS_AUDIO).get(); + ATSParser::AUDIO).get(); if (impl != NULL) { haveAudio = true; @@ -194,7 +194,7 @@ void MPEG2TSExtractor::init() { } } - if (++numPacketsParsed > 2500) { + if (++numPacketsParsed > 10000) { break; } } |