diff options
| author | Andreas Huber <andih@google.com> | 2011-05-19 08:37:39 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-05-25 15:57:07 -0700 |
| commit | 386d609dc513e838c7e7c4c46c604493ccd560be (patch) | |
| tree | d7352f19380578d525ad4a667e51a66ed84e2d58 /media/libmediaplayerservice | |
| parent | ade8c2d682d4f8c9424dece53e39400c237d22bf (diff) | |
| download | frameworks_av-386d609dc513e838c7e7c4c46c604493ccd560be.zip frameworks_av-386d609dc513e838c7e7c4c46c604493ccd560be.tar.gz frameworks_av-386d609dc513e838c7e7c4c46c604493ccd560be.tar.bz2 | |
Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.
Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp | 4 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/StreamingSource.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp index 576a850..b3b3af5 100644 --- a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp +++ b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp @@ -77,7 +77,7 @@ void NuPlayer::HTTPLiveSource::start() { sp<MetaData> NuPlayer::HTTPLiveSource::getFormat(bool audio) { ATSParser::SourceType type = - audio ? ATSParser::MPEG2ADTS_AUDIO : ATSParser::AVC_VIDEO; + audio ? ATSParser::AUDIO : ATSParser::VIDEO; sp<AnotherPacketSource> source = static_cast<AnotherPacketSource *>(mTSParser->getSource(type).get()); @@ -131,7 +131,7 @@ bool NuPlayer::HTTPLiveSource::feedMoreTSData() { status_t NuPlayer::HTTPLiveSource::dequeueAccessUnit( bool audio, sp<ABuffer> *accessUnit) { ATSParser::SourceType type = - audio ? ATSParser::MPEG2ADTS_AUDIO : ATSParser::AVC_VIDEO; + audio ? ATSParser::AUDIO : ATSParser::VIDEO; sp<AnotherPacketSource> source = static_cast<AnotherPacketSource *>(mTSParser->getSource(type).get()); diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp index 2016282..bbc8a6e 100644 --- a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp +++ b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp @@ -87,7 +87,7 @@ bool NuPlayer::StreamingSource::feedMoreTSData() { sp<MetaData> NuPlayer::StreamingSource::getFormat(bool audio) { ATSParser::SourceType type = - audio ? ATSParser::MPEG2ADTS_AUDIO : ATSParser::AVC_VIDEO; + audio ? ATSParser::AUDIO : ATSParser::VIDEO; sp<AnotherPacketSource> source = static_cast<AnotherPacketSource *>(mTSParser->getSource(type).get()); @@ -102,7 +102,7 @@ sp<MetaData> NuPlayer::StreamingSource::getFormat(bool audio) { status_t NuPlayer::StreamingSource::dequeueAccessUnit( bool audio, sp<ABuffer> *accessUnit) { ATSParser::SourceType type = - audio ? ATSParser::MPEG2ADTS_AUDIO : ATSParser::AVC_VIDEO; + audio ? ATSParser::AUDIO : ATSParser::VIDEO; sp<AnotherPacketSource> source = static_cast<AnotherPacketSource *>(mTSParser->getSource(type).get()); |