summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-08-16 10:28:24 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-16 10:28:24 -0700
commitd462cf92d08fe9b31b700fa3ce17fb6cb3e94636 (patch)
tree14608e9a64e568f66448e67ed6d01c9b4caeb3c1
parent7ad27c243d66b7fbef051dd4bdb064342dfd72c5 (diff)
parent4017773461651adeedef4b0c697ffeb83174a635 (diff)
downloaddevice_samsung_crespo-d462cf92d08fe9b31b700fa3ce17fb6cb3e94636.zip
device_samsung_crespo-d462cf92d08fe9b31b700fa3ce17fb6cb3e94636.tar.gz
device_samsung_crespo-d462cf92d08fe9b31b700fa3ce17fb6cb3e94636.tar.bz2
Merge "Advertise smaller input buffer size when metadata buffer mode is used for video encoding"
-rw-r--r--sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.c7
-rw-r--r--sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Def.h6
2 files changed, 13 insertions, 0 deletions
diff --git a/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.c b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.c
index 170600a..d151e52 100644
--- a/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.c
+++ b/sec_mm/sec_omx/sec_omx_component/common/SEC_OMX_Basecomponent.c
@@ -905,6 +905,13 @@ OMX_ERRORTYPE SEC_OMX_GetParameter(
pSECPort = &pSECComponent->pSECPort[portIndex];
SEC_OSAL_Memcpy(portDefinition, &pSECPort->portDefinition, portDefinition->nSize);
+
+#ifdef USE_ANDROID_EXTENSION
+ if (portIndex == 0 && pSECPort->bStoreMetaDataInBuffer == OMX_TRUE) {
+ portDefinition->nBufferSize = MAX_INPUT_METADATA_BUFFER_SIZE;
+ }
+#endif
+
}
break;
case OMX_IndexParamPriorityMgmt:
diff --git a/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Def.h b/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Def.h
index d25cde4..0b792b5 100644
--- a/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Def.h
+++ b/sec_mm/sec_omx/sec_omx_include/sec/SEC_OMX_Def.h
@@ -48,6 +48,12 @@
#define USE_ANDROID_EXTENSION
+#ifdef USE_ANDROID_EXTENSION
+// The largest metadata buffer size advertised
+// when metadata buffer mode is used for video encoding
+#define MAX_INPUT_METADATA_BUFFER_SIZE (64)
+#endif
+
typedef enum _SEC_CODEC_TYPE
{
SW_CODEC,