Modifying default input buffer count for encoding

Fixing vaddr.
Signed-off-by:Barun Kr. Singh <barun.singh@samsung.com>
Change-Id: Ib35aba9b62242bbc1958db1c37a7b4ce8651f6b8

diff --git a/openmax/component/video/enc/Exynos_OMX_Venc.c b/openmax/component/video/enc/Exynos_OMX_Venc.c
index 8a315f35505e36a8252ce3c2af083fb9d849f27f..d83ed303c6165ae4eb3c7bac02e5ad1c6bbc2596 100755 (executable)
--- a/openmax/component/video/enc/Exynos_OMX_Venc.c
+++ b/openmax/component/video/enc/Exynos_OMX_Venc.c
@@ -380,7 +380,7 @@ OMX_BOOL Exynos_Preprocessor_InputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_
             for (plane = 0; plane < MFC_INPUT_BUFFER_PLANE; plane++) {
                /* It seems MFC is not considering fd, so sending physical address.
                 Will be removed when MFC works correctly with buf fd. */
-                srcInputData->buffer.multiPlaneBuffer.dataBuffer[plane] = mm_buf->handle.paddr[plane];
+                srcInputData->buffer.multiPlaneBuffer.dataBuffer[plane] = mm_buf->data[plane];//handle.paddr[plane];
                 srcInputData->buffer.multiPlaneBuffer.fd[plane] = mm_buf->handle.dmabuf_fd[plane];
                 srcInputData->buffer.multiPlaneBuffer.size[plane] = mm_buf->size[plane];
                 Exynos_OSAL_Log(EXYNOS_LOG_ERROR, "[ENC] get fd[%d] %d , a[%d] %x size:[%d]"

diff --git a/openmax/component/video/enc/Exynos_OMX_Venc.h b/openmax/component/video/enc/Exynos_OMX_Venc.h
index 509d0a7fbae7fdf2d4cace2f28aab50581542adb..c35f507bbc8dd76eb6e65543dcb83385fca3b591 100755 (executable)
--- a/openmax/component/video/enc/Exynos_OMX_Venc.h
+++ b/openmax/component/video/enc/Exynos_OMX_Venc.h
@@ -34,7 +34,16 @@
 #include "Exynos_OMX_Baseport.h"
 #include "Exynos_OMX_Basecomponent.h"
 
-#define MAX_VIDEO_INPUTBUFFER_NUM    5
+#ifdef SLP_PLATFORM
+/* FIXME: for camera slow motion 12 buffer and eos issue, we increase this value */
+/* FIXME: for trim small resolution video. dec + enc case */
+#define MAX_CAMERA_INPUTBUFFER_NUM          13 /* number of metadata buffer */
+#else
+#define MAX_CAMERA_INPUTBUFFER_NUM          12 /* number of metadata buffer */
+#endif
+
+
+#define MAX_VIDEO_INPUTBUFFER_NUM    MAX_CAMERA_INPUTBUFFER_NUM
 #define MAX_VIDEO_OUTPUTBUFFER_NUM   4
 
 #define DEFAULT_FRAME_WIDTH          176
@@ -57,14 +66,6 @@
 #define MFC_INPUT_BUFFER_PLANE              2
 #define MFC_OUTPUT_BUFFER_PLANE             1
 
-#ifdef SLP_PLATFORM
-/* FIXME: for camera slow motion 12 buffer and eos issue, we increase this value */
-/* FIXME: for trim small resolution video. dec + enc case */
-#define MAX_CAMERA_INPUTBUFFER_NUM          13 /* number of metadata buffer */
-#else
-#define MAX_CAMERA_INPUTBUFFER_NUM          12 /* number of metadata buffer */
-#endif
-
 
 // The largest metadata buffer size advertised
 // when metadata buffer mode is used for video encoding