summaryrefslogtreecommitdiffstats
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
commit8fd10b7add00c31a3f9317430d9bdcad9fb324a5 (patch)
tree239ef540afee1a33a323343fa0931c6419dc0848
parent12b6894eca898771e4ddaaf69c6ca3425d582af0 (diff)
parent81dbf71f4488ee1a4cb612f2aba341f365fb546a (diff)
downloadframeworks_av-8fd10b7add00c31a3f9317430d9bdcad9fb324a5.zip
frameworks_av-8fd10b7add00c31a3f9317430d9bdcad9fb324a5.tar.gz
frameworks_av-8fd10b7add00c31a3f9317430d9bdcad9fb324a5.tar.bz2
Merge "Remove totally unused code from OMX.cpp"
-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)),