diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-03-05 10:59:06 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-03-05 10:59:06 -0800 |
| commit | 84d5bf541999dc9f0779f4ff8f35b2cc767fe816 (patch) | |
| tree | 4214c8968d064f4a003e9cf5b56780051418f275 | |
| parent | dbe5573b17afe64c74d3ae55cbda5225b29968e9 (diff) | |
| download | android_hardware_qcom_media-84d5bf541999dc9f0779f4ff8f35b2cc767fe816.tar.gz android_hardware_qcom_media-84d5bf541999dc9f0779f4ff8f35b2cc767fe816.tar.bz2 android_hardware_qcom_media-84d5bf541999dc9f0779f4ff8f35b2cc767fe816.zip | |
mm-video: Support for QCOM_BSP define
* Add support for QCOM_BSP flag, which implies that we have the new ION
API and a recent KGSL.
Change-Id: Ic3041cbb2333cd69d3417141ecf21f9eefbc95ea
| -rw-r--r-- | libc2dcolorconvert/C2DColorConverter.cpp | 4 | ||||
| -rw-r--r-- | mm-video/vidc/vdec/inc/omx_vdec.h | 4 | ||||
| -rw-r--r-- | mm-video/vidc/venc/inc/omx_video_base.h | 4 | ||||
| -rw-r--r-- | mm-video/vidc/venc/test/venc_test.cpp | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/libc2dcolorconvert/C2DColorConverter.cpp b/libc2dcolorconvert/C2DColorConverter.cpp index ceb5bae3..f511bd42 100644 --- a/libc2dcolorconvert/C2DColorConverter.cpp +++ b/libc2dcolorconvert/C2DColorConverter.cpp @@ -490,7 +490,11 @@ void * C2DColorConverter::getMappedGPUAddr(int bufFD, void *bufPtr, size_t bufLe param.len = bufLen; param.hostptr = (unsigned int)bufPtr; param.memtype = KGSL_USER_MEM_TYPE_ION; +#ifdef QCOM_BSP + param.flags = 0; +#else param.reserved = 0; +#endif param.gpuaddr = 0; if (!ioctl(mKgslFd, IOCTL_KGSL_MAP_USER_MEM, ¶m, sizeof(param))) { diff --git a/mm-video/vidc/vdec/inc/omx_vdec.h b/mm-video/vidc/vdec/inc/omx_vdec.h index 09a2e43e..9cb69e7a 100644 --- a/mm-video/vidc/vdec/inc/omx_vdec.h +++ b/mm-video/vidc/vdec/inc/omx_vdec.h @@ -46,6 +46,10 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <inttypes.h> #include <cstddef> +#ifdef QCOM_BSP +#define NEW_ION_API 1 +#endif + static ptrdiff_t x; #ifdef _ANDROID_ diff --git a/mm-video/vidc/venc/inc/omx_video_base.h b/mm-video/vidc/venc/inc/omx_video_base.h index 920dc19e..d26de03e 100644 --- a/mm-video/vidc/venc/inc/omx_video_base.h +++ b/mm-video/vidc/venc/inc/omx_video_base.h @@ -41,6 +41,10 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Include Files ////////////////////////////////////////////////////////////////////////////// +#ifdef QCOM_BSP +#define NEW_ION_API 1 +#endif + #include<stdlib.h> #include <stdio.h> #include <sys/mman.h> diff --git a/mm-video/vidc/venc/test/venc_test.cpp b/mm-video/vidc/venc/test/venc_test.cpp index 4eb3c9dc..67e373cc 100644 --- a/mm-video/vidc/venc/test/venc_test.cpp +++ b/mm-video/vidc/venc/test/venc_test.cpp @@ -60,6 +60,10 @@ REFERENCES #define QCOM_EXT 1 +#ifdef QCOM_BSP +#define NEW_ION_API 1 +#endif + #include "OMX_Core.h" #include "OMX_Video.h" #include "OMX_Component.h" |