diff options
author | Pradeep Venkatasubbarao | 2014-11-27 23:44:11 -0600 |
---|---|---|
committer | Pradeep Venkatasubbarao | 2014-11-27 23:53:12 -0600 |
commit | d56393c4e1cde702b568f484e4d860a0746bfc0c (patch) | |
tree | 0ae55387943e9d1875b7223ac3a9c28d416af9ac | |
parent | 4715ea56d8a266e66bc6cef982410c602a19be43 (diff) | |
download | hardware-ti-libdce-d56393c4e1cde702b568f484e4d860a0746bfc0c.tar.gz hardware-ti-libdce-d56393c4e1cde702b568f484e4d860a0746bfc0c.tar.xz hardware-ti-libdce-d56393c4e1cde702b568f484e4d860a0746bfc0c.zip |
[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>
-rw-r--r-- | libdce.c | 3 | ||||
-rw-r--r-- | libdce_linux.c | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -654,7 +654,8 @@ static XDAS_Int32 process(void *codec, void *inBufs, void *outBufs, | |||
654 | MmRpc_OFFSET((int32_t)inBufs, (int32_t)data_buf), | 654 | MmRpc_OFFSET((int32_t)inBufs, (int32_t)data_buf), |
655 | (size_t)*data_buf, (size_t)*data_buf); | 655 | (size_t)*data_buf, (size_t)*data_buf); |
656 | #ifdef BUILDOS_LINUX | 656 | #ifdef BUILDOS_LINUX |
657 | if(count == CHROMA_BUF && codec_id == OMAP_DCE_VIDENC2 ){ | 657 | /*Single planar input buffer for Encoder. No adjustments needed for Multiplanar case*/ |
658 | if(count == CHROMA_BUF && codec_id == OMAP_DCE_VIDENC2 && ((IVIDEO2_BufDesc *)inBufs)->planeDesc[LUMA_BUF].buf == ((IVIDEO2_BufDesc *)inBufs)->planeDesc[CHROMA_BUF].buf){ | ||
658 | if(((IVIDEO2_BufDesc *)inBufs)->planeDesc[count].memType == XDM_MEMTYPE_RAW || | 659 | if(((IVIDEO2_BufDesc *)inBufs)->planeDesc[count].memType == XDM_MEMTYPE_RAW || |
659 | ((IVIDEO2_BufDesc *)inBufs)->planeDesc[count].memType == XDM_MEMTYPE_TILEDPAGE ) | 660 | ((IVIDEO2_BufDesc *)inBufs)->planeDesc[count].memType == XDM_MEMTYPE_TILEDPAGE ) |
660 | *data_buf += ((IVIDEO2_BufDesc *)inBufs)->planeDesc[LUMA_BUF].bufSize.bytes; | 661 | *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 @@ | |||
38 | #include <omap_drm.h> | 38 | #include <omap_drm.h> |
39 | #include <omap_drmif.h> | 39 | #include <omap_drmif.h> |
40 | 40 | ||
41 | #include <MmRpc.h> | 41 | #include <ti/ipc/mm/MmRpc.h> |
42 | #include "dce_priv.h" | 42 | #include "dce_priv.h" |
43 | #include "libdce.h" | 43 | #include "libdce.h" |
44 | #include "dce_rpc.h" | 44 | #include "dce_rpc.h" |