diff options
author | Andreas Huber <andih@google.com> | 2011-08-04 15:05:17 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-08-04 15:05:17 -0700 |
commit | f89d780df70b7fbb8465bce4913c46cca019721f (patch) | |
tree | 56d00af18e567c8df2ecb9f41d596ad0d80cdf2d | |
parent | 6801b4dbd00b485ecdcd31b517ed885a8fa21c63 (diff) | |
download | frameworks_av-f89d780df70b7fbb8465bce4913c46cca019721f.zip frameworks_av-f89d780df70b7fbb8465bce4913c46cca019721f.tar.gz frameworks_av-f89d780df70b7fbb8465bce4913c46cca019721f.tar.bz2 |
Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer
Change-Id: I1313f117cd7cdfaf7d6ec25413a0b4b8ea495037
related-to-bug: 5122973
-rw-r--r-- | include/media/stagefright/MediaBuffer.h | 4 | ||||
-rw-r--r-- | media/libstagefright/MediaBuffer.cpp | 15 | ||||
-rw-r--r-- | media/libstagefright/mpeg2ts/AnotherPacketSource.cpp | 6 | ||||
-rw-r--r-- | media/libstagefright/rtsp/APacketSource.cpp | 4 |
4 files changed, 22 insertions, 7 deletions
diff --git a/include/media/stagefright/MediaBuffer.h b/include/media/stagefright/MediaBuffer.h index c1c4f94..3d79596 100644 --- a/include/media/stagefright/MediaBuffer.h +++ b/include/media/stagefright/MediaBuffer.h @@ -25,6 +25,7 @@ namespace android { +struct ABuffer; class GraphicBuffer; class MediaBuffer; class MediaBufferObserver; @@ -51,6 +52,8 @@ public: MediaBuffer(const sp<GraphicBuffer>& graphicBuffer); + MediaBuffer(const sp<ABuffer> &buffer); + // Decrements the reference count and returns the buffer to its // associated MediaBufferGroup if the reference count drops to 0. void release(); @@ -100,6 +103,7 @@ private: void *mData; size_t mSize, mRangeOffset, mRangeLength; sp<GraphicBuffer> mGraphicBuffer; + sp<ABuffer> mBuffer; bool mOwnsData; diff --git a/media/libstagefright/MediaBuffer.cpp b/media/libstagefright/MediaBuffer.cpp index a8fadf2..0b14f1e 100644 --- a/media/libstagefright/MediaBuffer.cpp +++ b/media/libstagefright/MediaBuffer.cpp @@ -21,6 +21,7 @@ #include <pthread.h> #include <stdlib.h> +#include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/MediaDebug.h> #include <media/stagefright/MetaData.h> @@ -70,6 +71,20 @@ MediaBuffer::MediaBuffer(const sp<GraphicBuffer>& graphicBuffer) mOriginal(NULL) { } +MediaBuffer::MediaBuffer(const sp<ABuffer> &buffer) + : mObserver(NULL), + mNextBuffer(NULL), + mRefCount(0), + mData(buffer->data()), + mSize(buffer->size()), + mRangeOffset(0), + mRangeLength(mSize), + mBuffer(buffer), + mOwnsData(false), + mMetaData(new MetaData), + mOriginal(NULL) { +} + void MediaBuffer::release() { if (mObserver == NULL) { CHECK_EQ(mRefCount, 0); diff --git a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp index 59de17e..2e66a2c 100644 --- a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp +++ b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp @@ -105,12 +105,10 @@ status_t AnotherPacketSource::read( int64_t timeUs; CHECK(buffer->meta()->findInt64("timeUs", &timeUs)); - MediaBuffer *mediaBuffer = new MediaBuffer(buffer->size()); - mediaBuffer->meta_data()->setInt64(kKeyTime, timeUs); + MediaBuffer *mediaBuffer = new MediaBuffer(buffer); - // hexdump(buffer->data(), buffer->size()); + mediaBuffer->meta_data()->setInt64(kKeyTime, timeUs); - memcpy(mediaBuffer->data(), buffer->data(), buffer->size()); *out = mediaBuffer; return OK; } diff --git a/media/libstagefright/rtsp/APacketSource.cpp b/media/libstagefright/rtsp/APacketSource.cpp index a02591f..4ecb92f 100644 --- a/media/libstagefright/rtsp/APacketSource.cpp +++ b/media/libstagefright/rtsp/APacketSource.cpp @@ -628,14 +628,12 @@ status_t APacketSource::read( updateNormalPlayTime_l(buffer); - MediaBuffer *mediaBuffer = new MediaBuffer(buffer->size()); - int64_t timeUs; CHECK(buffer->meta()->findInt64("timeUs", &timeUs)); + MediaBuffer *mediaBuffer = new MediaBuffer(buffer); mediaBuffer->meta_data()->setInt64(kKeyTime, timeUs); - memcpy(mediaBuffer->data(), buffer->data(), buffer->size()); *out = mediaBuffer; mBuffers.erase(mBuffers.begin()); |