diff options
| author | Weian Chen <weian.chen@intel.com> | 2013-10-27 15:17:25 -0700 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:03:42 -0700 |
| commit | 6b034a28c5a1731a2997f3fcbc07bb11338dc04f (patch) | |
| tree | 9f30687d3c0424324c533d20e652614e9e14ed48 | |
| parent | 43d2bde2a903886197f00f077218f13014bf8373 (diff) | |
| download | wrs_omxil_core-6b034a28c5a1731a2997f3fcbc07bb11338dc04f.tar.gz | |
omx-core: set pInputPortPrivate to NULL by default
BZ: 148092
pInputPortPrivate will be used by webRTC to contain the
rotation information, by default it should be NULL, remove
the useless code related to pInputPortPrivate in base class
Change-Id: I49ebd9b3867a186848c8d3a9fd44965048776974
Signed-off-by: Weian Chen <weian.chen@intel.com>
| -rw-r--r-- | base/src/componentbase.cpp | 3 | ||||
| -rw-r--r-- | base/src/portbase.cpp | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/base/src/componentbase.cpp b/base/src/componentbase.cpp index 87c8834..9643aa7 100644 --- a/base/src/componentbase.cpp +++ b/base/src/componentbase.cpp @@ -1004,9 +1004,6 @@ OMX_ERRORTYPE ComponentBase::CBaseEmptyThisBuffer( if (!port) return OMX_ErrorBadParameter; - if (pBuffer->pInputPortPrivate != port) - return OMX_ErrorBadParameter; - if (port->IsEnabled()) { if (state != OMX_StateIdle && state != OMX_StateExecuting && state != OMX_StatePause) diff --git a/base/src/portbase.cpp b/base/src/portbase.cpp index a0b7654..5449a62 100644 --- a/base/src/portbase.cpp +++ b/base/src/portbase.cpp @@ -361,17 +361,16 @@ OMX_ERRORTYPE PortBase::UseBuffer(OMX_BUFFERHEADERTYPE **ppBufferHdr, buffer_hdr->pBuffer = pBuffer; buffer_hdr->nAllocLen = nSizeBytes; buffer_hdr->pAppPrivate = pAppPrivate; + buffer_hdr->pInputPortPrivate = NULL; if (portdefinition.eDir == OMX_DirInput) { buffer_hdr->nInputPortIndex = nPortIndex; buffer_hdr->nOutputPortIndex = 0x7fffffff; - buffer_hdr->pInputPortPrivate = this; buffer_hdr->pOutputPortPrivate = NULL; } else { buffer_hdr->nOutputPortIndex = nPortIndex; buffer_hdr->nInputPortIndex = 0x7fffffff; buffer_hdr->pOutputPortPrivate = this; - buffer_hdr->pInputPortPrivate = NULL; } buffer_hdrs = __list_add_tail(buffer_hdrs, entry); @@ -462,17 +461,16 @@ OMX_ERRORTYPE PortBase:: AllocateBuffer(OMX_BUFFERHEADERTYPE **ppBuffer, buffer_hdr->nAllocLen = nSizeBytes; buffer_hdr->pAppPrivate = pAppPrivate; + buffer_hdr->pInputPortPrivate = NULL; if (portdefinition.eDir == OMX_DirInput) { buffer_hdr->nInputPortIndex = nPortIndex; buffer_hdr->nOutputPortIndex = (OMX_U32)-1; - buffer_hdr->pInputPortPrivate = this; buffer_hdr->pOutputPortPrivate = NULL; } else { buffer_hdr->nOutputPortIndex = nPortIndex; buffer_hdr->nInputPortIndex = (OMX_U32)-1; buffer_hdr->pOutputPortPrivate = this; - buffer_hdr->pInputPortPrivate = NULL; } buffer_hdrs = __list_add_tail(buffer_hdrs, entry); |