aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbuddy.liong2014-01-29 15:15:24 -0600
committerbuddy.liong2014-01-29 16:09:49 -0600
commitcfb8e7c9aaa58e1de04f4a468ed846d8d6223da1 (patch)
tree540ec05c91f787a3ee6bb83b5f95ca1732b9e56d /test_qnx
parent67e0fea9ac091319787abf2899e72f15fed48371 (diff)
downloadrepo-libdce-cfb8e7c9aaa58e1de04f4a468ed846d8d6223da1.tar.gz
repo-libdce-cfb8e7c9aaa58e1de04f4a468ed846d8d6223da1.tar.xz
repo-libdce-cfb8e7c9aaa58e1de04f4a468ed846d8d6223da1.zip
[DCE_TEST] Clean up of OMAP5 flag for MPEG4 decoder.
MPEG4 decoder is defined by IPUMM with "ivahd_mpeg4dec" name. Previously the name can be either "ivahd_mpeg4dec" or "ivahd_mpeg4vdec". This patch to clean up so that it will only used "ivahd_mpeg4dec" for OMAP5 or J6 which utilizes IPUMM image. Change-Id: Iff92620f1d09a9700f8d460b7126f6e4b95ac248 Signed-off-by: buddy.liong <buddy.budiono@ti.com>
Diffstat (limited to 'test_qnx')
-rw-r--r--test_qnx/dce_test/dce_test.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/test_qnx/dce_test/dce_test.c b/test_qnx/dce_test/dce_test.c
index 0343b01..a3d8df1 100644
--- a/test_qnx/dce_test/dce_test.c
+++ b/test_qnx/dce_test/dce_test.c
@@ -62,8 +62,6 @@
62 62
63#include "ti/shmemallocator/SharedMemoryAllocatorUsr.h" 63#include "ti/shmemallocator/SharedMemoryAllocatorUsr.h"
64 64
65#define OMAP5
66
67#define PRINT_DEBUG 65#define PRINT_DEBUG
68#define ERROR(FMT, ...) printf("%s:%d:\t%s\terror: " FMT "\n", __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__) 66#define ERROR(FMT, ...) printf("%s:%d:\t%s\terror: " FMT "\n", __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__)
69// enable below to print debug information 67// enable below to print debug information
@@ -180,7 +178,7 @@ static void *tiler_alloc(int width, int height)
180 178
181 bufPtr = MemMgr_Alloc(blocks, dimensions); 179 bufPtr = MemMgr_Alloc(blocks, dimensions);
182 } 180 }
183 DEBUG("tiler alloc return bufPtr %p", bufPtr); 181 DEBUG("tiler alloc return bufPtr %p PA 0x%x", bufPtr, TilerMem_VirtToPhys(bufPtr));
184 182
185 return (bufPtr); 183 return (bufPtr);
186} 184}
@@ -873,11 +871,8 @@ int main(int argc, char * *argv)
873 DEBUG("dce_alloc VIDDEC3_Params successful mpeg4_params=%p", mpeg4_params); 871 DEBUG("dce_alloc VIDDEC3_Params successful mpeg4_params=%p", mpeg4_params);
874 872
875 err = msync((Ptr)mpeg4_params, sizeof(IMPEG4VDEC_Params), MS_CACHE_ONLY | MS_SYNC); 873 err = msync((Ptr)mpeg4_params, sizeof(IMPEG4VDEC_Params), MS_CACHE_ONLY | MS_SYNC);
876#ifdef OMAP5 874
877 codec = VIDDEC3_create(engine, "ivahd_mpeg4dec", (VIDDEC3_Params *)mpeg4_params); 875 codec = VIDDEC3_create(engine, "ivahd_mpeg4dec", (VIDDEC3_Params *)mpeg4_params);
878#else
879 codec = VIDDEC3_create(engine, "ivahd_mpeg4vdec", (VIDDEC3_Params *)mpeg4_params);
880#endif
881 break; 876 break;
882 877
883 case DCE_TEST_VC1SMP : 878 case DCE_TEST_VC1SMP :