[Fix] Support Multiplanar encoder input buffers

An earlier patch to enable Single planar buffers for encoder
broke the multiplanar support.

This patch fixes this issue.

Change-Id: Ide169a43b3df915a969a401e623fdad7f8792faf
Signed-off-by: Pradeep Venkatasubbarao <pradeepv@ti.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/libdce.c b/libdce.c
index a51e5b3..6b664bd 100644
--- a/libdce.c
+++ b/libdce.c
@@ -654,7 +654,8 @@ static XDAS_Int32 process(void *codec, void *inBufs, void *outBufs,
                                     MmRpc_OFFSET((int32_t)inBufs, (int32_t)data_buf),
                                     (size_t)*data_buf, (size_t)*data_buf);
 #ifdef BUILDOS_LINUX
-        if(count == CHROMA_BUF && codec_id == OMAP_DCE_VIDENC2 ){
+        /*Single planar input buffer for Encoder. No adjustments needed for Multiplanar case*/
+        if(count == CHROMA_BUF && codec_id == OMAP_DCE_VIDENC2 && ((IVIDEO2_BufDesc *)inBufs)->planeDesc[LUMA_BUF].buf == ((IVIDEO2_BufDesc *)inBufs)->planeDesc[CHROMA_BUF].buf){
             if(((IVIDEO2_BufDesc *)inBufs)->planeDesc[count].memType == XDM_MEMTYPE_RAW ||
                ((IVIDEO2_BufDesc *)inBufs)->planeDesc[count].memType == XDM_MEMTYPE_TILEDPAGE )
                 *data_buf += ((IVIDEO2_BufDesc *)inBufs)->planeDesc[LUMA_BUF].bufSize.bytes;
diff --git a/libdce_linux.c b/libdce_linux.c
index 0a86905..85dc517 100644
--- a/libdce_linux.c
+++ b/libdce_linux.c
@@ -38,7 +38,7 @@
 #include <omap_drm.h>
 #include <omap_drmif.h>
 
-#include <MmRpc.h>
+#include <ti/ipc/mm/MmRpc.h>
 #include "dce_priv.h"
 #include "libdce.h"
 #include "dce_rpc.h"