aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBuddy Liong <a0270631@ti.com>2017-09-29 15:28:05 -0500
committerBuddy Liong <a0270631@ti.com>2017-09-29 15:47:50 -0500
commitf72096090e3063e85ea77cae66b2d99a48d91727 (patch)
tree09a316491255a3dca4706b13446a2d45220ecf36
parent338ba56b9b9393acf7b54e4d5ab531f710c7360b (diff)
downloaddce-linaro-mirror-3.00.14.00.tar.gz
[LIBDCE] Update dependency header fileslinaro-mirror-3.00.14.00
Update the header files to match with framework_components_3_40_02_07 xdctools_3_50_03_33_core Modify the README on the version as well. The codec header files have been checked to be similar (only spacing different) so no update is needed. Change-Id: Ie0afb59ec58f88fd18d49d688f958cf3aafc3848 Signed-off-by: Buddy Liong <a0270631@ti.com>
-rw-r--r--README14
-rw-r--r--packages/framework_components/ti/sdo/fc/ires/hdvicp/ires_hdvicp2.h242
-rw-r--r--packages/xdctools/xdc/std.h34
3 files changed, 148 insertions, 142 deletions
diff --git a/README b/README
index ef279dc..1d63761 100644
--- a/README
+++ b/README
@@ -411,17 +411,17 @@ 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
+XDC version : xdctools_3_50_03_33_core
CE version : codec_engine_3_24_00_08
XDAIS version: xdais_7_24_00_04
-FC version: framework_components_3_40_01_04
+FC version: framework_components_3_40_02_07
IVAHD_Codecs:
H.264 Enc : 02.00.09.01
MPEG-4 Enc : 01.00.02.01
-H.264 Dec : 02.00.17.01
-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.17.01
+H.264 Dec : 02.00.21.01
+MPEG-4 Dec : 01.00.15.01
+MPEG-2 Dec : 01.00.17.01
+VC-1 Dec : 01.00.02.05
+MJPEG Dec : 01.00.16.01
diff --git a/packages/framework_components/ti/sdo/fc/ires/hdvicp/ires_hdvicp2.h b/packages/framework_components/ti/sdo/fc/ires/hdvicp/ires_hdvicp2.h
index c2b0ada..f3e863d 100644
--- a/packages/framework_components/ti/sdo/fc/ires/hdvicp/ires_hdvicp2.h
+++ b/packages/framework_components/ti/sdo/fc/ires/hdvicp/ires_hdvicp2.h
@@ -1,9 +1,4 @@
/*
- * Copyright 2013 by Texas Instruments Incorporated.
- *
- */
-
-/*
* Copyright (c) 2012 - 2013, Texas Instruments Incorporated
* All rights reserved.
*
@@ -137,7 +132,7 @@ extern "C" {
/**
* @brief Protocol Revision for this resource
*/
-static IRES_ProtocolRevision IRES_HDVICP2_PROTOCOLREVISION = { 1, 0, 0 };
+static IRES_ProtocolRevision IRES_HDVICP2_PROTOCOLREVISION = {1, 0, 0};
#endif
@@ -151,20 +146,20 @@ typedef struct IRES_HDVICP2_Obj *IRES_HDVICP2_Handle;
* @brief Timeout value to be used by implementation of
* IRES_HDVICP2_Handle:wait function
*/
-extern unsigned int ti_sdo_fc_ires_hdvicp_HDVICP2_timeoutVal;
+extern unsigned int ti_sdo_fc_ires_hdvicp_HDVICP2_timeoutVal;
/**
* @brief
*/
-typedef IRES_YieldArgs (*ti_sdo_fc_ires_hdvicp_HDVICP2_GetYieldArgsFxn)
- (Int scratchId);
+typedef IRES_YieldArgs (* ti_sdo_fc_ires_hdvicp_HDVICP2_GetYieldArgsFxn)
+ (Int scratchId);
/**
* @brief
*/
-typedef Void (*ti_sdo_fc_ires_hdvicp_HDVICP2_YieldFxn)
- (IRES_YieldResourceType resource, IRES_YieldContextHandle ctxt,
- IRES_YieldArgs args);
+typedef Void (* ti_sdo_fc_ires_hdvicp_HDVICP2_YieldFxn)
+ (IRES_YieldResourceType resource, IRES_YieldContextHandle ctxt,
+ IRES_YieldArgs args);
@@ -174,7 +169,7 @@ typedef Void (*ti_sdo_fc_ires_hdvicp_HDVICP2_YieldFxn)
typedef struct IRES_HDVICP2_ProtocolArgs {
IRES_ProtocolArgs base; /**< Base protocol Args */
- XDAS_Int32 id; /**< HDVICP2 resource being requested.
+ XDAS_Int32 id; /**< HDVICP2 resource being requested.
*
* @remarks Could be 0, 1, 2,
* IRES_HDVICP2_ID_ANY or
@@ -186,7 +181,7 @@ typedef struct IRES_HDVICP2_ProtocolArgs {
* @brief Callback function signature, used by the IRES_HDVICP2_
* Handle's configure function
*/
-typedef void (*IRES_HDVICP2_CallbackFxn)(IALG_Handle handle, Void *args);
+typedef void (*IRES_HDVICP2_CallbackFxn)(IALG_Handle handle, Void * args);
/**
* @brief Describes the status/history of the HDVICP2 unit that is
@@ -211,8 +206,8 @@ typedef enum IRES_HDVICP2_Status {
*/
typedef struct IRES_HDVICP2_Obj {
- IRES_Obj ires; /**< Base IRES_Obj struct */
- Void *info; /**< Reserved for future use */
+ IRES_Obj ires; /**< Base IRES_Obj struct */
+ Void *info; /**< Reserved for future use */
XDAS_Int32 id; /**< HDVICP2 id granted
*
* @remark Could be 0, 1, 2, or
@@ -230,114 +225,114 @@ typedef struct IRES_HDVICP2_Obj {
* bit 1 -> ICONT2 reset
*/
- /**
- * @brief Acquire the HDVICP2 resource.
- *
- * @remarks This call acquires the HDVICP resource which the alg may
- * (or may not) have specifically requested.
- *
- * @remarks The returned @c hdvicp2Status indicates the status of
- * the particular HDVICP2 unit that is returned.
- * @sa IRES_HDVICP2_Status
- *
- * @remarks The @c configurationId argument is a codec specified
- * parameter that is both an input and output parameter. It
- * specifies the mode in which this particular HDVICP2 was
- * used last time, and the mode in which it will be
- * used this time.
- *
- * @remarks This API takes a @c yieldContext as argument, as it may
- * yield the processor to higher priority codecs in the
- * system.
- *
- * @remarks @c lateAcquireId is an optionally framework supplied
- * parameter (sometimes provided via an XDM control() call
- * setting the XDM_SETLATEACQUIREARG. If not supplied, the
- * codec should pass the value
- * #IRES_HDVICP2_UNKNOWNLATEACQUIREARG.
- *
- * @sa IRES_HDVICP2_UNKNOWNLATEACQUIREARG
- */
+/**
+ * @brief Acquire the HDVICP2 resource.
+ *
+ * @remarks This call acquires the HDVICP resource which the alg may
+ * (or may not) have specifically requested.
+ *
+ * @remarks The returned @c hdvicp2Status indicates the status of
+ * the particular HDVICP2 unit that is returned.
+ * @sa IRES_HDVICP2_Status
+ *
+ * @remarks The @c configurationId argument is a codec specified
+ * parameter that is both an input and output parameter. It
+ * specifies the mode in which this particular HDVICP2 was
+ * used last time, and the mode in which it will be
+ * used this time.
+ *
+ * @remarks This API takes a @c yieldContext as argument, as it may
+ * yield the processor to higher priority codecs in the
+ * system.
+ *
+ * @remarks @c lateAcquireId is an optionally framework supplied
+ * parameter (sometimes provided via an XDM control() call
+ * setting the XDM_SETLATEACQUIREARG. If not supplied, the
+ * codec should pass the value
+ * #IRES_HDVICP2_UNKNOWNLATEACQUIREARG.
+ *
+ * @sa IRES_HDVICP2_UNKNOWNLATEACQUIREARG
+ */
XDAS_Void (*acquire)(IALG_Handle algHandle,
- struct IRES_HDVICP2_Obj *hdvicpHandle,
- IRES_YieldContext *yieldCtxt, XDAS_UInt32 *hdvicp2Status,
- XDAS_UInt32 *configurationId, XDAS_Int32 lateAcquireArg);
-
- /**
- * @brief Release the HDVICP2 resource.
- *
- * @remarks This makes the resource available for use by other algorithms.
- */
+ struct IRES_HDVICP2_Obj * hdvicpHandle,
+ IRES_YieldContext * yieldCtxt, XDAS_UInt32 * hdvicp2Status,
+ XDAS_UInt32 *configurationId, XDAS_Int32 lateAcquireArg);
+
+/**
+ * @brief Release the HDVICP2 resource.
+ *
+ * @remarks This makes the resource available for use by other algorithms.
+ */
XDAS_Void (*release)(IALG_Handle algHandle,
- struct IRES_HDVICP2_Obj *hdvicpHandle);
-
- /**
- * @brief Reacquire the HDVICP2 resource recent released.
- *
- * @returns XDAS_TRUE The resource was not yet acquired by another
- * algorithm, and the resource handle is still
- * valid.
- * @returns XDAS_FALSE The resource is no longer available and has been
- * deactivated.
- */
+ struct IRES_HDVICP2_Obj * hdvicpHandle);
+
+/**
+ * @brief Reacquire the HDVICP2 resource recent released.
+ *
+ * @returns XDAS_TRUE The resource was not yet acquired by another
+ * algorithm, and the resource handle is still
+ * valid.
+ * @returns XDAS_FALSE The resource is no longer available and has been
+ * deactivated.
+ */
XDAS_UInt32 (*reacquireIfOwner)(IALG_Handle algHandle,
- struct IRES_HDVICP2_Obj *hdvicpHandle);
-
- /**
- * @brief Register a callback function with a HDVICP2 instance.
- *
- * @remarks The callback is invoked when an interrupt fires after
- * processing data.
- *
- * @remarks It is the algorithm's responsibility to configure the HDVICP2
- * to process data and fire the interrupt when done.
- */
+ struct IRES_HDVICP2_Obj * hdvicpHandle);
+
+/**
+ * @brief Register a callback function with a HDVICP2 instance.
+ *
+ * @remarks The callback is invoked when an interrupt fires after
+ * processing data.
+ *
+ * @remarks It is the algorithm's responsibility to configure the HDVICP2
+ * to process data and fire the interrupt when done.
+ */
XDAS_Void (*configure)(IALG_Handle algHandle,
- struct IRES_HDVICP2_Obj *hdvicpHandle,
- IRES_HDVICP2_CallbackFxn cbFunctionPtr, XDAS_Void *cbArgs);
-
- /**
- * @brief Wait until the HDVICP2 is done processing and then return.
- *
- * @remarks This is a blocking call, unless a positive timeout value
- * is configured, inwhich case the call returns after timeout.
- *
- * @remarks This function is passed a yieldContext, and will relinquish
- * the processor while it waits for the HDVICP2 to finish the
- * processing and return from wait.
- *
- * @returns XDAS_TRUE Success
- * @returns XDAS_FALSE Failure/Timeout
- */
+ struct IRES_HDVICP2_Obj * hdvicpHandle,
+ IRES_HDVICP2_CallbackFxn cbFunctionPtr, XDAS_Void * cbArgs);
+
+/**
+ * @brief Wait until the HDVICP2 is done processing and then return.
+ *
+ * @remarks This is a blocking call, unless a positive timeout value
+ * is configured, inwhich case the call returns after timeout.
+ *
+ * @remarks This function is passed a yieldContext, and will relinquish
+ * the processor while it waits for the HDVICP2 to finish the
+ * processing and return from wait.
+ *
+ * @returns XDAS_TRUE Success
+ * @returns XDAS_FALSE Failure/Timeout
+ */
XDAS_UInt32 (*wait)(IALG_Handle algHandle,
- struct IRES_HDVICP2_Obj *hdvicpHandle,
- IRES_YieldContext *yieldCtxt);
-
- /**
- * @brief Processing has completed.
- *
- * @remarks This is called from within the interrupt handler function when
- * processing completes, and is used to unblock the wait() API.
- *
- * @remarks Typically, this is called from within the algortihm's callback
- * function (see acquire() call).
- */
- XDAS_Void (*done)(IALG_Handle algHandle,
- struct IRES_HDVICP2_Obj *hdvicpHandle);
- /**
- * @brief Reset the HDVICP2.
- *
- * @remarks This can be called by the algorithm to "reset" the HDVICP2, and
- * is usually called when an acquired HDVICP2 is "dirty", i.e, it
- * requires both program/data reload.
- *
- * @remarks It works off a configured maximum reset cycle delay.
- *
- * @returns XDAS_TRUE Success
- * @returns XDAS_FALSE Failure
- */
+ struct IRES_HDVICP2_Obj *hdvicpHandle,
+ IRES_YieldContext * yieldCtxt);
+
+/**
+ * @brief Processing has completed.
+ *
+ * @remarks This is called from within the interrupt handler function when
+ * processing completes, and is used to unblock the wait() API.
+ *
+ * @remarks Typically, this is called from within the algortihm's callback
+ * function (see acquire() call).
+ */
+ XDAS_Void (*done) (IALG_Handle algHandle,
+ struct IRES_HDVICP2_Obj *hdvicpHandle);
+/**
+ * @brief Reset the HDVICP2.
+ *
+ * @remarks This can be called by the algorithm to "reset" the HDVICP2, and
+ * is usually called when an acquired HDVICP2 is "dirty", i.e, it
+ * requires both program/data reload.
+ *
+ * @remarks It works off a configured maximum reset cycle delay.
+ *
+ * @returns XDAS_TRUE Success
+ * @returns XDAS_FALSE Failure
+ */
XDAS_UInt32 (*reset)(IALG_Handle algHandle,
- struct IRES_HDVICP2_Obj *hdvicpHandle);
+ struct IRES_HDVICP2_Obj *hdvicpHandle);
} IRES_HDVICP2_Obj;
@@ -356,15 +351,15 @@ typedef struct IRES_HDVICP2_RegisterLayer {
*/
typedef struct IRES_HDVICP2_Properties {
- int size;
+ int size;
IRES_HDVICP2_RegisterLayer *globalRegs; /* Register layer of HDVICP2 */
} IRES_HDVICP2_Properties;
typedef IRES_Status (*ti_sdo_fc_ires_hdvicp_HDVICP2_GetHdvicp2Fxn)
- (XDAS_Int32 *Id, IALG_Handle alg, IRES_HDVICP2_Handle handle);
+ (XDAS_Int32 *Id, IALG_Handle alg, IRES_HDVICP2_Handle handle);
typedef IRES_Status (*ti_sdo_fc_ires_hdvicp_HDVICP2_FreeHdvicp2Fxn)
- (XDAS_Int32 Id, IALG_Handle alg, IRES_HDVICP2_Handle handle);
+ (XDAS_Int32 Id, IALG_Handle alg, IRES_HDVICP2_Handle handle);
#ifdef __cplusplus
}
@@ -373,8 +368,3 @@ typedef IRES_Status (*ti_sdo_fc_ires_hdvicp_HDVICP2_FreeHdvicp2Fxn)
/*@}*/
#endif
-/*
- * @(#) ti.sdo.fc.ires.hdvicp; 1, 0, 1,1; 6-12-2013 19:57:33; /db/atree/library/trees/fc/fc-t09/src/ xlibrary
-
- */
-
diff --git a/packages/xdctools/xdc/std.h b/packages/xdctools/xdc/std.h
index 848c527..e743765 100644
--- a/packages/xdctools/xdc/std.h
+++ b/packages/xdctools/xdc/std.h
@@ -1,10 +1,10 @@
-/*
- * Copyright (c) 2008 Texas Instruments. All rights reserved.
- * This program and the accompanying materials are made available under the
+/*
+ * Copyright (c) 2008-2016 Texas Instruments. All rights reserved.
+ * This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License
* v. 1.0 which accompanies this distribution. The Eclipse Public License is
* available at http://www.eclipse.org/legal/epl-v10.html and the Eclipse
- * Distribution License is available at
+ * Distribution License is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
* Contributors:
@@ -60,6 +60,7 @@ typedef const char *xdc_CString; /* null terminated immutable string */
#ifdef __GNUC__
#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6))
#pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
typedef int (*xdc_Fxn)(); /* function pointer */
#pragma GCC diagnostic pop
@@ -84,6 +85,10 @@ typedef const char *xdc_CString; /* null terminated immutable string */
*/
#ifdef __TI_COMPILER_VERSION__
#include <ti/targets/select.h>
+#elif defined(__IAR_SYSTEMS_ICC__)
+#include <iar/targets/select.h>
+#elif defined(__GNUC__)
+#include <gnu/targets/select.h>
#else
/*
* 'xdc_target_types__' must be defined to name a target-specific header
@@ -111,7 +116,7 @@ typedef unsigned int xdc_UInt32;
#endif
#endif
-/* Each modules' internal header file defines 'module' as
+/* Each modules' internal header file defines 'module' as
* xdc__MODOBJADDR__(Module__state__V), where Module__state__V is the actual
* object where the module state is kept. For most targets, the default macro
* given here results in the construct '(&Module__state__V)->field', when the
@@ -152,11 +157,17 @@ typedef unsigned long xdc_ULLong;
* for example.
*/
#ifndef xdc__ARGTOPTR
+static xdc_Ptr xdc_iargToPtr(xdc_IArg a);
+static xdc_Ptr xdc_uargToPtr(xdc_UArg a);
+
static inline xdc_Ptr xdc_iargToPtr(xdc_IArg a) { return ((xdc_Ptr)a); }
static inline xdc_Ptr xdc_uargToPtr(xdc_UArg a) { return ((xdc_Ptr)a); }
#endif
#ifndef xdc__ARGTOFXN
+static xdc_Fxn xdc_iargToFxn(xdc_IArg a);
+static xdc_Fxn xdc_uargToFxn(xdc_UArg a);
+
static inline xdc_Fxn xdc_iargToFxn(xdc_IArg a) { return ((xdc_Fxn)a); }
static inline xdc_Fxn xdc_uargToFxn(xdc_UArg a) { return ((xdc_Fxn)a); }
#endif
@@ -165,7 +176,7 @@ static inline xdc_Fxn xdc_uargToFxn(xdc_UArg a) { return ((xdc_Fxn)a); }
/*
* functions to efficiently convert a single precision float to an IArg
* and vice-versa while maintaining client type safety
- *
+ *
* Here the assumption is that sizeof(Float) <= sizeof(IArg);
*/
typedef union {
@@ -173,6 +184,7 @@ typedef union {
xdc_IArg a;
} xdc_FloatData;
+static xdc_IArg xdc_floatToArg(xdc_Float f);
static inline xdc_IArg xdc_floatToArg(xdc_Float f)
{
xdc_FloatData u;
@@ -181,6 +193,7 @@ static inline xdc_IArg xdc_floatToArg(xdc_Float f)
return (u.a);
}
+static xdc_Float xdc_argToFloat(xdc_IArg a);
static inline xdc_Float xdc_argToFloat(xdc_IArg a)
{
xdc_FloatData u;
@@ -232,7 +245,10 @@ typedef xdc_Int16 Int16;
typedef xdc_Int32 Int32;
typedef xdc_Fxn Fxn;
typedef xdc_Ptr Ptr;
+typedef xdc_CPtr CPtr;
+#ifndef xdc__nolocalstring
typedef xdc_String String;
+#endif
typedef xdc_CString CString;
typedef xdc_UInt8 UInt8;
@@ -324,7 +340,7 @@ typedef xdc_Bits64 Bits64;
* related functions into a single named sub-section (e.g.,
* "init-code") If this macro is not defined by the target, an
* empty definition is used instead.
- */
+ */
#ifndef xdc__CODESECT
#define xdc__CODESECT(fn, sn)
#endif
@@ -344,11 +360,11 @@ typedef xdc_Bits64 Bits64;
* as string constant in the current file.
*/
#ifndef xdc__META
-#define xdc__META(n,s) __FAR__ const char (n)[] = {s}
+#define xdc__META(n,s) __FAR__ const char (n)[] = {(s)}
#endif
#endif /* xdc_std__include */
/*
- * @(#) xdc; 1, 1, 1,476; 3-20-2014 17:05:02; /db/ztree/library/trees/xdc/xdc-A32x/src/packages/
+ * @(#) xdc; 1, 1, 1,0; 8-8-2017 17:29:31; /db/ztree/library/trees/xdc/xdc-D20/src/packages/
*/