diff options
| author | Andreas Huber <andih@google.com> | 2010-12-21 10:47:34 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-21 10:47:34 -0800 |
| commit | 27a932a79b99fd2d869125e4c08b230fb6108860 (patch) | |
| tree | 50437e52078fefd90a9a8adea6ac5c0930ff9e9e /media/libstagefright | |
| parent | 41152efd144ccf70c380d5c9a32105c02a039f43 (diff) | |
| parent | 3831a066bcf1019864a94d2bc7b4c9241efc5c22 (diff) | |
| download | frameworks_av-27a932a79b99fd2d869125e4c08b230fb6108860.zip frameworks_av-27a932a79b99fd2d869125e4c08b230fb6108860.tar.gz frameworks_av-27a932a79b99fd2d869125e4c08b230fb6108860.tar.bz2 | |
Merge "Squashed commit of the following:"
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 3 | ||||
| -rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 9 | ||||
| -rw-r--r-- | media/libstagefright/mpeg2ts/ATSParser.cpp | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 77276ab..3bb61f2 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -1157,6 +1157,9 @@ void ACodec::BaseState::onInputBufferFilled(const sp<AMessage> &msg) { if (!msg->findObject("buffer", &obj)) { CHECK(msg->findInt32("err", &err)); + LOGV("[%s] saw error %d instead of an input buffer", + mCodec->mComponentName.c_str(), err); + obj.clear(); } diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 30ac404..cc7189c 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -468,13 +468,16 @@ void LiveSession::onDownloadNext() { return; } - if (explicitDiscontinuity - || (mPrevBandwidthIndex >= 0 - && (size_t)mPrevBandwidthIndex != bandwidthIndex)) { + bool bandwidthChanged = + mPrevBandwidthIndex >= 0 + && (size_t)mPrevBandwidthIndex != bandwidthIndex; + + if (explicitDiscontinuity || bandwidthChanged) { // Signal discontinuity. sp<ABuffer> tmp = new ABuffer(188); memset(tmp->data(), 0, tmp->size()); + tmp->data()[1] = bandwidthChanged; mDataSource->queueBuffer(tmp); } diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp index de6346b..afacb2e 100644 --- a/media/libstagefright/mpeg2ts/ATSParser.cpp +++ b/media/libstagefright/mpeg2ts/ATSParser.cpp @@ -284,7 +284,7 @@ ATSParser::Stream::Stream( : mProgram(program), mElementaryPID(elementaryPID), mStreamType(streamType), - mBuffer(new ABuffer(128 * 1024)), + mBuffer(new ABuffer(192 * 1024)), mPayloadStarted(false), mQueue(streamType == 0x1b ? ElementaryStreamQueue::H264 : ElementaryStreamQueue::AAC) { |