From 36f1d1389852374f3804e63e98471a751dd24e57 Mon Sep 17 00:00:00 2001 From: Veeranna Hanchinal Date: Tue, 7 Feb 2017 17:55:29 +0530 Subject: libdce: Updated JpegEncoder interface file Updated MJPEGE header file due to MJPEGE codec update to 01.00.17.01 version. Change-Id: Id820f9cf3c66e1659564ba297cc469a30dc55732 Signed-off-by: Veeranna Hanchinal --- README | 4 +- .../ivahd_codecs/ti/sdo/codecs/jpegvenc/ijpegenc.h | 83 +++++++++++----------- 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/README b/README index 7b25162..ef279dc 100644 --- a/README +++ b/README @@ -409,7 +409,7 @@ If (BUILDOS_LINUX) { ************ Version Info of Headers included in packages folder *********** - +******** Version might not match due to no change in the interfaces ******** Tools: XDC version : xdctools_3_30_06_67_core CE version : codec_engine_3_24_00_08 @@ -424,4 +424,4 @@ MPEG-4 Dec : 01.00.15.01 MPEG-2 Dec : 01.00.14.01 VC-1 Dec : 01.00.02.00 MJPEG Dec : 01.00.13.01 -MJPEG Enc : 01.00.16.01 +MJPEG Enc : 01.00.17.01 diff --git a/packages/ivahd_codecs/ti/sdo/codecs/jpegvenc/ijpegenc.h b/packages/ivahd_codecs/ti/sdo/codecs/jpegvenc/ijpegenc.h index d903f98..cca4fda 100644 --- a/packages/ivahd_codecs/ti/sdo/codecs/jpegvenc/ijpegenc.h +++ b/packages/ivahd_codecs/ti/sdo/codecs/jpegvenc/ijpegenc.h @@ -77,6 +77,9 @@ * @version 2.3 (May 2013) : Added error check for “non-multiple of 16” * inputBufDesc->imagePitch [Naidu] * +* @version 2.4 (Feb 2017) : Jpegencoder symbol conflicts +* with Jpegdecoder [Prashanth Kumar] +* ******************************************************************************** */ @@ -699,50 +702,50 @@ typedef enum */ typedef enum { - JPEG_DYNAMIC_PARAMS_HANDLE_ERROR = 0, - JPEG_STATUS_HANDLE_ERROR, - JPEG_DYNAMIC_PARAMS_SIZE_ERROR, - JPEG_ENCODE_HEADER_ERROR, - JPEG_UNSUPPORTED_RESOLUTION, - JPEG_CAPTURE_WIDTH_ERROR, - JPEG_GET_DATA_FXN_NULL_POINTER, - JPEG_GET_BUFFER_FXN_NULL_POINTER, - JPEG_INVALID_RESTART_INTERVAL_ERROR, - JPEG_INVALID_QUALITY_FACTOR_ERROR, - JPEG_INVALID_INPUT_CHROMA_FORMAT_ERROR, - JPEG_NULL_QUANT_TABLE_POINTER_ERROR, - JPEG_NULL_INARGS_POINTER_ERROR, - JPEG_NULL_INARGS_APP_POINTER_ERROR, - JPEG_INARGS_SIZE_ERROR, - JPEG_INVALID_INPUT_BYTES_ERROR, - JPEG_INVALID_INPUT_ID_ERROR, - JPEG_NULL_INPUT_BUF_DESC_ERROR, - JPEG_NULL_INPUT_BUFFER_POINTER_ERROR, - JPEG_INVALID_INPUT_BUFFER_SIZE_ERROR, - JPEG_INVALID_NUM_OF_INPUT_BUFFERS_ERROR, - JPEG_INVALID_INPUT_BUFFER_MEMTYPE_ERROR, - JPEG_INVALID_OUTPUT_BUFFER_MEMTYPE_ERROR, - JPEG_NULL_OUTARGS_POINTER_ERROR, - JPEG_INVALID_OUTARGS_SIZE, - JPEG_NULL_OUTPUT_BUF_DESC_ERROR, - JPEG_NULL_OUTPUT_BUFFER_POINTER_ERROR, - JPEG_INVALID_OUTPUT_BUFFER_SIZE_ERROR, - JPEG_INVALID_NUM_OF_OUTPUT_BUFFERS_ERROR, - JPEG_INSUFFICIENT_OUTPUT_BUFFER_SIZE_ERROR, - JPEG_INVALID_JFIF_THUMBNAIL_ENABLE_ERROR, - JPEG_INVALID_EXIF_THUMBNAIL_ENABLE_ERROR, - JPEG_INPUT_BUFFER_POINTER_ALIGN_ERROR, + IJPEGVENC_DYNAMIC_PARAMS_HANDLE_ERROR = 0, + IJPEGVENC_STATUS_HANDLE_ERROR, + IJPEGVENC_DYNAMIC_PARAMS_SIZE_ERROR, + IJPEGVENC_ENCODE_HEADER_ERROR, + IJPEGVENC_UNSUPPORTED_RESOLUTION, + IJPEGVENC_CAPTURE_WIDTH_ERROR, + IJPEGVENC_GET_DATA_FXN_NULL_POINTER, + IJPEGVENC_GET_BUFFER_FXN_NULL_POINTER, + IJPEGVENC_INVALID_RESTART_INTERVAL_ERROR, + IJPEGVENC_INVALID_QUALITY_FACTOR_ERROR, + IJPEGVENC_INVALID_INPUT_CHROMA_FORMAT_ERROR, + IJPEGVENC_NULL_QUANT_TABLE_POINTER_ERROR, + IJPEGVENC_NULL_INARGS_POINTER_ERROR, + IJPEGVENC_NULL_INARGS_APP_POINTER_ERROR, + IJPEGVENC_INARGS_SIZE_ERROR, + IJPEGVENC_INVALID_INPUT_BYTES_ERROR, + IJPEGVENC_INVALID_INPUT_ID_ERROR, + IJPEGVENC_NULL_INPUT_BUF_DESC_ERROR, + IJPEGVENC_NULL_INPUT_BUFFER_POINTER_ERROR, + IJPEGVENC_INVALID_INPUT_BUFFER_SIZE_ERROR, + IJPEGVENC_INVALID_NUM_OF_INPUT_BUFFERS_ERROR, + IJPEGVENC_INVALID_INPUT_BUFFER_MEMTYPE_ERROR, + IJPEGVENC_INVALID_OUTPUT_BUFFER_MEMTYPE_ERROR, + IJPEGVENC_NULL_OUTARGS_POINTER_ERROR, + IJPEGVENC_INVALID_OUTARGS_SIZE, + IJPEGVENC_NULL_OUTPUT_BUF_DESC_ERROR, + IJPEGVENC_NULL_OUTPUT_BUFFER_POINTER_ERROR, + IJPEGVENC_INVALID_OUTPUT_BUFFER_SIZE_ERROR, + IJPEGVENC_INVALID_NUM_OF_OUTPUT_BUFFERS_ERROR, + IJPEGVENC_INSUFFICIENT_OUTPUT_BUFFER_SIZE_ERROR, + IJPEGVENC_INVALID_JFIF_THUMBNAIL_ENABLE_ERROR, + IJPEGVENC_INVALID_EXIF_THUMBNAIL_ENABLE_ERROR, + IJPEGVENC_INPUT_BUFFER_POINTER_ALIGN_ERROR, /* Extended Error Codes related to Data Sync */ - JPEG_DATASYNC_GET_ROW_DATA_ERROR, /* from 33rd bit*/ + IJPEGVENC_DATASYNC_GET_ROW_DATA_ERROR, /* from 33rd bit*/ - JPEG_DATASYNC_INVALID_RESTART_INTERVAL_ERROR, + IJPEGVENC_DATASYNC_INVALID_RESTART_INTERVAL_ERROR, - JPEG_DATASYNC_BLOCK_POINTER_ERROR, - JPEG_DATASYNC_BLOCK_SIZE_ERROR, - JPEG_DATASYNC_INVALID_BLOCKS_ERROR, - JPEG_DATASYNC_NOT_VALID_COMBINATION_ERROR, - JPEG_INVALID_IMAGEPITCH + IJPEGVENC_DATASYNC_BLOCK_POINTER_ERROR, + IJPEGVENC_DATASYNC_BLOCK_SIZE_ERROR, + IJPEGVENC_DATASYNC_INVALID_BLOCKS_ERROR, + IJPEGVENC_DATASYNC_NOT_VALID_COMBINATION_ERROR, + IJPEGVENC_INVALID_IMAGEPITCH }IjpegVENC_ErrorStatus; /** -- cgit v1.2.3-54-g00ecf