diff options
| author | Robert Shih <robertshih@google.com> | 2014-09-12 18:26:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-12 18:26:28 +0000 |
| commit | ae6fe431d150d561fa27d060f38b5dd7c42820bb (patch) | |
| tree | 84448c16e41b59a9cf17c713d4fb08a42ea5b23d | |
| parent | 84de1dc2512aa886638c103ee3e9f5c19f4a4a04 (diff) | |
| parent | af52c1a1ccab588ae4ed94521f202ed9474eccec (diff) | |
| download | frameworks_av-ae6fe431d150d561fa27d060f38b5dd7c42820bb.zip frameworks_av-ae6fe431d150d561fa27d060f38b5dd7c42820bb.tar.gz frameworks_av-ae6fe431d150d561fa27d060f38b5dd7c42820bb.tar.bz2 | |
Merge "GenericSource: move track packet init from start to prepare" into lmp-dev
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index ec1a9a0..d8ed836 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -170,6 +170,8 @@ status_t NuPlayer::GenericSource::initFromDataSource() { if (mAudioTrack.mSource == NULL) { mAudioTrack.mIndex = i; mAudioTrack.mSource = track; + mAudioTrack.mPackets = + new AnotherPacketSource(mAudioTrack.mSource->getFormat()); if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_VORBIS)) { mAudioIsVorbis = true; @@ -181,6 +183,8 @@ status_t NuPlayer::GenericSource::initFromDataSource() { if (mVideoTrack.mSource == NULL) { mVideoTrack.mIndex = i; mVideoTrack.mSource = track; + mVideoTrack.mPackets = + new AnotherPacketSource(mVideoTrack.mSource->getFormat()); // check if the source requires secure buffers int32_t secure; @@ -428,16 +432,12 @@ void NuPlayer::GenericSource::start() { if (mAudioTrack.mSource != NULL) { CHECK_EQ(mAudioTrack.mSource->start(), (status_t)OK); - mAudioTrack.mPackets = - new AnotherPacketSource(mAudioTrack.mSource->getFormat()); postReadBuffer(MEDIA_TRACK_TYPE_AUDIO); } if (mVideoTrack.mSource != NULL) { CHECK_EQ(mVideoTrack.mSource->start(), (status_t)OK); - mVideoTrack.mPackets = - new AnotherPacketSource(mVideoTrack.mSource->getFormat()); postReadBuffer(MEDIA_TRACK_TYPE_VIDEO); } |