Update the MPEG4 Decoder header file to sync with the codec header file in the ipumm release

Signed-off-by: Amarinder Bindra <a-bindra@ti.com>

1 files changed, 92 insertions, 38 deletions

diff --git a/packages/ivahd_codecs/ti/sdo/codecs/mpeg4dec/impeg4vdec.h b/packages/ivahd_codecs/ti/sdo/codecs/mpeg4dec/impeg4vdec.h
index 9cdedcb..0147bac 100644
--- a/packages/ivahd_codecs/ti/sdo/codecs/mpeg4dec/impeg4vdec.h
+++ b/packages/ivahd_codecs/ti/sdo/codecs/mpeg4dec/impeg4vdec.h
@@ -49,11 +49,13 @@
 *                           added debug trace level enum to interface file
 *                           [Ashish]
 *
-* @version 0.9 (Mar 2012) : Added create time params & enums to support Enhanced
+* @version 0.9 (Mar 2012) : Added create time params & enums to support Enhanced 
 *                           deblocking feature [Mahantesh]
 *
-* @version 1.0 [May 2012] : MB Info format structure added [Mahantesh]
+* @version 1.0 (May 2012) : MB Info format structure added [Mahantesh]
 *
+* @version 0.9 (July 2012): Added create time params, enums & Macros to support 
+*                           only I frame decoding [Mahantesh]
 *******************************************************************************
 */
 
@@ -202,7 +204,10 @@ typedef IVIDDEC3_Cmd IMPEG4VDEC_Cmd;
 *  @param  enhancedDeBlockingQp
 *          QP value to be used for filtering all edges
 *
-*  @param  reserved[2]
+*  @param  decodeOnlyIntraFrames
+*          Flag to indicate codec to decode only I frames from bitstream
+*
+*  @param  reserved
 *          allocted reserve space for future uses
 *
 *  @note    None
@@ -218,7 +223,8 @@ typedef struct IMPEG4VDEC_Params
   XDAS_UInt32        lastNFramesToLog;
   XDAS_UInt32        paddingMode;
   XDAS_UInt32        enhancedDeBlockingQp;
-  XDAS_UInt32        reserved[2];
+  XDAS_UInt32        decodeOnlyIntraFrames;
+  XDAS_UInt32        reserved;
 } IMPEG4VDEC_Params;
 
 extern IMPEG4VDEC_Params IMPEG4VDEC_PARAMS;
@@ -520,6 +526,10 @@ typedef enum _IMPEG4MemDescription
 * this memory type is allocated by alg_alloc call & this is allocated
 * for handle of decoder
 */
+  IMPEG4VDEC_DEBUG_TRACE_BUF,
+  /**<
+* Memtab for debug trace parameter storage
+*/
   IMPEG4VDEC_COLOC_PMBDATA,
 
   /**
@@ -531,10 +541,6 @@ typedef enum _IMPEG4MemDescription
 * this memory type is allocated by IRES & this is for storing the colocated
 * MB data for B Frame
 */
-  IMPEG4VDEC_DEBUG_TRACE_BUF,
-  /**<
-* Memtab for debug trace parameter storage
-*/
   IMPEG4VDEC_DEBLOCK_OFF_TOTAL_MEMTABS,
   /**
 * Number of MemTab required if Deblock is Off required
@@ -593,7 +599,33 @@ typedef enum _IMPEG4MemDescription
 *  Number of 2D resource required by codec from IRES when filtering is on
 */
 #define IMEPG4VDEC_MAX_2D_OBJECTS 0x6
