diff options
| author | Dan Liang <dan.liang@intel.com> | 2013-11-06 10:32:21 +0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:03:42 -0700 |
| commit | 64e2d27bd6b5c91266349730c4fe00a9f07bee81 (patch) | |
| tree | aa7625d37c8d0d525f5fbc25c0d13b3f977d3a1a | |
| parent | 3aca696c154c5d0b9347e8020bd82e9fab5c4565 (diff) | |
| download | wrs_omxil_core-64e2d27bd6b5c91266349730c4fe00a9f07bee81.tar.gz | |
wrs_omxil_core: use pOutputPortPrivate to report error
BZ: 147912
1)use pOutputPortPrivate to report error
2)define data structure OMX_VIDEO_CONFIG_INTEL_ERROR_REPORT
Change-Id: Id2e50570cf164cb441fbf9866e8c0749f19f7313
Signed-off-by: Dan Liang <dan.liang@intel.com>
| -rw-r--r-- | base/src/componentbase.cpp | 3 | ||||
| -rw-r--r-- | base/src/portbase.cpp | 6 | ||||
| -rw-r--r-- | core/inc/khronos/openmax/include/OMX_IntelVideoExt.h | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/base/src/componentbase.cpp b/base/src/componentbase.cpp index 9643aa7..5968ad1 100644 --- a/base/src/componentbase.cpp +++ b/base/src/componentbase.cpp @@ -1073,9 +1073,6 @@ OMX_ERRORTYPE ComponentBase::CBaseFillThisBuffer( if (!port) return OMX_ErrorBadParameter; - if (pBuffer->pOutputPortPrivate != 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 5449a62..c4019c0 100644 --- a/base/src/portbase.cpp +++ b/base/src/portbase.cpp @@ -362,15 +362,14 @@ OMX_ERRORTYPE PortBase::UseBuffer(OMX_BUFFERHEADERTYPE **ppBufferHdr, buffer_hdr->nAllocLen = nSizeBytes; buffer_hdr->pAppPrivate = pAppPrivate; buffer_hdr->pInputPortPrivate = NULL; + buffer_hdr->pOutputPortPrivate = NULL; if (portdefinition.eDir == OMX_DirInput) { buffer_hdr->nInputPortIndex = nPortIndex; buffer_hdr->nOutputPortIndex = 0x7fffffff; - buffer_hdr->pOutputPortPrivate = NULL; } else { buffer_hdr->nOutputPortIndex = nPortIndex; buffer_hdr->nInputPortIndex = 0x7fffffff; - buffer_hdr->pOutputPortPrivate = this; } buffer_hdrs = __list_add_tail(buffer_hdrs, entry); @@ -462,15 +461,14 @@ OMX_ERRORTYPE PortBase:: AllocateBuffer(OMX_BUFFERHEADERTYPE **ppBuffer, buffer_hdr->nAllocLen = nSizeBytes; buffer_hdr->pAppPrivate = pAppPrivate; buffer_hdr->pInputPortPrivate = NULL; + buffer_hdr->pOutputPortPrivate = NULL; if (portdefinition.eDir == OMX_DirInput) { buffer_hdr->nInputPortIndex = nPortIndex; buffer_hdr->nOutputPortIndex = (OMX_U32)-1; - buffer_hdr->pOutputPortPrivate = NULL; } else { buffer_hdr->nOutputPortIndex = nPortIndex; buffer_hdr->nInputPortIndex = (OMX_U32)-1; - buffer_hdr->pOutputPortPrivate = this; } buffer_hdrs = __list_add_tail(buffer_hdrs, entry); diff --git a/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h b/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h index fa886d9..43683a7 100644 --- a/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h +++ b/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h @@ -149,6 +149,13 @@ typedef struct OMX_VIDEO_CONFIG_PRI_INFOTYPE { } OMX_VIDEO_CONFIG_PRI_INFOTYPE; // Error reporting data structure +typedef struct OMX_VIDEO_CONFIG_INTEL_ERROR_REPORT { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bEnable; +} OMX_VIDEO_CONFIG_INTEL_ERROR_REPORT; + #define MAX_ERR_NUM 10 typedef enum |