summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/omx
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-01-19 10:50:54 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-19 10:50:54 -0800
commit0d41be3a291bfefefea178b18df1fb2b3019e886 (patch)
tree8008caa9fceda83cafae7618a2ad142923b19107 /media/libstagefright/omx
parent51bfd683fe35bb8ee8798ec467158ce52ce0199b (diff)
parentfed1a1c9c05d033301ad3fe4c20b854deada2408 (diff)
downloadframeworks_base-0d41be3a291bfefefea178b18df1fb2b3019e886.zip
frameworks_base-0d41be3a291bfefefea178b18df1fb2b3019e886.tar.gz
frameworks_base-0d41be3a291bfefefea178b18df1fb2b3019e886.tar.bz2
Merge "Remove totally unused code from OMX.cpp"
Diffstat (limited to 'media/libstagefright/omx')
-rw-r--r--media/libstagefright/omx/OMX.cpp44
1 files changed, 0 insertions, 44 deletions
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp
index 8c3f252..0d617a5 100644
--- a/media/libstagefright/omx/OMX.cpp
+++ b/media/libstagefright/omx/OMX.cpp
@@ -135,50 +135,6 @@ void OMX::CallbackDispatcher::threadEntry() {
////////////////////////////////////////////////////////////////////////////////
-class BufferMeta {
-public:
- BufferMeta(OMX *owner, const sp<IMemory> &mem, bool is_backup = false)
- : mOwner(owner),
- mMem(mem),
- mIsBackup(is_backup) {
- }
-
- BufferMeta(OMX *owner, size_t size)
- : mOwner(owner),
- mSize(size),
- mIsBackup(false) {
- }
-
- void CopyFromOMX(const OMX_BUFFERHEADERTYPE *header) {
- if (!mIsBackup) {
- return;
- }
-
- memcpy((OMX_U8 *)mMem->pointer() + header->nOffset,
- header->pBuffer + header->nOffset,
- header->nFilledLen);
- }
-
- void CopyToOMX(const OMX_BUFFERHEADERTYPE *header) {
- if (!mIsBackup) {
- return;
- }
-
- memcpy(header->pBuffer + header->nOffset,
- (const OMX_U8 *)mMem->pointer() + header->nOffset,
- header->nFilledLen);
- }
-
-private:
- OMX *mOwner;
- sp<IMemory> mMem;
- size_t mSize;
- bool mIsBackup;
-
- BufferMeta(const BufferMeta &);
- BufferMeta &operator=(const BufferMeta &);
-};
-
OMX::OMX()
: mMaster(new OMXMaster),
mDispatcher(new CallbackDispatcher(this)),