diff options
| author | Andreas Huber <andih@google.com> | 2009-12-03 11:39:54 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2009-12-03 12:49:09 -0800 |
| commit | e3ec3cec3a2e27033249ff82964d2cbd441d9873 (patch) | |
| tree | 46e3b22fc02c1f20b8a8403818395ba4ba51ddb2 /media/libstagefright/omx/OMXNodeInstance.cpp | |
| parent | c297fccffc4ab1cb3b9f5c6a5b0802be057f3e0f (diff) | |
| download | frameworks_av-e3ec3cec3a2e27033249ff82964d2cbd441d9873.zip frameworks_av-e3ec3cec3a2e27033249ff82964d2cbd441d9873.tar.gz frameworks_av-e3ec3cec3a2e27033249ff82964d2cbd441d9873.tar.bz2 | |
Squashed commit of the following:
commit 543e192bf2ae13f573dc4c4e53b239ed4ea00e81
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 3 11:33:57 2009 -0800
stagefright now acts as the OMX Master, vendors supply their own plugins through libstagefrighthw. In OpenCore-enabled builds we now sit on top of PVMaster...
commit 3cbfdbd9cecadbb77b63125c62883bf1065884fe
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 2 12:39:07 2009 -0800
More OMX infrastructure, stagefright is now taking over the OMX Master, multiplexing all contributing OMX implementations under a common interface.
Diffstat (limited to 'media/libstagefright/omx/OMXNodeInstance.cpp')
| -rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 8218918..099139a 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -20,7 +20,7 @@ #include "../include/OMXNodeInstance.h" -#include "pv_omxcore.h" +#include <OMX_Component.h> #include <binder/IMemory.h> #include <media/stagefright/MediaDebug.h> @@ -157,7 +157,8 @@ status_t OMXNodeInstance::freeNode() { break; } - OMX_ERRORTYPE err = OMX_MasterFreeHandle(mHandle); + OMX_ERRORTYPE err = + (*static_cast<OMX_COMPONENTTYPE *>(mHandle)->ComponentDeInit)(mHandle); mHandle = NULL; if (err != OMX_ErrorNone) { |