Revert "[HACK] venc: support USERPTR about input"

This reverts commit f27148d67da2a9a308adcb4d5f192ef69e7bbe9c.

Change-Id: Iacde17dca45d4e0034b7119d39ce41e8db87cbcb
Signed-off-by: Taehwan Kim <t_h.kim@samsung.com>

diff --git a/component/video/enc/Android.mk b/component/video/enc/Android.mk
index cfe4bd1e4ca21e8e916089768f5097e7376314a1..943757d51e145f3bdaa49adf29c2977d5f1db905 100644 (file)
--- a/component/video/enc/Android.mk
+++ b/component/video/enc/Android.mk
@@ -42,10 +42,6 @@ ifeq ($(BOARD_USE_DMA_BUF), true)
 LOCAL_CFLAGS += -DUSE_DMA_BUF
 endif
 
-ifeq ($(BOARD_USE_USERPTR_CAMERA_INPUT), true)
-LOCAL_CFLAGS += -DUSE_USERPTR_CAMERA_INPUT
-endif
-
 ifeq ($(BOARD_USE_GSC_RGB_ENCODER), true)
 LOCAL_CFLAGS += -DUSE_GSC_RGB_ENCODER
 endif

diff --git a/component/video/enc/Exynos_OMX_Venc.c b/component/video/enc/Exynos_OMX_Venc.c
index e01bb69e4d0d83d9c5d72ddadb64bae6f96a1250..38d28cf0c6d3497e47b567d3b3342d2eb3f75c1f 100644 (file)
--- a/component/video/enc/Exynos_OMX_Venc.c
+++ b/component/video/enc/Exynos_OMX_Venc.c
@@ -492,7 +492,6 @@ OMX_BOOL Exynos_Preprocessor_InputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_
                 } else {
                     /* kMetadataBufferTypeCameraSource */
                     Exynos_OSAL_GetInfoFromMetaData((OMX_BYTE)inputUseBuffer->bufferHeader->pBuffer, ppBuf);
-#ifndef USE_USERPTR_CAMERA_INPUT
 #ifdef USE_DMA_BUF
                     srcInputData->buffer.multiPlaneBuffer.fd[0] = ppBuf[0];
                     srcInputData->buffer.multiPlaneBuffer.fd[1] = ppBuf[1];
@@ -510,12 +509,6 @@ OMX_BOOL Exynos_Preprocessor_InputData(OMX_COMPONENTTYPE *pOMXComponent, EXYNOS_
                     /* input buffers are 2 plane. */
                     srcInputData->buffer.multiPlaneBuffer.dataBuffer[2] = NULL;
                     srcInputData->buffer.multiPlaneBuffer.fd[2] = -1;
-#else
-                    for (plane = 0; plane < MFC_INPUT_BUFFER_PLANE; plane++) {
-                        srcInputData->buffer.multiPlaneBuffer.dataBuffer[plane] = ppBuf[plane];
-                    }
-                    srcInputData->buffer.multiPlaneBuffer.dataBuffer[2] = NULL;
-#endif
 #else
                     for (plane = 0; plane < MFC_INPUT_BUFFER_PLANE; plane++) {
                         srcInputData->buffer.multiPlaneBuffer.dataBuffer[plane] = ppBuf[plane];