summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c4d2df1)
raw | patch | inline | side by side (parent: c4d2df1)
author | Saurabh Bipin Chandra <a0131926@ti.com> | |
Thu, 23 May 2013 12:06:20 +0000 (17:36 +0530) | ||
committer | Saurabh Bipin Chandra <a0131926@ti.com> | |
Thu, 23 May 2013 13:40:32 +0000 (19:10 +0530) |
This patch enables MPEG2 decoder as the MPEG2 codec
library 01.00.12.00 renames the enum which was common
with MJPEG decoder.
Change-Id: Ifbdabee6358652af633474ca7ac2aebad57f4591
Signed-off-by: Saurabh Bipin Chandra <a0131926@ti.com>
library 01.00.12.00 renames the enum which was common
with MJPEG decoder.
Change-Id: Ifbdabee6358652af633474ca7ac2aebad57f4591
Signed-off-by: Saurabh Bipin Chandra <a0131926@ti.com>
test_qnx/dce_test.c | patch | blob | history |
diff --git a/test_qnx/dce_test.c b/test_qnx/dce_test.c
index 6a6d6a196b4ffb3b53eff6fe67d3aa35b7fd335b..9de8562543009f640bc4637bcc3e70446c8b9791 100644 (file)
--- a/test_qnx/dce_test.c
+++ b/test_qnx/dce_test.c
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#include <xdc/std.h>
#include <stdlib.h>
#include <string.h>
#include <ti/sdo/codecs/mpeg4vdec/impeg4vdec.h>
#include <ti/sdo/codecs/vc1vdec/ivc1vdec.h>
#include <ti/sdo/codecs/jpegvdec/ijpegvdec.h>
-#ifdef ENABLE_MPEG2
#include <ti/sdo/codecs/mpeg2vdec/impeg2vdec.h>
-#endif
+
#include "ti/shmemallocator/SharedMemoryAllocatorUsr.h"
#include "libdce.h"
IJPEGVDEC_Params *mjpeg_params = NULL;
IJPEGVDEC_DynamicParams *mjpeg_dynParams = NULL;
IJPEGVDEC_Status *mjpeg_status = NULL;
-#ifdef ENABLE_MPEG2
+
IMPEG2VDEC_Params *mpeg2_params = NULL;
IMPEG2VDEC_DynamicParams *mpeg2_dynParams = NULL;
IMPEG2VDEC_Status *mpeg2_status = NULL;
-#endif
+
unsigned int frameSize[64000]; /* Buffer for keeping frame sizes */
static int input_offset = 0;
params->numOutputDataUnits = 1;
params->maxWidth = width;
break;
-#ifdef ENABLE_MPEG2
+
case DCE_TEST_MPEG2 :
params = dce_alloc(sizeof(IMPEG2VDEC_Params));
if( !params ) {
params->numOutputDataUnits = 0;
params->maxWidth = padded_width;
break;
-#endif
+
}
params->maxHeight = height;
codec = VIDDEC3_create(engine, "ivahd_jpegvdec", (VIDDEC3_Params *)mjpeg_params);
break;
-#ifdef ENABLE_MPEG2
+
case DCE_TEST_MPEG2 :
mpeg2_params = (IMPEG2VDEC_Params *) params;
mpeg2_params->outloopDeBlocking = TRUE;
codec = VIDDEC3_create(engine, "ivahd_mpeg2vdec", (VIDDEC3_Params *)mpeg2_params);
break;
-#endif
+
}
if( !codec ) {
dynParams->size = sizeof(IJPEGVDEC_DynamicParams);
dynParams->lateAcquireArg = -1;
break;
-#ifdef ENABLE_MPEG2
+
case DCE_TEST_MPEG2 :
dynParams = dce_alloc(sizeof(IMPEG2VDEC_DynamicParams));
dynParams->size = sizeof(IMPEG2VDEC_DynamicParams);
dynParams->lateAcquireArg = -1;
break;
-#endif
+
}
dynParams->decodeHeader = XDM_DECODE_AU;
DEBUG("dce_alloc IJPEGVDEC_Status successful mjpeg_status=%p", mjpeg_status);
err = VIDDEC3_control(codec, XDM_SETPARAMS, (VIDDEC3_DynamicParams *) mjpeg_dynParams, (VIDDEC3_Status *) mjpeg_status);
break;
-#ifdef ENABLE_MPEG2
+
case DCE_TEST_MPEG2 :
DEBUG("dce_alloc IMPEG2VDEC_DynamicParams successful dynParams=%p", dynParams);
DEBUG("dce_alloc IMPEG2VDEC_Status successful mpeg2_status=%p", mpeg2_status);
err = VIDDEC3_control(codec, XDM_SETPARAMS, (VIDDEC3_DynamicParams *) mpeg2_dynParams, (VIDDEC3_Status *) mpeg2_status);
break;
-#endif
+
default :
DEBUG("Not implemented or supported codec_switch %d", codec_switch);
}
DEBUG("Calling VIDDEC3_control XDM_FLUSH mjpeg_dynParams %p mjpeg_status %p", mjpeg_dynParams, mjpeg_status);
err = VIDDEC3_control(codec, XDM_FLUSH, (VIDDEC3_DynamicParams *) mjpeg_dynParams, (VIDDEC3_Status *) mjpeg_status);
break;
-#ifdef ENABLE_MPEG2
+
case DCE_TEST_MPEG2 :
DEBUG("Calling VIDDEC3_control XDM_FLUSH mpeg2_dynParams %p mpeg2_status %p", mpeg2_dynParams, mpeg2_status);
err = VIDDEC3_control(codec, XDM_FLUSH, (VIDDEC3_DynamicParams *) mpeg2_dynParams, (VIDDEC3_Status *) mpeg2_status);
break;
-#endif
+
}
/* We have sent the XDM_FLUSH, call VIDDEC3_process until we get
DEBUG("Calling VIDDEC3_control XDM_FLUSH mjpeg_dynParams %p mjpeg_status %p", mjpeg_dynParams, mjpeg_status);
err = VIDDEC3_control(codec, XDM_FLUSH, (VIDDEC3_DynamicParams *) mjpeg_dynParams, (VIDDEC3_Status *) mjpeg_status);
break;
-#ifdef ENABLE_MPEG2
+
case DCE_TEST_MPEG2 :
DEBUG("Calling VIDDEC3_control XDM_FLUSH mpeg2_dynParams %p mpeg2_status %p", mpeg2_dynParams, mpeg2_status);
err = VIDDEC3_control(codec, XDM_FLUSH, (VIDDEC3_DynamicParams *) mpeg2_dynParams, (VIDDEC3_Status *) mpeg2_status);
break;
-#endif
+
}
/* We have sent the XDM_FLUSH, call VIDDEC3_process until we get