-
+/*
+*  Number of 1D resource required by codec from IRES
+*/
+#define IMEPG4VDEC_TOTAL_1D_OBJECTS_DECODE_ONLY_I_FRAMES     0x3
+/*
+*  Number of 1D resource required by codec from IRES when 
+*  decodeOnlyIntraframes = 1
+*/
+#define IMPEG4VDEC_DEBLOCK_OFF_TOTAL_MEMTABS_DECODE_ONLY_I_FRAMES 0x3
+/*
+* Number of memtab required if deblock is on and decodeOnlyIntraframes = 1,  
+* and it will be  maximum resource required by codec
+*/
+#define IMPEG4VDEC_DEBLOCK_ON_TOTAL_MEMTABS_DECODE_ONLY_I_FRAMES 0x5
+/*
+*  Number of 2D resource required by codec from IRES when filtering is on and
+*  decodeOnlyIntraframes = 1
+*/
+#define IMEPG4VDEC_MAX_2D_OBJECTS_DECODE_ONLY_I_FRAMES 0x2
+/*
+*   Luma recon buffer index in memory resource handle array
+*/
+#define IMPEG4VDEC_LUMARECON_DATA_BUF0_DECODE_ONLY_I_FRAMES 0x3
+/*
+*   Chroma recon buffer index in memory resource handle array
+*/
+#define IMPEG4VDEC_CHROMARECON_DATA_BUF0_DECODE_ONLY_I_FRAMES 0x4
 /**
 *******************************************************************************
 *  @struct   IMPEG4VDEC_Fxns
@@ -677,7 +709,7 @@ typedef enum
 /**
  ******************************************************************************
  *  @enum       IMPEG4VDEC_EnhancedDeblockQp
- *  @brief      This enum the MIN & MAX values that QP can take while filering
+ *  @brief      This enum the MIN & MAX values that QP can take while filering 
  *              for all edges is enabled
  *
  ******************************************************************************
@@ -762,6 +794,26 @@ typedef enum
 
 /**
  ******************************************************************************
+ *  @enum       IMPEG4VDEC_DecodeOnlyIntraFrames
+ *  @brief      This enum indicates whether codec should decode only I frames 
+ *              or all frames
+ *
+ ******************************************************************************
+*/
+typedef enum
+{
+  IMPEG4VDEC_DECODE_ONLY_I_FRAMES_DISABLE = 0,
+  /**
+    *  Flag to set error concealement disable
+    */
+  IMPEG4VDEC_DECODE_ONLY_I_FRAMES_ENABLE
+  /**
+    *  Flag to error concealment enable
+    */
+}IMPEG4VDEC_DecodeOnlyIntraFrames;
+
+/**
+ ******************************************************************************
  *  @enum   IMPEG4VDEC_FrameToLog
  *  @brief  These enumerations captures the max number of frame for which codec
  *          will dump debug trace.
@@ -787,8 +839,8 @@ typedef enum
  *  @brief  This structure defines the common fields in MB info
  *
  ******************************************************************************
-*/
-typedef struct _IMPEG4VDEC_TI_CommonInfo
+*/  
+typedef struct _IMPEG4VDEC_TI_CommonInfo 
 {
   XDAS_UInt32 codec_type:8;
   XDAS_UInt32 fmt_type:8;
@@ -815,7 +867,7 @@ typedef struct _IMPEG4VDEC_TI_CommonInfo
  *  @brief  This structure defines codec specific fields in MB info
  *
  ******************************************************************************
-*/
+*/  
 typedef struct _IMPEG4VDEC_TI_CodecSpecificWordSix
 {
   XDAS_UInt32 pred_mode:3;
@@ -855,7 +907,7 @@ typedef struct _IMPEG4VDEC_TI_CodecSpecificWordSix
  *  @brief  This structure defines codec specific fields in MB info
  *
  ******************************************************************************
-*/
+*/  
 typedef struct _IMPEG4VDEC_TI_CodecSpecificWordSeven
 {
   XDAS_UInt32 dc_scaler_luma:6;
@@ -876,8 +928,8 @@ typedef struct _IMPEG4VDEC_TI_CodecSpecificWordSeven
  *  @brief  This structure defines format of Motion Vectors as present in MBinfo
  *
  ******************************************************************************
-*/
-typedef struct _IMPEG4VDEC_TI_MotionVector
+*/  
+typedef struct _IMPEG4VDEC_TI_MotionVector 
 {
   XDAS_Int16 x;
   XDAS_Int16 y;
@@ -887,12 +939,12 @@ typedef struct _IMPEG4VDEC_TI_MotionVector
  ******************************************************************************
  *  @struct IMPEG4VDEC_TI_MvBidirectional4
  *
- *  @brief  This structure defines Motion Vectors at 8x8 level in both
+ *  @brief  This structure defines Motion Vectors at 8x8 level in both 
  *          directions
  *
  ******************************************************************************
-*/
-typedef struct _IMPEG4VDEC_TI_MvBidirectional4
+*/  
+typedef struct _IMPEG4VDEC_TI_MvBidirectional4 
 {
   IMPEG4VDEC_TI_MotionVector   mv_forward[4];
   IMPEG4VDEC_TI_MotionVector   mv_backward[4];
@@ -910,7 +962,7 @@ typedef struct _IMPEG4VDEC_TI_MvBidirectional4
  *
  *  @param  info : This elements gives details about the MB placement in the
  *                 frame.
- *
+ *   
  *  @param  IQedDCY2: This field holds the Inverse Quantized DC for Y2 MB
  *
  *  @param  IQedDCY3: This field holds the Inverse Quantized DC for Y3 MB
@@ -923,22 +975,22 @@ typedef struct _IMPEG4VDEC_TI_MvBidirectional4
  *
  *  @param  zeroes1[3]: This field is set to 0
  *
- *  @param  DP_DC_Y0: If data partition = 1, this field contains DC coefficient
+ *  @param  DP_DC_Y0: If data partition = 1, this field contains DC coefficient 
  *                    values for Y0 MB
  *
- *  @param  DP_DC_Y1: If data partition = 1, this field contains DC coefficient
+ *  @param  DP_DC_Y1: If data partition = 1, this field contains DC coefficient 
  *                    values for Y1 MB
  *
- *  @param  DP_DC_Y2: If data partition = 1, this field contains DC coefficient
+ *  @param  DP_DC_Y2: If data partition = 1, this field contains DC coefficient 
  *                    values for Y2 MB
- *
- *  @param  DP_DC_Y3: If data partition = 1, this field contains DC coefficient
+ * 
+ *  @param  DP_DC_Y3: If data partition = 1, this field contains DC coefficient 
  *                    values for Y3 MB
  *
- *  @param  DP_DC_Cb: If data partition = 1, this field contains DC coefficient
+ *  @param  DP_DC_Cb: If data partition = 1, this field contains DC coefficient 
  *                    values for Cb MB
  *
- *  @param  DP_DC_Cr: If data partition = 1, this field contains DC coefficient
+ *  @param  DP_DC_Cr: If data partition = 1, this field contains DC coefficient 
  *                    values for Cr MB
  *
  *  @param  Reserved: Reserved field
@@ -951,48 +1003,48 @@ typedef struct _IMPEG4VDEC_TI_MvBidirectional4
  *
  *  @param  zeroes3[4]: This field is set to 0
  *
- *  @param  mv_forward_backward: Lists all Motion vectors at 4x4 level in L0 &
- *                               L1 direction. First 4 MVs in L0 next 4 MVs in
+ *  @param  mv_forward_backward: Lists all Motion vectors at 4x4 level in L0 & 
+ *                               L1 direction. First 4 MVs in L0 next 4 MVs in 
  *                               L1 direction.
  *
  *  @param  bidirectional4: Lists all Motion vectors at 8x8 level in both
  *                          directions
  ******************************************************************************
-*/
+*/  
 typedef struct _IMPEG4VDEC_TI_MbInfo
 {
   IMPEG4VDEC_TI_CommonInfo info;
-
+  
   XDAS_Int16 IQedDCY2;
   XDAS_Int16 IQedDCY3;
   XDAS_Int16 IQedDCCb;
   XDAS_Int16 IQedDCCr;
-
+    
   XDAS_Int16 IQedDCY1;
   XDAS_Int16 zeroes1[3];
-
+  
   XDAS_Int16 DP_DC_Y0;
   XDAS_Int16 DP_DC_Y1;
   XDAS_Int16 DP_DC_Y2;
   XDAS_Int16 DP_DC_Y3;
-
+    
   XDAS_Int16 DP_DC_Cb;
   XDAS_Int16 DP_DC_Cr;
   XDAS_Int32 Reserved;
-
+    
   XDAS_Int32 zeroes2[2];
-
+  
   IMPEG4VDEC_TI_CodecSpecificWordSix codecSpecificinfoWordSix;
 
   IMPEG4VDEC_TI_CodecSpecificWordSeven codecSpecificinfoWordSeven;
-
+  
   XDAS_Int32 zeroes3[4];
 
   union {
     IMPEG4VDEC_TI_MotionVector       mv_forward_backward[8];
     IMPEG4VDEC_TI_MvBidirectional4   bidirectional4;
   } IMPEG4VDEC_TI_motion_vecs;
-
+  
 
 } IMPEG4VDEC_TI_MbInfo;
 
@@ -1008,3 +1060,5 @@ typedef struct _IMPEG4VDEC_TI_MbInfo
 
 
 
+
+