diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig
index b9fa7306..8e7dbd2f 100644
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig
@@ -17,7 +17,7 @@ BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_USES_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_MUSL=y
 BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
-# BR2_TOOLCHAIN_BUILDROOT_CXX is not set
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/aacdec.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/aacdec.h
deleted file mode 100644
index 05652ee9..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/aacdec.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/*****************************************************************************
-*             Copyright 2004 - 2050, Hisilicon Tech. Co., Ltd.
-*                           ALL RIGHTS RESERVED
-* FileName: aacdec.h
-* Description:
-*
-* History:
-* Version   Date         Author     DefectNum    Description
-* 0.01      2006-11-01   z40717    NULL         Create this file.
-*
-*****************************************************************************/
-/**
- * \file
- * \brief Describes the information about AACDEC.
- */
-
-#ifndef _AACDEC_H
-#define _AACDEC_H
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif  /* __cpluscplus */
-#endif  /* __cpluscplus */
-
-#include "hi_type.h"
-
-
-/********************************Macro Definition********************************/
-/** \addtogroup      AACDEC */
-/** @{ */  /** <!-- [AACDEC] */
-
-#ifndef AAC_MAX_NCHANS
-#define AAC_MAX_NCHANS      2
-#endif
-#define AAC_MAX_NSAMPS      1024
-#define AAC_MAINBUF_SIZE    (768 * AAC_MAX_NCHANS)  /**<according to spec (13818-7 section 8.2.2, 14496-3 section 4.5.3),6144 bits =  768 bytes per SCE or CCE-I,12288 bits = 1536 bytes per CPE*/
-
-#define AAC_NUM_PROFILES    3
-#define AAC_PROFILE_MP      0
-#define AAC_PROFILE_LC      1
-#define AAC_PROFILE_SSR     2
-
-#ifndef HI_SUCCESS
-#define HI_SUCCESS          0
-#endif
-/** @} */  /** <!-- ==== Macro Definition end ==== */
-
-/*************************** Structure Definition ****************************/
-/** \addtogroup      AACDEC */
-/** @{ */  /** <!-- [AACDEC] */
-
-/**Defines AACDEC error code*/
-typedef enum
-{
-    ERR_AAC_NONE                          =   0,        /**<no decode error*/
-    ERR_AAC_INDATA_UNDERFLOW              =  -1,        /**<not enough input data*/
-    ERR_AAC_NULL_POINTER                  =  -2,        /**<null pointer*/
-    ERR_AAC_INVALID_ADTS_HEADER           =  -3,        /**<invalid adts header*/
-    ERR_AAC_INVALID_ADIF_HEADER           =  -4,        /**<invalid adif header*/
-    ERR_AAC_INVALID_FRAME                 =  -5,        /**<invalid frame*/
-    ERR_AAC_MPEG4_UNSUPPORTED             =  -6,        /**<upsupport mpeg4 format*/
-    ERR_AAC_CHANNEL_MAP                   =  -7,        /**<channel map error*/
-    ERR_AAC_SYNTAX_ELEMENT                =  -8,        /**<element error*/
-    ERR_AAC_DEQUANT                       =  -9,        /**<dequant error*/
-    ERR_AAC_STEREO_PROCESS                = -10,        /**<stereo process error*/
-    ERR_AAC_PNS                           = -11,        /**<pns process error*/
-    ERR_AAC_SHORT_BLOCK_DEINT             = -12,        /**<reserved*/
-    ERR_AAC_TNS                           = -13,        /**<TNS process error*/
-    ERR_AAC_IMDCT                         = -14,        /**<IMDCT process error*/
-    ERR_AAC_NCHANS_TOO_HIGH               = -15,        /**<unsupport mutil channel*/
-    ERR_AAC_SBR_INIT                      = -16,        /**<SBR init error*/
-    ERR_AAC_SBR_BITSTREAM                 = -17,        /**<SBR bitstream error*/
-    ERR_AAC_SBR_DATA                      = -18,        /**<SBR data error*/
-    ERR_AAC_SBR_PCM_FORMAT                = -19,        /**<SBR pcm data error*/
-    ERR_AAC_SBR_NCHANS_TOO_HIGH           = -20,        /**<unsupport SBR multi channel*/
-    ERR_AAC_SBR_SINGLERATE_UNSUPPORTED    = -21,        /**<SBR invalid samplerate*/
-    ERR_AAC_RAWBLOCK_PARAMS               = -22,        /**<invalid RawBlock params*/
-    ERR_AAC_PS_INIT                       = -23,        /**<PS init error*/
-    ERR_AAC_CH_MAPPING                    = -24,
-    ERR_UNKNOWN                           = -9999,      /**<reserved*/
-    ERR_AAC_OUT_OF_MEMORY                 = 2,          /*!< Heap returned NULL pointer. Output buffer is invalid. */
-    ERR_AAC_UNKNOWN                       = 5,          /*!< Error condition is of unknown reason, or from a another module. Output buffer is invalid. */
-    ERR_AAC_TRANSPORT_SYNC_ERROR          = 4097,       /*!< The transport decoder had syncronisation problems. Do not exit decoding. Just feed new bitstream data. */
-    ERR_AAC_NOT_ENOUGH_BITS               = 4098,       /*!< The input buffer ran out of bits. */
-    ERR_AAC_TRANSPORT_FATAL_ERROR         = 4099,       /*!< The transport decoder occut fatal error. Reset Tranport */
-    ERR_AAC_INVALID_HANDLE                = 8193,       /*!< The handle passed to the function call was invalid (NULL). */
-    ERR_AAC_UNSUPPORTED_AOT               = 8194,       /*!< The AOT found in the configuration is not supported. */
-    ERR_AAC_UNSUPPORTED_FORMAT            = 8195,       /*!< The bitstream format is not supported.  */
-    ERR_AAC_UNSUPPORTED_ER_FORMAT         = 8196,       /*!< The error resilience tool format is not supported. */
-    ERR_AAC_UNSUPPORTED_EPCONFIG          = 8197,       /*!< The error protection format is not supported. */
-    ERR_AAC_UNSUPPORTED_MULTILAYER        = 8198,       /*!< More than one layer for AAC scalable is not supported. */
-    ERR_AAC_UNSUPPORTED_CHANNELCONFIG     = 8199,       /*!< The channel configuration (either number or arrangement) is not supported. */
-    ERR_AAC_UNSUPPORTED_SAMPLINGRATE      = 8200,       /*!< The sample rate specified in the configuration is not supported. */
-    ERR_AAC_INVALID_SBR_CONFIG            = 8201,       /*!< The SBR configuration is not supported. */
-    ERR_AAC_SET_PARAM_FAIL                = 8202,       /*!< The parameter could not be set. Either the value was out of range or the parameter does not exist. */
-    ERR_AAC_NEED_TO_RESTART               = 8203,       /*!< The decoder needs to be restarted, since the requiered configuration change cannot be performed. */
-    ERR_AAC_TRANSPORT_ERROR               = 16385,      /*!< The transport decoder encountered an unexpected error. */
-    ERR_AAC_PARSE_ERROR                   = 16386,      /*!< Error while parsing the bitstream. Most probably it is corrupted, or the system crashed. */
-    ERR_AAC_UNSUPPORTED_EXTENSION_PAYLOAD = 16387,      /*!< Error while parsing the extension payload of the bitstream. The extension payload type found is not supported. */
-    ERR_AAC_DECODE_FRAME_ERROR            = 16388,      /*!< The parsed bitstream value is out of range. Most probably the bitstream is corrupt, or the system crashed. */
-    ERR_AAC_CRC_ERROR                     = 16389,      /*!< The embedded CRC did not match. */
-    ERR_AAC_INVALID_CODE_BOOK             = 16390,      /*!< An invalid codebook was signalled. Most probably the bitstream is corrupt, or the system crashed. */
-    ERR_AAC_UNSUPPORTED_PREDICTION        = 16391,      /*!< Predictor found, but not supported in the AAC Low Complexity profile. Most probably the bitstream is corrupt, or has a wrong format. */
-    ERR_AAC_UNSUPPORTED_CCE               = 16392,      /*!< A CCE element was found which is not supported. Most probably the bitstream is corrupt, or has a wrong format. */
-    ERR_AAC_UNSUPPORTED_LFE               = 16393,      /*!< A LFE element was found which is not supported. Most probably the bitstream is corrupt, or has a wrong format. */
-    ERR_AAC_UNSUPPORTED_GAIN_CONTROL_DATA = 16394,      /*!< Gain control data found but not supported. Most probably the bitstream is corrupt, or has a wrong format. */
-    ERR_AAC_UNSUPPORTED_SBA               = 16395,      /*!< SBA found, but currently not supported in the BSAC profile. */
-    ERR_AAC_TNS_READ_ERROR                = 16396,      /*!< Error while reading TNS data. Most probably the bitstream is corrupt or the system crashed. */
-    ERR_AAC_RVLC_ERROR                    = 16397,      /*!< Error while decoding error resillient data. */
-    ERR_AAC_ANC_DATA_ERROR                = 32769,      /*!< Non severe error concerning the ancillary data handling. */
-    ERR_AAC_TOO_SMALL_ANC_BUFFER          = 32770,      /*!< The registered ancillary data buffer is too small to receive the parsed data. */
-    ERR_AAC_TOO_MANY_ANC_ELEMENTS         = 32771,      /*!< More than the allowed number of ancillary data elements should be written to buffer. */
-} HI_AACDEC_ERR_E;
-
-typedef struct _AACFrameInfo
-{
-    int bitRate;
-    int nChans;                      /**<channels,range:1,2*/
-    int sampRateCore;                /**<inner sample rate*/
-    int sampRateOut;                 /**<output samplerate*/
-    int bitsPerSample;               /**<bitwidth ,range:16*/
-    int outputSamps;                 /**<output samples*/
-    int profile;                     /**<profile*/
-    int tnsUsed;                     /**<tns tools*/
-    int pnsUsed;                     /**<pns tools*/
-} AACFrameInfo;
-
-typedef enum
-{
-    AACDEC_ADTS = 0,
-    AACDEC_LOAS = 1,
-    AACDEC_LATM_MCP1 = 2,
-} AACDECTransportType;
-
-typedef void* HAACDecoder;
-
-typedef struct hiAACDEC_VERSION_S
-{
-    HI_U8 aVersion[64];
-} AACDEC_VERSION_S;
-
-
-/** @} */  /** <!-- ==== Structure Definition End ==== */
-
-/******************************* API declaration *****************************/
-/** \addtogroup      AACDEC */
-/** @{ */  /** <!--  [AACDEC]*/
-
-/**
-\brief Get version information.
-\attention \n
-N/A
-\param[in] pVersion    :   version describe struct
-\retval ::HI_SUCCESS   :   Success
-\retval ::HI_FAILURE   :   pVersion is NULL, return HI_FAILURE
-\see \n
-N/A
-*/
-HI_S32 HI_AACDEC_GetVersion(AACDEC_VERSION_S* pVersion);
-
-/**
-\brief create and initial decoder device.
-\attention \n
-N/A
-\param[in] enTranType   : transport type
-\retval ::HAACDecoder   : init success, return non-NULL handle.
-\retval ::NULL          : init failure, return NULL
-\see \n
-N/A
-*/
-HAACDecoder AACInitDecoder(AACDECTransportType enTranType);
-
-/**
-\brief destroy AAC-Decoder, free the memory.
-\attention \n
-N/A
-\param[in] hAACDecoder  : AAC-Decoder handle
-\see \n
-N/A
-*/
-HI_VOID AACFreeDecoder(HAACDecoder hAACDecoder);
-
-/**
-\brief set RawMode before decode Raw Format aac bitstream(Reserved API, unused now.)
-\attention \n
-N/A
-\param[in] hAACDecoder  : AAC-Decoder handle
-\param[in] nChans       : inout channels
-\param[in] sampRate     : input sampelrate
-\retval ::HI_FAILURE    : RESERVED API, always return HI_FAILURE.
-\see \n
-N/A
-*/
-HI_S32  AACSetRawMode(HAACDecoder hAACDecoder, HI_S32 nChans, HI_S32 sampRate);
-
-/**
-\brief look for valid AAC sync header
-\attention \n
-N/A
-\param[in] hAACDecoder      : AAC-Decoder handle
-\param[in/out] ppInbufPtr   : address of the pointer of start-point of the bitstream
-\param[in/out] pBytesLeft   : pointer to BytesLeft that indicates bitstream numbers at input buffer
-\retval ::<0                : err, always return ERR_AAC_INDATA_UNDERFLOW
-\retval ::other             : Success, return number bytes of current frame
-\see \n
-N/A
-*/
-HI_S32 AACDecodeFindSyncHeader(HAACDecoder hAACDecoder, HI_U8** ppInbufPtr, HI_S32* pBytesLeft);
-
-/**
-\brief decoding AAC frame and output 1024(LC) OR 2048(HEAAC/eAAC/eAAC+) 16bit PCM samples per channel.
-\attention \n
-\param[in] hAACDecoder       : AAC-Decoder handle
-\param[in] ppInbufPtr        : address of the pointer of start-point of the bitstream
-\param[in/out] pBytesLeft    : pointer to BytesLeft that indicates bitstream numbers at input buffer,indicates the left bytes
-\param[in] pOutPcm           : the address of the out pcm buffer,pcm data in noninterlaced fotmat: L/L/L/... R/R/R/...
-\retval :: SUCCESS           : Success
-\retval :: ERROR_CODE        : FAILURE, return error_code.
-\see \n
-N/A
-*/
-HI_S32  AACDecodeFrame(HAACDecoder hAACDecoder, HI_U8** ppInbufPtr, HI_S32* pBytesLeft, HI_S16* pOutPcm);
-
-/**
-\brief get the frame information.
-\attention \n
-\param[in] hAACDecoder       : AAC-Decoder handle
-\param[out] aacFrameInfo     : frame information
-\retval :: HI_SUCCESS        : Success
-\retval :: ERROR_CODE        : FAILURE, return error_code.
-\see \n
-N/A
-*/
-HI_S32 AACGetLastFrameInfo(HAACDecoder hAACDecoder, AACFrameInfo* aacFrameInfo);
-
-/**
-\brief set eosflag.
-\attention \n
-\param[in] hAACDecoder       : AAC-Decoder handle
-\param[in] s32Eosflag        : end flag
-\retval :: HI_SUCCESS        : Success
-\retval :: ERROR_CODE        : FAILURE, return error_code.
-\see \n
-N/A
-*/
-HI_S32 AACDecoderSetEosFlag(HAACDecoder hAACDecoder, HI_S32 s32Eosflag);
-
-/**
-\brief flush internal codec state (after seeking, for example)
-\attention \n
-\param[in] hAACDecoder       : AAC-Decoder handle
-\retval :: HI_SUCCESS        : Success
-\retval :: ERROR_CODE        : FAILURE, return error_code.
-\see \n
-N/A
-*/
-HI_S32  AACFlushCodec(HAACDecoder hAACDecoder);
-
-/**
-\brief register sbrdec module
-\attention \n
-N/A
-\param[in] pModuleHandle     : pointer to WorkHandle of sbrdec module
-\retval :: HI_SUCCESS        : Success
-\retval :: ERROR_CODE        : FAILURE, return error_code.
-\see \n
-N/A
-*/
-HI_S32  AACDecoderRegisterModule(HI_VOID* pModuleHandle);
-
-/**
-\brief Get WorkHandle of sbrdec module
-\attention \n
-N/A
-\retval :: HI_VOID *          : pointer to WorkHandle of sbrdec module
-\see \n
-N/A
-*/
-HI_VOID * HI_AAC_SBRDEC_GetHandle(HI_VOID);
-
-/** @} */  /** <!-- ==== API declaration end ==== */
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif  /* __cpluscplus */
-#endif  /* __cpluscplus */
-
-#endif  /* _AACDEC_H */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/aacenc.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/aacenc.h
deleted file mode 100644
index bfeba431..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/aacenc.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*****************************************************************************
-*             Copyright 2004 - 2018, Hisilicon Tech. Co., Ltd.
-*                           ALL RIGHTS RESERVED
-* FileName: hi_spdif.h
-* Description:
-*
-* History:
-* Version   Date         Author     DefectNum    Description
-* 0.01      2006-11-01   z40717    NULL         Create this file.
-*
-*****************************************************************************/
-/**
- * \file
- * \brief Describes the information about AACENC.
- */
-
-#ifndef _AACENC_H
-#define _AACENC_H
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif     /* __cpluscplus */
-#endif  /* __cpluscplus */
-
-#include "hi_type.h"
-
-/********************************Macro Definition********************************/
-/** \addtogroup      AACENC */
-/** @{ */  /** <!-- [AACENC] */
-
-#ifdef MONO_ONLY
-#define MAX_CHANNELS 1 /**<aacenc encoder channels*/
-#else
-#define MAX_CHANNELS 2
-#endif
-
-#define AACENC_BLOCKSIZE 1024 /**<aacenc blocksize*/
-/** @} */  /** <!-- ==== Macro Definition end ==== */
-
-/*************************** Structure Definition ****************************/
-/** \addtogroup      AACENC */
-/** @{ */  /** <!-- [AACENC] */
-
-typedef enum
-{
-    HI_AACENC_OK                     = 0x0000,  /*!< No error happened. All fine. */
-
-    HI_AACENC_INVALID_HANDLE         = 0x0020,  /*!< Handle passed to function call was invalid. */
-    HI_AACENC_MEMORY_ERROR           = 0x0021,  /*!< Memory allocation failed. */
-    HI_AACENC_UNSUPPORTED_PARAMETER  = 0x0022,  /*!< Parameter not available. */
-    HI_AACENC_INVALID_CONFIG         = 0x0023,  /*!< Configuration not provided. */
-
-    HI_AACENC_INIT_ERROR             = 0x0040,  /*!< General initialization error. */
-    HI_AACENC_INIT_AAC_ERROR         = 0x0041,  /*!< AAC library initialization error. */
-    HI_AACENC_INIT_SBR_ERROR         = 0x0042,  /*!< SBR library initialization error. */
-    HI_AACENC_INIT_TP_ERROR          = 0x0043,  /*!< Transport library initialization error. */
-    HI_AACENC_INIT_META_ERROR        = 0x0044,  /*!< Meta data library initialization error. */
-
-    HI_AACENC_ENCODE_ERROR           = 0x0060,  /*!< The encoding process was interrupted by an unexpected error. */
-
-    HI_AACENC_ENCODE_EOF             = 0x0080   /*!< End of file reached. */
-
-} HI_AACENC_ERROR_E;
-
-/**Defines AACENC quality*/
-typedef enum
-{
-    AU_QualityExcellent = 0,
-    AU_QualityHigh   = 1,
-    AU_QualityMedium = 2,
-    AU_QualityLow = 3,
-} AuQuality;
-
-/**Defines AACENC format*/
-typedef enum
-{
-    AACLC = 0,              /**<AAC-LC format*/
-    EAAC = 1,               /**<HEAAC or AAC+  or aacPlusV1*/
-    EAACPLUS = 2,           /**<AAC++ or aacPlusV2*/
-    AACLD = 3,              /**<AAC LD(Low Delay)*/
-    AACELD = 4,             /**<AAC ELD(Low Delay)*/
-} AuEncoderFormat;
-
-/**Defines AACENC container*/
-typedef enum
-{
-    AACENC_ADTS = 0,
-    AACENC_LOAS = 1,
-    AACENC_LATM_MCP1 = 2,
-} AACENCTransportType;
-
-/**Defines AACENC configuration*/
-typedef struct
-{
-    AuQuality       quality;
-    AuEncoderFormat coderFormat;
-    HI_S16          bitsPerSample;
-    HI_S32          sampleRate;    /**<audio file sample rate */
-    HI_S32          bitRate;       /**<encoder bit rate in bits/sec */
-    HI_S16          nChannelsIn;   /**<number of channels on input (1,2) */
-    HI_S16          nChannelsOut;  /**<number of channels on output (1,2) */
-    HI_S16          bandWidth;     /**<targeted audio bandwidth in Hz */
-    AACENCTransportType transtype;
-} AACENC_CONFIG;
-
-/**Defines AACENC version*/
-typedef struct hiAACENC_VERSION_S
-{
-    HI_U8 aVersion[64];
-} AACENC_VERSION_S;
-
-typedef HI_U32 AAC_ENCODER_S;
-
-
-/** @} */  /** <!-- ==== Structure Definition End ==== */
-
-/******************************* API declaration *****************************/
-/** \addtogroup      AACENC */
-/** @{ */  /** <!--  [AACENC] */
-
-/**
-\brief Get version information.
-\attention \n
-N/A
-\param[in] pVersion       version describe struct
-\retval ::HI_SUCCESS   : Success
-\retval ::HI_FAILURE          : FAILURE
-\see \n
-N/A
-*/
-HI_S32  HI_AACENC_GetVersion(AACENC_VERSION_S* pVersion);
-
-/**
-\brief get reasonable default configuration.
-\attention \n
-N/A
-\param[in] pstConfig    pointer to an configuration information structure
-\retval ::HI_SUCCESS   : Success
-\retval ::HI_FAILURE          : FAILURE
-\see \n
-N/A
-*/
-HI_S32  AACInitDefaultConfig(AACENC_CONFIG* pstConfig);
-
-/**
-\brief allocate and initialize a new encoder instance.
-\attention \n
-N/A
-\param[in] phAacPlusEnc    pointer to an configuration information structure
-\param[in] pstConfig    pointer to an configuration information structure
-\retval ::HI_SUCCESS   : Success
-\retval ::HI_FAILURE   : FAILURE
-\see \n
-N/A
-*/
-HI_S32  AACEncoderOpen(AAC_ENCODER_S** phAacPlusEnc, AACENC_CONFIG* pstConfig);
-
-/**
-\brief allocate and initialize a new encoder instance
-\attention \n
-N/A
-\param[in] hAacPlusEnc    pointer to an configuration information structure
-\param[in] ps16PcmBuf    BLOCKSIZE*nChannels audio samples,interleaved
-\param[in] pu8Outbuf    pointer to output buffer,(must be 6144/8*MAX_CHANNELS bytes large)
-\param[in] ps32NumOutBytes    number of bytes in output buffer after processing
-\retval ::HI_SUCCESS   : Success
-\retval ::HI_FAILURE   : FAILURE
-\see \n
-N/A
-*/
-HI_S32  AACEncoderFrame(AAC_ENCODER_S* hAacPlusEnc, HI_S16* ps16PcmBuf,
-                        HI_U8* pu8Outbuf, HI_S32* ps32NumOutBytes);
-
-/**
-\brief close encoder device.
-\attention \n
-N/A
-\param[in] hAacPlusEnc    pointer to an configuration information structure
-\retval N/A
-\see \n
-N/A
-*/
-HI_VOID AACEncoderClose (AAC_ENCODER_S* hAacPlusEnc);
-
-/**
-\brief register sbrenc module.
-\attention \n
-N/A
-\param[in] pModuleHandle  pointer to WorkHandle of sbrenc module
-\retval ::HI_SUCCESS   : Success
-\retval ::HI_FAILURE   : FAILURE
-\see \n
-N/A
-*/
-HI_S32  AACEncoderRegisterModule(HI_VOID* pModuleHandle);
-
-/**
-\brief Get WorkHandle of sbrenc module.
-\attention \n
-N/A
-\retval ::HI_VOID *    : pointer to WorkHandle of sbrenc module
-\see \n
-N/A
-*/
-HI_VOID * HI_AAC_SBRENC_GetHandle(HI_VOID);
-
-/** @} */  /** <!-- ==== API declaration end ==== */
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif     /* __cpluscplus */
-#endif  /* __cpluscplus */
-
-#endif  /* _AACENC_H */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/acodec.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/acodec.h
deleted file mode 100644
index 61f998d2..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/acodec.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016-2018, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : acodec.h
-  Version         : Initial Draft
-  Author          : Hisilicon multimedia software group
-  Created        : 2016/6/15
-  Last Modified :
-  Description    :
-  Function List  :
-******************************************************************************/
-
-#ifndef _ACODEC_H_
-#define _ACODEC_H_
-
-#define IOC_TYPE_ACODEC 'A'
-
-typedef enum hiACODEC_FS_E {
-    ACODEC_FS_8000  =   0x1,
-    ACODEC_FS_11025 =   0x2,
-    ACODEC_FS_12000 =   0x3,
-    ACODEC_FS_16000 =   0x4,
-    ACODEC_FS_22050 =   0x5,
-    ACODEC_FS_24000 =   0x6,
-    ACODEC_FS_32000 =   0x7,
-    ACODEC_FS_44100 =   0x8,
-    ACODEC_FS_48000 =   0x9,
-    ACODEC_FS_64000 =   0xa,
-    ACODEC_FS_96000 =   0xb,
-
-    ACODEC_FS_BUTT = 0xc,
-} ACODEC_FS_E;
-
-typedef enum hiACODEC_MIXER_E {
-    ACODEC_MIXER_IN0   = 0x0,   /* 16EV200/16EV300/18EV300 Unsupport IN0. */
-    ACODEC_MIXER_IN1   = 0x1,
-    ACODEC_MIXER_IN_D  = 0x2,
-
-    ACODEC_MIXER_BUTT,
-} ACODEC_MIXER_E;
-
-typedef struct {
-    /* volume control, 0x00~0x7e, 0x7F:mute */
-    unsigned int vol_ctrl;
-    /* adc/dac mute control, 1:mute, 0:unmute */
-    unsigned int vol_ctrl_mute;
-} ACODEC_VOL_CTRL;
-
-typedef enum hiACODEC_IOCTL_E {
-    IOC_NR_SOFT_RESET_CTRL = 0x0,
-
-    IOC_NR_SET_INPUT_VOL,
-    IOC_NR_SET_OUTPUT_VOL,
-    IOC_NR_GET_INPUT_VOL,
-    IOC_NR_GET_OUTPUT_VOL,
-
-    IOC_NR_SET_I2S1_FS,
-    IOC_NR_SET_MIXER_MIC,
-    IOC_NR_SEL_DAC_CLK,
-    IOC_NR_SEL_ADC_CLK,
-    IOC_NR_SEL_ANA_MCLK,
-    IOC_NR_SET_GAIN_MICL,
-    IOC_NR_SET_GAIN_MICR,
-    IOC_NR_SET_DACL_VOL,
-    IOC_NR_SET_DACR_VOL,
-    IOC_NR_SET_ADCL_VOL,
-    IOC_NR_SET_ADCR_VOL,
-    IOC_NR_SET_MICL_MUTE,
-    IOC_NR_SET_MICR_MUTE,
-    IOC_NR_SET_DACL_MUTE,
-    IOC_NR_SET_DACR_MUTE,
-    IOC_NR_BOOSTL_ENABLE,
-    IOC_NR_BOOSTR_ENABLE,
-
-    IOC_NR_GET_GAIN_MICL,
-    IOC_NR_GET_GAIN_MICR,
-    IOC_NR_GET_DACL_VOL,
-    IOC_NR_GET_DACR_VOL,
-    IOC_NR_GET_ADCL_VOL,
-    IOC_NR_GET_ADCR_VOL,
-
-    IOC_NR_SET_PD_DACL,
-    IOC_NR_SET_PD_DACR,
-    IOC_NR_SET_PD_ADCL,
-    IOC_NR_SET_PD_ADCR,
-    IOC_NR_SET_PD_LINEINL,
-    IOC_NR_SET_PD_LINEINR,
-
-    IOC_NR_SET_DAC_DE_EMPHASIS,
-    IOC_NR_SET_ADC_HP_FILTER,
-
-    IOC_NR_SET_I2S1_DATAWIDTH,
-} ACODEC_IOCTL_E;
-
-/* reset the audio code to the default config */
-#define ACODEC_SOFT_RESET_CTRL \
-    _IO(IOC_TYPE_ACODEC, IOC_NR_SOFT_RESET_CTRL)
-/* ACODEC_FS_E */
-#define ACODEC_SET_I2S1_FS \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_I2S1_FS, unsigned int)
-
-/* select the micpga's input, micin linein, or differential input(ACODEC_MIXER_E) */
-#define ACODEC_SET_MIXER_MIC \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_MIXER_MIC, unsigned int)
-/* analog part input volume control(left channel 0~0x1f) */
-#define ACODEC_SET_GAIN_MICL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_GAIN_MICL, unsigned int)
-/* analog part input volume control(right channel 0~0x1f) */
-#define ACODEC_SET_GAIN_MICR \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_GAIN_MICR, unsigned int)
-/* Output volume control(left channel) ACODEC_VOL_CTRL */
-#define ACODEC_SET_DACL_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_DACL_VOL, ACODEC_VOL_CTRL)
-/* Output volume control(right channel) ACODEC_VOL_CTRL */
-#define ACODEC_SET_DACR_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_DACR_VOL, ACODEC_VOL_CTRL)
-/* Input volume control(left channel) ACODEC_VOL_CTRL */
-#define ACODEC_SET_ADCL_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_ADCL_VOL, ACODEC_VOL_CTRL)
-/* Input volume control(right channel) ACODEC_VOL_CTRL */
-#define ACODEC_SET_ADCR_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_ADCR_VOL, ACODEC_VOL_CTRL)
-/* Input mute control(left channel), 1:mute, 0:unmute */
-#define ACODEC_SET_MICL_MUTE \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_MICL_MUTE, unsigned int)
-/* Input mute control(right channel), 1:mute, 0:unmute */
-#define ACODEC_SET_MICR_MUTE \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_MICR_MUTE, unsigned int)
-/* Output mute control(left channel), 1:mute, 0:unmute */
-#define ACODEC_SET_DACL_MUTE \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_DACL_MUTE, unsigned int)
-/* Output mute control(right channel), 1:mute, 0:unmute */
-#define ACODEC_SET_DACR_MUTE \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_DACR_MUTE, unsigned int)
-/* Audio AD BOOST Control, 1:on, 0:off */
-#define ACODEC_ENABLE_BOOSTL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_BOOSTL_ENABLE, unsigned int)
-#define ACODEC_ENABLE_BOOSTR \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_BOOSTR_ENABLE, unsigned int)
-
-#define ACODEC_GET_GAIN_MICL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_GET_GAIN_MICL, unsigned int)
-#define ACODEC_GET_GAIN_MICR \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_GET_GAIN_MICR, unsigned int)
-#define ACODEC_GET_DACL_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_GET_DACL_VOL, ACODEC_VOL_CTRL)
-#define ACODEC_GET_DACR_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_GET_DACR_VOL, ACODEC_VOL_CTRL)
-#define ACODEC_GET_ADCL_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_GET_ADCL_VOL, ACODEC_VOL_CTRL)
-#define ACODEC_GET_ADCR_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_GET_ADCR_VOL, ACODEC_VOL_CTRL)
-
-/* set adcl power, 0: power up, 1: power down */
-#define  ACODEC_SET_PD_DACL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_PD_DACL, unsigned int)
-/* set adcr power, 0: power up, 1: power down */
-#define  ACODEC_SET_PD_DACR \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_PD_DACR, unsigned int)
-/* set adcl power, 0: power up, 1: power down */
-#define  ACODEC_SET_PD_ADCL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_PD_ADCL, unsigned int)
-/* set adcr power, 0: power up, 1: power down */
-#define  ACODEC_SET_PD_ADCR \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_PD_ADCR, unsigned int)
-/* set adcl power, 0: power up, 1: power down */
-#define  ACODEC_SET_PD_LINEINL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_PD_LINEINL, unsigned int)
-/* set adcr power, 0: power up, 1: power down */
-#define  ACODEC_SET_PD_LINEINR \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_PD_LINEINR, unsigned int)
-
-/* Don't need to set, the driver will set a default value */
-/* clock of dac and adc is reverse or obverse */
-#define ACODEC_SEL_DAC_CLK \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SEL_DAC_CLK, unsigned int)
-#define ACODEC_SEL_ADC_CLK \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SEL_ADC_CLK, unsigned int)
-/* clock of analog part and digital part is reverse or obverse */
-#define ACODEC_SEL_ANA_MCLK \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SEL_ANA_MCLK, unsigned int)
-#define ACODEC_SET_DAC_DE_EMPHASIS \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_DAC_DE_EMPHASIS, unsigned int)
-#define ACODEC_SET_ADC_HP_FILTER \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_ADC_HP_FILTER, unsigned int)
-
-#define ACODEC_SET_INPUT_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_INPUT_VOL, unsigned int)
-#define ACODEC_SET_OUTPUT_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_OUTPUT_VOL, unsigned int)
-#define ACODEC_GET_INPUT_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_GET_INPUT_VOL, unsigned int)
-#define ACODEC_GET_OUTPUT_VOL \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_GET_OUTPUT_VOL, unsigned int)
-
-/* Reserved ioctl cmd */
-#define ACODEC_SET_I2S1_DATAWIDTH \
-    _IOWR(IOC_TYPE_ACODEC, IOC_NR_SET_I2S1_DATAWIDTH, unsigned int)
-
-#endif /* End of #ifndef _ACODEC_H_ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/autoconf.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/autoconf.h
deleted file mode 100644
index 060550ad..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/autoconf.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Automatically generated C config: don't edit
- * Busybox version: 
- */
-#define AUTOCONF_TIMESTAMP "2019-10-18 18:20:56 CST"
-
-
-/*
- * General Setup
- */
-#define CONFIG_HI3516EV200 1
-#define CONFIG_HI_CHIP_TYPE 0x3516E200
-#define CONFIG_HI_ARCH "hi3516ev200"
-#define CONFIG_HI_SUBARCH ""
-#define CONFIG_HI_SUBCHIP_TYPE 0x
-#define CONFIG_SUBCHIP_HI3516EV200 1
-#define CONFIG_HI_SUBARCH ""
-#define CONFIG_HI_SUBCHIP_TYPE 0x
-#define CONFIG_UP 1
-#define CONFIG_ARM_ARCH_TYPE "up"
-#define CONFIG_A7 1
-#define CONFIG_CPU_TYPE "a7"
-#define CONFIG_VERSION_ASIC 1
-#define CONFIG_HI_FPGA "n"
-#define CONFIG_LINUX_OS 1
-#define CONFIG_OS_TYPE "linux"
-#define CONFIG_LINUX_4_9_y 1
-#define CONFIG_KERNEL_VERSION "linux-4.9.y"
-#define CONFIG_KERNEL_ARM_HIMIX100_LINUX 1
-#define CONFIG_HI_CROSS "arm-himix100-linux-"
-#define CONFIG_LIBC_TYPE "uclibc"
-#define CONFIG_KERNEL_BIT "KERNEL_BIT_32"
-#define CONFIG_USER_ARM_HIMIX100_LINUX 1
-#define CONFIG_HI_CROSS_LIB "arm-himix100-linux-"
-#define CONFIG_USER_BIT "USER_BIT_32"
-#define CONFIG_RELEASE_TYPE_RELEASE 1
-#define CONFIG_HI_RLS_MODE "HI_RELEASE"
-#define CONFIG_CUSTOMER_VERSION_COMMON 1
-#define CONFIG_CUSTOMER_VERSION "COMMON"
-
-/*
- * Media Modules Setup
- */
-
-/*
- * media base config
- */
-
-/*
- * media sys config
- */
-#define CONFIG_HI_SYS_SUPPORT 1
-#define CONFIG_HI_SYS_SCALE_COEF_SUPPORT 1
-
-/*
- * media vi config
- */
-#define CONFIG_HI_VI_SUPPORT 1
-#define CONFIG_HI_VI_BT656 1
-#define CONFIG_HI_VI_MIPI 1
-#define CONFIG_HI_ISP_2DOF_DIS_SUPPORT 1
-#define CONFIG_HI_VI_LDCV3_SUPPORT 1
-#define CONFIG_HI_VI_USERPIC_SUPPORT 1
-#define CONFIG_HI_VI_COVEREX_OVERLAYEX_SUPPORT 1
-#define CONFIG_HI_VI_LUMA_SUPPORT 1
-#define CONFIG_HI_VI_FPN_SUPPORT 1
-#define CONFIG_HI_VI_EXTCHN_SUPPORT 1
-
-/*
- * media isp config
- */
-#define CONFIG_HI_ISP_SUPPORT 1
-#define CONFIG_HI_ISP_AF_SUPPORT 1
-#define CONFIG_HI_ISP_CR_SUPPORT 1
-#define CONFIG_HI_ISP_PREGAMMA_SUPPORT 1
-#define CONFIG_HI_ISP_CA_SUPPORT 1
-
-/*
- * media dis config
- */
-
-/*
- * media vpss config
- */
-#define CONFIG_HI_VPSS_SUPPORT 1
-#define CONFIG_HI_VPSS_3DNR 1
-#define CONFIG_HI_VPSS_CHN0_BUF_WRAP 1
-#define CONFIG_HI_VPSS_LUMA_STAT_SUPPORT 1
-#define CONFIG_HI_VPSS_VGS_LDC_SUPPORT 1
-#define CONFIG_HI_VPSS_VGS_ROTATION_SUPPORT 1
-#define CONFIG_HI_VPSS_COVER_SUPPORT 1
-#define CONFIG_HI_VPSS_MOSAIC_SUPPORT 1
-#define CONFIG_HI_VPSS_BUFFER_REUSE_SUPPORT 1
-
-/*
- * media avs config
- */
-
-/*
- * media gdc config
- */
-
-/*
- * media vgs config
- */
-#define CONFIG_HI_VGS_SUPPORT 1
-#define CONFIG_HI_VGS_IVE_PRE_SUPPORT 1
-#define CONFIG_HI_VGS_LUMA_STAT_SUPPORT 1
-
-/*
- * media chnl config
- */
-#define CONFIG_HI_CHNL_SUPPORT 1
-
-/*
- * media venc config
- */
-#define CONFIG_HI_VENC_SUPPORT 1
-#define CONFIG_HI_H265E_SUPPORT 1
-#define CONFIG_HI_H265E_USERDATA_SUPPORT 1
-#define CONFIG_HI_H265E_INTRA_REFRESH_SUPPORT 1
-#define CONFIG_HI_H264E_SUPPORT 1
-#define CONFIG_HI_H264E_SVC_SUPPORT 1
-#define CONFIG_HI_H264E_USERDATA_SUPPORT 1
-#define CONFIG_HI_H264E_INTRA_REFRESH_SUPPORT 1
-#define CONFIG_HI_JPEGE_SUPPORT 1
-#define CONFIG_HI_MJPEGE_SUPPORT 1
-#define CONFIG_HI_JPEGE_DCF_SUPPORT 1
-#define CONFIG_HI_JPEGE_USERDATA_SUPPORT 1
-#define CONFIG_HI_VENC_LOWDELAY_SUPPORT 1
-#define CONFIG_HI_VENC_FRAMEBUF_RECYCLE_SUPPORT 1
-#define CONFIG_HI_VENC_MPF_VGS_SUPPORT 1
-#define CONFIG_HI_VENC_VGS_SUPPORT 1
-#define CONFIG_HI_VENC_SMARTP_SUPPORT 1
-#define CONFIG_HI_VENC_DUALP_SUPPORT 1
-#define CONFIG_HI_VENC_RCNREF_SHARE_SUPPORT 1
-#define CONFIG_HI_VENC_DEBREATH_SUPPORT 1
-#define CONFIG_HI_VENC_SKIPREF_SUPPORT 1
-#define CONFIG_HI_VENC_SCENE0_SUPPORT 1
-#define CONFIG_HI_VENC_SCENE1_SUPPORT 1
-#define CONFIG_HI_VENC_SCENE2_SUPPORT 1
-#define CONFIG_HI_RC_AVBR_SUPPORT 1
-#define CONFIG_HI_RC_QPMAP_SUPPORT 1
-#define CONFIG_HI_RC_QVBR_SUPPORT 1
-#define CONFIG_HI_RC_CVBR_SUPPORT 1
-
-/*
- * media vdec config
- */
-#define CONFIG_VDEC_IP ""
-
-/*
- * media vo config
- */
-#define CONFIG_HI_VO_SUPPORT 1
-#define CONFIG_HI_VO_COVER_OSD_SUPPORT 1
-#define CONFIG_HI_VO_VGS 1
-#define CONFIG_HI_VO_GRAPH 1
-
-/*
- * media region config
- */
-#define CONFIG_HI_REGION_SUPPORT 1
-#define CONFIG_HI_RGN_DIFFPIXOSD_SUPPORT 1
-
-/*
- * media audio config
- */
-#define CONFIG_HI_AUDIO_SUPPORT 1
-#define CONFIG_HI_ACODEC_SUPPORT 1
-#define CONFIG_HI_ACODEC_VERSION "V750"
-#define CONFIG_HI_ACODEC_MAX_GAIN 56
-#define CONFIG_HI_ACODEC_MIN_GAIN 0
-#define CONFIG_HI_ACODEC_GAIN_STEP 3
-#define CONFIG_HI_ACODEC_FAST_POWER_SUPPORT 1
-#define CONFIG_HI_DOWNVQE_SUPPORT 1
-#define CONFIG_HI_TALKVQE_SUPPORT 1
-#define CONFIG_HI_RECORDVQE_SUPPORT 1
-#define CONFIG_HI_AUDIO_STATIC_REGISTER_SUPPORT 1
-#define CONFIG_HI_AUDIO_BCD_SUPPORT 1
-#define CONFIG_HI_AUDIO_3518EV300_SUPPORT_BCD 1
-
-/*
- * media hdr config
- */
-
-/*
- * media mcf config
- */
-
-/*
- * Device Driver Setup
- */
-
-/*
- * drv config
- */
-#define CONFIG_DRV 1
-#define CONFIG_EXTDRV 1
-#define CONFIG_INTERDRV 1
-#define CONFIG_CIPHER 1
-#define CONFIG_HIUSER 1
-#define CONFIG_MIPI_RX 1
-#define CONFIG_HI_WDG 1
-#define CONFIG_HI_SYSCFG 1
-#define CONFIG_HI_LSADC 1
-
-/*
- * Component Setup
- */
-
-/*
- * Component hdmi Config
- */
-
-/*
- * Component hifb Config
- */
-#define CONFIG_HI_HIFB_SUPPORT 1
-#define CONFIG_HI_HIFB_VGS 1
-
-/*
- * Component svp Config
- */
-#define CONFIG_HI_SVP_IVE 1
-#define CONFIG_HI_SVP_IVE_NORM_GRAD 1
-#define CONFIG_HI_SVP_IVE_ST_CANDI_CORNER 1
-#define CONFIG_HI_SVP_IVE_CNN_EX 1
-#define CONFIG_HI_SVP_IVP 1
-#define CONFIG_HI_SVP_MD 1
-#define CONFIG_HI_SVP_QR 1
-
-/*
- * Component photo Config
- */
-
-/*
- * Component tde Config
- */
-#define CONFIG_HI_TDE_SUPPORT 1
-
-/*
- * Component pciv Config
- */
-
-/*
- * Component avs lut Config
- */
-
-/*
- * Component pos_query Config
- */
-
-/*
- * Component tzasc Config
- */
-
-/*
- * Component motionfusion config
- */
-
-/*
- * Component pm Config
- */
-#define CONFIG_HI_PM_SUPPORT 1
-
-/*
- * HISYSLINK Setup
- */
-
-/*
- * hisyslink config
- */
-
-/*
- * Debug Config
- */
-#define CONFIG_HI_GDB_NO 1
-#define CONFIG_HI_GDB "n"
-#define CONFIG_HI_LOG_TRACE_SUPPORT 1
-#define CONFIG_HI_LOG_TRACE_ALL 1
-#define CONFIG_HI_LOG_TRACE_LEVEL 7
-
-/*
- * Test Config
- */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_adc.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_adc.h
deleted file mode 100644
index 95187ecd..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_adc.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-*
-* Copyright (c) 2017 Hisilicon Co., Ltd.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-*
-*/
-
-#ifndef __HI_ADC_H__
-#define __HI_ADC_H__
-
-
-#define LSADC_IOCTL_BASE 'A'
-
-typedef enum hiIOC_NR_LSADC_E
-{
-    IOC_NR_LSADC_MODEL_SEL = 0,
-    IOC_NR_LSADC_CHN_ENABLE,
-    IOC_NR_LSADC_CHN_DISABLE,
-    IOC_NR_LSADC_START,
-    IOC_NR_LSADC_STOP,
-    IOC_NR_LSADC_GET_CHNVAL,
-    IOC_NR_LSADC_BUTT
-}IOC_NR_LSADC_E;
-
-#define LSADC_IOC_MODEL_SEL         _IOWR(LSADC_IOCTL_BASE, IOC_NR_LSADC_MODEL_SEL, int)
-#define LSADC_IOC_CHN_ENABLE        _IOW(LSADC_IOCTL_BASE, IOC_NR_LSADC_CHN_ENABLE, int)
-#define LSADC_IOC_CHN_DISABLE       _IOW(LSADC_IOCTL_BASE, IOC_NR_LSADC_CHN_DISABLE, int)
-#define LSADC_IOC_START             _IO(LSADC_IOCTL_BASE, IOC_NR_LSADC_START)
-#define LSADC_IOC_STOP              _IO(LSADC_IOCTL_BASE, IOC_NR_LSADC_STOP)
-#define LSADC_IOC_GET_CHNVAL        _IOWR(LSADC_IOCTL_BASE, IOC_NR_LSADC_GET_CHNVAL, int)
-
-
-
-
-#endif /* __HI_ADC_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ae_comm.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ae_comm.h
deleted file mode 100644
index ca4a9b6c..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ae_comm.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_ae_comm.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2012/12/18
-  Description   :
-  History       :
-  1.Date        : 2012/12/18
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-#ifndef __HI_AE_COMM_H__
-#define __HI_AE_COMM_H__
-
-#include "hi_type.h"
-#include "hi_comm_isp.h"
-
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#define HI_AE_LIB_NAME "hisi_ae_lib"
-
-/************************** ae ctrl cmd **************************************/
-typedef enum hiAE_CTRL_CMD_E {
-    AE_DEBUG_ATTR_SET,
-    AE_DEBUG_ATTR_GET,
-
-    AE_CTRL_BUTT,
-} AE_CTRL_CMD_E;
-
-typedef struct hiAE_DBG_ATTR_S {
-    HI_U32  u32MaxIntTime;
-    HI_U32  u32MinIntTime;
-    HI_U32  u32MaxAgain;
-    HI_U32  u32MinAgain;
-    HI_U32  u32MaxDgain;
-    HI_U32  u32MinDgain;
-    HI_U32  u32MaxIspDgain;
-    HI_U32  u32MinIspDgain;
-    HI_U32  u32MaxSysGain;
-    HI_U32  u32MinSysGain;
-    HI_U32  u32Compensation;
-    HI_U32  u32EVBias;
-    HI_BOOL bManualExposureEn;
-    HI_BOOL bManualTimeEn;
-    HI_BOOL bManualAgainEn;
-    HI_BOOL bManualDgainEn;
-    HI_BOOL bManualIspDgainEn;
-    HI_U32  u32ManualExposureLines;
-    HI_U32  u32ManualAgain;
-    HI_U32  u32ManualDgain;
-    HI_U32  u32ManualIspDgain;
-    HI_U32  au32AeWeights[AE_ZONE_ROW *AE_ZONE_COLUMN];
-} AE_DBG_ATTR_S;
-
-typedef struct hiAE_DBG_STATUS_S {
-    HI_U32  u32FrmNumBgn;
-    HI_U32  u32FullLines;
-    HI_U32  u32IntTime;
-    HI_U32  u32ShortIntTime;
-    HI_U32  u32MedIntTime;
-    HI_U32  u32LongIntTime;
-    HI_U32  u32Again;
-    HI_U32  u32Dgain;
-    HI_U32  u32IspDgain;
-    HI_U32  u32IrisFNOLin;
-    HI_U64  u64Exposure;
-    HI_U32  u32Increment;
-    HI_S32  s32HistError;
-    HI_S32  s32HistOriAverage;
-    HI_S32  s32LumaOffset;
-    HI_U32  u32Iso;
-    HI_U32  u32ExpRatio;
-    HI_U32  u32OverExpRatio;
-    HI_U32  u32OverExpRatioFilter;
-} AE_DBG_STATUS_S;
-
-/************************** sensor's interface to ae *********************/
-/* eg: 0.35db, enAccuType=AE_ACCURACY_DB, f32Accuracy=0.35
-*  and the multiply of 0.35db is power(10, (0.35/20))
-*  eg: 1/16, 2/16, 3/16 multiplies, enAccuType=AE_ACCURACY_LINEAR, f32Accuracy=0.0625
-*  eg: 1,2,4,8,16 multiplies, enAccuType=AE_ACCURACY_DB, f32Accuracy=6
-*/
-typedef enum hiAE_ACCURACY_E {
-    AE_ACCURACY_DB = 0,
-    AE_ACCURACY_LINEAR,
-    AE_ACCURACY_TABLE,
-
-    AE_ACCURACY_BUTT,
-} AE_ACCURACY_E;
-
-typedef struct hiAE_ACCURACY_S {
-    AE_ACCURACY_E enAccuType;
-    float   f32Accuracy;
-    float   f32Offset;
-} AE_ACCURACY_S;
-
-typedef struct hiAE_SENSOR_DEFAULT_S {
-    HI_U8   au8HistThresh[HIST_THRESH_NUM];
-    HI_U8   u8AeCompensation;
-
-    HI_U32  u32LinesPer500ms;
-    HI_U32  u32FlickerFreq;
-    HI_FLOAT f32Fps;
-    HI_U32  u32HmaxTimes; /* unit is ns */
-    HI_U32  u32InitExposure;
-    HI_U32  u32InitAESpeed;
-    HI_U32  u32InitAETolerance;
-
-    HI_U32  u32FullLinesStd;
-    HI_U32  u32FullLinesMax;
-    HI_U32  u32FullLines;
-    HI_U32  u32MaxIntTime;     /* RW;unit is line */
-    HI_U32  u32MinIntTime;
-    HI_U32  u32MaxIntTimeTarget;
-    HI_U32  u32MinIntTimeTarget;
-    AE_ACCURACY_S stIntTimeAccu;
-
-    HI_U32  u32MaxAgain;
-    HI_U32  u32MinAgain;
-    HI_U32  u32MaxAgainTarget;
-    HI_U32  u32MinAgainTarget;
-    AE_ACCURACY_S stAgainAccu;
-
-    HI_U32  u32MaxDgain;
-    HI_U32  u32MinDgain;
-    HI_U32  u32MaxDgainTarget;
-    HI_U32  u32MinDgainTarget;
-    AE_ACCURACY_S stDgainAccu;
-
-    HI_U32  u32MaxISPDgainTarget;
-    HI_U32  u32MinISPDgainTarget;
-    HI_U32  u32ISPDgainShift;
-
-    HI_U32  u32MaxIntTimeStep;
-    HI_U32  u32LFMaxShortTime;
-    HI_U32  u32LFMinExposure;
-
-    ISP_AE_ROUTE_S stAERouteAttr;
-    HI_BOOL bAERouteExValid;
-    ISP_AE_ROUTE_EX_S stAERouteAttrEx;
-
-    ISP_AE_ROUTE_S stAERouteSFAttr;
-    ISP_AE_ROUTE_EX_S stAERouteSFAttrEx;
-
-    HI_U16 u16ManRatioEnable;
-    HI_U32 au32Ratio[EXP_RATIO_NUM];
-
-    ISP_IRIS_TYPE_E  enIrisType;
-    ISP_PIRIS_ATTR_S stPirisAttr;
-    ISP_IRIS_F_NO_E  enMaxIrisFNO;  /* RW; Range:[0, 10]; Format:4.0; Max F number of Piris's aperture, it's related to the specific iris */
-    ISP_IRIS_F_NO_E  enMinIrisFNO;  /* RW; Range:[0, 10]; Format:4.0; Min F number of Piris's aperture, it's related to the specific iris */
-
-    ISP_AE_STRATEGY_E enAeExpMode;
-
-    HI_U16 u16ISOCalCoef;
-    HI_U8  u8AERunInterval;
-    HI_U32 u32ExpRatioMax;
-    HI_U32 u32ExpRatioMin;
-    HI_BOOL bDiffGainSupport;
-} AE_SENSOR_DEFAULT_S;
-
-typedef struct hiAE_FSWDR_ATTR_S {
-    ISP_FSWDR_MODE_E enFSWDRMode;
-} AE_FSWDR_ATTR_S;
-
-typedef struct hiAE_SENSOR_EXP_FUNC_S {
-    HI_S32 (*pfn_cmos_get_ae_default)(VI_PIPE ViPipe, AE_SENSOR_DEFAULT_S *pstAeSnsDft);
-
-    /* the function of sensor set fps */
-    HI_VOID (*pfn_cmos_fps_set)(VI_PIPE ViPipe, HI_FLOAT f32Fps, AE_SENSOR_DEFAULT_S *pstAeSnsDft);
-    HI_VOID (*pfn_cmos_slow_framerate_set)(VI_PIPE ViPipe, HI_U32 u32FullLines, AE_SENSOR_DEFAULT_S *pstAeSnsDft);
-
-    /* while isp notify ae to update sensor regs, ae call these funcs. */
-    HI_VOID (*pfn_cmos_inttime_update)(VI_PIPE ViPipe, HI_U32 u32IntTime);
-    HI_VOID (*pfn_cmos_gains_update)(VI_PIPE ViPipe, HI_U32 u32Again, HI_U32 u32Dgain);
-
-    HI_VOID (*pfn_cmos_again_calc_table)(VI_PIPE ViPipe, HI_U32 *pu32AgainLin, HI_U32 *pu32AgainDb);
-    HI_VOID (*pfn_cmos_dgain_calc_table)(VI_PIPE ViPipe, HI_U32 *pu32DgainLin, HI_U32 *pu32DgainDb);
-
-    HI_VOID (*pfn_cmos_get_inttime_max)(VI_PIPE ViPipe, HI_U16 u16ManRatioEnable, HI_U32 *au32Ratio, HI_U32 *au32IntTimeMax, HI_U32 *au32IntTimeMin, HI_U32 *pu32LFMaxIntTime);
-
-    /* long frame mode set */
-    HI_VOID (*pfn_cmos_ae_fswdr_attr_set)(VI_PIPE ViPipe, AE_FSWDR_ATTR_S *pstAeFSWDRAttr);
-
-} AE_SENSOR_EXP_FUNC_S;
-
-typedef struct hiAE_SENSOR_REGISTER_S {
-    AE_SENSOR_EXP_FUNC_S stSnsExp;
-} AE_SENSOR_REGISTER_S;
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_af_comm.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_af_comm.h
deleted file mode 100644
index f4edcfac..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_af_comm.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_af_comm.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2012/12/20
-  Description   :
-  History       :
-  1.Date        : 2012/12/20
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-#ifndef __HI_AF_COMM_H__
-#define __HI_AF_COMM_H__
-
-#include "hi_type.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#define HI_AF_LIB_NAME "hisi_af_lib"
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_audio_bcd.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_audio_bcd.h
deleted file mode 100644
index 85d343d8..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_audio_bcd.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2001-2019. All rights reserved.
- * Description: header of baby crying detection
- * Author: Hisilicon multimedia software group
- * Create: 2019-04-01
- */
-
-#ifndef __HI_AUDIO_BCD_H__
-#define __HI_AUDIO_BCD_H__
-
-#include "hi_type.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Defines the error of Baby Crying Detection. */
-#define HI_ERR_BCD_INVALID_HANDLE (hi_u32)(0xA0148100) /* Handle passed to function call was invalid. */
-#define HI_ERR_BCD_MEMORY_ERROR   (hi_u32)(0xA0148101) /* Memory allocation failed. */
-#define HI_ERR_BCD_ILLEGAL_PARAM  (hi_u32)(0xA0148102) /* Parameter not illegal. */
-#define HI_ERR_BCD_NULL_PTR       (hi_u32)(0xA0148103) /* Pointer is null. */
-#define HI_ERR_BCD_NOT_PERM       (hi_u32)(0xA0148104) /* Operation not permitted. */
-
-typedef hi_void *bcd_handle;
-typedef hi_s32 (*fn_bcd_callback)(hi_void *); /* Baby Crying Detection be noticed Function Handle type */
-
-/* Defines the configure parameters of Baby Crying Detection. */
-typedef struct {
-    hi_bool usr_mode;                  /* mode 0: auto mode 1: mannual. */
-    hi_bool bypass;                    /* value 0: enable function; value 1: bypass function. */
-    hi_u32 alarm_threshold;            /* alarm threshold. range[0, 100] */
-    hi_u32 time_limit;                 /* alarm time limit(ms). */
-    hi_u32 time_limit_threshold_count; /* alarm time limit threshold count. */
-    hi_u32 interval_time;              /* alarm interval time(ms) */
-    fn_bcd_callback callback;          /* the callback function pointer */
-} hi_bcd_config;
-
-/* Defines the process data configure of Baby Crying Detection. */
-typedef struct {
-    hi_s16 *data;     /* the pointer to data buf. */
-    hi_s32 data_size; /* the size of data buf. */
-} hi_bcd_process_data;
-
-hi_s32 hi_baby_crying_detection_init(bcd_handle *bcd, hi_s32 sample_rate, const hi_bcd_config *bcd_config);
-
-hi_s32 hi_baby_crying_detection_process(bcd_handle bcd, hi_bcd_process_data *input_data,
-                                        hi_bcd_process_data *output_data);
-
-hi_s32 hi_baby_crying_detection_deinit(bcd_handle bcd);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
\ No newline at end of file
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_awb_comm.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_awb_comm.h
deleted file mode 100644
index 37f12eb1..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_awb_comm.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_awb_comm.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2012/12/19
-  Description   :
-  History       :
-  1.Date        : 2012/12/19
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-#ifndef __HI_AWB_COMM_H__
-#define __HI_AWB_COMM_H__
-
-#include "hi_type.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#define HI_AWB_LIB_NAME "hisi_awb_lib"
-
-typedef struct hiAWB_DBG_ATTR_S {
-    HI_U16 u16WhiteLevel;
-    HI_U16 u16BlackLevel;
-    HI_U16 u16CrMax;
-    HI_U16 u16CrMin;
-    HI_U16 u16CbMax;
-    HI_U16 u16CbMin;
-    HI_U16 u16CrHigh;
-    HI_U16 u16CrLow;
-    HI_U16 u16CbHigh;
-    HI_U16 u16CbLow;
-    HI_U16 u16RawWhiteLevel;
-    HI_U16 u16RawBlackLevel;
-    HI_U16 u16RawCrMax;
-    HI_U16 u16RawCrMin;
-    HI_U16 u16RawCbMax;
-    HI_U16 u16RawCbMin;
-    HI_U16 u16RawCrHigh;
-    HI_U16 u16RawCrLow;
-    HI_U16 u16RawCbHigh;
-    HI_U16 u16RawCbLow;
-
-    HI_U16 u16WDRMode;
-    HI_U16 u16Enable;
-    HI_U16 u16ManualEnable;
-    HI_U16 u16Zone;
-    HI_U16 u16HighTemp;
-    HI_U16 u16LowTemp;
-    HI_U16 u16RefTemp;
-    HI_U16 u16RgainBase;
-    HI_U16 u16GgainBase;
-    HI_U16 u16BgainBase;
-    HI_S32 s32p1;
-    HI_S32 s32p2;
-    HI_S32 s32q;
-    HI_S32 s32a;
-    HI_S32 s32c;
-
-    HI_U16 u16ManSatEnable;
-    HI_U16 u16SatTarget;
-} AWB_DBG_ATTR_S;
-
-typedef struct hiAWB_ZONE_DBG_S {
-    HI_U16 u16Sum;
-    HI_U16 u16Rg;
-    HI_U16 u16Bg;
-    HI_U16 u16CountAll;
-    HI_U16 u16CountMin;
-    HI_U16 u16CountMax;
-    HI_U16 u16RawRAvg;
-    HI_U16 u16RawGAvg;
-    HI_U16 u16RawBAvg;
-    HI_U16 u16TK;
-    HI_U16 u16Weight;
-    HI_S16 s16Shift;
-} AWB_ZONE_DBG_S;
-
-typedef struct hiAWB_DBG_STATUS_S {
-    HI_U32 u32FrmNumBgn;
-    HI_U32 u32GlobalSum;
-    HI_U16 u16GlobalRgSta;
-    HI_U16 u16GlobalBgSta;
-    HI_U16 u16GlobalCountAll;
-    HI_U16 u16GlobalCountMin;
-    HI_U16 u16GlobalCountMax;
-    HI_U16 u16GlobalRAvg;
-    HI_U16 u16GlobalGAvg;
-    HI_U16 u16GlobalBAvg;
-    HI_U16 u16TK;
-    HI_U16 u16Rgain;
-    HI_U16 u16Ggain;
-    HI_U16 u16Bgain;
-    HI_U16 au16CCM[CCM_MATRIX_SIZE];
-
-    HI_U32 au32HistInfo[256];
-    AWB_ZONE_DBG_S astZoneDebug[AWB_ZONE_NUM];
-
-    HI_U32 u32FrmNumEnd;
-} AWB_DBG_STATUS_S;
-
-/************************** sensor's interface to awb *********************/
-
-typedef struct hiAWB_CCM_TAB_S {
-    HI_U16 u16ColorTemp;                   /* RW;  Range:[2000,10000]; Format:16.0; the current color temperature */
-    HI_U16 au16CCM[CCM_MATRIX_SIZE];       /* RW;  Range: [0x0, 0xFFFF]; Format:8.8; CCM matrixes for different color temperature */
-} AWB_CCM_TAB_S;
-
-typedef struct hiAWB_CCM_S {
-    HI_U16  u16CCMTabNum;                   /* RW;  Range: [0x3, 0x7]; Format:16.0; The number of CCM matrixes */
-    AWB_CCM_TAB_S astCCMTab[CCM_MATRIX_NUM];
-} AWB_CCM_S;
-
-typedef struct hiAWB_AGC_TABLE_S {
-    HI_BOOL bValid;
-
-    HI_U8   au8Saturation[ISP_AUTO_ISO_STRENGTH_NUM];   /* RW;adjust saturation, different iso with different saturation */
-} AWB_AGC_TABLE_S;
-
-typedef struct hiAWB_SENSOR_DEFAULT_S {
-    HI_U16  u16WbRefTemp;       /* RW;reference color temperature for WB  */
-    HI_U16  au16GainOffset[ISP_BAYER_CHN_NUM];  /* RW; gain offset for white balance */
-    HI_S32  as32WbPara[AWB_CURVE_PARA_NUM];      /* RW; parameter for wb curve,p1,p2,q1,a1,b1,c1 */
-
-    HI_U16  u16GoldenRgain;      /* Rgain for the golden sample */
-    HI_U16  u16GoldenBgain;      /* Bgain for the golden sample */
-    HI_U16  u16SampleRgain;      /* Rgain for the current sample */
-    HI_U16  u16SampleBgain;      /* Bgain for the current sample */
-    AWB_AGC_TABLE_S stAgcTbl;
-    AWB_CCM_S stCcm;
-    HI_U16    u16InitRgain;           /* Init WB gain */
-    HI_U16    u16InitGgain;
-    HI_U16    u16InitBgain;
-    HI_U8     u8AWBRunInterval;       /* RW;AWB Run Interval */
-    HI_U16    au16InitCCM[CCM_MATRIX_SIZE];
-} AWB_SENSOR_DEFAULT_S;
-
-typedef struct hiAWB_SPEC_SENSOR_DEFAULT_S {
-    ISP_SPECAWB_ATTR_S  stSpecAwbAttrs;
-    ISP_SPECAWB_CAA_CONTROl_S stCaaControl;
-} AWB_SPEC_SENSOR_DEFAULT_S;
-
-typedef struct hiAWB_SENSOR_EXP_FUNC_S {
-    HI_S32 (*pfn_cmos_get_awb_default)(VI_PIPE ViPipe, AWB_SENSOR_DEFAULT_S *pstAwbSnsDft);
-    HI_S32 (*pfn_cmos_get_awb_spec_default)(VI_PIPE ViPipe, AWB_SPEC_SENSOR_DEFAULT_S *pstAwbSpecSnsDft);
-} AWB_SENSOR_EXP_FUNC_S;
-
-typedef struct hiAWB_SENSOR_REGISTER_S {
-    AWB_SENSOR_EXP_FUNC_S stSnsExp;
-} AWB_SENSOR_REGISTER_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_buffer.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_buffer.h
deleted file mode 100644
index 13793513..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_buffer.h
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
-* Copyright (c) Hisilicon Technologies Co., Ltd. 2011-2019. All rights reserved.
-* Description:
-* Author: Hisilicon multimedia software group
-* Create: 2011/06/28
- */
-
-#ifndef __HI_BUFFER_H__
-#define __HI_BUFFER_H__
-
-#include "hi_math.h"
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_comm_video.h"
-#ifndef __HuaweiLite__
-#ifdef __KERNEL__
-#include "hi_osal.h"
-#endif
-#endif
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-#define HI_MAXINUM_LIMIT 10000
-
-__inline static HI_VOID COMMON_GetPicBufferConfig(HI_U32 u32Width, HI_U32 u32Height,
-    PIXEL_FORMAT_E enPixelFormat, DATA_BITWIDTH_E enBitWidth,
-    COMPRESS_MODE_E enCmpMode, HI_U32 u32Align, VB_CAL_CONFIG_S *pstCalConfig)
-{
-    HI_U32 u32BitWidth = 0;
-    HI_U32 u32VBSize = 0;
-    HI_U32 u32HeadSize = 0;
-    HI_U32 u32AlignHeight;
-    HI_U32 u32MainStride = 0;
-    HI_U32 u32MainSize = 0;
-    HI_U32 u32HeadStride = 0;
-    HI_U32 u32HeadYSize = 0;
-    HI_U32 u32YSize = 0;
-
-    if ((u32Width > HI_MAXINUM_LIMIT) || (u32Height > HI_MAXINUM_LIMIT)) {
-        pstCalConfig->u32VBSize = 0;
-    }
-
-    /* u32Align: 0 is automatic mode, alignment size following system. Non-0 for specified alignment size */
-    if (u32Align == 0) {
-        u32Align = DEFAULT_ALIGN;
-    } else if (u32Align > MAX_ALIGN) {
-        u32Align = MAX_ALIGN;
-    } else {
-        u32Align = (ALIGN_UP(u32Align, DEFAULT_ALIGN));
-    }
-
-    switch (enBitWidth) {
-        case DATA_BITWIDTH_8: {
-            u32BitWidth = 8;
-            break;
-        }
-        case DATA_BITWIDTH_16: {
-            u32BitWidth = 16;
-            break;
-        }
-        default:
-        {
-            u32BitWidth = 0;
-            break;
-        }
-    }
-
-    u32AlignHeight = ALIGN_UP(u32Height, 2);
-
-    if (enCmpMode == COMPRESS_MODE_NONE) {
-        u32MainStride = ALIGN_UP((u32Width * u32BitWidth + 7) >> 3, u32Align);
-        u32YSize = u32MainStride * u32AlignHeight;
-
-        if ((PIXEL_FORMAT_YVU_SEMIPLANAR_420 == enPixelFormat) ||
-            (PIXEL_FORMAT_YUV_SEMIPLANAR_420 == enPixelFormat)) {
-            u32MainSize = (u32MainStride * u32AlignHeight * 3) >> 1;
-        } else if ((PIXEL_FORMAT_YVU_SEMIPLANAR_422 == enPixelFormat) ||
-                   (PIXEL_FORMAT_YUV_SEMIPLANAR_422 == enPixelFormat)) {
-            u32MainSize = u32MainStride * u32AlignHeight * 2;
-        } else if ((enPixelFormat == PIXEL_FORMAT_YUV_400) ||
-                   (enPixelFormat == PIXEL_FORMAT_S16C1) ||
-                   (enPixelFormat == PIXEL_FORMAT_U16C1) ||
-                   (enPixelFormat == PIXEL_FORMAT_S8C1) ||
-                   (enPixelFormat == PIXEL_FORMAT_U8C1)) {
-            u32MainSize = u32MainStride * u32AlignHeight;
-        } else if ((PIXEL_FORMAT_YUYV_PACKAGE_422 == enPixelFormat) ||
-                   (PIXEL_FORMAT_YVYU_PACKAGE_422 == enPixelFormat) ||
-                   (PIXEL_FORMAT_UYVY_PACKAGE_422 == enPixelFormat) ||
-                   (PIXEL_FORMAT_VYUY_PACKAGE_422 == enPixelFormat) ||
-                   (PIXEL_FORMAT_YYUV_PACKAGE_422 == enPixelFormat) ||
-                   (PIXEL_FORMAT_YYVU_PACKAGE_422 == enPixelFormat) ||
-                   (PIXEL_FORMAT_UVYY_PACKAGE_422 == enPixelFormat) ||
-                   (PIXEL_FORMAT_VUYY_PACKAGE_422 == enPixelFormat) ||
-                   (PIXEL_FORMAT_VY1UY0_PACKAGE_422 == enPixelFormat)) {
-            u32MainStride = ALIGN_UP((u32Width * u32BitWidth + 7) >> 3, u32Align) * 2;
-            u32MainSize = u32MainStride * u32AlignHeight;
-        } else {
-            u32MainSize = u32MainStride * u32AlignHeight * 3;
-        }
-
-        u32VBSize = u32MainSize;
-    } else {
-        HI_U32 u32CmpRatioLuma = 1450;
-        HI_U32 u32CmpRatioChroma = 1800;
-        HI_U32 u32CSizeFor420;
-
-        u32HeadStride = 16;
-        u32HeadYSize = u32HeadStride * u32AlignHeight;
-
-#ifndef __HuaweiLite__
-#ifdef __KERNEL__
-        u32YSize = osal_div64_u64(u32Width * u32AlignHeight * 1000ULL, u32CmpRatioLuma);
-#else
-        u32YSize = u32Width * u32AlignHeight * 1000ULL / u32CmpRatioLuma;
-#endif
-#else
-        u32YSize = u32Width * u32AlignHeight * 1000ULL / u32CmpRatioLuma;
-#endif
-        u32YSize = ALIGN_UP(u32YSize, DEFAULT_ALIGN);
-
-#ifndef __HuaweiLite__
-#ifdef __KERNEL__
-        u32CSizeFor420 = osal_div64_u64(u32Width * u32AlignHeight * 1000ULL, u32CmpRatioChroma * 2);
-#else
-        u32CSizeFor420 = (u32Width * u32AlignHeight * 1000ULL) / (u32CmpRatioChroma*2);
-#endif
-#else
-        u32CSizeFor420 = (u32Width * u32AlignHeight * 1000ULL) / (u32CmpRatioChroma*2);
-#endif
-        u32CSizeFor420 = ALIGN_UP(u32CSizeFor420, DEFAULT_ALIGN);
-
-        if ((PIXEL_FORMAT_YVU_SEMIPLANAR_420 == enPixelFormat) ||
-            (PIXEL_FORMAT_YUV_SEMIPLANAR_420 == enPixelFormat)) {
-            u32HeadSize = u32HeadYSize + u32HeadYSize / 2;
-            u32MainSize = u32YSize + u32CSizeFor420;
-        } else if (PIXEL_FORMAT_YVU_SEMIPLANAR_422 == enPixelFormat ||
-                   PIXEL_FORMAT_YUV_SEMIPLANAR_422 == enPixelFormat) {
-            u32HeadSize = u32HeadYSize * 2;
-            u32MainSize = u32YSize + (u32CSizeFor420 * 2);
-        } else if (enPixelFormat == PIXEL_FORMAT_YUV_400) {
-            u32HeadSize = u32HeadYSize;
-            u32MainSize = u32YSize;
-        } else {
-            u32HeadSize = u32HeadYSize * 3;
-            u32MainSize = u32YSize + (u32CSizeFor420 * 2) * 2;
-        }
-
-        if (u32Width <= VPSS_LINE_BUFFER) {
-            u32HeadSize = 64 + ALIGN_UP(u32HeadSize, u32Align);
-            u32VBSize = u32HeadSize + u32MainSize;
-        } else {
-            u32HeadSize = (64 + ALIGN_UP(u32HeadSize, u32Align)) * 2;
-            u32VBSize = u32HeadSize + u32MainSize + 2 * DEFAULT_ALIGN;
-        }
-    }
-
-    pstCalConfig->u32VBSize = u32VBSize;
-    pstCalConfig->u32HeadStride = u32HeadStride;
-    pstCalConfig->u32HeadYSize = u32HeadYSize;
-    pstCalConfig->u32HeadSize = u32HeadSize;
-    pstCalConfig->u32MainStride = u32MainStride;
-    pstCalConfig->u32MainYSize = u32YSize;
-    pstCalConfig->u32MainSize = u32MainSize;
-    pstCalConfig->u32ExtStride = 0;
-    pstCalConfig->u32ExtYSize = 0;
-
-    return;
-}
-
-__inline static HI_U32 COMMON_GetPicBufferSize(HI_U32 u32Width, HI_U32 u32Height,
-    PIXEL_FORMAT_E enPixelFormat, DATA_BITWIDTH_E enBitWidth, COMPRESS_MODE_E enCmpMode, HI_U32 u32Align)
-{
-    VB_CAL_CONFIG_S stCalConfig;
-
-    COMMON_GetPicBufferConfig(u32Width, u32Height, enPixelFormat, enBitWidth, enCmpMode, u32Align, &stCalConfig);
-
-    return stCalConfig.u32VBSize;
-}
-
-__inline static HI_U32 VPSS_GetWrapBufferSize(HI_U32 u32Width, HI_U32 u32Height, HI_U32 u32BufLine,
-    PIXEL_FORMAT_E enPixelFormat, DATA_BITWIDTH_E enBitWidth, COMPRESS_MODE_E enCmpMode, HI_U32 u32Align)
-{
-    VB_CAL_CONFIG_S stCalConfig;
-
-    /* u32Align: 0 is automatic mode, alignment size following system. Non-0 for specified alignment size */
-    if (u32Align == 0) {
-        u32Align = DEFAULT_ALIGN;
-    } else if (u32Align > MAX_ALIGN) {
-        u32Align = MAX_ALIGN;
-    } else {
-        u32Align = (ALIGN_UP(u32Align, DEFAULT_ALIGN));
-    }
-
-    if ((u32BufLine != 0) && (u32BufLine < u32Height)) {
-        COMMON_GetPicBufferConfig(u32Width, u32BufLine, enPixelFormat, enBitWidth, enCmpMode, u32Align, &stCalConfig);
-
-        if(enCmpMode == COMPRESS_MODE_SEG){
-            stCalConfig.u32HeadYSize = stCalConfig.u32HeadStride * ALIGN_UP(u32Height, 2);
-            if ((PIXEL_FORMAT_YVU_SEMIPLANAR_420 == enPixelFormat) || (PIXEL_FORMAT_YUV_SEMIPLANAR_420 == enPixelFormat)) {
-                stCalConfig.u32HeadSize = stCalConfig.u32HeadYSize + stCalConfig.u32HeadYSize / 2;
-            } else if (PIXEL_FORMAT_YVU_SEMIPLANAR_422 == enPixelFormat ||
-                       PIXEL_FORMAT_YUV_SEMIPLANAR_422 == enPixelFormat) {
-                stCalConfig.u32HeadSize = stCalConfig.u32HeadYSize * 2;
-            } else if (enPixelFormat == PIXEL_FORMAT_YUV_400) {
-                stCalConfig.u32HeadSize = stCalConfig.u32HeadYSize;
-            } else {
-                stCalConfig.u32HeadSize = stCalConfig.u32HeadYSize * 3;
-            }
-
-            if (u32Width <= VPSS_LINE_BUFFER) {
-                stCalConfig.u32HeadSize = 64 + ALIGN_UP(stCalConfig.u32HeadSize, u32Align);
-                stCalConfig.u32VBSize = stCalConfig.u32HeadSize + stCalConfig.u32MainSize;
-            } else {
-                stCalConfig.u32HeadSize = (64 + ALIGN_UP(stCalConfig.u32HeadSize, u32Align)) * 2;
-                stCalConfig.u32VBSize = stCalConfig.u32HeadSize + stCalConfig.u32MainSize + 2 * DEFAULT_ALIGN;
-            }
-
-                }
-    } else {
-        COMMON_GetPicBufferConfig(u32Width, u32Height, enPixelFormat, enBitWidth, enCmpMode, u32Align, &stCalConfig);
-    }
-
-    return stCalConfig.u32VBSize;
-}
-
-__inline static HI_U32 VI_GetRawBufferSize(HI_U32 u32Width, HI_U32 u32Height,
-                                           PIXEL_FORMAT_E enPixelFormat, COMPRESS_MODE_E enCmpMode, HI_U32 u32Align)
-{
-    HI_U32 u32BitWidth;
-    HI_U32 u32Size = 0;
-    HI_U32 u32Stride = 0;
-    HI_U32 u32CmpRatioLine = 1600;
-    HI_U32 u32CmpRatioFrame = 2000;
-
-    if ((u32Width > HI_MAXINUM_LIMIT) || (u32Height > HI_MAXINUM_LIMIT)) {
-        return 0;
-    }
-
-    /* u32Align: 0 is automatic mode, alignment size following system. Non-0 for specified alignment size */
-    if (u32Align == 0) {
-        u32Align = DEFAULT_ALIGN;
-    } else if (u32Align > MAX_ALIGN) {
-        u32Align = MAX_ALIGN;
-    } else {
-        u32Align = (ALIGN_UP(u32Align, DEFAULT_ALIGN));
-    }
-
-    switch (enPixelFormat) {
-        case PIXEL_FORMAT_RGB_BAYER_8BPP: {
-            u32BitWidth = 8;
-            break;
-        }
-
-        case PIXEL_FORMAT_RGB_BAYER_10BPP: {
-            u32BitWidth = 10;
-            break;
-        }
-
-        case PIXEL_FORMAT_RGB_BAYER_12BPP: {
-            u32BitWidth = 12;
-            break;
-        }
-
-        case PIXEL_FORMAT_RGB_BAYER_14BPP: {
-            u32BitWidth = 14;
-            break;
-        }
-
-        case PIXEL_FORMAT_RGB_BAYER_16BPP: {
-            u32BitWidth = 16;
-            break;
-        }
-
-        default:
-        {
-            u32BitWidth = 0;
-            break;
-        }
-    }
-
-    if (enCmpMode == COMPRESS_MODE_NONE) {
-        u32Stride = ALIGN_UP(ALIGN_UP(u32Width * u32BitWidth, 8) / 8, u32Align);
-        u32Size = u32Stride * u32Height;
-    } else if (enCmpMode == COMPRESS_MODE_LINE) {
-        HI_U32 u32Tmp;
-        u32Tmp = ALIGN_UP((16 + u32Width * u32BitWidth * 1000UL / u32CmpRatioLine + 8192 + 127) / 128, 2);
-        u32Stride = ALIGN_UP(u32Tmp * 16, u32Align);
-        u32Size = u32Stride * u32Height;
-    } else if (enCmpMode == COMPRESS_MODE_FRAME) {
-        u32Size = ALIGN_UP(u32Height * u32Width * u32BitWidth * 1000UL / (u32CmpRatioFrame * 8), u32Align);
-    }
-
-    return u32Size;
-}
-
-__inline static HI_U32 VENC_GetRefPicInfoBufferSize(PAYLOAD_TYPE_E enType, HI_U32 u32Width, HI_U32 u32Height,
-                                                    HI_U32 u32Align)
-{
-    HI_U32 u32Size;
-    HI_U32 u32AlignWidth, u32AlignHeight;
-    HI_U32 u32TmvSize, u32PmeSize, u32PmeInfoSize;
-
-    if ((u32Width > HI_MAXINUM_LIMIT) || (u32Height > HI_MAXINUM_LIMIT)) {
-        return 0;
-    }
-
-    if (enType == PT_H265) {
-        u32AlignWidth = ALIGN_UP(u32Width, 32) >> 5;
-        u32AlignHeight = ALIGN_UP(u32Height, 32) >> 5;
-
-        u32TmvSize = ALIGN_UP(u32AlignWidth * u32AlignHeight, 2) * 16;
-        u32PmeSize = (u32AlignWidth << 3) * (u32AlignHeight << 3);
-
-        u32AlignWidth = ALIGN_UP(u32Width, 512) >> 9;
-        u32AlignHeight = ALIGN_UP(u32Height, 32) >> 5;
-        u32PmeInfoSize = (u32AlignWidth * u32AlignHeight) << 3;
-
-        u32Size = u32TmvSize + u32PmeSize + u32PmeInfoSize;
-
-    } else if (enType == PT_H264) {
-        u32TmvSize = 0;
-
-        u32AlignWidth = ALIGN_UP(u32Width, 64) / 4;
-        u32AlignHeight = ALIGN_UP(u32Height, 16) / 4;
-        u32PmeSize = u32AlignWidth * u32AlignHeight;
-
-        u32AlignWidth = ALIGN_UP(u32Width, 1024) >> 10;
-        u32AlignHeight = ALIGN_UP(u32Height, 16) >> 4;
-        u32PmeInfoSize = (u32AlignWidth * u32AlignHeight) << 3;
-
-        u32Size = u32TmvSize + u32PmeSize + u32PmeInfoSize;
-    } else {
-        u32Size = 0;
-    }
-
-    return u32Size;
-}
-
-__inline static HI_U32 VENC_GetRefBufferSize(PAYLOAD_TYPE_E enType, HI_U32 u32Width, HI_U32 u32Height,
-                                             DATA_BITWIDTH_E enBitWidth, HI_U32 u32Align)
-{
-    HI_U32 u32Size = 0;
-    HI_U32 u32AlignWidth, u32AlignHeight, u32BitWidth;
-    HI_U32 u32YHeaderSize, u32CHeaderSize, u32YSize, u32CSize;
-
-    if ((u32Width > HI_MAXINUM_LIMIT) || (u32Height > HI_MAXINUM_LIMIT)) {
-        return 0;
-    }
-
-    if (enBitWidth == DATA_BITWIDTH_8) {
-        u32BitWidth = 8;
-    } else {
-        return 0;
-    }
-
-    if (enType == PT_H265) {
-        u32AlignWidth = ALIGN_UP(u32Width, 128);
-        u32AlignHeight = ALIGN_UP(u32Height, 32);
-
-        u32YHeaderSize = ((u32AlignWidth >> 7) << 4) * ((u32AlignHeight >> 5) + 1);
-        u32CHeaderSize = u32YHeaderSize;
-
-        u32AlignWidth = ALIGN_UP(u32Width, 64);
-        u32AlignHeight = ALIGN_UP(u32Height, 16);
-        u32YSize = (u32AlignWidth * u32AlignHeight * u32BitWidth) >> 3;
-        u32CSize = u32YSize >> 1;
-
-        u32Size = u32YHeaderSize + u32CHeaderSize + u32YSize + u32CSize;
-    } else if (enType == PT_H264) {
-        u32AlignWidth = ALIGN_UP(u32Width, 256);
-        u32AlignHeight = ALIGN_UP(u32Height, 16);
-        u32YHeaderSize = ((u32AlignWidth >> 8) << 4) * ((u32AlignHeight >> 4) + 1);
-        u32CHeaderSize = u32YHeaderSize;
-
-        u32AlignWidth = ALIGN_UP(u32Width, 64);
-        u32AlignHeight = ALIGN_UP(u32Height, 16);
-        u32YSize = u32AlignWidth * u32AlignHeight;
-        u32CSize = u32YSize >> 1;
-
-        u32Size = u32YHeaderSize + u32CHeaderSize + u32YSize + u32CSize;
-    } else {
-        u32Size = 0;
-    }
-
-    return u32Size;
-}
-
-__inline static HI_U32 VENC_GetQpmapSizeStride(HI_U32 u32Width)
-{
-    if (u32Width > HI_MAXINUM_LIMIT) {
-        return 0;
-    }
-
-    return DIV_UP(u32Width, 128) * 8;
-}
-
-__inline static HI_U32 VENC_GetQpmapSize(HI_U32 u32Width, HI_U32 u32Height)
-{
-    HI_U32 u32Stride, u32AlignHeight;
-
-    if ((u32Width > HI_MAXINUM_LIMIT) || (u32Height > HI_MAXINUM_LIMIT)) {
-        return 0;
-    }
-
-    u32Stride = VENC_GetQpmapSizeStride(u32Width);
-    u32AlignHeight = DIV_UP(u32Height, 16);
-
-    return u32Stride * u32AlignHeight;
-}
-
-__inline static HI_U32 VENC_GetSkipWeightSizeStride(PAYLOAD_TYPE_E enType, HI_U32 u32Width)
-{
-    HI_U32 u32Stride;
-
-    if (u32Width > HI_MAXINUM_LIMIT) {
-        return 0;
-    }
-
-    if (enType == PT_H265) {
-        u32Stride = DIV_UP(u32Width, 512) * 8;
-    } else if (enType == PT_H264) {
-        u32Stride = DIV_UP(u32Width, 256) * 8;
-    } else {
-        u32Stride = 0;
-    }
-
-    return u32Stride;
-}
-__inline static HI_U32 VENC_GetSkipWeightSize(PAYLOAD_TYPE_E enType, HI_U32 u32Width, HI_U32 u32Height)
-{
-    HI_U32 u32Stride, u32AlignHeight;
-
-    if ((u32Width > HI_MAXINUM_LIMIT) || (u32Height > HI_MAXINUM_LIMIT)) {
-        return 0;
-    }
-
-    u32Stride = VENC_GetSkipWeightSizeStride(enType, u32Width);
-
-    if (enType == PT_H265) {
-        u32AlignHeight = DIV_UP(u32Height, 32);
-    } else if (enType == PT_H264) {
-        u32AlignHeight = DIV_UP(u32Height, 16);
-    } else {
-        u32AlignHeight = 0;
-    }
-
-    return u32Stride * u32AlignHeight;
-}
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_BUFFER_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_3a.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_3a.h
deleted file mode 100644
index 2ac40a01..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_3a.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_comm_3a.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2012/12/18
-  Description   :
-  History       :
-  1.Date        : 2012/12/18
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-
-#ifndef __HI_COMM_3A_H__
-#define __HI_COMM_3A_H__
-
-#include "hi_common.h"
-#include "hi_comm_isp.h"
-#include "hi_comm_sns.h"
-
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#define IS_LINEAR_MODE(mode)      ((mode) == WDR_MODE_NONE)
-#define IS_WDR_MODE(mode)         ((!IS_LINEAR_MODE(mode)) && ((mode) < WDR_MODE_BUTT))
-#define IS_HDR_MODE(mode)         (((mode) > DYNAMIC_RANGE_SDR10) && ((mode) < DYNAMIC_RANGE_BUTT))
-#define IS_BUILT_IN_WDR_MODE(mode) ((mode) == WDR_MODE_BUILT_IN)
-#define IS_FS_WDR_MODE(mode)      ((!IS_LINEAR_MODE(mode))&& (!IS_BUILT_IN_WDR_MODE(mode)) && ((mode) < WDR_MODE_BUTT))
-#define IS_2to1_WDR_MODE(mode)    (((mode) == WDR_MODE_2To1_FRAME) || ((mode) == WDR_MODE_2To1_FRAME_FULL_RATE) || ((mode) == WDR_MODE_2To1_LINE) || ((mode) == WDR_MODE_QUDRA))
-#define IS_3to1_WDR_MODE(mode)    (((mode) == WDR_MODE_3To1_FRAME) || ((mode) == WDR_MODE_3To1_FRAME_FULL_RATE) || ((mode) == WDR_MODE_3To1_LINE))
-#define IS_4to1_WDR_MODE(mode)    (((mode) == WDR_MODE_4To1_FRAME) || ((mode) == WDR_MODE_4To1_FRAME_FULL_RATE) || ((mode) == WDR_MODE_4To1_LINE))
-#define IS_FULL_WDR_MODE(mode)    (((mode) == WDR_MODE_2To1_FRAME_FULL_RATE) || ((mode) == WDR_MODE_3To1_FRAME_FULL_RATE) || ((mode) == WDR_MODE_4To1_FRAME_FULL_RATE))
-#define IS_HALF_WDR_MODE(mode)    (((mode) == WDR_MODE_2To1_FRAME) || ((mode) == WDR_MODE_3To1_FRAME) || ((mode) == WDR_MODE_4To1_FRAME))
-#define IS_LINE_WDR_MODE(mode)    (((mode) == WDR_MODE_2To1_LINE) || ((mode) == WDR_MODE_3To1_LINE) || ((mode) == WDR_MODE_4To1_LINE) || ((mode) == WDR_MODE_QUDRA))
-
-#define IS_STITCH_MAIN_PIPE(ViPipe,MainPipe) ((ViPipe) == (MainPipe))
-#define IS_OFFLINE_MODE(mode)    ((mode) == ISP_MODE_RUNNING_OFFLINE)
-#define IS_ONLINE_MODE(mode)     ((mode) == ISP_MODE_RUNNING_ONLINE)
-#define IS_SIDEBYSIDE_MODE(mode) ((mode) == ISP_MODE_RUNNING_SIDEBYSIDE)
-#define IS_STRIPING_MODE(mode)   ((mode) == ISP_MODE_RUNNING_STRIPING)
-
-#define MAX_REGISTER_ALG_LIB_NUM 2
-
-typedef enum hiISP_ALG_MOD_E {
-    ISP_ALG_AE = 0,
-    ISP_ALG_AF,
-    ISP_ALG_AWB,
-    ISP_ALG_BLC,
-    ISP_ALG_FELOGLUT,
-    ISP_ALG_LOGLUT,
-    ISP_ALG_DP,
-    ISP_ALG_PREGAMMA,
-    ISP_ALG_DRC,
-    ISP_ALG_DEMOSAIC,
-    ISP_ALG_ANTIFALSECOLOR,
-    ISP_ALG_GAMMA,
-    ISP_ALG_GE,
-    ISP_ALG_SHARPEN,
-    ISP_ALG_EDGEAMRK,
-    ISP_ALG_FrameWDR,
-    ISP_ALG_FPN,
-    ISP_ALG_DEHAZE,
-    ISP_ALG_ACM,
-    ISP_ALG_LCAC,
-    ISP_ALG_GCAC,
-    ISP_ALG_CSC,
-    ISP_ALG_EXPANDER,
-    ISP_ALG_MCDS,
-    ISP_ALG_LSC,
-    ISP_ALG_RLSC,
-    ISP_ALG_FeLSC,
-    ISP_ALG_RC,
-    ISP_ALG_RGBIR,
-    ISP_ALG_HRS,
-    ISP_ALG_DG,
-    ISP_ALG_BAYERNR,
-    ISP_ALG_FLICKER,
-    ISP_ALG_SPLIT,
-    ISP_ALG_LDCI,
-    ISP_ALG_CA,
-    ISP_ALG_CLUT,
-    ISP_ALG_DETAIL,
-    ISP_ALG_BUTT,
-} ISP_ALG_MOD_E;
-
-typedef enum hiISP_CTRL_CMD_E {
-    ISP_WDR_MODE_SET = 8000,
-    ISP_PROC_WRITE,
-
-    ISP_AE_FPS_BASE_SET,
-    ISP_AE_BLC_SET,
-    ISP_AE_RC_SET,
-    ISP_AE_BAYER_FORMAT_SET,
-    ISP_AE_INIT_INFO_GET,
-
-    ISP_AWB_ISO_SET,  /* set iso, change saturation when iso change */
-    ISP_CHANGE_IMAGE_MODE_SET,
-    ISP_UPDATE_INFO_GET,
-    ISP_FRAMEINFO_GET,
-    ISP_ATTACHINFO_GET,
-    ISP_COLORGAMUTINFO_GET,
-    ISP_AWB_INTTIME_SET,
-    ISP_BAS_MODE_SET,
-    ISP_PROTRIGGER_SET,
-    ISP_AWB_PIRIS_SET,
-    ISP_AWB_SNAP_MODE_SET,
-    ISP_AWB_ZONE_ROW_SET,
-    ISP_AWB_ZONE_COL_SET,
-    ISP_AWB_ZONE_BIN_SET,
-    ISP_CTRL_CMD_BUTT,
-} ISP_CTRL_CMD_E;
-
-typedef struct hiISP_CTRL_PROC_WRITE_S {
-    HI_CHAR *pcProcBuff;
-    HI_U32   u32BuffLen;
-    HI_U32   u32WriteLen;   /* The len count should contain '\0'. */
-} ISP_CTRL_PROC_WRITE_S;
-
-
-typedef struct hiISP_STITCH_ATTR_S {
-    HI_BOOL bStitchEnable;
-    HI_BOOL bMainPipe;
-    HI_U8   u8StitchPipeNum;
-    HI_S8   as8StitchBindId[VI_MAX_PIPE_NUM];
-} ISP_STITCH_ATTR_S;
-/********************************  AE  *************************************/
-/* the init param of ae alg */
-typedef struct hiISP_AE_PARAM_S {
-    SENSOR_ID SensorId;
-    HI_U8  u8WDRMode;
-    HI_U8  u8HDRMode;
-    HI_U16 u16BlackLevel;
-    HI_FLOAT f32Fps;
-    ISP_BAYER_FORMAT_E enBayer;
-    ISP_STITCH_ATTR_S stStitchAttr;
-
-    HI_S32 s32Rsv;
-} ISP_AE_PARAM_S;
-
-/* the statistics of ae alg */
-typedef struct hiISP_FE_AE_STAT_1_S {
-    HI_U32  u32PixelCount[ISP_CHN_MAX_NUM];
-    HI_U32  u32PixelWeight[ISP_CHN_MAX_NUM];
-    HI_U32  au32HistogramMemArray[ISP_CHN_MAX_NUM][1024];
-} ISP_FE_AE_STAT_1_S;
-
-typedef struct hiISP_FE_AE_STAT_2_S {
-    HI_U16  u16GlobalAvgR[ISP_CHN_MAX_NUM];
-    HI_U16  u16GlobalAvgGr[ISP_CHN_MAX_NUM];
-    HI_U16  u16GlobalAvgGb[ISP_CHN_MAX_NUM];
-    HI_U16  u16GlobalAvgB[ISP_CHN_MAX_NUM];
-} ISP_FE_AE_STAT_2_S;
-
-typedef struct hiISP_FE_AE_STAT_3_S {
-    HI_U16  au16ZoneAvg[ISP_CHN_MAX_NUM][AE_ZONE_ROW][AE_ZONE_COLUMN][4];
-} ISP_FE_AE_STAT_3_S;
-
-typedef struct hiISP_FE_AE_STITCH_STAT_3_S {
-    HI_U16  au16ZoneAvg[VI_MAX_PIPE_NUM][ISP_CHN_MAX_NUM][AE_ZONE_ROW][AE_ZONE_COLUMN][4];
-} ISP_FE_AE_STITCH_STAT_3_S;
-
-typedef struct hiISP_BE_AE_STAT_1_S {
-    HI_U32  u32PixelCount;
-    HI_U32  u32PixelWeight;
-    HI_U32  au32HistogramMemArray[1024];
-} ISP_BE_AE_STAT_1_S;
-
-typedef struct hiISP_BE_AE_STAT_2_S {
-    HI_U16  u16GlobalAvgR;
-    HI_U16  u16GlobalAvgGr;
-    HI_U16  u16GlobalAvgGb;
-    HI_U16  u16GlobalAvgB;
-} ISP_BE_AE_STAT_2_S;
-
-typedef struct hiISP_BE_AE_STAT_3_S {
-    HI_U16  au16ZoneAvg[AE_ZONE_ROW][AE_ZONE_COLUMN][4];
-} ISP_BE_AE_STAT_3_S;
-
-typedef struct hiISP_BE_AE_STITCH_STAT_3_S {
-    HI_U16  au16ZoneAvg[VI_MAX_PIPE_NUM][AE_ZONE_ROW][AE_ZONE_COLUMN][4];
-} ISP_BE_AE_STITCH_STAT_3_S;
-
-typedef struct hiISP_AE_INFO_S {
-    HI_U32  u32FrameCnt;    /* the counting of frame */
-    ISP_SMART_INFO_S stSmartInfo;  /* Only used for Hi3516EV200/Hi3516EV300/Hi3518EV300 */
-
-    ISP_FE_AE_STAT_1_S *pstFEAeStat1;
-    ISP_FE_AE_STAT_2_S *pstFEAeStat2;
-    ISP_FE_AE_STAT_3_S *pstFEAeStat3;
-    ISP_FE_AE_STITCH_STAT_3_S *pstFEAeStiStat;
-    ISP_BE_AE_STAT_1_S *pstBEAeStat1;
-    ISP_BE_AE_STAT_2_S *pstBEAeStat2;
-    ISP_BE_AE_STAT_3_S *pstBEAeStat3;
-    ISP_BE_AE_STITCH_STAT_3_S *pstBEAeStiStat;
-} ISP_AE_INFO_S;
-
-
-typedef struct hiISP_AE_STAT_ATTR_S {
-    HI_BOOL bChange;
-
-    HI_BOOL bHistAdjust;
-    HI_U8 u8AEBESel;
-    HI_U8 u8FourPlaneMode;
-    HI_U8 u8HistOffsetX;
-    HI_U8 u8HistOffsetY;
-    HI_U8 u8HistSkipX;
-    HI_U8 u8HistSkipY;
-
-    HI_BOOL bModeUpdate;
-    HI_U8 u8HistMode;
-    HI_U8 u8AverMode;
-    HI_U8 u8MaxGainMode;
-
-    HI_BOOL bWightTableUpdate;
-    HI_U8 au8WeightTable[VI_MAX_PIPE_NUM][AE_ZONE_ROW][AE_ZONE_COLUMN];
-} ISP_AE_STAT_ATTR_S;
-
-/* the final calculate of ae alg */
-#define AE_INT_TIME_NUM          (4)
-typedef struct hiISP_AE_RESULT_S {
-    HI_U32  u32IntTime[AE_INT_TIME_NUM];
-    HI_U32  u32IspDgain;
-    HI_U32  u32Again;
-    HI_U32  u32Dgain;
-    HI_U32  u32Iso;
-    HI_U32  u32IspDgainSF;
-    HI_U32  u32AgainSF;
-    HI_U32  u32DgainSF;
-    HI_U32  u32IsoSF;
-    HI_U8   u8AERunInterval;
-
-    HI_BOOL bPirisValid;
-    HI_S32  s32PirisPos;
-    HI_U32  u32PirisGain;
-
-    ISP_FSWDR_MODE_E enFSWDRMode;
-    HI_U32  au32WDRGain[4];
-    HI_U32  u32HmaxTimes; /* unit is ns */
-    HI_U32  u32Vmax; /* unit is line */
-
-    ISP_AE_STAT_ATTR_S stStatAttr;
-    ISP_DCF_UPDATE_INFO_S stUpdateInfo;
-} ISP_AE_RESULT_S;
-
-typedef struct hiISP_AE_INIT_INFO_S {
-    HI_U32 u32IspDgain;
-    HI_U32 u32Iso;
-} ISP_AE_INIT_INFO_S;
-
-typedef struct hiISP_AE_EXP_FUNC_S {
-    HI_S32 (*pfn_ae_init)(HI_S32 s32Handle, const ISP_AE_PARAM_S *pstAeParam);
-    HI_S32 (*pfn_ae_run)(HI_S32 s32Handle,
-                         const ISP_AE_INFO_S *pstAeInfo,
-                         ISP_AE_RESULT_S *pstAeResult,
-                         HI_S32 s32Rsv
-                        );
-    HI_S32 (*pfn_ae_ctrl)(HI_S32 s32Handle, HI_U32 u32Cmd, HI_VOID *pValue);
-    HI_S32 (*pfn_ae_exit)(HI_S32 s32Handle);
-} ISP_AE_EXP_FUNC_S;
-
-typedef struct hiISP_AE_REGISTER_S {
-    ISP_AE_EXP_FUNC_S stAeExpFunc;
-} ISP_AE_REGISTER_S;
-
-/********************************  AWB  *************************************/
-typedef enum hiAWB_CTRL_CMD_E {
-    AWB_CCM_CONFIG_SET,
-    AWB_CCM_CONFIG_GET,
-
-    AWB_DEBUG_ATTR_SET,
-    AWB_DEBUG_ATTR_GET,
-
-    AWB_CTRL_BUTT,
-} AWB_CTRL_CMD_E;
-
-typedef struct hiAWB_CCM_CONFIG_S {
-    HI_BOOL bAWBBypassEn;
-    HI_BOOL bManualSatEn;
-    HI_BOOL bManualTempEn;
-
-    HI_U32  u32ManualSatValue;
-    HI_U32  u32ManualTempValue;
-    HI_U16  u16CCMSpeed;
-
-    HI_U16  au16HighCCM[9];
-    HI_U16  au16LowCCM[9];
-    HI_U16  u16HighColorTemp;
-    HI_U16  u16LowColorTemp;
-} AWB_CCM_CONFIG_S;
-
-/* the init param of awb alg */
-typedef struct hiISP_AWB_PARAM_S {
-    SENSOR_ID SensorId;
-    HI_U8 u8WDRMode;
-    HI_U8 u8AWBZoneRow;
-    HI_U8 u8AWBZoneCol;
-    HI_U8 u8AWBZoneBin;
-    ISP_STITCH_ATTR_S stStitchAttr;
-    HI_U16 u16AWBWidth;
-    HI_U16 u16AWBHeight;
-    HI_U32 u32InitIso;
-    HI_S8 s8Rsv;
-} ISP_AWB_PARAM_S;
-
-/* the statistics of awb alg */
-typedef struct hiISP_AWB_STAT_1_S {
-    HI_U16  u16MeteringAwbAvgR;
-    HI_U16  u16MeteringAwbAvgG;
-    HI_U16  u16MeteringAwbAvgB;
-    HI_U16  u16MeteringAwbCountAll;
-} ISP_AWB_STAT_1_S;
-
-typedef struct hiISP_AWB_STAT_2_S {
-    HI_U16  au16MeteringMemArrayAvgR[AWB_ZONE_NUM];
-    HI_U16  au16MeteringMemArrayAvgG[AWB_ZONE_NUM];
-    HI_U16  au16MeteringMemArrayAvgB[AWB_ZONE_NUM];
-    HI_U16  au16MeteringMemArrayCountAll[AWB_ZONE_NUM];
-
-} ISP_AWB_STAT_2_S;
-
-typedef struct hiISP_AWB_STAT_STITCH_S {
-    HI_U16  u16ZoneCol;
-    HI_U16  u16ZoneRow;
-    HI_U16  u16ZoneBin;
-    HI_U16  au16MeteringMemArrayAvgR[AWB_ZONE_STITCH_MAX];
-    HI_U16  au16MeteringMemArrayAvgG[AWB_ZONE_STITCH_MAX];
-    HI_U16  au16MeteringMemArrayAvgB[AWB_ZONE_STITCH_MAX];
-    HI_U16  au16MeteringMemArrayCountAll[AWB_ZONE_STITCH_MAX];
-
-} ISP_AWB_STAT_STITCH_S;
-
-typedef struct hiISP_AWB_STAT_RESULT_S {
-    HI_U16 *pau16ZoneAvgR;
-    HI_U16 *pau16ZoneAvgG;
-    HI_U16 *pau16ZoneAvgB;
-    HI_U16 *pau16ZoneCount;
-} ISP_AWB_STAT_RESULT_S;
-
-typedef struct hiISP_AWB_INFO_S {
-    HI_U32  u32FrameCnt;
-
-    ISP_AWB_STAT_1_S *pstAwbStat1;
-    ISP_AWB_STAT_RESULT_S stAwbStat2;
-    HI_U8 u8AwbGainSwitch;
-    HI_U8 u8AwbStatSwitch;
-    HI_U32 au32WDRWBGain[ISP_BAYER_CHN_NUM];
-} ISP_AWB_INFO_S;
-
-/* the statistics's attr of awb alg */
-typedef struct hiISP_AWB_RAW_STAT_ATTR_S {
-    HI_BOOL bStatCfgUpdate;
-
-    HI_U16  u16MeteringWhiteLevelAwb;
-    HI_U16  u16MeteringBlackLevelAwb;
-    HI_U16  u16MeteringCrRefMaxAwb;
-    HI_U16  u16MeteringCbRefMaxAwb;
-    HI_U16  u16MeteringCrRefMinAwb;
-    HI_U16  u16MeteringCbRefMinAwb;
-} ISP_AWB_RAW_STAT_ATTR_S;
-
-/* the final calculate of awb alg */
-typedef struct hiISP_AWB_RESULT_S {
-    HI_U32  au32WhiteBalanceGain[ISP_BAYER_CHN_NUM];
-    HI_U16  au16ColorMatrix[CCM_MATRIX_SIZE];
-    HI_U32  u32ColorTemp;
-    HI_U8   u8Saturation;
-    ISP_AWB_RAW_STAT_ATTR_S stRawStatAttr;
-} ISP_AWB_RESULT_S;
-
-typedef struct hiISP_AWB_EXP_FUNC_S {
-    HI_S32 (*pfn_awb_init)(HI_S32 s32Handle, const ISP_AWB_PARAM_S *pstAwbParam, ISP_AWB_RESULT_S *pstAwbResult);
-    HI_S32 (*pfn_awb_run)(HI_S32 s32Handle,
-                          const ISP_AWB_INFO_S *pstAwbInfo,
-                          ISP_AWB_RESULT_S *pstAwbResult,
-                          HI_S32 s32Rsv);
-    HI_S32 (*pfn_awb_ctrl)(HI_S32 s32Handle, HI_U32 u32Cmd, HI_VOID *pValue);
-    HI_S32 (*pfn_awb_exit)(HI_S32 s32Handle);
-} ISP_AWB_EXP_FUNC_S;
-
-typedef struct hiISP_AWB_REGISTER_S {
-    ISP_AWB_EXP_FUNC_S stAwbExpFunc;
-} ISP_AWB_REGISTER_S;
-
-/********************************  AF  *************************************/
-/* the statistics of af alg */
-typedef struct hiISP_AF_ZONE_S {
-    HI_U16  u16v1;
-    HI_U16  u16h1;
-    HI_U16  u16v2;
-    HI_U16  u16h2;
-    HI_U16  u16y;
-    HI_U16  u16HlCnt;
-} ISP_AF_ZONE_S;
-
-typedef struct hiISP_FE_AF_STAT_S {
-    ISP_AF_ZONE_S stZoneMetrics[WDR_CHN_MAX][AF_ZONE_ROW][AF_ZONE_COLUMN]; /* R; The zoned measure of contrast */
-} ISP_FE_AF_STAT_S;
-
-typedef struct hiISP_BE_AF_STAT_S {
-    ISP_AF_ZONE_S stZoneMetrics[AF_ZONE_ROW][AF_ZONE_COLUMN]; /* R; The zoned measure of contrast */
-} ISP_BE_AF_STAT_S;
-
-#define ALG_LIB_NAME_SIZE_MAX    (20)
-typedef struct hiALG_LIB_S {
-    HI_S32  s32Id;
-    HI_CHAR acLibName[ALG_LIB_NAME_SIZE_MAX];
-} ALG_LIB_S;
-
-typedef struct hiISP_BIND_ATTR_S {
-    SENSOR_ID   SensorId;
-    ALG_LIB_S   stAeLib;
-    ALG_LIB_S   stAfLib;
-    ALG_LIB_S   stAwbLib;
-} ISP_BIND_ATTR_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* __HI_COMM_SNS_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_adec.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_adec.h
deleted file mode 100644
index 8d3d9738..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_adec.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2001-2018, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name       	: 	hi_comm_adec.h
-  Version        		: 	Initial Draft
-  Author         		: 	Hisilicon multimedia software group
-  Created       		: 	2006/12/15
-  Last Modified		    :
-  Description  		    :
-  Function List 		:
-  History       		:
-  1.Date        		: 	2006/12/15
-    Author      		: 	z50825
-    Modification   	    :	Created file
-  2.Date                :   2007/5/10
-    Author              :   z50825
-    Modification        :   add err code
-******************************************************************************/
-
-
-#ifndef  __HI_COMM_ADEC_H__
-#define  __HI_COMM_ADEC_H__
-
-
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_comm_aio.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-typedef struct hiADEC_ATTR_G711_S {
-    HI_U32 resv;
-} ADEC_ATTR_G711_S;
-
-typedef struct hiADEC_ATTR_G726_S {
-    G726_BPS_E enG726bps;
-} ADEC_ATTR_G726_S;
-
-typedef struct hiADEC_ATTR_ADPCM_S {
-    ADPCM_TYPE_E enADPCMType;
-} ADEC_ATTR_ADPCM_S;
-
-typedef struct hiADEC_ATTR_LPCM_S {
-    HI_U32 resv;
-} ADEC_ATTR_LPCM_S;
-
-typedef enum hiADEC_MODE_E {
-    ADEC_MODE_PACK = 0, /* require input is valid dec pack(a
-                           complete frame encode result),
-                           e.g.the stream get from AENC is a
-                           valid dec pack, the stream know actually
-                           pack len from file is also a dec pack.
-                           this mode is high-performative */
-    ADEC_MODE_STREAM,   /* input is stream, low-performative,
-                           if you couldn't find out whether a stream is
-                           vaild dec pack,you could use
-                           this mode */
-    ADEC_MODE_BUTT
-}ADEC_MODE_E;
-
-typedef struct hiADEC_CH_ATTR_S {
-    PAYLOAD_TYPE_E enType;
-    HI_U32         u32BufSize;  /* buf size[2~MAX_AUDIO_FRAME_NUM] */
-    ADEC_MODE_E    enMode;      /* decode mode */
-    HI_VOID ATTRIBUTE      *pValue;
-}ADEC_CHN_ATTR_S;
-
-typedef struct hiADEC_CHN_STATE_S {
-    HI_BOOL bEndOfStream;             /* EOS flag */
-    HI_U32 u32BufferFrmNum;           /* total number of channel buffer */
-    HI_U32 u32BufferFreeNum;          /* free number of channel buffer */
-    HI_U32 u32BufferBusyNum;          /* busy number of channel buffer */
-} ADEC_CHN_STATE_S;
-
-typedef struct hiADEC_DECODER_S {
-    PAYLOAD_TYPE_E  enType;
-    HI_CHAR         aszName[17];
-    HI_S32          (*pfnOpenDecoder)(HI_VOID *pDecoderAttr, HI_VOID **ppDecoder); /* struct ppDecoder is packed by user,
-    user malloc and free memory for this struct */
-    HI_S32          (*pfnDecodeFrm)(HI_VOID *pDecoder, HI_U8 **pu8Inbuf, HI_S32 *ps32LeftByte,
-                        HI_U16 *pu16Outbuf, HI_U32 *pu32OutLen, HI_U32 *pu32Chns);
-    HI_S32          (*pfnGetFrmInfo)(HI_VOID *pDecoder, HI_VOID *pInfo);
-    HI_S32          (*pfnCloseDecoder)(HI_VOID *pDecoder);
-    HI_S32          (*pfnResetDecoder)(HI_VOID *pDecoder);
-} ADEC_DECODER_S;
-
-typedef enum hiEN_ADEC_ERR_CODE_E {
-    ADEC_ERR_DECODER_ERR     = 64,
-    ADEC_ERR_BUF_LACK,
-} EN_ADEC_ERR_CODE_E;
-
-
-/* invlalid device ID */
-#define HI_ERR_ADEC_INVALID_DEVID     HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_DEVID)
-/* invlalid channel ID */
-#define HI_ERR_ADEC_INVALID_CHNID     HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-/* at lease one parameter is illagal ,eg, an illegal enumeration value  */
-#define HI_ERR_ADEC_ILLEGAL_PARAM     HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-/* channel exists */
-#define HI_ERR_ADEC_EXIST             HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_EXIST)
-/* channel unexists */
-#define HI_ERR_ADEC_UNEXIST           HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-/* using a NULL point */
-#define HI_ERR_ADEC_NULL_PTR          HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-/* try to enable or initialize system,device or channel, before configing attribute */
-#define HI_ERR_ADEC_NOT_CONFIG        HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_CONFIG)
-/* operation is not supported by NOW */
-#define HI_ERR_ADEC_NOT_SUPPORT       HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-/* operation is not permitted ,eg, try to change stati attribute */
-#define HI_ERR_ADEC_NOT_PERM          HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-/* failure caused by malloc memory */
-#define HI_ERR_ADEC_NOMEM             HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-/* failure caused by malloc buffer */
-#define HI_ERR_ADEC_NOBUF             HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-/* no data in buffer */
-#define HI_ERR_ADEC_BUF_EMPTY         HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-/* no buffer for new data */
-#define HI_ERR_ADEC_BUF_FULL          HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-/* system is not ready,had not initialed or loaded */
-#define HI_ERR_ADEC_SYS_NOTREADY      HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-/* decoder internal err */
-#define HI_ERR_ADEC_DECODER_ERR       HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, ADEC_ERR_DECODER_ERR)
-/* input buffer not enough to decode one frame */
-#define HI_ERR_ADEC_BUF_LACK          HI_DEF_ERR(HI_ID_ADEC, EN_ERR_LEVEL_ERROR, ADEC_ERR_BUF_LACK)
-
-
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif/* End of #ifndef __HI_COMM_ADEC_H__*/
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_aenc.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_aenc.h
deleted file mode 100644
index db7f7314..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_aenc.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2001-2018, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name             :   hi_comm_aenc.h
-  Version               :   Initial Draft
-  Author                :   Hisilicon multimedia software group
-  Created               :   2006/12/15
-  Last Modified         :
-  Description           :
-  Function List         :
-  History               :
-  1.Date                :   2006/12/15
-    Author              :   z50825
-    Modification        :   Created file
-  2.Date                :   2007/5/10
-    Author              :   z50825
-    Modification        :   add err code
-******************************************************************************/
-
-
-#ifndef  __HI_COMM_AENC_H__
-#define  __HI_COMM_AENC_H__
-
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_comm_aio.h"
-
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-typedef struct hiAENC_ATTR_G711_S {
-    HI_U32 resv;            /* reserve item */
-} AENC_ATTR_G711_S;
-
-typedef struct hiAENC_ATTR_G726_S {
-    G726_BPS_E enG726bps;
-} AENC_ATTR_G726_S;
-
-typedef struct hiAENC_ATTR_ADPCM_S {
-    ADPCM_TYPE_E enADPCMType;
-} AENC_ATTR_ADPCM_S;
-
-typedef struct hiAENC_ATTR_LPCM_S {
-    HI_U32 resv;            /* reserve item */
-} AENC_ATTR_LPCM_S;
-
-typedef struct hiAENC_ENCODER_S {
-    PAYLOAD_TYPE_E  enType;
-    HI_U32          u32MaxFrmLen;
-    HI_CHAR         aszName[17];    /* encoder type,be used to print proc information */
-    HI_S32          (*pfnOpenEncoder)(HI_VOID *pEncoderAttr, HI_VOID **ppEncoder); /* pEncoder is the handle to control the encoder */
-    HI_S32          (*pfnEncodeFrm)(HI_VOID *pEncoder, const AUDIO_FRAME_S *pstData,
-                        HI_U8 *pu8Outbuf, HI_U32 *pu32OutLen);
-    HI_S32          (*pfnCloseEncoder)(HI_VOID *pEncoder);
-} AENC_ENCODER_S;
-
-typedef struct hiAENC_CHN_ATTR_S {
-    PAYLOAD_TYPE_E      enType;
-    HI_U32              u32PtNumPerFrm;
-    HI_U32              u32BufSize;      /* buf size [2~MAX_AUDIO_FRAME_NUM] */
-    HI_VOID ATTRIBUTE   *pValue;  /* point to attribute of definite audio encoder */
-} AENC_CHN_ATTR_S;
-
-typedef enum hiEN_AENC_ERR_CODE_E {
-    AENC_ERR_ENCODER_ERR     = 64,
-    AENC_ERR_VQE_ERR         = 65,
-} EN_AENC_ERR_CODE_E;
-
-
-/* invlalid device ID */
-#define HI_ERR_AENC_INVALID_DEVID     HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_DEVID)
-/* invlalid channel ID */
-#define HI_ERR_AENC_INVALID_CHNID     HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-/* at lease one parameter is illagal ,eg, an illegal enumeration value  */
-#define HI_ERR_AENC_ILLEGAL_PARAM     HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-/* channel exists */
-#define HI_ERR_AENC_EXIST             HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_EXIST)
-/* channel unexists */
-#define HI_ERR_AENC_UNEXIST           HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-/* using a NULL point */
-#define HI_ERR_AENC_NULL_PTR          HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-/* try to enable or initialize system,device or channel, before configing attribute */
-#define HI_ERR_AENC_NOT_CONFIG        HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_CONFIG)
-/* operation is not supported by NOW */
-#define HI_ERR_AENC_NOT_SUPPORT       HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-/* operation is not permitted ,eg, try to change static attribute */
-#define HI_ERR_AENC_NOT_PERM          HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-/* failure caused by malloc memory */
-#define HI_ERR_AENC_NOMEM             HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-/* failure caused by malloc buffer */
-#define HI_ERR_AENC_NOBUF             HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-/* no data in buffer */
-#define HI_ERR_AENC_BUF_EMPTY         HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-/* no buffer for new data */
-#define HI_ERR_AENC_BUF_FULL          HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-/* system is not ready,had not initialed or loaded */
-#define HI_ERR_AENC_SYS_NOTREADY      HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-/* encoder internal err */
-#define HI_ERR_AENC_ENCODER_ERR       HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, AENC_ERR_ENCODER_ERR)
-/* vqe internal err */
-#define HI_ERR_AENC_VQE_ERR       HI_DEF_ERR(HI_ID_AENC, EN_ERR_LEVEL_ERROR, AENC_ERR_VQE_ERR)
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif/* End of #ifndef __HI_COMM_AENC_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_ai.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_ai.h
deleted file mode 100644
index 4eea275b..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_ai.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2001-2018, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_comm_ai.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2009/5/5
-  Description   :
-  History       :
-  1.Date        : 2009/5/5
-    Author      : p00123320
-    Modification: Created file
-******************************************************************************/
-
-
-#ifndef __HI_COMM_AI_H__
-#define __HI_COMM_AI_H__
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"{
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* End of #ifndef __HI_COMM_AI_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_aio.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_aio.h
deleted file mode 100644
index 707a2e2b..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_aio.h
+++ /dev/null
@@ -1,566 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2001-2018, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_comm_aio.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2009/5/5
-  Description   :
-  History       :
-  1.Date        : 2009/5/5
-    Author      : p00123320
-    Modification: Created file
-******************************************************************************/
-
-
-#ifndef __HI_COMM_AIO_H__
-#define __HI_COMM_AIO_H__
-
-#include "hi_common.h"
-#include "hi_errno.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-
-#define MAX_AUDIO_FRAME_NUM    300       /* max count of audio frame in Buffer */
-#define MAX_AUDIO_POINT_BYTES  4        /* max bytes of one sample point(now 32bit max) */
-
-#define MAX_VOICE_POINT_NUM    480      /* max sample per frame for voice encode */
-
-#define MAX_AUDIO_POINT_NUM    2048     /* max sample per frame for all encoder(aacplus:2048) */
-#define MAX_AO_POINT_NUM       4096     /* from h3;support 4096 framelen */
-#define MIN_AUDIO_POINT_NUM    80       /* min sample per frame */
-#define MAX_AI_POINT_NUM    2048     /* max sample per frame for all encoder(aacplus:2048) */
-
-/* max length of audio frame by bytes, one frame contain many sample point */
-#define MAX_AUDIO_FRAME_LEN    (MAX_AUDIO_POINT_BYTES*MAX_AO_POINT_NUM)
-
-/* max length of audio stream by bytes */
-#define MAX_AUDIO_STREAM_LEN   MAX_AUDIO_FRAME_LEN
-
-#define MAX_AI_USRFRM_DEPTH     30      /* max depth of user frame buf */
-
-#define MAX_AUDIO_FILE_PATH_LEN 256
-#define MAX_AUDIO_FILE_NAME_LEN 256
-
-/* The VQE EQ Band num. */
-#define VQE_EQ_BAND_NUM  10
-#define VQE_DRC_SECNUM 5
-
-#define AI_RECORDVQE_MASK_HPF       0x1
-#define AI_RECORDVQE_MASK_RNR       0x2
-#define AI_RECORDVQE_MASK_HDR       0x4
-#define AI_RECORDVQE_MASK_DRC       0x8
-#define AI_RECORDVQE_MASK_EQ        0x10
-#define AI_RECORDVQE_MASK_AGC       0x20
-
-#define AI_TALKVQE_MASK_HPF     0x1
-#define AI_TALKVQE_MASK_AEC     0x2
-#define AI_TALKVQE_MASK_AGC     0x8
-#define AI_TALKVQE_MASK_EQ      0x10
-#define AI_TALKVQE_MASK_ANR     0x20
-
-#define AO_VQE_MASK_HPF         0x1
-#define AO_VQE_MASK_ANR         0x2
-#define AO_VQE_MASK_AGC         0x4
-#define AO_VQE_MASK_EQ          0x8
-
-
-typedef enum hiAUDIO_SAMPLE_RATE_E {
-    AUDIO_SAMPLE_RATE_8000   = 8000,    /* 8K samplerate */
-    AUDIO_SAMPLE_RATE_12000  = 12000,   /* 12K samplerate */
-    AUDIO_SAMPLE_RATE_11025  = 11025,   /* 11.025K samplerate */
-    AUDIO_SAMPLE_RATE_16000  = 16000,   /* 16K samplerate */
-    AUDIO_SAMPLE_RATE_22050  = 22050,   /* 22.050K samplerate */
-    AUDIO_SAMPLE_RATE_24000  = 24000,   /* 24K samplerate */
-    AUDIO_SAMPLE_RATE_32000  = 32000,   /* 32K samplerate */
-    AUDIO_SAMPLE_RATE_44100  = 44100,   /* 44.1K samplerate */
-    AUDIO_SAMPLE_RATE_48000  = 48000,   /* 48K samplerate */
-    AUDIO_SAMPLE_RATE_64000  = 64000,   /* 64K samplerate */
-    AUDIO_SAMPLE_RATE_96000  = 96000,   /* 96K samplerate */
-    AUDIO_SAMPLE_RATE_BUTT,
-} AUDIO_SAMPLE_RATE_E;
-
-typedef enum hiAUDIO_BIT_WIDTH_E {
-    AUDIO_BIT_WIDTH_8   = 0,   /* 8bit width */
-    AUDIO_BIT_WIDTH_16  = 1,   /* 16bit width */
-    AUDIO_BIT_WIDTH_24  = 2,   /* 24bit width */
-    AUDIO_BIT_WIDTH_BUTT,
-} AUDIO_BIT_WIDTH_E;
-
-typedef enum hiAIO_MODE_E {
-    AIO_MODE_I2S_MASTER  = 0,   /* AIO I2S master mode */
-    AIO_MODE_I2S_SLAVE,         /* AIO I2S slave mode */
-    AIO_MODE_PCM_SLAVE_STD,     /* AIO PCM slave standard mode */
-    AIO_MODE_PCM_SLAVE_NSTD,    /* AIO PCM slave non-standard mode */
-    AIO_MODE_PCM_MASTER_STD,    /* AIO PCM master standard mode */
-    AIO_MODE_PCM_MASTER_NSTD,   /* AIO PCM master non-standard mode */
-    AIO_MODE_BUTT
-} AIO_MODE_E;
-
-typedef enum {
-    AIO_I2STYPE_INNERCODEC = 0, /* AIO I2S connect inner audio CODEC */
-    AIO_I2STYPE_INNERHDMI,      /* AIO I2S connect Inner HDMI */
-    AIO_I2STYPE_EXTERN,         /* AIO I2S connect extern hardware */
-} AIO_I2STYPE_E;
-
-typedef enum hiAIO_SOUND_MODE_E {
-    AUDIO_SOUND_MODE_MONO   = 0, /* mono */
-    AUDIO_SOUND_MODE_STEREO = 1, /* stereo */
-    AUDIO_SOUND_MODE_BUTT
-} AUDIO_SOUND_MODE_E;
-
-/*
-An example of the packing scheme for G726-32 codewords is as shown, and bit A3 is the least significant bit of the first codeword:
-RTP G726-32:
-0                   1
-0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
-|B B B B|A A A A|D D D D|C C C C| ...
-|0 1 2 3|0 1 2 3|0 1 2 3|0 1 2 3|
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
-
-MEDIA G726-32:
-0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
-|A A A A|B B B B|C C C C|D D D D| ...
-|3 2 1 0|3 2 1 0|3 2 1 0|3 2 1 0|
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
-*/
-typedef enum hiG726_BPS_E {
-    G726_16K = 0,       /* G726 16kbps, see RFC3551.txt  4.5.4 G726-16 */
-    G726_24K,           /* G726 24kbps, see RFC3551.txt  4.5.4 G726-24 */
-    G726_32K,           /* G726 32kbps, see RFC3551.txt  4.5.4 G726-32 */
-    G726_40K,           /* G726 40kbps, see RFC3551.txt  4.5.4 G726-40 */
-    MEDIA_G726_16K,     /* G726 16kbps for ASF ... */
-    MEDIA_G726_24K,     /* G726 24kbps for ASF ... */
-    MEDIA_G726_32K,     /* G726 32kbps for ASF ... */
-    MEDIA_G726_40K,     /* G726 40kbps for ASF ... */
-    G726_BUTT,
-} G726_BPS_E;
-
-typedef enum hiADPCM_TYPE_E {
-    /* see DVI4 diiffers in three respects from the IMA ADPCM at RFC3551.txt 4.5.1 DVI4 */
-    ADPCM_TYPE_DVI4 = 0,    /* 32kbps ADPCM(DVI4) for RTP */
-    ADPCM_TYPE_IMA,         /* 32kbps ADPCM(IMA),NOTICE:point num must be 161/241/321/481 */
-    ADPCM_TYPE_ORG_DVI4,
-    ADPCM_TYPE_BUTT,
-} ADPCM_TYPE_E;
-
-#define AI_EXPAND  0x01
-#define AI_CUT     0x02
-
-typedef struct hiAIO_ATTR_S {
-    AUDIO_SAMPLE_RATE_E enSamplerate;   /* sample rate */
-    AUDIO_BIT_WIDTH_E   enBitwidth;     /* bitwidth */
-    AIO_MODE_E          enWorkmode;     /* master or slave mode */
-    AUDIO_SOUND_MODE_E  enSoundmode;    /* momo or steror */
-    HI_U32              u32EXFlag;      /* expand 8bit to 16bit, use AI_EXPAND(only valid for AI 8bit),use AI_CUT(only valid for extern Codec for 24bit) */
-    HI_U32              u32FrmNum;      /* frame num in buf[2,MAX_AUDIO_FRAME_NUM] */
-    HI_U32              u32PtNumPerFrm; /* point num per frame (80/160/240/320/480/1024/2048)
-                                                (ADPCM IMA should add 1 point, AMR only support 160) */
-    HI_U32              u32ChnCnt;      /* channle number on FS, valid value:1/2/4/8 */
-    HI_U32              u32ClkSel;      /* 0: AI and AO clock is separate
-                                                 1: AI and AO clock is inseparate, AI use AO's clock */
-    AIO_I2STYPE_E       enI2sType;      /* i2s type */
-} AIO_ATTR_S;
-
-typedef struct hiAI_CHN_PARAM_S {
-    HI_U32 u32UsrFrmDepth;
-} AI_CHN_PARAM_S;
-
-typedef struct hiAUDIO_FRAME_S {
-    AUDIO_BIT_WIDTH_E   enBitwidth;     /* audio frame bitwidth */
-    AUDIO_SOUND_MODE_E  enSoundmode;    /* audio frame momo or stereo mode */
-    HI_U8*  u64VirAddr[2];
-    HI_U64  u64PhyAddr[2];
-    HI_U64  u64TimeStamp;                /* audio frame timestamp */
-    HI_U32  u32Seq;                      /* audio frame seq */
-    HI_U32  u32Len;                      /* data lenth per channel in frame */
-    HI_U32  u32PoolId[2];
-} AUDIO_FRAME_S;
-
-typedef struct hiAEC_FRAME_S {
-    AUDIO_FRAME_S   stRefFrame;    /* AEC reference audio frame */
-    HI_BOOL         bValid;        /* whether frame is valid */
-    HI_BOOL         bSysBind;      /* whether is sysbind */
-} AEC_FRAME_S;
-
-
-typedef struct hiAUDIO_FRAME_INFO_S {
-    AUDIO_FRAME_S *pstFrame; /* frame ptr */
-    HI_U32         u32Id;   /* frame id */
-} AUDIO_FRAME_INFO_S;
-
-typedef struct hiAUDIO_STREAM_S {
-    HI_U8 ATTRIBUTE *pStream;         /* the virtual address of stream */
-    HI_U64 ATTRIBUTE u64PhyAddr;      /* the physics address of stream */
-    HI_U32 u32Len;          /* stream lenth, by bytes */
-    HI_U64 u64TimeStamp;    /* frame time stamp */
-    HI_U32 u32Seq;          /* frame seq, if stream is not a valid frame,u32Seq is 0 */
-} AUDIO_STREAM_S;
-
-
-typedef struct hiAO_CHN_STATE_S {
-    HI_U32                  u32ChnTotalNum;    /* total number of channel buffer */
-    HI_U32                  u32ChnFreeNum;     /* free number of channel buffer */
-    HI_U32                  u32ChnBusyNum;     /* busy number of channel buffer */
-} AO_CHN_STATE_S;
-
-typedef enum hiAUDIO_TRACK_MODE_E {
-    AUDIO_TRACK_NORMAL      = 0,
-    AUDIO_TRACK_BOTH_LEFT   = 1,
-    AUDIO_TRACK_BOTH_RIGHT  = 2,
-    AUDIO_TRACK_EXCHANGE    = 3,
-    AUDIO_TRACK_MIX         = 4,
-    AUDIO_TRACK_LEFT_MUTE   = 5,
-    AUDIO_TRACK_RIGHT_MUTE  = 6,
-    AUDIO_TRACK_BOTH_MUTE   = 7,
-
-    AUDIO_TRACK_BUTT
-} AUDIO_TRACK_MODE_E;
-
-
-typedef enum hiAUDIO_FADE_RATE_E {
-    AUDIO_FADE_RATE_1   = 0,
-    AUDIO_FADE_RATE_2   = 1,
-    AUDIO_FADE_RATE_4   = 2,
-    AUDIO_FADE_RATE_8   = 3,
-    AUDIO_FADE_RATE_16  = 4,
-    AUDIO_FADE_RATE_32  = 5,
-    AUDIO_FADE_RATE_64  = 6,
-    AUDIO_FADE_RATE_128 = 7,
-
-    AUDIO_FADE_RATE_BUTT
-} AUDIO_FADE_RATE_E;
-
-typedef struct hiAUDIO_FADE_S {
-    HI_BOOL         bFade;
-    AUDIO_FADE_RATE_E enFadeInRate;
-    AUDIO_FADE_RATE_E enFadeOutRate;
-} AUDIO_FADE_S;
-
-/* Defines the configure parameters of AEC. */
-typedef struct hiAI_AEC_CONFIG_S {
-    HI_BOOL bUsrMode;                            /* mode 0: auto mode 1: mannual. */
-    HI_S8 s8CngMode;                             /* cozy noisy mode: 0 close, 1 open, recommend 1 */
-    HI_S8 s8NearAllPassEnergy;                   /* the far-end energy threshold for judging whether unvarnished transmission: 0 -59dBm0,
-    1 -49dBm0, 2 -39dBm0, recommend 1 */
-    HI_S8 s8NearCleanSupEnergy;                  /* the energy threshold for compelling reset of near-end signal: 0 12dB,
-    1 15dB, 2 18dB, recommend 2 */
-
-    HI_S16 s16DTHnlSortQTh;                      /* the threshold of judging single or double talk, recommend 16384, [0, 32767] */
-
-    HI_S16 s16EchoBandLow;                       /* voice processing band1,
-    low frequency parameter, [1, 63) for 8k, [1, 127) for 16k, recommend 10 */
-    HI_S16 s16EchoBandHigh;                      /* voice processing band1,
-                                                 high frequency parameter, (s16EchoBandLow, 63] for 8k, (s16EchoBandLow, 127] for 16k, recommend 41 */
-    /* s16EchoBandHigh must be greater than s16EchoBandLow */
-    HI_S16 s16EchoBandLow2;                      /* voice processing band2,
-    low frequency parameter, [1, 63) for 8k, [1, 127) for 16k, recommend 47 */
-    HI_S16 s16EchoBandHigh2;                     /* voice processing band2,
-                                                 high frequency parameter, (s16EchoBandLow2, 63] for 8k, (s16EchoBandLow2, 127] for 16k, recommend 72 */
-    /* s16EchoBandHigh2 must be greater than s16EchoBandLow2 */
-
-    HI_S16 s16ERLBand[6];                        /* ERL protect area,
-                                                 [1, 63] for 8k, [1, 127] for 16k, frequency band calculated by s16ERLBand * 62.5 */
-    /* besides, s16ERLBand[n+1] should be greater than s16ERLBand[n] */
-    HI_S16 s16ERL[7];                            /* ERL protect value of ERL protect area,
-    the smaller its value, the more strength its protect ability,[0, 18] */
-    HI_S16 s16VioceProtectFreqL;                 /* protect area of near-end low frequency,
-    [1, 63) for 8k, [1, 127) for 16k, recommend 3 */
-    HI_S16 s16VioceProtectFreqL1;                /* protect area of near-end low frequency1,
-    (s16VioceProtectFreqL, 63] for 8k, (s16VioceProtectFreqL, 127] for 16k, recommend 6 */
-    HI_S32 s32Reserved;                          /* s16VioceProtectFreqL1 must be greater than s16VioceProtectFreqL */
-} AI_AEC_CONFIG_S;
-
-/* Defines the configure parameters of ANR. */
-typedef struct hiAUDIO_ANR_CONFIG_S {
-    HI_BOOL bUsrMode;   /* mode 0: auto, mode 1: manual. */
-
-    HI_S16 s16NrIntensity;       /* noise reduce intensity, range: [0, 25] */
-    HI_S16 s16NoiseDbThr;        /* noise threshold, range: [30, 60] */
-    HI_S8  s8SpProSwitch;        /* switch for music probe, range: [0:close, 1:open] */
-
-    HI_S32 s32Reserved;
-} AUDIO_ANR_CONFIG_S;
-
-/* Defines the configure parameters of AGC. */
-typedef struct hiAUDIO_AGC_CONFIG_S {
-    HI_BOOL bUsrMode;          /* mode 0: auto, mode 1: manual. */
-
-    HI_S8 s8TargetLevel;       /* target voltage level, range: [-40, -1]dB */
-    HI_S8 s8NoiseFloor;        /* noise floor, range: TalkVqe/AoVqe[-65, -20]dB, RecordVqe[-50, -20]dB */
-    HI_S8 s8MaxGain;           /* max gain, range: [0, 30]dB */
-    HI_S8 s8AdjustSpeed;       /* adjustable speed, range: [0, 10]dB/s */
-
-    HI_S8 s8ImproveSNR;        /* switch for improving SNR, range: [0:close, 1:upper limit 3dB, 2:upper limit 6dB] */
-    HI_S8 s8UseHighPassFilt;   /* switch for using high pass filt,
-    range: [0:close, 1:80Hz, 2:120Hz, 3:150:Hz, 4:300Hz: 5:500Hz] */
-    HI_S8 s8OutputMode;        /* output mode, mute when lower than noise floor, range: [0:close, 1:open] */
-    HI_S16 s16NoiseSupSwitch;  /* switch for noise suppression, range: [0:close, 1:open] */
-
-
-    HI_S32 s32Reserved;
-} AUDIO_AGC_CONFIG_S;
-
-/* Defines the configure parameters of HPF. */
-typedef enum hiAUDIO_HPF_FREQ_E {
-    AUDIO_HPF_FREQ_80   = 80,    /* 80Hz */
-    AUDIO_HPF_FREQ_120  = 120,   /* 120Hz */
-    AUDIO_HPF_FREQ_150  = 150,   /* 150Hz */
-    AUDIO_HPF_FREQ_BUTT,
-} AUDIO_HPF_FREQ_E;
-
-typedef struct hiAUDIO_HPF_CONFIG_S {
-    HI_BOOL bUsrMode;   /* mode 0: auto mode 1: mannual. */
-    AUDIO_HPF_FREQ_E enHpfFreq; /* freq to be processed, value:HiFiVqe/TalkVqe/AoVqe(80Hz,120Hz,150Hz), RecordVqe(80Hz) */
-} AUDIO_HPF_CONFIG_S;
-
-typedef struct hiAI_RNR_CONFIG_S {
-    HI_BOOL bUsrMode;                /* mode 0: auto, mode 1: mannual. */
-
-    HI_S32  s32NrMode;               /* mode 0: floor noise; 1:ambient noise */
-
-    HI_S32 s32MaxNrLevel;            /* max NR level range:[2,20]dB */
-
-    HI_S32  s32NoiseThresh;          /* noise threshold, range:[-80, -20] */
-} AI_RNR_CONFIG_S;
-
-typedef struct hiAUDIO_EQ_CONFIG_S {
-    HI_S8  s8GaindB[VQE_EQ_BAND_NUM];   /* EQ band, include 100, 200, 250, 350, 500, 800, 1.2k, 2.5k, 4k, 8k in turn,
-                                        range:TalkVqe/AoVqe[-100, 20], RecordVqe[-50, 20] */
-    HI_S32 s32Reserved;
-} AUDIO_EQ_CONFIG_S;
-
-
-/* Defines the configure parameters of UPVQE work state. */
-typedef enum hiVQE_WORKSTATE_E {
-    VQE_WORKSTATE_COMMON  = 0,   /* common environment, Applicable to the family of voice calls. */
-    VQE_WORKSTATE_MUSIC   = 1,   /* music environment , Applicable to the family of music environment. */
-    VQE_WORKSTATE_NOISY   = 2,   /* noisy environment , Applicable to the noisy voice calls.  */
-} VQE_WORKSTATE_E;
-
-/* Defines record type */
-typedef enum hiVQE_RECORD_TYPE {
-    VQE_RECORD_NORMAL        = 0,  /* <double micphone recording. */
-    VQE_RECORD_BUTT,
-} VQE_RECORD_TYPE;
-
-
-/* HDR Set CODEC GAIN Function Handle type */
-typedef HI_S32 (*pFuncGainCallBack)(HI_S32 s32SetGain);
-
-typedef struct hiAI_HDR_CONFIG_S {
-    HI_BOOL bUsrMode;               /* mode 0: auto mode 1: mannual. */
-
-    HI_S32 s32MinGaindB;            /* the minimum of MIC(AI) CODEC gain, [0, 120] */
-    HI_S32 s32MaxGaindB;            /* the maximum of MIC(AI) CODEC gain, [0, 120] */
-
-    HI_S32 s32MicGaindB;            /* the current gain of MIC(AI) CODEC,[s32MinGaindB, s32MaxGaindB] */
-    HI_S32 s32MicGainStepdB;        /* the step size of gain adjustment, [1, 3], recommemd 2 */
-    pFuncGainCallBack pcallback;    /* the callback function pointer of CODEC gain adjustment */
-} AI_HDR_CONFIG_S;
-
-typedef struct hiAI_DRC_CONFIG_S {
-    HI_BOOL bUsrMode;   /* enable user mode or not,default 0: disable user mode,1: user mode. */
-
-    HI_S16  s16AttackTime;   /* time of signal change from large to small (ms), range:HiFiVqe[10, 250]ms, RecordVqe[10, 126]ms */
-    HI_S16  s16ReleaseTime;  /* time of signal change from small to large (ms), range:HiFiVqe[10, 250]ms, RecordVqe[10, 126]ms */
-
-    HI_S16 s16OldLevDb[VQE_DRC_SECNUM];  /* old curve level(dB), default[0, -472, -792, -960, -1280],range:[-1440, 0]ms,store from big to small,scale:Q4 */
-    HI_S16 s16NewLevDb[VQE_DRC_SECNUM];  /* new curve level(dB), default[0, -174, -410, -608, -1021],range:[-1440, 0]ms,store from big to small,scale:Q4 */
-} AI_DRC_CONFIG_S;
-
-
-/* Defines the configure parameters of Record VQE. */
-typedef struct hiAI_RECORDVQE_CONFIG_S {
-    HI_U32              u32OpenMask;
-
-    HI_S32              s32WorkSampleRate;  /* Sample Rate:16KHz/48KHz */
-    HI_S32              s32FrameSample; /* VQE frame length:80-4096 */
-    VQE_WORKSTATE_E     enWorkstate;
-
-    HI_S32                s32InChNum;
-    HI_S32                s32OutChNum;
-    VQE_RECORD_TYPE       enRecordType;
-
-    AUDIO_HPF_CONFIG_S  stHpfCfg;
-    AI_RNR_CONFIG_S     stRnrCfg;
-    AI_HDR_CONFIG_S     stHdrCfg;
-    AI_DRC_CONFIG_S     stDrcCfg;
-    AUDIO_EQ_CONFIG_S   stEqCfg;
-    AUDIO_AGC_CONFIG_S  stAgcCfg;
-} AI_RECORDVQE_CONFIG_S;
-
-/* Defines the configure parameters of Talk VQE. */
-typedef struct hiAI_TALKVQE_CONFIG_S {
-    HI_U32              u32OpenMask;
-
-    HI_S32              s32WorkSampleRate;  /* Sample Rate: 8KHz/16KHz. default: 8KHz */
-    HI_S32              s32FrameSample; /* VQE frame length: 80-4096 */
-    VQE_WORKSTATE_E     enWorkstate;
-
-    AUDIO_HPF_CONFIG_S  stHpfCfg;
-    AI_AEC_CONFIG_S     stAecCfg;
-    AUDIO_ANR_CONFIG_S  stAnrCfg;
-    AUDIO_AGC_CONFIG_S  stAgcCfg;
-    AUDIO_EQ_CONFIG_S   stEqCfg;
-} AI_TALKVQE_CONFIG_S;
-
-typedef struct hiAO_VQE_CONFIG_S {
-    HI_U32              u32OpenMask;
-
-    HI_S32              s32WorkSampleRate;  /* Sample Rate: 8KHz/16KHz/48KHz. default: 8KHz */
-    HI_S32              s32FrameSample; /* VQE frame length: 80-4096 */
-    VQE_WORKSTATE_E     enWorkstate;
-
-    AUDIO_HPF_CONFIG_S stHpfCfg;
-    AUDIO_ANR_CONFIG_S stAnrCfg;
-    AUDIO_AGC_CONFIG_S stAgcCfg;
-    AUDIO_EQ_CONFIG_S  stEqCfg;
-} AO_VQE_CONFIG_S;
-
-/* Defines the module register configure of VQE. */
-typedef struct hiVQE_MODULE_CONFIG_S {
-    HI_VOID *pHandle;
-} VQE_MODULE_CONFIG_S;
-
-typedef struct hiAUDIO_VQE_REGISTER_S {
-    VQE_MODULE_CONFIG_S stResModCfg;
-    VQE_MODULE_CONFIG_S stHpfModCfg;
-    VQE_MODULE_CONFIG_S stHdrModCfg;
-    VQE_MODULE_CONFIG_S stGainModCfg;
-
-    // Record VQE
-    VQE_MODULE_CONFIG_S stRecordModCfg;
-
-    // Talk VQE
-    VQE_MODULE_CONFIG_S stAecModCfg;
-    VQE_MODULE_CONFIG_S stAnrModCfg;
-    VQE_MODULE_CONFIG_S stAgcModCfg;
-    VQE_MODULE_CONFIG_S stEqModCfg;
-
-    // HiFi VQE
-    VQE_MODULE_CONFIG_S stRnrModCfg;
-    VQE_MODULE_CONFIG_S stDrcModCfg;
-    VQE_MODULE_CONFIG_S stPeqModCfg;
-} AUDIO_VQE_REGISTER_S;
-
-/* Defines the configure parameters of AI saving file. */
-typedef struct hiAUDIO_SAVE_FILE_INFO_S {
-    HI_BOOL     bCfg;
-    HI_CHAR     aFilePath[MAX_AUDIO_FILE_PATH_LEN];
-    HI_CHAR     aFileName[MAX_AUDIO_FILE_NAME_LEN];
-    HI_U32      u32FileSize;  /* in KB */
-} AUDIO_SAVE_FILE_INFO_S;
-
-/* Defines whether the file is saving or not . */
-typedef struct hiAUDIO_FILE_STATUS_S {
-    HI_BOOL     bSaving;
-} AUDIO_FILE_STATUS_S;
-
-/* Defines audio clksel type */
-typedef enum hiAUDIO_CLKSEL_E {
-    AUDIO_CLKSEL_BASE       = 0,  /* <Audio base clk. */
-    AUDIO_CLKSEL_SPARE,           /* <Audio spare clk. */
-
-    AUDIO_CLKSEL_BUTT,
-} AUDIO_CLKSEL_E;
-
-/* Defines audio mode parameter. */
-typedef struct hiAUDIO_MOD_PARAM_S {
-    AUDIO_CLKSEL_E enClkSel;
-} AUDIO_MOD_PARAM_S;
-
-
-typedef enum hiEN_AIO_ERR_CODE_E {
-    AIO_ERR_VQE_ERR        = 65, /* vqe error */
-} EN_AIO_ERR_CODE_E;
-
-/* at lease one parameter is illagal ,eg, an illegal enumeration value  */
-#define HI_ERR_AIO_ILLEGAL_PARAM     HI_DEF_ERR(HI_ID_AIO, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-/* using a NULL point */
-#define HI_ERR_AIO_NULL_PTR          HI_DEF_ERR(HI_ID_AIO, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-/* operation is not supported by NOW */
-#define HI_ERR_AIO_NOT_PERM          HI_DEF_ERR(HI_ID_AIO, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-/* vqe  err */
-#define HI_ERR_AIO_REGISTER_ERR      HI_DEF_ERR(HI_ID_AIO, EN_ERR_LEVEL_ERROR, AIO_ERR_VQE_ERR)
-
-/* invlalid device ID */
-#define HI_ERR_AI_INVALID_DEVID     HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_DEVID)
-/* invlalid channel ID */
-#define HI_ERR_AI_INVALID_CHNID     HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-/* at lease one parameter is illagal ,eg, an illegal enumeration value  */
-#define HI_ERR_AI_ILLEGAL_PARAM     HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-/* using a NULL point */
-#define HI_ERR_AI_NULL_PTR          HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-/* try to enable or initialize system,device or channel, before configing attribute */
-#define HI_ERR_AI_NOT_CONFIG        HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_CONFIG)
-/* operation is not supported by NOW */
-#define HI_ERR_AI_NOT_SUPPORT       HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-/* operation is not permitted ,eg, try to change stati attribute */
-#define HI_ERR_AI_NOT_PERM          HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-/* the devide is not enabled  */
-#define HI_ERR_AI_NOT_ENABLED       HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-/* failure caused by malloc memory */
-#define HI_ERR_AI_NOMEM             HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-/* failure caused by malloc buffer */
-#define HI_ERR_AI_NOBUF             HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-/* no data in buffer */
-#define HI_ERR_AI_BUF_EMPTY         HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-/* no buffer for new data */
-#define HI_ERR_AI_BUF_FULL          HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-/* system is not ready,had not initialed or loaded */
-#define HI_ERR_AI_SYS_NOTREADY      HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-
-#define HI_ERR_AI_BUSY              HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-/* vqe  err */
-#define HI_ERR_AI_VQE_ERR       HI_DEF_ERR(HI_ID_AI, EN_ERR_LEVEL_ERROR, AIO_ERR_VQE_ERR)
-
-/* invlalid device ID */
-#define HI_ERR_AO_INVALID_DEVID     HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_DEVID)
-/* invlalid channel ID */
-#define HI_ERR_AO_INVALID_CHNID     HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-/* at lease one parameter is illagal ,eg, an illegal enumeration value  */
-#define HI_ERR_AO_ILLEGAL_PARAM     HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-/* using a NULL point */
-#define HI_ERR_AO_NULL_PTR          HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-/* try to enable or initialize system,device or channel, before configing attribute */
-#define HI_ERR_AO_NOT_CONFIG        HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_CONFIG)
-/* operation is not supported by NOW */
-#define HI_ERR_AO_NOT_SUPPORT       HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-/* operation is not permitted ,eg, try to change stati attribute */
-#define HI_ERR_AO_NOT_PERM          HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-/* the devide is not enabled  */
-#define HI_ERR_AO_NOT_ENABLED       HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-/* failure caused by malloc memory */
-#define HI_ERR_AO_NOMEM             HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-/* failure caused by malloc buffer */
-#define HI_ERR_AO_NOBUF             HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-/* no data in buffer */
-#define HI_ERR_AO_BUF_EMPTY         HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-/* no buffer for new data */
-#define HI_ERR_AO_BUF_FULL          HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-/* system is not ready,had not initialed or loaded */
-#define HI_ERR_AO_SYS_NOTREADY      HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-
-#define HI_ERR_AO_BUSY              HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-/* vqe err */
-#define HI_ERR_AO_VQE_ERR       HI_DEF_ERR(HI_ID_AO, EN_ERR_LEVEL_ERROR, AIO_ERR_VQE_ERR)
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* End of #ifndef __HI_COMM_AI_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_ao.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_ao.h
deleted file mode 100644
index bf5969d8..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_ao.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2001-2018, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_comm_ao.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2009/5/5
-  Description   :
-  History       :
-  1.Date        : 2009/5/5
-    Author      : p00123320
-    Modification: Created file
-******************************************************************************/
-
-
-#ifndef __HI_COMM_AO_H__
-#define __HI_COMM_AO_H__
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"{
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* End of #ifndef __HI_COMM_AO_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_dis.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_dis.h
deleted file mode 100644
index 5c7ba8e4..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_dis.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2017-2018, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_comm_dis.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2016/08/23
-  Description   : hi_comm_dis.h header file
-  History       :
-******************************************************************************/
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_errno.h"
-#include "hi_comm_video.h"
-
-#ifndef __HI_COMM_DIS_H__
-#define __HI_COMM_DIS_H__
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif
-
-/* failure caused by malloc buffer */
-#define HI_ERR_DIS_NOBUF         HI_DEF_ERR(HI_ID_DIS, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-#define HI_ERR_DIS_BUF_EMPTY     HI_DEF_ERR(HI_ID_DIS, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-#define HI_ERR_DIS_NULL_PTR      HI_DEF_ERR(HI_ID_DIS, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-#define HI_ERR_DIS_ILLEGAL_PARAM HI_DEF_ERR(HI_ID_DIS, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-#define HI_ERR_DIS_BUF_FULL      HI_DEF_ERR(HI_ID_DIS, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-#define HI_ERR_DIS_SYS_NOTREADY  HI_DEF_ERR(HI_ID_DIS, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-#define HI_ERR_DIS_NOT_SUPPORT   HI_DEF_ERR(HI_ID_DIS, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-#define HI_ERR_DIS_NOT_PERMITTED HI_DEF_ERR(HI_ID_DIS, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-#define HI_ERR_DIS_BUSY          HI_DEF_ERR(HI_ID_DIS, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-#define HI_ERR_DIS_INVALID_CHNID HI_DEF_ERR(HI_ID_DIS, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-#define HI_ERR_DIS_CHN_UNEXIST   HI_DEF_ERR(HI_ID_DIS, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-
-/* Different mode of DIS */
-typedef enum hiDIS_MODE_E {
-    DIS_MODE_4_DOF_GME = 0, /* Only use with GME in 4 dof  */
-    DIS_MODE_6_DOF_GME, /* Only use with GME in 6 dof  */
-    DIS_MODE_GYRO, /* Only use with gryo in 6 dof  */
-    DIS_MODE_DOF_BUTT,
-} DIS_MODE_E;
-
-/* The motion level of camera */
-typedef enum hiDIS_MOTION_LEVEL_E {
-    DIS_MOTION_LEVEL_LOW = 0, /* Low motion level */
-    DIS_MOTION_LEVEL_NORMAL, /* Normal motion level */
-    DIS_MOTION_LEVEL_HIGH, /* High motion level */
-    DIS_MOTION_LEVEL_BUTT
-} DIS_MOTION_LEVEL_E;
-
-/* Different product type used DIS */
-typedef enum hiDIS_PDT_TYPE_E {
-    DIS_PDT_TYPE_IPC = 0, /* IPC product type */
-    DIS_PDT_TYPE_DV, /* DV product type */
-    DIS_PDT_TYPE_DRONE, /* DRONE product type */
-    DIS_PDT_TYPE_BUTT
-} DIS_PDT_TYPE_E;
-
-/* The Attribute of DIS */
-typedef struct hiDIS_ATTR_S {
-    HI_BOOL bEnable; /* RW; DIS enable */
-    HI_BOOL bGdcBypass; /* RW; gdc correction process , DIS = GME&GDC correction */
-    HI_U32 u32MovingSubjectLevel; /* RW; Range:[0,6]; Moving Subject level */
-    HI_S32 s32RollingShutterCoef; /* RW; Range:[0,1000]; Rolling shutter coefficients */
-    HI_S32 s32Timelag; /* RW; Range:[-2000000,2000000]; Timestamp delay between Gyro and Frame PTS */
-    HI_U32 u32ViewAngle; /* Reserved */
-    HI_U32 u32HorizontalLimit; /* RW; Range:[0,1000]; Parameter to limit horizontal drift by large foreground */
-    HI_U32 u32VerticalLimit; /* RW; Range:[0,1000]; Parameter to limit vertical drift by large foreground */
-    HI_BOOL bStillCrop; /* RW; The stabilization will be not working ,but the output image still be cropped */
-} DIS_ATTR_S;
-
-/* The Config of DIS */
-typedef struct hiDIS_CONFIG_S {
-    DIS_MODE_E enMode; /* RW; DIS Mode */
-    DIS_MOTION_LEVEL_E enMotionLevel; /* RW; DIS Motion level of the camera */
-    DIS_PDT_TYPE_E enPdtType; /* RW; DIS product type */
-    HI_U32 u32BufNum; /* RW; Range:[5,10]; Buf num for DIS */
-    HI_U32 u32CropRatio; /* RW; Range:[50,98]; Crop ratio of output image */
-    HI_U32 u32FrameRate; /* RW; Range: Hi3559AV100 = (0, 120] | Hi3519AV100 = (0, 120] | Hi3516CV500 = (0, 60] |
-                            Hi3516DV300 = (0, 60] | Hi3559V200 = (0, 60] | Hi3556V200 = (0, 60] . */
-    HI_U32 u32GyroOutputRange; /* RW; Range:[0,200000]; The range of Gyro output in degree */
-    HI_U32 u32GyroDataBitWidth; /* RW; Range:[0,32]; The bits used for gyro angular velocity output */
-    HI_BOOL bCameraSteady; /* RW; The camera is steady or not */
-    HI_BOOL bScale; /* RW; Scale output image or not */
-} DIS_CONFIG_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-
-#endif
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_gdc.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_gdc.h
deleted file mode 100644
index 312e8d08..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_gdc.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2012-2018. All rights reserved.
- * Description: hi_comm_gdc.h
- * Author:
- * Create: 2016-10-07
- */
-
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_errno.h"
-#include "hi_comm_video.h"
-
-#ifndef __HI_COMM_GDC_H__
-#define __HI_COMM_GDC_H__
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-/* failure caused by malloc buffer */
-#define HI_ERR_GDC_NOBUF         HI_DEF_ERR(HI_ID_GDC, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-#define HI_ERR_GDC_BUF_EMPTY     HI_DEF_ERR(HI_ID_GDC, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-#define HI_ERR_GDC_NULL_PTR      HI_DEF_ERR(HI_ID_GDC, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-#define HI_ERR_GDC_ILLEGAL_PARAM HI_DEF_ERR(HI_ID_GDC, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-#define HI_ERR_GDC_BUF_FULL      HI_DEF_ERR(HI_ID_GDC, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-#define HI_ERR_GDC_SYS_NOTREADY  HI_DEF_ERR(HI_ID_GDC, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-#define HI_ERR_GDC_NOT_SUPPORT   HI_DEF_ERR(HI_ID_GDC, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-#define HI_ERR_GDC_NOT_PERMITTED HI_DEF_ERR(HI_ID_GDC, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-#define HI_ERR_GDC_BUSY          HI_DEF_ERR(HI_ID_GDC, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-#define HI_ERR_GDC_INVALID_CHNID HI_DEF_ERR(HI_ID_GDC, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-#define HI_ERR_GDC_CHN_UNEXIST   HI_DEF_ERR(HI_ID_GDC, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-
-#define FISHEYE_MAX_REGION_NUM   4
-#define FISHEYE_LMFCOEF_NUM      128
-#define GDC_PMFCOEF_NUM          9
-
-typedef HI_S32 GDC_HANDLE;
-
-typedef struct hiGDC_TASK_ATTR_S {
-    VIDEO_FRAME_INFO_S stImgIn; /* Input picture */
-    VIDEO_FRAME_INFO_S stImgOut; /* Output picture */
-    HI_U64 au64privateData[4]; /* RW; Private data of task */
-    HI_U64 reserved; /* RW; Debug information,state of current picture */
-} GDC_TASK_ATTR_S;
-
-/* Mount mode of device */
-typedef enum hiFISHEYE_MOUNT_MODE_E {
-    FISHEYE_DESKTOP_MOUNT = 0, /* Desktop mount mode */
-    FISHEYE_CEILING_MOUNT = 1, /* Ceiling mount mode */
-    FISHEYE_WALL_MOUNT = 2, /* wall mount mode */
-
-    FISHEYE_MOUNT_MODE_BUTT
-} FISHEYE_MOUNT_MODE_E;
-
-/* View mode of client */
-typedef enum hiFISHEYE_VIEW_MODE_E {
-    FISHEYE_VIEW_360_PANORAMA = 0, /* 360 panorama mode of gdc correction */
-    FISHEYE_VIEW_180_PANORAMA = 1, /* 180 panorama mode of gdc correction */
-    FISHEYE_VIEW_NORMAL = 2, /* normal mode of gdc correction */
-    FISHEYE_NO_TRANSFORMATION = 3, /* no gdc correction */
-
-    FISHEYE_VIEW_MODE_BUTT
-} FISHEYE_VIEW_MODE_E;
-
-/* Fisheye region correction attribute */
-typedef struct hiFISHEYE_REGION_ATTR_S {
-    FISHEYE_VIEW_MODE_E enViewMode; /* RW; Range: [0, 3];gdc view mode */
-    HI_U32 u32InRadius; /* RW; inner radius of gdc correction region */
-    HI_U32 u32OutRadius; /* RW; out radius of gdc correction region */
-    HI_U32 u32Pan; /* RW; Range: [0, 360] */
-    HI_U32 u32Tilt; /* RW; Range: [0, 360] */
-    HI_U32 u32HorZoom; /* RW; Range: [1, 4095] */
-    HI_U32 u32VerZoom; /* RW; Range: [1, 4095] */
-    RECT_S stOutRect; /* RW; out Imge rectangle attribute */
-} FISHEYE_REGION_ATTR_S;
-
-typedef struct hiFISHEYE_REGION_ATTR_EX_S {
-    FISHEYE_VIEW_MODE_E enViewMode; /* RW; Range: [0, 3];gdc view mode */
-    HI_U32 u32InRadius; /* RW; inner radius of gdc correction region */
-    HI_U32 u32OutRadius; /* RW; out radius of gdc correction region */
-    HI_U32 u32X; /* RW; Range: [0, 4608] */
-    HI_U32 u32Y; /* RW; Range: [0, 3456] */
-    HI_U32 u32HorZoom; /* RW; Range: [1, 4095] */
-    HI_U32 u32VerZoom; /* RW; Range: [1, 4095] */
-    RECT_S stOutRect; /* RW; out Imge rectangle attribute */
-} FISHEYE_REGION_ATTR_EX_S;
-
-/* Fisheye all regions correction attribute */
-typedef struct hiFISHEYE_ATTR_S {
-    HI_BOOL bEnable; /* RW; Range: [0, 1];whether enable fisheye correction or not */
-    HI_BOOL bLMF; /* RW; Range: [0, 1];whether gdc len's LMF coefficient is from user config or
-                     from default linear config */
-    HI_BOOL bBgColor; /* RW; Range: [0, 1];whether use background color or not */
-    HI_U32 u32BgColor; /* RW; Range: [0,0xffffff];the background color RGB888 */
-
-    HI_S32 s32HorOffset; /* RW; Range: [-511, 511];the horizontal offset between image center and
-                            physical center of len */
-    HI_S32 s32VerOffset; /* RW; Range: [-511, 511]; the vertical offset between image center and
-                            physical center of len */
-
-    HI_U32 u32TrapezoidCoef; /* RW; Range: [0, 32];strength coefficient of trapezoid correction */
-    HI_S32 s32FanStrength; /* RW; Range: [-760, 760];strength coefficient of fan correction */
-
-    FISHEYE_MOUNT_MODE_E enMountMode; /* RW; Range: [0, 2];gdc mount mode */
-
-    HI_U32 u32RegionNum; /* RW; Range: [1, 4]; gdc correction region number */
-    FISHEYE_REGION_ATTR_S astFishEyeRegionAttr[FISHEYE_MAX_REGION_NUM]; /* RW; attribution of gdc correction region */
-} FISHEYE_ATTR_S;
-
-typedef struct hiFISHEYE_ATTR_EX_S {
-    HI_BOOL bEnable; /* RW; Range: [0, 1];whether enable fisheye correction or not */
-    HI_BOOL bLMF; /* RW; Range: [0, 1];whether gdc len's LMF coefficient is from user config or
-                     from default linear config */
-    HI_BOOL bBgColor; /* RW; Range: [0, 1];whether use background color or not */
-    HI_U32 u32BgColor; /* RW; Range: [0,0xffffff];the background color RGB888 */
-
-    HI_S32 s32HorOffset; /* RW; Range: [-511, 511];the horizontal offset between image center and
-                            physical center of len */
-    HI_S32 s32VerOffset; /* RW; Range: [-511, 511]; the vertical offset between image center and
-                            physical center of len */
-
-    HI_U32 u32TrapezoidCoef; /* RW; Range: [0, 32];strength coefficient of trapezoid correction */
-    HI_S32 s32FanStrength; /* RW; Range: [-760, 760];strength coefficient of fan correction */
-
-    FISHEYE_MOUNT_MODE_E enMountMode; /* RW; Range: [0, 2];gdc mount mode */
-
-    HI_U32 u32RegionNum; /* RW; Range: [1, 4]; gdc correction region number */
-    /* RW; attribution of gdc correction region */
-    FISHEYE_REGION_ATTR_EX_S astFishEyeRegionAttr[FISHEYE_MAX_REGION_NUM];
-} FISHEYE_ATTR_EX_S;
-
-/* Spread correction attribute */
-typedef struct hiSPREAD_ATTR_S {
-    HI_BOOL bEnable; /* RW; Range: [0, 1];whether enable spread or not,
-                        When spread on,ldc DistortionRatio range should be [0, 500] */
-    HI_U32 u32SpreadCoef; /* RW; Range: [0, 18];strength coefficient of spread correction */
-    SIZE_S stDestSize; /* RW; dest size of spread */
-} SPREAD_ATTR_S;
-
-/* Fisheye Job Config */
-typedef struct hiFISHEYE_JOB_CONFIG_S {
-    HI_U64 u64LenMapPhyAddr; /* LMF coefficient Physic Addr */
-} FISHEYE_JOB_CONFIG_S;
-
-/* Fisheye Config */
-typedef struct hiFISHEYE_CONFIG_S {
-    HI_U16 au16LMFCoef[FISHEYE_LMFCOEF_NUM]; /* RW;  LMF coefficient of gdc len */
-} FISHEYE_CONFIG_S;
-
-/* Gdc PMF Attr */
-typedef struct hiGDC_PMF_ATTR_S {
-    HI_S64 as64PMFCoef[GDC_PMFCOEF_NUM]; /* W;  PMF coefficient of gdc */
-} GDC_PMF_ATTR_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_COMM_GDC_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_isp.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_isp.h
deleted file mode 100644
index 08eb4ee6..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_isp.h
+++ /dev/null
@@ -1,2669 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_comm_isp.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2010/12/20
-  Description   :
-  History       :
-  1.Date        : 2010/12/20
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-
-#ifndef __HI_COMM_ISP_H__
-#define __HI_COMM_ISP_H__
-
-#include "hi_type.h"
-#include "hi_errno.h"
-#include "hi_common.h"
-#include "hi_isp_debug.h"
-#include "hi_comm_video.h"
-#include "hi_isp_defines.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-/****************************************************************************
- * MACRO DEFINITION                                                         *
- ****************************************************************************/
-
-#define RES_WIDTH_MAX(dev)              (g_au16ResWMax[dev])
-#define RES_WIDTH_MIN                   (120)
-#define RES_HEIGHT_MAX(dev)             (g_au16ResHMax[dev])
-#define RES_HEIGHT_MIN                  (120)
-#define FRAME_RATE_MAX                  (65535.0)
-
-#define VREG_MAX_NUM                    (16)
-
-#define AWB_ZONE_ORIG_ROW               (32)
-#define AWB_ZONE_ORIG_COLUMN            (32)
-#define AE_ZONE_ROW                     (15)
-#define AE_ZONE_COLUMN                  (17)
-#define MG_ZONE_ROW                     (15)
-#define MG_ZONE_COLUMN                  (17)
-#define AWB_ZONE_NUM                    (AWB_ZONE_ORIG_ROW * AWB_ZONE_ORIG_COLUMN * AWB_ZONE_BIN)
-#define AWB_ZONE_STITCH_MAX             (AWB_ZONE_NUM * ISP_MAX_STITCH_NUM)
-#define AF_ZONE_ROW                     (15)
-#define AF_ZONE_COLUMN                  (17)
-#define LIGHTSOURCE_NUM                 (4)
-#define MAX_AWB_LIB_NUM                 (AWB_LIB_NUM)
-#define MAX_AE_LIB_NUM                  (AE_LIB_NUM)
-
-#define AE_MIN_WIDTH                    (256)
-#define AE_MIN_HEIGHT                   (120)
-#define AWB_MIN_WIDTH                   (60)
-#define AWB_MIN_HEIGHT                  (14)
-
-#define GAMMA_NODE_NUM                  (1025)
-#define PREGAMMA_NODE_NUM               (257)
-#define PREGAMMA_SEG_NUM                (8)
-
-#define LCAC_STRENGTH_NUM               (16)
-
-#define ISP_AUTO_ISO_STRENGTH_NUM       (16)
-#define ISP_SHARPEN_LUMA_NUM            (32)
-#define ISP_SHARPEN_GAIN_NUM            (32)
-
-#define ISP_MAX_SNS_REGS                (32)
-
-#define HI_ISP_RLSC_POINTS                (129)
-#define HI_ISP_RLSC_DEFAULT_RADIAL_STR    (4096)
-#define HI_ISP_RLSC_DEFAULT_SCALE         (3)
-#define HI_ISP_RLSC_DEFAULT_MANUAL_WEIGHT (256)
-#define HI_ISP_RLSC_DEFAULT_WBGAIN        (256)
-#define HI_ISP_RLSC_DEFAULT_LIGHT         (0)
-#define HI_ISP_RLSC_WEIGHT_Q_BITS         (8)
-
-#define ISP_VREG_SIZE_BIN               (0x20000)
-#define ALG_LIB_VREG_SIZE_BIN           (0x1000)
-#define WDR_MAX_FRAME_NUM               (4)
-
-#define BAYER_CALIBTAION_MAX_NUM        (50)
-#define HI_ISP_BAYERNR_STRENGTH_DIVISOR (100)
-#define HI_ISP_BAYERNR_CORINGLOW_STRENGTH_DIVISOR (10000)
-#define AI_MAX_STEP_FNO_NUM             (1024)
-
-#define ISP_BAS_TAPS_ROW_NUM            (17)
-#define ISP_BAS_TAPS_COL_6              (6)
-#define ISP_BAS_TAPS_COL_4              (4)
-#define HI_ISP_BAYERNR_LUT_LENGTH       (33)
-#define HI_ISP_BAYERNR_LMTLUTNUM        (129)
-#define PRO_MAX_FRAME_NUM               (8)
-
-#define HI_ISP_DEMOSAIC_LUT_LENGTH      (17)
-#define ISP_BAYER_CHN_NUM               (4)
-#define BAYER_CHN_R                     0
-#define BAYER_CHN_GR                    1
-#define BAYER_CHN_GB                    2
-#define BAYER_CHN_B                     3
-#define LDCI_LPF_LUT_SIZE               (9)
-#define LDCI_HE_LUT_SIZE                (33)
-#define LDCI_DE_USM_LUT_SIZE            (33)
-#define LDCI_COLOR_GAIN_LUT_SIZE        (65)
-
-#define NoiseSet_EleNum                 (7)
-#define CCM_MATRIX_SIZE                 (9)
-#define CCM_MATRIX_NUM                  (7)
-
-#define HI_ISP_DRC_CUBIC_POINT_NUM      (5)
-#define HI_ISP_DRC_CC_NODE_NUM          (33)
-#define HI_ISP_DRC_TM_NODE_NUM          (200)
-#define HI_ISP_DRC_TM_SEG_NUM           (8)
-#define HI_ISP_DRC_EXP_COMP_SAMPLE_NUM  (8)
-#define HI_ISP_DRC_SHP_LOG_CONFIG_NUM   (16)
-
-#define LOG_LUT_SIZE                    (1025)
-#define PRE_LOG_LUT_SIZE                (1025)
-
-#define HI_ISP_DE_LUMA_GAIN_LUT_N       (17)
-#define ISP_EXP_RATIO_STRENGTH_NUM      (16)
-
-#define ISP_DO_NOT_NEED_SWITCH_IMAGEMODE (-2)
-
-/*****************************************************************************
-*******DEFAULT VALUE OF GLOBAL REGISTERS DEFINED HERE*************************
-*****************************************************************************/
-
-/* ----------------------- AE ------------------------------- */
-#define HI_ISP_TOP_RGGB_START_R_GR_GB_B           (0)
-#define HI_ISP_TOP_RGGB_START_GR_R_B_GB           (1)
-#define HI_ISP_TOP_RGGB_START_GB_B_R_GR           (2)
-#define HI_ISP_TOP_RGGB_START_B_GB_GR_R           (3)
-
-#define HI_ISP_TOP_AE_SELECT_AFTER_DG             (0)
-#define HI_ISP_TOP_AE_SELECT_AFTER_WB             (1)
-#define HI_ISP_TOP_AE_SELECT_AFTER_DRC            (2)
-
-#define HI_ISP_AE_FOUR_PLANE_MODE_DISABLE         (0)
-#define HI_ISP_AE_FOUR_PLANE_MODE_ENABLE          (1)
-
-/* ----------------------- AWB ------------------------------- */
-#define HI_ISP_AWB_OFFSET_COMP_DEF                (0)
-#define HI_ISP_CCM_COLORTONE_EN_DEFAULT           (1)
-#define HI_ISP_CCM_COLORTONE_RGAIN_DEFAULT        (256)
-#define HI_ISP_CCM_COLORTONE_BGAIN_DEFAULT        (256)
-#define HI_ISP_CCM_COLORTONE_GGAIN_DEFAULT        (256)
-
-#define HI_ISP_CCM_PROT_EN_DEFAULT                (0)
-#define HI_ISP_CCM_CC_THD0_DEFAULT                (0)
-#define HI_ISP_CCM_CC_THD1_DEFAULT                (0x1E)
-#define HI_ISP_CCM_CC_PROT_RATIO_DEFAULT          (10)
-#define HI_ISP_CCM_RR_THD0_DEFAULT                (0x1E)
-#define HI_ISP_CCM_RR_THD1_DEFAULT                (0x64)
-#define HI_ISP_CCM_GG_THD0_DEFAULT                (0x6)
-#define HI_ISP_CCM_GG_THD1_DEFAULT                (0x3C)
-#define HI_ISP_CCM_BB_THD0_DEFAULT                (0x1E)
-#define HI_ISP_CCM_BB_THD1_DEFAULT                (0x64)
-#define HI_ISP_CCM_MAX_RGB_DEFAULT                (0xC8)
-#define HI_ISP_CCM_RGB_PROT_RATIO_DEFAULT         (10)
-#define HI_ISP_CCM_RECOVER_EN_DEFAULT             (1)
-#define HI_ISP_CCM_LUM_RATIO_DEFAULT              (256)
-#define HI_ISP_CCM_HUE_RATIO_DEFAULT              (256)
-
-#define CCM_CONVERT_PRE(value)  ((value & 0x8000) | (value << 2))
-#define CCM_CONVERT(value)      ((value & 0x8000)?((~(value & 0x7FFF)) + 1):(value))
-/********************************** DEFINED END **************************************/
-
-/****************************************************************************
- * GENERAL STRUCTURES                                                       *
- ****************************************************************************/
-/*
-ISP Error Code
-0x40 : ISP_NOT_INIT
-0x41 : ISP_MEM_NOT_INIT
-0x42 : ISP_ATTR_NOT_CFG
-0x43 : ISP_SNS_UNREGISTER
-0x44 : ISP_INVALID_ADDR
-0x45 : ISP_NOMEM
-0x46 : ISP_NO_INT
-*/
-typedef enum hiISP_ERR_CODE_E {
-    ERR_ISP_NOT_INIT                = 0x40, // ISP not init
-    ERR_ISP_MEM_NOT_INIT            = 0x41, // ISP memory not init
-    ERR_ISP_ATTR_NOT_CFG            = 0x42, // ISP attribute not cfg
-    ERR_ISP_SNS_UNREGISTER          = 0x43, // ISP sensor unregister
-    ERR_ISP_INVALID_ADDR            = 0x44, // ISP invalid address
-    ERR_ISP_NOMEM                   = 0x45, // ISP nomem
-    ERR_ISP_NO_INT                  = 0x46, // ISP
-} ISP_ERR_CODE_E;
-
-#define HI_ERR_ISP_NULL_PTR         HI_DEF_ERR(HI_ID_ISP, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-#define HI_ERR_ISP_ILLEGAL_PARAM    HI_DEF_ERR(HI_ID_ISP, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-#define HI_ERR_ISP_NOT_SUPPORT      HI_DEF_ERR(HI_ID_ISP, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-
-#define HI_ERR_ISP_NOT_INIT         HI_DEF_ERR(HI_ID_ISP, EN_ERR_LEVEL_ERROR, ERR_ISP_NOT_INIT)
-#define HI_ERR_ISP_MEM_NOT_INIT     HI_DEF_ERR(HI_ID_ISP, EN_ERR_LEVEL_ERROR, ERR_ISP_MEM_NOT_INIT)
-#define HI_ERR_ISP_ATTR_NOT_CFG     HI_DEF_ERR(HI_ID_ISP, EN_ERR_LEVEL_ERROR, ERR_ISP_ATTR_NOT_CFG)
-#define HI_ERR_ISP_SNS_UNREGISTER   HI_DEF_ERR(HI_ID_ISP, EN_ERR_LEVEL_ERROR, ERR_ISP_SNS_UNREGISTER)
-#define HI_ERR_ISP_INVALID_ADDR     HI_DEF_ERR(HI_ID_ISP, EN_ERR_LEVEL_ERROR, ERR_ISP_INVALID_ADDR)
-#define HI_ERR_ISP_NOMEM            HI_DEF_ERR(HI_ID_ISP, EN_ERR_LEVEL_ERROR, ERR_ISP_NOMEM)
-#define HI_ERR_ISP_NO_INT           HI_DEF_ERR(HI_ID_ISP, EN_ERR_LEVEL_ERROR, ERR_ISP_NO_INT)
-
-/*
-Defines the structure of ISP module parameters.
-*/
-typedef struct hiISP_MOD_PARAM_S {
-    HI_U32      u32IntBotHalf;  /* RW;Range:[0,1]; Format:32.0; Indicate ISP interrupt bottom half,No distinction vipipe */
-    HI_U32      u32QuickStart;  /* RW;Range:[0,1]; Format:32.0; Indicate ISP Quick Start No distinction vipipe. Only used for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_BOOL     bLongFrmIntEn; /*when wdr mode enable/disable long frame pipe interrupt.Only used for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_MOD_PARAM_S;
-
-/*
-Defines the structure of ISP control parameters.
-*/
-typedef struct hiISP_CTRL_PARAM_S {
-    HI_U32      u32ProcParam;    /* RW;Format:32.0; Indicate the update frequency of ISP_PROC information,No distinction vipipe */
-    HI_U32      u32StatIntvl;    /* RW;Range:(0,0xffffffff];Format:32.0; Indicate the time interval of ISP statistic information */
-    HI_U32      u32UpdatePos;    /* RW;Range:[0,1]; Format:32.0; Indicate the location of the configuration register of ISP interrupt */
-    HI_U32      u32IntTimeOut;   /* RW;Format:32.0; Indicate the time(unit:ms) of interrupt timeout */
-    HI_U32      u32PwmNumber;    /* R;Format:32.0; Indicate PWM number */
-    HI_U32      u32PortIntDelay; /* RW;Format:32.0; Port intertupt delay value, unit:clk */
-    HI_BOOL     bLdciTprFltEn;  /* R;Indicate Enable LDCI temporal filter. Not support changed after isp init */
-} ISP_CTRL_PARAM_S;
-
-/*
-Defines the working mode of ISP
-0 = automatic mode
-1 = manual mode
-*/
-typedef enum hiISP_OP_TYPE_E {
-    OP_TYPE_AUTO    = 0,
-    OP_TYPE_MANUAL  = 1,
-    OP_TYPE_BUTT
-} ISP_OP_TYPE_E;
-
-
-/*
-Defines the prior frame of ISP
-0 = short frame
-1 = middle frame
-2 = second middle frame
-3 = long frame
-*/
-typedef enum hiISP_PRIOR_FRAME_E {
-    LONG_FRAME      = 0,
-    SHORT_FRAME       = 1,
-    PRIOR_FRAME_BUTT
-} ISP_PRIOR_FRAME_E;
-
-/*
-Defines the ISP correction or detection status
-0 = initial status, no calibration
-1 = The static defect pixel calibration ends normally
-2 = The static defect pixel calibration ends due to timeout.
-*/
-typedef enum hiISP_STATE_E {
-    ISP_STATE_INIT     = 0,
-    ISP_STATE_SUCCESS  = 1,
-    ISP_STATE_TIMEOUT  = 2,
-    ISP_STATE_BUTT
-} ISP_STATUS_E;
-
-typedef struct hiISP_PIPE_DIFF_ATTR_S {
-    HI_S32 as32Offset[ISP_BAYER_CHN_NUM];   /* RW;Range:[-4095,4095];Format:12.0; Black level differences between the offset value */
-    HI_U32 au32Gain[ISP_BAYER_CHN_NUM];     /* RW;Range:[0x80,0x400];Format:4.8; The gain difference ratio */
-    HI_U16 au16ColorMatrix[CCM_MATRIX_SIZE]; /* RW;Range:[0x0,0xFFFF];Format:8.8; Color correction matrix variance ratio */
-} ISP_PIPE_DIFF_ATTR_S;
-
-/* Defines the format of the input Bayer image */
-typedef enum hiISP_BAYER_FORMAT_E {
-    BAYER_RGGB    = 0,
-    BAYER_GRBG    = 1,
-    BAYER_GBRG    = 2,
-    BAYER_BGGR    = 3,
-    BAYER_BUTT
-} ISP_BAYER_FORMAT_E;
-
-/* Defines the bitwidth of the input Bayer image, used for lsc online calibration */
-typedef enum hiISP_BAYER_RAWBIT_E {
-    BAYER_RAWBIT_8BIT    = 8,
-    BAYER_RAWBIT_10BIT   = 10,
-    BAYER_RAWBIT_12BIT   = 12,
-    BAYER_RAWBIT_14BIT   = 14,
-    BAYER_RAWBIT_16BIT   = 16,
-    BAYER_RAWBIT_BUTT
-
-} ISP_BAYER_RAWBIT_E;
-
-
-
-/* ISP public attribute, contains the public image attribute */
-typedef struct hiISP_PUB_ATTR_S {
-    RECT_S          stWndRect;      /* RW; Start position of the cropping window, image width, and image height */
-    SIZE_S          stSnsSize;      /* RW; Width and height of the image output from the sensor */
-    HI_FLOAT        f32FrameRate;   /* RW; Range: [0, 0xFFFF]; For frame rate */
-    ISP_BAYER_FORMAT_E  enBayer;    /* RW; Range:[0,3] ;Format:2.0;the format of the input Bayer image */
-    WDR_MODE_E      enWDRMode;      /* RW; WDR mode select */
-    HI_U8           u8SnsMode;      /* RW; Range: [0, 0xFF]; Format: 8.0; For special sensor mode switches */
-} ISP_PUB_ATTR_S;
-
-/* Slave mode sensor sync signal generate module */
-typedef struct hiISP_SLAVE_SNS_SYNC_S {
-    union {
-        struct {
-            HI_U32  bit16Rsv          :  16;
-            HI_U32  bitHInv           :  1;
-            HI_U32  bitVInv           :  1;
-            HI_U32  bit12Rsv          :  12;
-            HI_U32  bitHEnable        :  1;
-            HI_U32  bitVEnable        :  1;
-        } stBits;
-        HI_U32 u32Bytes;
-    } unCfg;
-
-    HI_U32  u32VsTime;
-    HI_U32  u32HsTime;
-    HI_U32  u32VsCyc;
-    HI_U32  u32HsCyc;
-    HI_U32  u32SlaveModeTime;
-
-} ISP_SLAVE_SNS_SYNC_S;
-
-/*
-Defines the ISP stitch attribute.
-*/
-/*
-Defines the ISP firmware status
-0 = Running status
-1 = Frozen status
-*/
-typedef enum hiISP_FMW_STATE_E {
-    ISP_FMW_STATE_RUN = 0,
-    ISP_FMW_STATE_FREEZE,
-    ISP_FMW_STATE_BUTT
-} ISP_FMW_STATE_E;
-
-/* Defines the WDR mode of the ISP */
-typedef struct hiISP_WDR_MODE_S {
-    WDR_MODE_E  enWDRMode;
-} ISP_WDR_MODE_S;
-
-typedef union hiISP_MODULE_CTRL_U {
-    HI_U64  u64Key;
-    struct {
-        HI_U64  bitBypassISPDGain      : 1 ;   /* RW;[0] */
-        HI_U64  bitBypassAntiFC        : 1 ;   /* RW;[1] */
-        HI_U64  bitBypassCrosstalkR    : 1 ;   /* RW;[2] */
-        HI_U64  bitBypassDPC           : 1 ;   /* RW;[3] */
-        HI_U64  bitBypassNR            : 1 ;   /* RW;[4] */
-        HI_U64  bitBypassDehaze        : 1 ;   /* RW;[5] */
-        HI_U64  bitBypassWBGain        : 1 ;   /* RW;[6] */
-        HI_U64  bitBypassMeshShading   : 1 ;   /* RW;[7] */
-        HI_U64  bitBypassDRC           : 1 ;   /* RW;[8] */
-        HI_U64  bitBypassDemosaic      : 1 ;   /* RW;[9] */
-        HI_U64  bitBypassColorMatrix   : 1 ;   /* RW;[10] */
-        HI_U64  bitBypassGamma         : 1 ;   /* RW;[11] */
-        HI_U64  bitBypassFSWDR         : 1 ;   /* RW;[12] */
-        HI_U64  bitBypassCA            : 1 ;   /* RW;[13]; Not support for Hi3559V200/Hi3556V200 */
-        HI_U64  bitBypassCsConv        : 1 ;   /* RW;[14] */
-        HI_U64  bitBypassRadialCrop    : 1 ;   /* RW;[15]; Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-        HI_U64  bitBypassSharpen       : 1 ;   /* RW;[16] */
-        HI_U64  bitBypassLCAC          : 1 ;   /* RW;[17] */
-        HI_U64  bitBypassGCAC          : 1 ;   /* RW;[18]; Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bit2ChnSelect          : 2 ;   /* RW;[19:20] */
-        HI_U64  bitBypassLdci          : 1 ;   /* RW;[21] */
-        HI_U64  bitBypassPreGamma      : 1 ;   /* RW;[22]; Not support for Hi3559V200/Hi3556V200 */
-        HI_U64  bitBypassRadialShading : 1 ;   /* RW;[23]; Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bitBypassAEStatFE      : 1 ;   /* RW;[24] */
-        HI_U64  bitBypassAEStatBE      : 1 ;   /* RW;[25] */
-        HI_U64  bitBypassMGStat        : 1 ;   /* RW;[26] */
-        HI_U64  bitBypassDE            : 1 ;   /* RW;[27] ; Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-        HI_U64  bitBypassAFStatFE      : 1 ;   /* RW;[28] ; Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bitBypassAFStatBE      : 1 ;   /* RW;[29] ; Not support for Hi3559V200/Hi3556V200 */
-        HI_U64  bitBypassAWBStat       : 1 ;   /* RW;[30] ; */
-        HI_U64  bitBypassCLUT          : 1 ;   /* RW;[31] ; Not support for  Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bitBypassHLC           : 1 ;   /* RW;[32] ; Not support for Hi3559AV100/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bitBypassEdgeMark      : 1 ;   /* RW;[33] ; Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bitBypassRGBIR         : 1 ;   /* RW;[34] ; Only used for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bitRsv29               : 29 ;  /* H  ; [35:63] */
-    };
-} ISP_MODULE_CTRL_U;
-/*
-Defines the ISP FSWDR attributes in combination mode.
- 0 = Short exposure data is used when combining
- 1 = Long exposure data is used when combining
- */
-typedef enum hiISP_COMBINE_MODE_E {
-    FS_WDR_COMBINE_SHORT_FIRST  = 0,
-    FS_WDR_COMBINE_LONG_FIRST   = 1,
-    FS_WDR_COMBINE_BUTT
-} ISP_COMBINE_MODE_E;
-
-/*
-Defines the ISP WDR merge mode.
-0 = WDR mode is used
-1 = Fusion mode is used
-*/
-typedef enum hiISP_WDR_MERGE_MODE_E {
-    MERGE_WDR_MODE      = 0,
-    MERGE_FUSION_MODE   = 1,
-    MERGE_BUTT
-} ISP_WDR_MERGE_MODE_E;
-
-/*
- 0 = The function of bnr is off
- 1 = The function of bnr is on
-*/
-typedef enum hiISP_BNR_MODE_E {
-    BNR_OFF_MODE         = 0,
-    BNR_ON_MODE          = 1,
-    BNR_BUTT
-} ISP_BNR_MODE_E;
-
-typedef enum hiISP_WDR_WBGAIN_POSITION_E {
-    WDR_WBGAIN_IN_DG1         = 0,
-    WDR_WBGAIN_IN_WB          = 1,
-    WDR_WBGAIN_POSITION_BUTT
-} ISP_WDR_WBGAIN_POSITION_E;
-
-typedef struct hiISP_FSWDR_MANUAL_ATTR_S {
-    HI_U8 u8MdThrLowGain;
-    HI_U8 u8MdThrHigGain;
-} ISP_FSWDR_MANUAL_ATTR_S;
-
-typedef struct hiISP_FSWDR_AUTO_ATTR_S {
-    HI_U8 au8MdThrLowGain[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8 au8MdThrHigGain[ISP_AUTO_ISO_STRENGTH_NUM];
-} ISP_FSWDR_AUTO_ATTR_S;
-
-typedef struct hiISP_MDT_ATTR_S {
-    HI_BOOL bShortExpoChk;     /* RW;Range:[0x0,0x1];Format:1.0; */
-    HI_U16  u16ShortCheckThd;   /* RW;Range:[0x0,0xFFF];Format:12.0 */
-    HI_BOOL bMDRefFlicker;
-    HI_U8   u8MdtStillThd;     /* RW;Range:[0x0,0xFE];Format:8.0 */
-    HI_U8   u8MdtFullThd;      /* RW;Range:[0x0,0xFE];Format:8.0,Only used for Hi3559AV100 */
-    HI_U8   u8MdtLongBlend;    /* RW;Range:[0x0,0xFE] */
-    ISP_OP_TYPE_E enOpType;
-    ISP_FSWDR_MANUAL_ATTR_S stManual;
-    ISP_FSWDR_AUTO_ATTR_S   stAuto;
-} ISP_FSWDR_MDT_ATTR_S;
-
-
-typedef struct hiISP_WDR_COMBINE_ATTR_S {
-    HI_BOOL bMotionComp;              /* RW;Range:[0x0,0x1];Format:1.0; HI_TRUE: enable motion compensation; HI_FALSE: disable motion compensation */
-    HI_U16  u16ShortThr;              /* RW;Range:[0x0,0xFFF];Format:12.0; Data above this threshold will be taken from short exposure only. */
-    HI_U16  u16LongThr;               /* RW;Range:[0x0,0xFFF];Format:12.0; limited range :[0x0,u16ShortThr],Data below this threshold will be taken from long exposure only. */
-    HI_BOOL bForceLong;               /* RW;Range:[0x0,0x1];Format:1.0; HI_TRUE: enable Force Long; HI_FALSE: disable Force Long,Not support for Hi3559AV100 */
-    HI_U16  u16ForceLongLowThr;       /* RW;Range:[0x0,0xFFF];Format:12.0; Data above this threshold will Force to choose long frame only,Not support for Hi3559AV100 */
-    HI_U16  u16ForceLongHigThr;       /* RW;Range:[0x0,0xFFF];Format:12.0; Data below this threshold will Force to choose long frame only,Not support for Hi3559AV100 */
-    ISP_FSWDR_MDT_ATTR_S stWDRMdt;
-} ISP_WDR_COMBINE_ATTR_S;
-
-typedef struct hiISP_FUSION_ATTR_S {
-    HI_U16  au16FusionThr[4];      /* RW;Range:[0x0,0x3FFF];Format:14.0;The threshold of the 4 frame */
-} ISP_FUSION_ATTR_S;
-
-typedef struct hiISP_WDR_BNR_ATTR_S {
-    ISP_BNR_MODE_E enBnrMode;         /* RW;Range:[0x0,0x1];Format:1.0; HI_TRUE:enable the bnr of wdr;HI_FALSE:disable the bnr of wdr */
-    HI_BOOL        bShortFrameNR;     /* RW;Range:[0x0,0x1];Format:1.0; HI_TRUE:enable the bnr of short frame;HI_FALSE:disable the bnr of short frame,Only used for Hi3519AV100 */
-    HI_U8          u8ShortFrameNRStr; /* RW;Range:[0x0,0x3F];Format:8.0;the Level 2 short frame sigma weight of G channel,Only used for Hi3519AV100                             */
-    HI_U8          u8FusionBnrStr;    /* RW;Range:[0x0,0x3F];Format:3.3,Only used for Hi3519AV100   */
-    HI_U8          au8NoiseFloor[NoiseSet_EleNum];  /* RW;Range:[0x0,0xFF];Format:8.0,Only used for Hi3559AV100/Hi3519AV100   */
-    HI_U8          u8FullMdtSigGWgt;  /* RW;Range:[0x0,0x1F];Format:8.0,Only used for Hi3519AV100   */
-    HI_U8          u8FullMdtSigRBWgt; /* RW;Range:[0x0,0x1F];Format:8.0,Only used for Hi3519AV100  */
-    HI_U8          u8FullMdtSigWgt;  /* RW;Range:[0x0,0x1F];Format:8.0,Only used for Hi3559AV100 */
-    HI_U8          au8GsigmaGain[3];  /* RW;Range:[0x0,0xFF];Format:8.0,Only used for Hi3559AV100/Hi3519AV100  */
-    HI_U8          au8RBsigmaGain[3]; /* RW;Range:[0x0,0xFF];Format:8.0,Only used for Hi3559AV100/Hi3519AV100  */
-} ISP_WDR_BNR_ATTR_S;
-
-typedef struct hiISP_WDR_FS_ATTR_S {
-    ISP_WDR_MERGE_MODE_E enWDRMergeMode;
-    ISP_WDR_COMBINE_ATTR_S stWDRCombine;
-    ISP_WDR_BNR_ATTR_S stBnr;         /* Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    ISP_FUSION_ATTR_S stFusion;
-    ISP_WDR_WBGAIN_POSITION_E enWDRWbgainPosition; /* RW; Range: [0x0, 0x1]; WDR Gain with or without WB Gain. Only used for Hi3559AV100 */
-} ISP_WDR_FS_ATTR_S;
-
-typedef struct hiISP_DRC_CUBIC_POINT_ATTR_S {
-    HI_U16 u16X;        /* RW; Range:[0,1000];  Format:10.0; x position of the characteristic point of the cubic curve; Only used for Hi3559AV100 */
-    HI_U16 u16Y;        /* RW; Range:[0,1000];  Format:10.0; y position of the characteristic point of the cubic curve; Only used for Hi3559AV100 */
-    HI_U16 u16Slope;    /* RW; Range:[0,10000]; Format:14.0; slope of the characteristic point of the cubic curve; Only used for Hi3559AV100 */
-} ISP_DRC_CUBIC_POINT_ATTR_S;
-
-typedef struct hiISP_DRC_ASYMMETRY_CURVE_ATTR_S {
-    HI_U8   u8Asymmetry;              /* RW; Range:[0x1, 0x1E]; Format:5.0; The parameter0 of DRC asymmetry tone mapping curve */
-    HI_U8   u8SecondPole;             /* RW; Range:[0x96,0xD2]; Format:8.0; The parameter1 of DRC asymmetry tone mapping curve */
-    HI_U8   u8Stretch;                /* RW; Range:[0x1E,0x3C]; Format:6.0; The parameter2 of DRC asymmetry tone mapping curve */
-    HI_U8   u8Compress;               /* RW; Range:[0x64,0xC8]; Format:8.0; The parameter3 of DRC asymmetry tone mapping curve */
-} ISP_DRC_ASYMMETRY_CURVE_ATTR_S;
-
-typedef struct hiISP_DRC_MANUAL_ATTR_S {
-    HI_U16  u16Strength;          /* RW; Range:Hi3559AV100 = [0x0, 0xFF] | Hi3519AV100 = [0x0, 0x3FF] | Hi3516CV500 = [0x0, 0x3FF] | Hi3516DV300 = [0x0, 0x3FF] | Hi3516AV300 = [0x0, 0x3FF] |
-                                     Hi3559V200 = [0x0, 0x3FF] | Hi3556V200 = [0x0, 0x3FF] | Hi3516EV200 = [0x0, 0x3FF] | Hi3516EV300 = [0x0, 0x3FF] | Hi3518EV300 = [0x0, 0x3FF] | Hi3516DV200 = [0x0, 0x3FF];
-                                     Strength of dynamic range compression. Higher values lead to higher differential gain between shadows and highlights. */
-} ISP_DRC_MANUAL_ATTR_S;
-
-typedef struct hiISP_DRC_AUTO_ATTR_S {
-    HI_U16  u16Strength;   /* RW; Range:Hi3559AV100 = [0x0, 0xFF] | Hi3519AV100 = [0x0, 0x3FF] | Hi3516CV500 = [0x0, 0x3FF]| Hi3516DV300 = [0x0, 0x3FF] |Hi3516AV300 = [0x0, 0x3FF] |
-                                                 Hi3559V200 = [0x0, 0x3FF]| Hi3556V200 = [0x0, 0x3FF] | Hi3516EV200 = [0x0, 0x3FF] | Hi3516EV300 = [0x0, 0x3FF]|Hi3518EV300 = [0x0, 0x3FF]|Hi3516DV200 = [0x0, 0x3FF];
-                                                 It is the base strength. The strength used in ISP is generated by firmware.
-                                                 n linear mode, strength = f1(u16Strength, histogram)
-                                                 In sensor WDR mode: strength = f2(u16Strength, histogram)
-                                                 In 2to1 WDR mode: strength = f3(ExpRatio) */
-
-    HI_U16 u16StrengthMax; /* RW; Range: Hi3559AV100 = [0x0, 0xFF] | Hi3519AV100 = [0x0, 0x3FF] | Hi3516CV500 = [0x0, 0x3FF] | Hi3516DV300 = [0x0, 0x3FF] |
-                                                 Hi3516AV300 = [0x0, 0x3FF] |Hi3559V200 = [0x0, 0x3FF] | Hi3556V200 = [0x0, 0x3FF] | Hi3516EV200 = [0x0, 0x3FF]|
-                                                 Hi3516EV300 = [0x0, 0x3FF] | Hi3518EV300 = [0x0, 0x3FF]| Hi3516DV200 = [0x0, 0x3FF]; Maximum DRC strength in Auto mode */
-    HI_U16 u16StrengthMin; /* RW; Range: Hi3559AV100 = [0x0, 0xFF] | Hi3519AV100 = [0x0, 0x3FF] | Hi3516CV500 = [0x0, 0x3FF] | Hi3516DV300 = [0x0, 0x3FF] |
-                                                 Hi3516AV300 = [0x0, 0x3FF] | Hi3559V200 = [0x0, 0x3FF] | Hi3556V200 = [0x0, 0x3FF]| Hi3516EV200 = [0x0, 0x3FF] |
-                                                 Hi3516EV300 = [0x0, 0x3FF]|Hi3518EV300 = [0x0, 0x3FF]|Hi3516DV200 = [0x0, 0x3FF]; Minimum DRC strength in Auto mode */
-
-} ISP_DRC_AUTO_ATTR_S;
-
-
-/* DRC curve type: 0 = Asymmetry curve, 1 = Cubic curve, 2 = User-defined curve */
-typedef enum hiISP_DRC_CURVE_SELECT_E {
-    DRC_CURVE_ASYMMETRY = 0x0,
-    DRC_CURVE_CUBIC,      /* Only used for Hi3559AV100 */
-    DRC_CURVE_USER,
-    DRC_CURVE_BUTT
-} ISP_DRC_CURVE_SELECT_E;
-
-typedef struct hiISP_DRC_ATTR_S {
-    HI_BOOL bEnable;
-    ISP_DRC_CURVE_SELECT_E enCurveSelect;  /* RW; Range:[0x0, 0x2]; Select tone mapping curve type */
-
-    HI_U8  u8PDStrength;           /* RW; Range:[0x0, 0x80]; Format:8.0; Controls the purple detection strength,
-                                      Only used for Hi3559AV100/Hi3519AV100/Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-    HI_U8  u8LocalMixingBrightMax; /* RW; Range:[0x0, 0x80]; Format:8.0; Maximum enhancement strength for positive detail */
-    HI_U8  u8LocalMixingBrightMin; /* RW; Range:[0x0, 0x40]; Format:8.0; Minimum enhancement strength for positive detail */
-    HI_U8  u8LocalMixingBrightThr; /* RW; Range:[0x0, 0xFF]; Format:8.0; Luma threshold for enhancement strength adaptation of positive detail */
-    HI_S8  s8LocalMixingBrightSlo; /* RW; Range:[-7, 7]; Format:s4.0; Enhancement strength adaptation slope for positive detail */
-    HI_U8  u8LocalMixingDarkMax;   /* RW; Range:[0x0, 0x80]; Format:8.0; Maximum enhancement strength for negative detail */
-    HI_U8  u8LocalMixingDarkMin;   /* RW; Range:[0x0, 0x40]; Format:8.0; Minimum enhancement strength for negative detail */
-    HI_U8  u8LocalMixingDarkThr;   /* RW; Range:[0x0, 0xFF]; Format:8.0; Luma threshold for enhancement strength adaptation of negative detail */
-    HI_S8  s8LocalMixingDarkSlo;   /* RW; Range:[-7, 7]; Format:s4.0; Enhancement strength adaptation slope for negative detail */
-
-    HI_U8  u8DetailBrightStr;      /* RW; Range:[0x0, 0x80]; Format:8.0; Controls the gain of the non-linear positive detail enhancement; Only used for Hi3559AV100 */
-    HI_U8  u8DetailDarkStr;        /* RW; Range:[0x0, 0x80]; Format:8.0; Controls the gain of the non-linear negative detail enhancement; Only used for Hi3559AV100 */
-    HI_U8  u8DetailBrightStep;     /* RW; Range:[0x0, 0x80]; Format:8.0; Controls the step of the non-linear positive detail enhancement; Only used for Hi3559AV100 */
-    HI_U8  u8DetailDarkStep;       /* RW; Range:[0x0, 0x80]; Format:8.0; Controls the step of the non-linear negative detail enhancement; Only used for Hi3559AV100 */
-
-    HI_U8  u8BrightGainLmt;        /* RW; Range:[0x0, 0xF];  Format:4.0; Bright area gain high limit */
-    HI_U8  u8BrightGainLmtStep;    /* RW; Range:[0x0, 0xF];  Format:4.0; Bright area gain high limit step */
-    HI_U8  u8DarkGainLmtY;         /* RW; Range:[0x0, 0x85]; Format:7.0; Dark area luma gain limit */
-    HI_U8  u8DarkGainLmtC;         /* RW; Range:[0x0, 0x85]; Format:7.0; Dark area chroma gain limit */
-    HI_U16 au16ColorCorrectionLut[HI_ISP_DRC_CC_NODE_NUM]; /* RW; Range:[0x0, 0x400]; Format:4.12; LUT of color correction coefficients */
-    HI_U16 au16ToneMappingValue[HI_ISP_DRC_TM_NODE_NUM];   /* RW; Range:[0x0, 0xffff]; Format:16.0; LUT of user-defined curve */
-
-    HI_U8  u8FltScaleCoarse;     /* RW; Range:[0x0, 0xF]; Format:4.0; Spatial filter scale coarse control; Only used for Hi3559AV100 and Hi3519AV100 */
-    HI_U8  u8FltScaleFine;       /* RW; Range:[0x0, 0xF]; Format:4.0; Spatial filter scale fine control; Only used for Hi3559AV100 and Hi3519AV100  */
-    HI_U8  u8ContrastControl;    /* RW; Range:[0x0, 0xF]; Format:4.0; Contrast control */
-    HI_S8  s8DetailAdjustFactor; /* RW; Range:[-15, 15];  Format:4.0; Detail adjustment factor */
-
-    HI_U8  u8SpatialFltCoef;     /* RW; Range: Hi3559AV100 = [0x0, 0xA] | Hi3519AV100 = [0x0, 0x5] | Hi3516CV500 = [0x0, 0x5] | Hi3516DV300 = [0x0, 0x5] |
-                                                                      Hi3516AV300 = [0x0, 0x5] |Hi3559V200 = [0x0, 0x5] | Hi3556V200 = [0x0, 0x5] |
-                                                                      Hi3516EV200 = [0x0, 0x5] | Hi3516EV300 = [0x0, 0x5] |Hi3518EV300 = [0x0, 0x5]|Hi3516DV200 = [0x0, 0x5];
-                                                                      Spatial filter coefficients */
-    HI_U8  u8RangeFltCoef;       /* RW; Range:[0x0, 0xA]; Format:4.0; Range filter coefficients */
-    HI_U8  u8RangeAdaMax;        /* RW; Range:[0x0, 0x8]; Format:4.0; Maximum range filter coefficient adaptation range */
-
-    HI_U8  u8GradRevMax;         /* RW; Range:[0x0, 0x40]; Format:7.0; Maximum gradient reversal reduction strength */
-    HI_U8  u8GradRevThr;         /* RW; Range:[0x0, 0x80]; Format:8.0; Gradient reversal reduction threshold */
-
-    HI_U8  u8DpDetectRangeRatio; /* RW; Range:[0x0, 0x1F]; Format:5.0; DRC defect pixel detection control parameter; Only used for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8  u8DpDetectThrSlo;     /* RW; Range:[0x0, 0x1F]; Format:5.0; DRC defect pixel detection control parameter; Only used for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16 u16DpDetectThrMin;    /* RW; Range:[0x0, 0xFFFF]; Format:16.0; DRC defect pixel detection control parameter; Only used for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-
-    ISP_OP_TYPE_E enOpType;
-    ISP_DRC_MANUAL_ATTR_S stManual;
-    ISP_DRC_AUTO_ATTR_S   stAuto;
-    ISP_DRC_CUBIC_POINT_ATTR_S astCubicPoint[HI_ISP_DRC_CUBIC_POINT_NUM]; /* Only used for Hi3559AV100 */
-    ISP_DRC_ASYMMETRY_CURVE_ATTR_S stAsymmetryCurve;
-
-} ISP_DRC_ATTR_S;
-
-typedef struct hiISP_LDCI_GAUSS_COEF_ATTR_S {
-    HI_U8   u8Wgt;      /* RW;Range:Hi3559AV100 = [0x0, 0x80] | Hi3519AV100 = [0x0, 0x80]| Hi3516CV500 = [0x0, 0xFF] | Hi3516DV300 = [0x0, 0xFF]|
-                                                           Hi3516AV300 = [0x0, 0xFF]|Hi3559V200 = [0x0, 0xFF] | Hi3556V200 = [0x0, 0xFF] |
-                                                           Hi3516EV200 = [0x0, 0xFF] | Hi3516EV300 = [0x0, 0xFF] | Hi3518EV300 = [0x0, 0xFF]| Hi3516DV200 = [0x0, 0xFF];
-                                                           Format:1.7;Weight of Gaussian distribution */
-    HI_U8   u8Sigma;    /* RW;Range: [0x1, 0xFF];Format:0.8;Sigma of Gaussian distribution */
-    HI_U8   u8Mean;     /* RW;Range: [0x0, 0xFF];Format:0.8;Mean of Gaussian distribution */
-} ISP_LDCI_GAUSS_COEF_ATTR_S;
-
-typedef struct hiISP_LDCI_HE_WGT_ATTR_S {
-    ISP_LDCI_GAUSS_COEF_ATTR_S  stHePosWgt;
-    ISP_LDCI_GAUSS_COEF_ATTR_S  stHeNegWgt;
-} ISP_LDCI_HE_WGT_ATTR_S;
-
-typedef struct hiISP_LDCI_MANUAL_ATTR_S {
-    ISP_LDCI_HE_WGT_ATTR_S  stHeWgt;
-    HI_U16                  u16BlcCtrl; /* RW;Range: [0x0, 0x1FF];Format:9.0;Restrain dark region */
-} ISP_LDCI_MANUAL_ATTR_S;
-
-typedef struct hiISP_LDCI_AUTO_ATTR_S {
-    ISP_LDCI_HE_WGT_ATTR_S  astHeWgt[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U16                  au16BlcCtrl[ISP_AUTO_ISO_STRENGTH_NUM]; /* RW;Range: [0x0, 0x1FF];Format:9.0;auto mode, Restrain dark region */
-} ISP_LDCI_AUTO_ATTR_S;
-
-typedef struct hiISP_LDCI_ATTR_S {
-    HI_BOOL                 bEnable;                /* RW;Range:[0x0,0x1];Format:1.0; */
-    HI_U8                   u8GaussLPFSigma;        /* RW;Range: [0x1, 0xFF];Format:0.8;Coefficient of Gaussian low-pass filter */
-    ISP_OP_TYPE_E           enOpType;
-    ISP_LDCI_MANUAL_ATTR_S  stManual;
-    ISP_LDCI_AUTO_ATTR_S    stAuto;
-    HI_U16                  u16TprIncrCoef;         /* RW;Range: [0x0, 0x100];Format:0.9;Increase Coefficient of temporal filter */
-    HI_U16                  u16TprDecrCoef;         /* RW;Range: [0x0, 0x100];Format:0.9;Decrease Coefficient of temporal filter */
-} ISP_LDCI_ATTR_S;
-
-/*
-defines CA type
-0 = enable Ca module
-1 = enable Cp module
- */
-typedef enum hiISP_CA_TYPE_E {
-    ISP_CA_ENABLE = 0x0,
-    ISP_CP_ENABLE,
-    ISP_CA_BUTT
-} ISP_CA_TYPE_E;
-
-typedef struct hiISP_CA_LUT_S {
-    HI_U32  au32YRatioLut[HI_ISP_CA_YRATIO_LUT_LENGTH];  /* RW;Range:[0,2047];Format:1.11;Not support for Hi3559V200/Hi3556V200 */
-    HI_S32  as32ISORatio[ISP_AUTO_ISO_STRENGTH_NUM];     /* RW;Range:[0,2047];Format:1.10;Not support for Hi3559V200/Hi3556V200 */
-} ISP_CA_LUT_S;
-
-typedef struct hiISP_CP_LUT_S {
-    HI_U8   au8CPLutY[HI_ISP_CA_YRATIO_LUT_LENGTH]; /* RW;Range:[0,255];Format:8.0;Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   au8CPLutU[HI_ISP_CA_YRATIO_LUT_LENGTH]; /* RW;Range:[0,255];Format:8.0;Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   au8CPLutV[HI_ISP_CA_YRATIO_LUT_LENGTH]; /* RW;Range:[0,255];Format:8.0;Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_CP_LUT_S;
-
-/* Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_CA_ATTR_S {
-    HI_BOOL bEnable;            /* RW;Range:[0x0,0x1];Format:1.0;Not support for Hi3559V200/Hi3556V200 */
-    ISP_CA_TYPE_E eCaCpEn;      /* Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    ISP_CA_LUT_S stCA;          /* Not support for Hi3559V200/Hi3556V200 */
-    ISP_CP_LUT_S stCP;          /* Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_CA_ATTR_S;
-
-// CSC
-
-typedef struct hiCSC_MATRX_S {
-    HI_S16 as16CSCIdc[3];  /* RW; Range:[-1024, 1023]; Format: 11.0; Input dc component for csc matrix */
-    HI_S16 as16CSCOdc[3];  /* RW; Range:[-1024, 1023]; Format: 11.0; Output dc component for csc matrix */
-    HI_S16 as16CSCCoef[9]; /* RW; Range:[-4096, 4095]; Format: 5.10; 3x3 coefficients for csc matrix */
-} CSC_MATRX_S;
-
-typedef struct hiISP_CSC_ATTR_S {
-    HI_BOOL bEnable;            /* RW; Range:[0, 1];Format:1.0; Enable/Disable CSC Function */
-
-    COLOR_GAMUT_E enColorGamut; /* RW; Range: [0, 4]; Color gamut type; COLOR_GAMUT_BT2020 only used for Hi3559AV100 */
-    HI_U8   u8Hue;              /* RW; Range:[0, 100];Format:8.0; Csc Hue Value */
-    HI_U8   u8Luma;             /* RW; Range:[0, 100];Format:8.0; Csc Luma Value */
-    HI_U8   u8Contr;            /* RW; Range:[0, 100];Format:8.0; Csc Contrast Value */
-    HI_U8   u8Satu;             /* RW; Range:[0, 100];Format:8.0; Csc Saturation Value */
-    HI_BOOL bLimitedRangeEn;    /* RW; Range: [0x0, 0x1]; Enable/Disable: Enable Limited range output mode(default full range output) */
-    HI_BOOL bExtCscEn;          /* RW; Range: [0x0, 0x1]; Enable/Disable: Enable extended luma range */
-    HI_BOOL bCtModeEn;          /* RW; Range: [0x0, 0x1]; Enable/Disable: Enable ct mode */
-    CSC_MATRX_S stCscMagtrx;    /* RW; Color Space Conversion matrix */
-
-} ISP_CSC_ATTR_S;
-
-/********************** CLUT **************************************/
-
-typedef struct hiISP_CLUT_ATTR_S {
-    HI_BOOL         bEnable         ; /* RW; Range:[0, 1];Format:1.0; Enable/Disable CLUT Function,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U32          u32GainR        ; /* RW; Range:[0,4095];Format:12.0,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U32          u32GainG        ; /* RW; Range:[0,4095];Format:12.0,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U32          u32GainB        ; /* RW; Range:[0,4095];Format:12.0,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_CLUT_ATTR_S;
-
-/* CLUT LUT */
-
-typedef struct hiISP_CLUT_LUT_S {
-    HI_U32 au32lut[HI_ISP_CLUT_LUT_LENGTH];     /* RW; Range: Hi3559AV100 = [0, 4294967295] | Hi3519AV100 = [0x0, 1073741823]| Hi3516CV500 = [0x0, 1073741823]|
-                                                   Hi3516DV300 = [0x0, 1073741823] | Hi3516AV300 = [0x0, 1073741823] | Hi3559V200 = [0x0, 1073741823]| Hi3556V200 = [0x0, 1073741823];
-                                                   Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_CLUT_LUT_S;
-
-/*****************************************************************/
-
-
-/*
-Defines the type of static defect pixel calibration
-0 = bright defect pixel calibration
-1 = dark defect pixel calibration
- */
-typedef enum hiISP_STATIC_DP_TYPE_E {
-    ISP_STATIC_DP_BRIGHT = 0x0,
-    ISP_STATIC_DP_DARK,
-    ISP_STATIC_DP_BUTT
-} ISP_STATIC_DP_TYPE_E;
-
-
-typedef struct hiISP_DP_STATIC_CALIBRATE_S {
-    HI_BOOL bEnableDetect;                  /* RW; Range: [0, 1];Format 1.0;Set 'HI_TRUE'to start static defect-pixel calibration, and firmware will set 'HI_FALSE' when finished,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    ISP_STATIC_DP_TYPE_E enStaticDPType;    /* RW; Range: [0, 1];Format 1.0;Select static bright/dark defect-pixel calibration,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   u8StartThresh;                  /* RW; Range: [1, 255]; Format 8.0;Start threshold for static defect-pixel calibraiton,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16  u16CountMax;                    /* RW; Range:Hi3559AV100 = [0, 8192] | Hi3519AV100 = [0, 8192]| Hi3516CV500 = [0, 6144] | Hi3516DV300 = [0, 6144] |
-                                               Hi3516AV300 = [0, 6144] |Hi3559V200 = [0, 6144] | Hi3556V200 = [0, 6144];Format 14.0;
-                                               limited Range: [0, STATIC_DP_COUNT_NORMAL*BlkNum],Limit of max number of static defect-pixel calibraiton.
-                                               Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16  u16CountMin;                    /* RW; Range:Hi3559AV100 = [0, 8192] | Hi3519AV100 = [0, 8192]| Hi3516CV500 = [0, 6144] | Hi3516DV300 = [0, 6144]|
-                                               Hi3516AV300 = [0, 6144]| Hi3559V200 = [0, 6144] | Hi3556V200 = [0, 6144];Format 14.0;
-                                               limited Range: [0, u16CountMax],Limit of min number of static defect-pixel calibraiton.
-                                               Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16  u16TimeLimit;                   /* RW; Range: [0x0, 1600];Format 11.0;Time limit for static defect-pixel calibraiton, in frame number,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-
-    HI_U32      au32Table[STATIC_DP_COUNT_MAX];  /* R;  [0,0x1FFF1FFF];Format 29.0;Static defect-pixel calibraiton table,0~12 bits represents the X coordinate of the defect pixel, 16~28 bits represent the Y coordinate of the defect pixel.
-                                                  Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8       u8FinishThresh;   /* R; Range: [0, 255];Format 8.0; Finish threshold for static defect-pixel calibraiton,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16      u16Count;         /* R; Range:Hi3559AV100 = [0, 8192] | Hi3519AV100 = [0, 8192] Hi3516CV500 = [0, 6144]| Hi3516DV300 = [0, 6144]|
-                                     Hi3516AV300 = [0, 6144]| Hi3559V200 = [0, 6144] | Hi3556V200 = [0, 6144];Format 14.0; Finish number for static defect-pixel calibraiton
-                                     Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    ISP_STATUS_E enStatus;        /* R; Range: [0, 2];Format 2.0;Status of static defect-pixel calibraiton,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_DP_STATIC_CALIBRATE_S;
-
-typedef struct hiISP_DP_STATIC_ATTR_S {
-    HI_BOOL bEnable;                /* RW; Range: [0, 1];Format 1.0;Enable/disable the static defect-pixel module,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16  u16BrightCount;         /* RW; Range:Hi3559AV100 = [0, 8192] | Hi3519AV100 = [0, 8192]| Hi3516CV500 = [0, 6144]| Hi3516DV300 = [0, 6144]|
-                                       Hi3516AV300 = [0, 6144]| Hi3559V200 = [0, 6144] | Hi3556V200 = [0, 6144];Format 14.0;limited Range: [0, STATIC_DP_COUNT_NORMAL*BlkNum],
-                                       When used as input(W), indicate the number of static bright defect pixels;As output(R),indicate the number of static bright and dark defect pixels.
-                                       Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16  u16DarkCount;           /* RW; Range:Hi3559AV100 = [0, 8192] | Hi3519AV100 = [0, 8192]| Hi3516CV500 = [0, 6144]| Hi3516DV300 = [0, 6144]|
-                                       Hi3516AV300 = [0, 6144]|Hi3559V200 = [0, 6144] | Hi3556V200 = [0, 6144];Format 14.0;limited Range: [0, STATIC_DP_COUNT_NORMAL*BlkNum],
-                                       When used as input(W), indicate the number of static dark defect pixels; As output(R), invalid value 0.
-                                       Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U32  au32BrightTable[STATIC_DP_COUNT_MAX];   /* RW; Range: [0x0, 0x1FFF1FFF];Format 29.0;0~12 bits represents the X coordinate of the defect pixel, 16~28 bits represent the Y coordinate of the defect pixel
-                                                       Notice : When used as input(W), indicate static bright defect pixels table;  As output(R), indicate static bright and dark defect pixels table.
-                                                       Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-
-    HI_U32  au32DarkTable[STATIC_DP_COUNT_MAX];     /* RW; Range: [0x0, 0x1FFF1FFF];Format 29.0;0~12 bits represents the X coordinate of the defect pixel, 16~28 bits represent the Y coordinate of the defect pixel
-                                                       Notice : When used as input(W), indicate static dark defect pixels table;  As output(R), invalid value.
-                                                       Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_BOOL bShow;                  /* RW; Range: [0, 1];Format 1.0;RW;highlight static defect pixel,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_DP_STATIC_ATTR_S;
-
-typedef struct hiISP_DP_DYNAMIC_MANUAL_ATTR_S {
-    HI_U16  u16Strength;          /* RW; Range: [0, 255];Format:8.0;Dynamic DPC strength. */
-    HI_U16  u16BlendRatio;        /* RW; Range: [0, 128];Format:9.0;Blending ratio required for DPC */
-} ISP_DP_DYNAMIC_MANUAL_ATTR_S;
-
-typedef struct hiISP_DP_DYNAMIC_AUTO_ATTR_S {
-    HI_U16  au16Strength[ISP_AUTO_ISO_STRENGTH_NUM];  /* RW; Range: [0, 255];Format:8.0;Dynamic DPC strength. */
-    HI_U16  au16BlendRatio[ISP_AUTO_ISO_STRENGTH_NUM]; /* RW; Range: [0, 128];Format:9.0;Blending ratio required for DPC */
-} ISP_DP_DYNAMIC_AUTO_ATTR_S;
-
-typedef struct hiISP_DP_DYNAMIC_ATTR_S {
-    HI_BOOL bEnable;            /* RW; Range: [0, 1];Format 1.0;Enable/disable the dynamic defect-pixel module */
-    HI_BOOL bSupTwinkleEn;      /* RW; Range: [0, 1];Format 1.0;Enable/disable the twinkle suppression  module */
-    HI_S8   s8SoftThr;          /* RW; Range: [0, 127];Format s8.0;twinkle suppression threshold */
-    HI_U8   u8SoftSlope;        /* RW; Range: [0, 255];Format 8.0;Correction controlling parameter of the pixels whose deviation is smaller than s8SoftThr. */
-    ISP_OP_TYPE_E enOpType;     /* RW; Range: [0, 1];Format 1.0;Working mode of dynamic DPC */
-    ISP_DP_DYNAMIC_MANUAL_ATTR_S stManual;
-    ISP_DP_DYNAMIC_AUTO_ATTR_S   stAuto;
-} ISP_DP_DYNAMIC_ATTR_S;
-
-typedef struct hiISP_DIS_ATTR_S {
-    HI_BOOL bEnable; /* RW; Range: [0, 1];Format 1.0;Enable/disable dis module,Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-} ISP_DIS_ATTR_S;
-
-
-typedef struct hiISP_SHADING_ATTR_S {
-    HI_BOOL bEnable;            /* RW; Range:[0, 1];Format:1.0; HI_TRUE: enable lsc; HI_FALSE: disable lsc */
-    HI_U16  u16MeshStr;         /* RW; Range:Hi3559AV100=[0, 65535]| Hi3519AV100=[0, 65535]|Hi3516CV500=[0, 65535]|Hi3516DV300=[0, 65535]|Hi3516AV300=[0, 65535]|
-                                  Hi3559V200=[0, 65535]|Hi3556V200=[0, 65535] | Hi3516EV200 = [0x0, 1023] | Hi3516EV300 = [0x0,1023] | Hi3518EV300 = [0x0,1023] | Hi3516DV200 = [0x0,1023];
-                                  The strength of the mesh shading correction */
-    HI_U16  u16BlendRatio;      /* RW; Range:[0, 256];Format:9.0; the blendratio of the two mesh gain lookup-table */
-} ISP_SHADING_ATTR_S;
-
-typedef struct hiISP_SHADING_LUT_S {
-    HI_U16  au16RGain[HI_ISP_LSC_GRID_POINTS];  /* RW; Range:[0,1023];Member used to store the calibration data of the R channel required for LSC. */
-    HI_U16  au16GrGain[HI_ISP_LSC_GRID_POINTS]; /* RW; Range:[0,1023];Member used to store the calibration data of the Gr channel required for LSC. */
-    HI_U16  au16GbGain[HI_ISP_LSC_GRID_POINTS]; /* RW; Range:[0,1023];Member used to store the calibration data of the Gb channel required for LSC. */
-    HI_U16  au16BGain[HI_ISP_LSC_GRID_POINTS];  /* RW; Range:[0,1023];Member used to store the calibration data of the B channel required for LSC. */
-} ISP_SHADING_GAIN_LUT_S;
-
-typedef struct hiISP_BNR_LSC_GAIN_LUT_S {
-    HI_U16  au16RGain[HI_ISP_RLSC_POINTS];  /* RW; Range:[0,65535];Member used to store the calibration data of the R channel required for BNR_LSC.Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16  au16GrGain[HI_ISP_RLSC_POINTS]; /* RW; Range:[0,65535];Member used to store the calibration data of the Gr channel required for BNR_LSC.Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16  au16GbGain[HI_ISP_RLSC_POINTS]; /* RW; Range:[0,65535];Member used to store the calibration data of the Gb channel required for BNR_LSC.Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16  au16BGain[HI_ISP_RLSC_POINTS];  /* RW; Range:[0,65535];Member used to store the calibration data of the B channel required for BNR_LSC.Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_BNR_LSC_GAIN_LUT_S;
-
-typedef struct hiISP_SHADING_LUT_ATTR_S {
-    HI_U8   u8MeshScale;        /* RW; Range:[0, 7];Format:3.0;Three bit value that selects the scale and precision for the 10 bit gain coefficients stored in mesh tables */
-    HI_U16  au16XGridWidth[(HI_ISP_LSC_GRID_COL - 1) / 2]; /* RW; Range:Hi3559AV100=[4, 1988]| Hi3519AV100=[4, 1988]|Hi3516CV500=[4, 1092]|Hi3516DV300=[4, 1092]|
-                                                             Hi3516AV300=[4, 1092]|Hi3559V200=[4, 1092]|Hi3556V200=[4, 1092] | Hi3516EV200 = [4,255]|Hi3516EV300 = [4,255]|Hi3518EV300 = [4,255]|Hi3516DV200 = [4,255];
-                                                             limited Range:[4, u32Width/4 - 60], Member used to store the width data of each GRID partition */
-    HI_U16  au16YGridWidth[(HI_ISP_LSC_GRID_ROW - 1) / 2]; /* RW; Range:Hi3559AV100=[4, 1988]| Hi3519AV100=[4, 1988]|Hi3516CV500=[4, 1092]|Hi3516DV300=[4, 1092]|
-                                                             Hi3516AV300=[4, 1092]|Hi3559V200=[4, 1092]|Hi3556V200=[4, 1092]|Hi3516EV200 = [4,255]|Hi3516EV300 =[4,255]| Hi3518EV300 = [0,255 ]| Hi3516DV200 = [0,255 ];
-                                                             limited Range:[4, u32Height/4 - 60]; Member used to store the height data of each GRID partition */
-    ISP_SHADING_GAIN_LUT_S astLscGainLut[2];
-    ISP_BNR_LSC_GAIN_LUT_S stBNRLscGainLut; /* Not support for Hi3559AV100/Hi3519AV100 */
-} ISP_SHADING_LUT_ATTR_S;
-
-typedef struct hiISP_MLSC_CALIBRATION_CFG_S {
-    ISP_BAYER_FORMAT_E enBayer;   /* RW; Range: [0, 3];Format ENUM;Shows bayer pattern */
-    ISP_BAYER_RAWBIT_E enRawBit;  /* RW; Range: {8,10,12,14,16};Format ENUM;Shows input raw bitwidth */
-
-    HI_U16  u16ImgHeight; /* RW; Range: [0, 65535];Format 16.0;Input raw image height */
-    HI_U16  u16ImgWidth;  /* RW; Range: [0, 65535];Format 16.0;Input raw image width */
-
-    HI_U16  u16DstImgHeight; /* RW; Range: [0, 65535];Format 16.0;limited Range:[0, u16ImgHeight],Image height that crop from input raw image, set to ImgHeight if don't need to crop */
-    HI_U16  u16DstImgWidth;  /* RW; Range: [0, 65535];Format 16.0;limited Range:[0, u16ImgWidth],Image width that crop from input raw image, set to ImgWidth if don't need to crop */
-    HI_U16  u16OffsetX;      /* RW; Range: [0, 65535];Format 16.0;limited Range:[0, u16ImgWidth - u16DstImgWidth],Horizontal offset that crop from input raw image, set to 0 if don't need to crop */
-    HI_U16  u16OffsetY;      /* RW; Range: [0, 65535];Format 16.0;limited Range:[0, u16ImgHeight - u16DstImgHeight],Vertical offset that crop from input raw image, set to 0 if don't need to crop */
-
-    HI_U32  u32MeshScale; /* RW; Range: [0, 7];Format 3.0; Shows Mesh Scale value */
-
-    HI_U16  u16BLCOffsetR; /* RW; Range: [0, 4095];Format 12.0;BLC value for R channel */
-    HI_U16  u16BLCOffsetGr; /* RW; Range: [0, 4095];Format 12.0;BLC value for Gr channel */
-    HI_U16  u16BLCOffsetGb; /* RW; Range: [0, 4095];Format 12.0;BLC value for Gb channel */
-    HI_U16  u16BLCOffsetB; /* RW; Range: [0, 4095];Format 12.0;BLC value for B channel */
-} ISP_MLSC_CALIBRATION_CFG_S;
-
-typedef struct hiISP_MESH_SHADING_TABLE_S {
-    HI_U8   u8MeshScale;       /* RW; Range:[0, 7];Format:3.0;Three bit value that selects the scale and precision for the 10 bit gain coefficients stored in mesh tables */
-    HI_U16  au16XGridWidth[(HI_ISP_LSC_GRID_COL - 1) / 2]; /* RW; Range:Hi3559AV100=[4, 16323]| Hi3519AV100=[4, 16323]|Hi3516CV500=[4, 16323]|Hi3516DV300=[4, 16323]|Hi3516AV300=[4, 16323] |
-                                                            Hi3559V200=[4, 16323]|Hi3556V200=[4, 16323]|Hi3516EV200 = [4,255]|Hi3516EV300 =[4,255]| Hi3518EV300 = [0,255 ]| Hi3516DV200 = [0,255 ];
-                                                            limited Range:[4, u16ImgWidth /4 - 60],Member used to store the width data of each GRID partition */
-    HI_U16  au16YGridWidth[(HI_ISP_LSC_GRID_ROW - 1) / 2]; /* RW; Hi3559AV100=[4, 16323]| Hi3519AV100=[4, 16323]|Hi3516CV500=[4, 16323]|Hi3516DV300=[4, 16323]|Hi3516AV300=[4, 16323]|
-                                                            Hi3559V200=[4, 16323] |Hi3556V200=[4, 16323]|Hi3516EV200 = [4,255]|Hi3516EV300 =[4,255]| Hi3518EV300 = [0,255 ]|Hi3516DV200 = [0,255 ];
-                                                            limited Range:[4, u16ImgHeight /4 - 60],Member used to store the height data of each GRID partition */
-    ISP_SHADING_GAIN_LUT_S stLscGainLut;
-    ISP_BNR_LSC_GAIN_LUT_S stBNRLscGainLut; /* Not support for Hi3559AV100/Hi3519AV100/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_MESH_SHADING_TABLE_S;
-
-/* Only used for Hi3559AV100/Hi3519AV100 */
-typedef struct hiISP_RADIAL_SHADING_ATTR_S {
-    HI_BOOL bEnable;          /* RW; Range:[0, 1];Format:1.0; HI_TRUE: enable rlsc; HI_FALSE: disable rlsc,Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16RadialStr;     /* RW; Range:[0, 65535];Format:4.12; the strength of the mesh shading correction,Only used for Hi3559AV100/Hi3519AV100 */
-} ISP_RADIAL_SHADING_ATTR_S;
-
-/* Only used for Hi3559AV100/Hi3519AV100 */
-typedef struct hiISP_RADIAL_SHADING_LUT_S {
-    HI_U16  au16RGain[HI_ISP_RLSC_POINTS];  /* RW; Range:[0,65535];Member used to store the calibration data of the R channel required for RLSC.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  au16GrGain[HI_ISP_RLSC_POINTS]; /* RW; Range:[0,65535];Member used to store the calibration data of the Gr channel required for RLSC.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  au16GbGain[HI_ISP_RLSC_POINTS]; /* RW; Range:[0,65535];Member used to store the calibration data of the Gb channel required for RLSC.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  au16BGain[HI_ISP_RLSC_POINTS];  /* RW; Range:[0,65535];Member used to store the calibration data of the B channel required for RLSC.Only used for Hi3559AV100/Hi3519AV100 */
-} ISP_RADIAL_SHADING_GAIN_LUT_S;
-
-/* Only used for Hi3559AV100/Hi3519AV100 */
-typedef struct hiISP_RADIAL_SHADING_LUT_ATTR_S {
-    OPERATION_MODE_E enLightMode;   /* RW; Range:[0, 1];Format:1.0; HI_TRUE: manual mode; HI_FALSE: auto mode.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16BlendRatio;          /* RW; Range:[0, 256];Format:8.0; Used in manual mode only, indicates the light blending strength for the first light info.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U8   u8LightType1;           /* RW; Range:[0, 2];Format:2.0; Used in manual mode only, indicates the first light source selected.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U8   u8LightType2;           /* RW; Range:[0, 2];Format:2.0; Used in manual mode only, indicates the second light source selected.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U8   u8RadialScale;          /* RW; Range:[0, 13];Format:4.0;Four bit value that selects the scale and precision for the 10 bit gain coefficients.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16CenterRX;     /* RW; Range:[0, 65535];Format:16.0;Limited Range:[0, Width], shows x value of the position of optical center of red channel.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16CenterRY;     /* RW; Range:[0, 65535];Format:16.0;Limited Range:[0, Height], shows y value of the position of optical center of red channel.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16CenterGrX;    /* RW; Range:[0, 65535];Format:16.0;Limited Range:[0, Width], shows x value of the position of optical center of gr channel.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16CenterGrY;    /* RW; Range:[0, 65535];Format:16.0;Limited Range:[0, Height], shows y value of the position of optical center of gr channel.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16CenterGbX;    /* RW; Range:[0, 65535];Format:16.0;Limited Range:[0, Width], shows x value of the position of optical center of gb channel.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16CenterGbY;    /* RW; Range:[0, 65535];Format:16.0;Limited Range:[0, Height], shows y value of the position of optical center of gb channel.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16CenterBX;     /* RW; Range:[0, 65535];Format:16.0;Limited Range:[0, Width], shows x value of the position of optical center of blue channel.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16CenterBY;     /* RW; Range:[0, 65535];Format:16.0;Limited Range:[0, Height], shows y value of the position of optical center of blue channel.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16OffCenterR;   /* RW; Range:[0, 65535];Format:16.0;related to the 1/R^2 value of red channel.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16OffCenterGr;  /* RW; Range:[0, 65535];Format:16.0;related to the 1/R^2 value of gr channel.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16OffCenterGb;  /* RW; Range:[0, 65535];Format:16.0;related to the 1/R^2 value of gb channel.Only used for Hi3559AV100/Hi3519AV100 */
-    HI_U16  u16OffCenterB;   /* RW; Range:[0, 65535];Format:16.0;related to the 1/R^2 value of blue channel.Only used for Hi3559AV100/Hi3519AV100 */
-    ISP_RADIAL_SHADING_GAIN_LUT_S astRLscGainLut[3]; /* Only used for Hi3559AV100/Hi3519AV100 */
-} ISP_RADIAL_SHADING_LUT_ATTR_S;
-
-typedef struct hiISP_NR_MANUAL_ATTR_S {
-    HI_U8   au8ChromaStr[ISP_BAYER_CHN_NUM];   /* RW;Range:[0x0,0x3];Format:2.0;Strength of Chrmoa noise reduction for R/Gr/Gb/B channel,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   u8FineStr;                         /* RW;Range:[0x0,0x80];Format:8.0;Strength of Luma noise reduction */
-    HI_U16  u16CoringWgt;                      /* RW;Range:[0x0,0xc80];Format:12.0;Strength of reserving the random noise */
-    HI_U16  au16CoarseStr[ISP_BAYER_CHN_NUM];  /* RW;Range:[0x0,0x360];Format:10.0; Coarse Strength of noise reduction */
-} ISP_NR_MANUAL_ATTR_S;
-
-typedef struct hiISP_NR_AUTO_ATTR_S {
-    HI_U8   au8ChromaStr[ISP_BAYER_CHN_NUM][ISP_AUTO_ISO_STRENGTH_NUM];  /* RW;Range:[0x0,0x3];Format:2.0; Strength of chrmoa noise reduction for R/Gr/Gb/B channel,Not support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   au8FineStr[ISP_AUTO_ISO_STRENGTH_NUM];                       /* RW;Range:[0x0,0x80];Format:8.0; Strength of luma noise reduction */
-    HI_U16  au16CoringWgt[ISP_AUTO_ISO_STRENGTH_NUM];                    /* RW;Range:[0x0,0xc80];Format:12.0; Strength of reserving the random noise */
-    HI_U16  au16CoarseStr[ISP_BAYER_CHN_NUM][ISP_AUTO_ISO_STRENGTH_NUM]; /* RW;Range:[0x0,0x360];Format:10.0; Coarse Strength of noise reduction */
-} ISP_NR_AUTO_ATTR_S;
-
-typedef struct hiISP_NR_WDR_ATTR_S {
-    HI_U8    au8WDRFrameStr[WDR_MAX_FRAME_NUM];       /* RW;Range:[0x0,0x50];Format:7.0; Strength of each frame in wdr mode */
-    HI_U8    au8FusionFrameStr[WDR_MAX_FRAME_NUM];    /* RW;Range:[0x0,0x50];Format:7.0; Strength of each frame in wdr mode. Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_NR_WDR_ATTR_S;
-
-typedef struct hiISP_NR_ATTR_S {
-    HI_BOOL  bEnable;                                     /* RW;Range:[0x0,0x1];Format:1.0; Nr Enable */
-    HI_BOOL  bLowPowerEnable;                             /* RW;Range:[0x0,0x1];Format:1.0; Nr Low Power Enable. Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_BOOL  bNrLscEnable;                                /* RW;Range:[0x0,0x1];Format:1.0; HI_TRUE: Noise reduction refers to lens shading; HI_FALSE: Noise reduction not refers to lens shading; */
-    HI_U8    u8NrLscRatio;                                /* RW;Range:[0x0,0xff];Format:8.0; Ratio of referring to lens shading. Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8    u8BnrLscMaxGain;                             /* RW;Range:[0x0,0xbf];Format:2.6; Max gain for referring to lens shading.Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16   u16BnrLscCmpStrength;                        /* RW;Range:[0x0,0x100];Format:1.8; Compare strength for referring to lens shading.Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16   au16CoringRatio[HI_ISP_BAYERNR_LUT_LENGTH];  /* RW;Range:[0x0,0x3ff];Format:12.0; Strength of reserving the random noise according to luma */
-
-    ISP_OP_TYPE_E enOpType;
-    ISP_NR_AUTO_ATTR_S stAuto;
-    ISP_NR_MANUAL_ATTR_S stManual;
-    ISP_NR_WDR_ATTR_S  stWdr;
-} ISP_NR_ATTR_S;
-
-/* Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-typedef struct hiISP_DE_MANUAL_ATTR_S {
-    HI_U16       u16GlobalGain;         /* RW;Range:[0x0,0x100];Format:1.8; Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-    HI_U16       u16GainLF;             /* RW;Range:[0x0,0x20];Format:2.4; Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-    HI_U16       u16GainHF;             /* RW;Range:[0x0,0x20];Format:2.4;Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-} ISP_DE_MANUAL_ATTR_S;
-
-/* Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-typedef struct hiISP_DE_AUTO_ATTR_S {
-    HI_U16       au16GlobalGain[ISP_AUTO_ISO_STRENGTH_NUM];         /* RW;Range:[0x0,0x100];Format:1.8; Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-    HI_U16       au16GainLF[ISP_AUTO_ISO_STRENGTH_NUM];             /* RW;Range:[0x0,0x20];Format:2.4; Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-    HI_U16       au16GainHF[ISP_AUTO_ISO_STRENGTH_NUM];             /* RW;Range:[0x0,0x20];Format:2.4; Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-} ISP_DE_AUTO_ATTR_S;
-
-
-/* Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-typedef struct hiISP_DE_ATTR_S {
-    HI_BOOL       bEnable;                                    /* RW;Range:[0x0,0x1];Format:1.0; De Enable,Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-    HI_U16        au16LumaGainLut[HI_ISP_DE_LUMA_GAIN_LUT_N]; /* RW;Range:[0x0,0x100];Format:1.8; Only used for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-
-    ISP_OP_TYPE_E        enOpType;
-    ISP_DE_AUTO_ATTR_S   stAuto;
-    ISP_DE_MANUAL_ATTR_S stManual;
-} ISP_DE_ATTR_S;
-
-#define ISP_CVTMAT_NUM                            12
-#define ISP_EXP_CTRL_NUM                          2
-
-/* Only support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-typedef enum hiISP_IRBAYER_FORMAT_E {
-    IRBAYER_GRGBI = 0,
-    IRBAYER_RGBGI = 1,
-    IRBAYER_GBGRI = 2,
-    IRBAYER_BGRGI = 3,
-    IRBAYER_IGRGB = 4,
-    IRBAYER_IRGBG = 5,
-    IRBAYER_IBGRG = 6,
-    IRBAYER_IGBGR = 7,
-    IRBAYER_BUTT
-
-} ISP_IRBAYER_FORMAT_E;
-
-/* Only support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-typedef enum hiISP_IR_CVTMAT_MODE_E {
-    ISP_IR_CVTMAT_MODE_NORMAL = 0,
-    ISP_IR_CVTMAT_MODE_MONO,
-    ISP_IR_CVTMAT_MODE_USER,
-    ISP_IR_CVTMAT_MODE_BUTT
-
-} ISP_IR_CVTMAT_MODE_E;
-
-/* Only support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-typedef struct hiISP_RGBIR_ATTR_S {
-    HI_BOOL              bEnable    ;      /* RW;Range:[0x0,0x1];Format:1.0; Enable/Disable RGBIR module,Only support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    ISP_IRBAYER_FORMAT_E enInPattern;      /* RW;Range:[0x0,0x7];Format:3.0; IR pattern of the input signal,Only support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    ISP_BAYER_FORMAT_E   enOutPattern;     /* RW;Range:[0x0,0x3];Format:2.0; Bayer pattern of the output signal,Only support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-
-    HI_U16               au16ExpCtrl[ISP_EXP_CTRL_NUM];    /* RW;Range:[0, 2047];Format:11.0; Over expose control parameter,Only support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16               au16Gain[ISP_EXP_CTRL_NUM];       /* RW;Range:[0, 511];Format:9.0; Over expose control parameter,Only support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-
-    ISP_IR_CVTMAT_MODE_E enIRCvtMatMode;
-    HI_S16               as16CvtMatrix[ISP_CVTMAT_NUM]; /* RW;Range:[-32768, 32767];Format:s15.0; RGBIR to Bayer image Convert matrix coefficients(need calibration),Only support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_RGBIR_ATTR_S;
-
-/*
-Defines the type of the ISP gamma curve
-0 = Default curve
-1 = Default BT.709 curve (Gamma Curve)
-2 = Default SMPTE.2084 curve (PQ Curve), Only used for Hi3559AV100
-3 = User defined Gamma curve, LUT must be correct
-*/
-typedef enum hiISP_GAMMA_CURVE_TYPE_E {
-    ISP_GAMMA_CURVE_DEFAULT = 0x0,
-    ISP_GAMMA_CURVE_SRGB,
-    ISP_GAMMA_CURVE_HDR,    /* Only used for Hi3559AV100 */
-    ISP_GAMMA_CURVE_USER_DEFINE,
-    ISP_GAMMA_CURVE_BUTT
-} ISP_GAMMA_CURVE_TYPE_E;
-typedef struct hiISP_GAMMA_ATTR_S {
-    HI_BOOL   bEnable;                     /* RW; Range:[0, 1]; Format:1.0;Enable/Disable Gamma Function */
-    HI_U16    u16Table[GAMMA_NODE_NUM];    /* RW; Range:[0, 4095]; Format:12.0;Gamma LUT nodes value */
-
-    ISP_GAMMA_CURVE_TYPE_E enCurveType;    /* RW; Range:[0, 3]; Format:2.0;Gamma curve type */
-} ISP_GAMMA_ATTR_S;
-
-/* Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_PREGAMMA_ATTR_S {
-    HI_BOOL   bEnable;                         /* RW; Range:[0, 1]; Format:1.0;Enable/Disable PreGamma Function.Not support for Hi3559V200/Hi3556V200 */
-    HI_U32    au32Table[PREGAMMA_NODE_NUM];    /* RW; Range:Hi3559AV100 = [0, 0x100000] | Hi3519AV100 = [0, 0x100000] | Hi3516CV500 = [0, 0xFFFFF] |Hi3516DV300 = [0, 0xFFFFF] |
-                                                 Hi3516AV300 = [0, 0xFFFFF] |Hi3516EV200 = [0x0, 0xFFFFF]|Hi3516EV300 = [0x0, 0xFFFFF]|Hi3518EV300 = [0x0,0xFFFFF]|Hi3516DV200 = [0x0,0xFFFFF];
-                                                 Format:21.0;PreGamma LUT nodes value.Not support for Hi3559V200/Hi3556V200 */
-} ISP_PREGAMMA_ATTR_S;
-
-typedef struct hiISP_PRELOGLUT_ATTR_S {
-    HI_BOOL                 bEnable;    /* RW; Range:[0, 1]; Format:1.0;Enable/Disable PreLogLUT Function.Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-} ISP_PRELOGLUT_ATTR_S;
-
-typedef struct hiISP_LOGLUT_ATTR_S {
-    HI_BOOL                 bEnable;    /* RW; Range:[0, 1]; Format:1.0;Enable/Disable LogLUT Function.Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-} ISP_LOGLUT_ATTR_S;
-
-#define     ISP_SHARPEN_FREQ_CORING_LENGTH      (8)
-#define     SHRP_GAIN_LUT_SIZE                  (64)
-
-typedef struct hiISP_SHARPEN_MANUAL_ATTR_S {
-    HI_U8  au8LumaWgt[ISP_SHARPEN_LUMA_NUM];     /* RW; Range: Hi3559AV100 =[0,127]|Hi3519AV100=[0,127]|Hi3516CV500 = [0, 127]|Hi3516DV300 =[0, 127]|
-                                                    Hi3516AV300 =[0, 127]|Hi3559V200 = [0, 127]| Hi3556V200 =[0, 127]| Hi3516EV200 = [0x0, 31]|Hi3516EV300 = [0x0, 31]|Hi3518EV300 = [0x0, 31]|Hi3516DV200 = [0x0, 31];
-                                                    Format:0.7;Adjust the sharpen strength according to luma. Sharpen strength will be weaker when it decrease. */
-    HI_U16 au16TextureStr[ISP_SHARPEN_GAIN_NUM]; /* RW; Range: [0, 4095]; Format:7.5;Undirectional sharpen strength for texture and detail enhancement */
-    HI_U16 au16EdgeStr[ISP_SHARPEN_GAIN_NUM];    /* RW; Range: [0, 4095]; Format:7.5;Directional sharpen strength for edge enhancement */
-    HI_U16 u16TextureFreq;         /* RW; Range: [0, 4095];Format:6.6; Texture frequency adjustment. Texture and detail will be finer when it increase */
-    HI_U16 u16EdgeFreq;            /* RW; Range: [0, 4095];Format:6.6; Edge frequency adjustment. Edge will be narrower and thiner when it increase */
-    HI_U8  u8OverShoot;            /* RW; Range: [0, 127]; Format:7.0;u8OvershootAmt */
-    HI_U8  u8UnderShoot;           /* RW; Range: [0, 127]; Format:7.0;u8UndershootAmt */
-    HI_U8  u8ShootSupStr;          /* RW; Range: [0, 255]; Format:8.0;overshoot and undershoot suppression strength, the amplitude and width of shoot will be decrease when shootSupSt increase */
-    HI_U8  u8ShootSupAdj;          /* RW; Range: [0, 15]; Format:4.0;overshoot and undershoot suppression adjusting, adjust the edge shoot suppression strength */
-    HI_U8  u8DetailCtrl;           /* RW; Range: [0, 255]; Format:8.0;Different sharpen strength for detail and edge. When it is bigger than 128, detail sharpen strength will be stronger than edge. */
-    HI_U8  u8DetailCtrlThr;        /* RW; Range: [0, 255]; Format:8.0; The threshold of DetailCtrl, it is used to distinguish detail and edge. */
-    HI_U8  u8EdgeFiltStr;          /* RW; Range: [0, 63]; Format:6.0;The strength of edge filtering. */
-    HI_U8  u8EdgeFiltMaxCap;       /* RW; Range: [0, 47]; Format:6.0;The max capacity of edge filtering.*/
-    HI_U8  u8RGain;                /* RW; Range: [0, 31];   Format:5.0;Sharpen Gain for Red Area */
-    HI_U8  u8GGain;                /* RW; Range: [0, 255]; Format:8.0; Sharpen Gain for Green Area */
-    HI_U8  u8BGain;                /* RW; Range: [0, 31];   Format:5.0;Sharpen Gain for Blue Area */
-    HI_U8  u8SkinGain;             /* RW; Range: [0, 31]; Format:5.0;Sharpen Gain for Skin Area */
-    HI_U16  u16MaxSharpGain;       /* RW; Range: [0, 0x7FF]; Format:8.3; Maximum sharpen gain */
-    HI_U8  u8WeakDetailGain;       /* RW; Range: [0, 127];  Only support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200; sharpen Gain for weakdetail */
-} ISP_SHARPEN_MANUAL_ATTR_S;
-
-
-typedef struct hiISP_SHARPEN_AUTO_ATTR_S {
-    HI_U8  au8LumaWgt[ISP_SHARPEN_LUMA_NUM][ISP_AUTO_ISO_STRENGTH_NUM];      /* RW; Range:Hi3559AV100 =[0,127]|Hi3519AV100=[0,127]|Hi3516CV500 = [0, 127]|
-                                                                                Hi3516DV300 =[0, 127]|  Hi3516AV300 =[0, 127]|Hi3559V200 = [0, 127] |Hi3556V200 = [0, 127]| Hi3556V200 =[0, 127]| Hi3516EV200 = [0x0, 31]|Hi3516EV300 = [0x0, 31]|Hi3518EV300 = [0x0, 31]|Hi3516DV200 = [0x0, 31]
-                                                                                Format:0.7; Adjust the sharpen strength according to luma. Sharpen strength will be weaker when it decrease. */
-    HI_U16 au16TextureStr[ISP_SHARPEN_GAIN_NUM][ISP_AUTO_ISO_STRENGTH_NUM];  /* RW; Range: [0, 4095]; Format:7.5;Undirectional sharpen strength for texture and detail enhancement */
-    HI_U16 au16EdgeStr[ISP_SHARPEN_GAIN_NUM][ISP_AUTO_ISO_STRENGTH_NUM];     /* RW; Range: [0, 4095]; Format:7.5;Directional sharpen strength for edge enhancement */
-    HI_U16 au16TextureFreq[ISP_AUTO_ISO_STRENGTH_NUM];   /* RW; Range: [0, 4095]; Format:6.6;Texture frequency adjustment. Texture and detail will be finer when it increase */
-    HI_U16 au16EdgeFreq[ISP_AUTO_ISO_STRENGTH_NUM];      /* RW; Range: [0, 4095]; Format:6.6;Edge frequency adjustment. Edge will be narrower and thiner when it increase */
-    HI_U8  au8OverShoot[ISP_AUTO_ISO_STRENGTH_NUM];      /* RW; Range: [0, 127];  Format:7.0;u8OvershootAmt */
-    HI_U8  au8UnderShoot[ISP_AUTO_ISO_STRENGTH_NUM];     /* RW; Range: [0, 127];  Format:7.0;u8UndershootAmt */
-    HI_U8  au8ShootSupStr[ISP_AUTO_ISO_STRENGTH_NUM];    /* RW; Range: [0, 255]; Format:8.0;overshoot and undershoot suppression strength, the amplitude and width of shoot will be decrease when shootSupSt increase */
-    HI_U8  au8ShootSupAdj[ISP_AUTO_ISO_STRENGTH_NUM];    /* RW; Range: [0, 15]; Format:4.0;overshoot and undershoot suppression adjusting, adjust the edge shoot suppression strength */
-    HI_U8  au8DetailCtrl[ISP_AUTO_ISO_STRENGTH_NUM];     /* RW; Range: [0, 255]; Format:8.0;Different sharpen strength for detail and edge. When it is bigger than 128, detail sharpen strength will be stronger than edge. */
-    HI_U8  au8DetailCtrlThr[ISP_AUTO_ISO_STRENGTH_NUM];  /* RW; Range: [0, 255]; Format:8.0; The threshold of DetailCtrl, it is used to distinguish detail and edge. */
-    HI_U8  au8EdgeFiltStr[ISP_AUTO_ISO_STRENGTH_NUM];    /* RW; Range: [0, 63]; Format:6.0;The strength of edge filtering. */
-    HI_U8  au8EdgeFiltMaxCap[ISP_AUTO_ISO_STRENGTH_NUM];  /* RW; Range: [0, 47]; Format:6.0;The max capacity of edge filtering.*/
-    HI_U8  au8RGain[ISP_AUTO_ISO_STRENGTH_NUM];                 /* RW; Range: [0, 31];   Format:5.0; Sharpen Gain for Red Area */
-    HI_U8  au8GGain[ISP_AUTO_ISO_STRENGTH_NUM];                 /* RW; Range: [0, 255]; Format:8.0; Sharpen Gain for Green Area */
-    HI_U8  au8BGain[ISP_AUTO_ISO_STRENGTH_NUM];                 /* RW; Range: [0, 31];   Format:5.0; Sharpen Gain for Blue Area */
-    HI_U8  au8SkinGain[ISP_AUTO_ISO_STRENGTH_NUM];       /* RW; Range: [0, 31]; Format:5.0;Sharpen Gain for Skin Area */
-    HI_U16  au16MaxSharpGain[ISP_AUTO_ISO_STRENGTH_NUM]; /* RW; Range: [0, 0x7FF]; Format:8.3; Maximum sharpen gain */
-    HI_U8  au8WeakDetailGain[ISP_AUTO_ISO_STRENGTH_NUM]; /* RW; Range: [0, 127]; Format:7.0; Only support for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200; sharpen Gain for weakdetail */
-} ISP_SHARPEN_AUTO_ATTR_S;
-
-typedef struct hiISP_SHARPEN_ATTR_S {
-    HI_BOOL bEnable;    /* RW; Range:[0, 1]; Format:1.0;Enable/Disable sharpen module */
-    HI_U8 u8SkinUmin;   /* RW; Range: [0, 255];  Format:8.0; U min value of the range of skin area */
-    HI_U8 u8SkinVmin;   /* RW; Range: [0, 255];  Format:8.0; V min value of the range of skin area */
-    HI_U8 u8SkinUmax;   /* RW; Range: [0, 255];  Format:8.0; U max value of the range of skin area */
-    HI_U8 u8SkinVmax;   /* RW; Range: [0, 255];  Format:8.0; V max value of the range of skin area */
-    ISP_OP_TYPE_E enOpType;
-    ISP_SHARPEN_MANUAL_ATTR_S stManual;
-    ISP_SHARPEN_AUTO_ATTR_S   stAuto;
-} ISP_SHARPEN_ATTR_S;
-
-/* Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-typedef struct hiISP_EDGEMARK_ATTR_S {
-    HI_BOOL bEnable;              /* RW; Range:[0, 1]; Format:1.0;Enable/Disable Edge Mark. Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   u8Threshold;          /* RW; Range: [0, 255];  Format:8.0;Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U32  u32Color;             /* RW; Range: [0, 0xFFFFFF];  Format:32.0;Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_EDGEMARK_ATTR_S;
-
-// High Light Constraint
-/* Not support for Hi3559AV100/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-typedef struct hiISP_HLC_ATTR_S {
-    HI_BOOL bEnable;              /* RW; Range:[0, 1];  Format:1.0;Enable/Disable HLC module,Only used for Hi3519AV100/Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   u8LumaThr;            /* RW; Range:[0, 255];Format:8.0;Only used for Hi3519AV100/Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   u8LumaTarget;         /* RW; Range:[0, 255];Format:8.0;Only used for Hi3519AV100/Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_HLC_ATTR_S;
-
-/* Crosstalk Removal */
-typedef struct hiISP_CR_ATTR_S {
-    HI_BOOL  bEnable;       /* RW; Range: [0, 1];Format 1.0;Enable/disable the crosstalk removal module */
-    HI_U8    u8Slope;       /* RW; Range: Hi3559AV100 = [0, 14] | Hi3519AV100 = [0, 14]|Hi3516CV500 = [0, 14]|Hi3516DV300 =[0, 14] |Hi3516AV300 =[0, 14] |
-                                                   Hi3559V200 =[0, 14] |Hi3556V200 =[0, 14] |Hi3516EV200 = [0,16]|Hi3516EV300 = [0,16]|Hi3518EV300 = [0,16]|Hi3516DV200 = [0,16];
-                                                   Crosstalk slope value. */
-    HI_U8    u8SensiSlope;  /* RW; Range: Hi3559AV100 = [0, 14] | Hi3519AV100 = [0, 14]|Hi3516CV500 = [0, 14]|Hi3516DV300 =[0, 14]||Hi3516AV300 =[0, 14] |
-                                                   Hi3559V200 =[0, 14] |Hi3556V200 =[0, 14] |Hi3516EV200 = [0,16]|Hi3516EV300 = [0,16]|Hi3518EV300 = [0,16]|Hi3516DV200 = [0,16];
-                                                   Crosstalk sensitivity. */
-    HI_U16   u16SensiThr;   /* RW; Range: Hi3559AV100 = [0, 16383] | Hi3519AV100 = [0, 16383]|Hi3516CV500 = [0, 16383]|Hi3516DV300 =[0, 16383]|Hi3516AV300 =[0, 16383]|
-                                                   Hi3559V200 =[0, 16383]|Hi3556V200 =[0, 16383]|Hi3516EV200 = [0,65535]|Hi3516EV300 = [0,65535]|Hi3518EV300 = [0,65535]|Hi3516DV200 = [0,65535];
-                                                   Crosstalk sensitivity threshold. */
-    HI_U16   au16Strength[ISP_AUTO_ISO_STRENGTH_NUM];   /* RW; Range: [0,256];Crosstalk strength value. */
-    HI_U16   au16Threshold[ISP_AUTO_ISO_STRENGTH_NUM];  /* RW; Range: Hi3559AV100 = [0, 16383] | Hi3519AV100 = [0, 16383]|Hi3516CV500 = [0, 16383]|Hi3516DV300 =[0, 16383] |
-                                                                                                  Hi3516AV300 =[0, 16383]|Hi3559V200 =[0, 16383] |Hi3556V200 =[0, 16383] |Hi3516EV200 = [0,65535]|
-                                                                                                  Hi3516EV300 = [0,65535]|Hi3518EV300 = [0,65535]|Hi3516DV200 = [0,65535]; Crosstalk threshold. */
-    HI_U16   au16NpOffset[ISP_AUTO_ISO_STRENGTH_NUM];   /* RW; Range: Hi3559AV100 = [512, 16383] | Hi3519AV100 = [512, 16383]|Hi3516CV500 = [512, 16383]|
-                                                                                                  Hi3516DV300 =[512, 16383] |Hi3516AV300 =[512, 16383] |Hi3559V200 =[512, 16383] |Hi3556V200 =[512, 16383] |
-                                                                                                  Hi3516EV200 = [8192,65535]|Hi3516EV300 = [8192,65535]|Hi3518EV300 = [8192,65535]|Hi3516DV200 = [8192,65535];  Set Noise profile value. */
-} ISP_CR_ATTR_S;
-
-typedef struct hiISP_ANTIFALSECOLOR_MANUAL_ATTR_S {
-    HI_U8    u8AntiFalseColorThreshold;     /* RW;Range:[0x0,0x20];Format:6.0;Threshold for antifalsecolor */
-    HI_U8    u8AntiFalseColorStrength;      /* RW;Range:[0x0,0x1F];Format:5.0;Strength of antifalsecolor */
-} ISP_ANTIFALSECOLOR_MANUAL_ATTR_S;
-
-typedef struct hiISP_ANTIFALSECOLOR_AUTO_ATTR_S {
-    HI_U8   au8AntiFalseColorThreshold[ISP_AUTO_ISO_STRENGTH_NUM];    /* RW;Range:[0x0,0x20];Format:6.0;Threshold for antifalsecolor */
-    HI_U8   au8AntiFalseColorStrength[ISP_AUTO_ISO_STRENGTH_NUM];     /* RW;Range:[0x0,0x1F];Format:5.0;Strength of antifalsecolor */
-} ISP_ANTIFALSECOLOR_AUTO_ATTR_S;
-
-typedef struct hiISP_ANTIFALSECOLOR_ATTR_S {
-    HI_BOOL  bEnable;                               /* RW;Range:[0x0,0x1];Format:1.0; AntiFalseColor Enable */
-    ISP_OP_TYPE_E enOpType;
-    ISP_ANTIFALSECOLOR_AUTO_ATTR_S stAuto;
-    ISP_ANTIFALSECOLOR_MANUAL_ATTR_S stManual;
-} ISP_ANTIFALSECOLOR_ATTR_S;
-
-typedef struct hiISP_DEMOSAIC_MANUAL_ATTR_S {
-    HI_U8   u8NonDirStr;            /* RW; Range:[0x0, 0xFF]; Format:4.4; Non-direction strength */
-    HI_U8   u8NonDirMFDetailEhcStr; /* RW; Range:Hi3559AV100 = [0x0, 0x10] |Hi3519AV100 = [0x0, 0x7f] |Hi3516CV500= [0x0, 0x7f]|Hi3516DV300= [0x0, 0x7f]|
-                                                               Hi3516AV300= [0x0, 0x7f]|Hi3559V200= [0x0, 0x7f]|Hi3556V200= [0x0, 0x7f]|
-                                                               Hi3516EV200 = [0x0, 0x7f]|Hi3516EV300 = [0x0, 0x7f]|Hi3518EV300 = [0x0, 0x7f]|Hi3516DV200 = [0x0, 0x7f];
-                                                               Format:3.4; Non-direction medium frequent detail enhance  strength */
-    HI_U8   u8NonDirHFDetailEhcStr; /* RW; Range:[0x0,0x10];  Format:2.2; Non-direction high frequent detail enhance strength */
-    HI_U8   u8DetailSmoothRange;    /* RW; Range:Hi3559AV100 = [0x1, 0x8] |Hi3519AV100 = [0x1, 0x7] |Hi3516CV500 = [0x1, 0x7]|Hi3516DV300 = [0x1, 0x7]|
-                                                                Hi3516AV300 = [0x1, 0x7]|Hi3559V200 = [0x1, 0x7]|Hi3556V200 = [0x1, 0x7] |
-                                                                Hi3516EV200 = [0x1, 0x7]|Hi3516EV300 = [0x1, 0x7]|Hi3518EV300 = [0x1, 0x7]|Hi3516DV200 = [0x1, 0x7];
-                                                                Format:4.0; Detail smooth range */
-    HI_U16  u16DetailSmoothStr;     /* RW;Range:[0x0,0x100]; Format:9.0;   Strength of detail smooth, Only used for Hi3559AV100 */
-	HI_U8   u8ColorNoiseThdF;       /* RW;Range:[0x0,0xFF]; Format:8.0;   Frequency Threshold used for ColorNoise */
-    HI_U8   u8ColorNoiseStrF;       /* RW;Range:[0x0,0x8]; Format:4.0;   Frequency Strength used for ColorNoise */
-    HI_U8   u8ColorNoiseThdY;       /* RW;Range:[0x0,0xF];Format:4.0; Range of color denoise luma*/
-    HI_U8   u8ColorNoiseStrY;       /* RW;Range:[0x0,0x3F];Format:6.0; Strength of color denoise luma*/
-} ISP_DEMOSAIC_MANUAL_ATTR_S;
-
-typedef struct hiISP_DEMOSAIC_AUTO_ATTR_S {
-    HI_U8   au8NonDirStr[ISP_AUTO_ISO_STRENGTH_NUM];            /* RW; Range:[0x0, 0xFF]; Format:4.4; Non-direction strength */
-    HI_U8   au8NonDirMFDetailEhcStr[ISP_AUTO_ISO_STRENGTH_NUM]; /* RW; Range:Hi3559AV100 = [0x0, 0x10] |Hi3519AV100 = [0x0, 0x7f] |Hi3516CV500= [0x0, 0x7f]|
-                                                                  Hi3516DV300= [0x0, 0x7f]|Hi3516AV300= [0x0, 0x7f]|Hi3559V200 = [0x0, 0x7f] |Hi3556V200= [0x0, 0x7f] |
-                                                                  Hi3516EV200= [0x0, 0x7f]|Hi3516EV300 = [0x0, 0x7f] |Hi3518EV300= [0x0, 0x7f]|Hi3516DV200 = [0x0, 0x7f];
-                                                                  Format:3.4; Non-direction medium frequent detail enhance  strength */
-    HI_U8   au8NonDirHFDetailEhcStr[ISP_AUTO_ISO_STRENGTH_NUM]; /* RW; Range:[0x0,0x10];  Format:2.2; Non-direction high frequent detail enhance  strength */
-    HI_U8   au8DetailSmoothRange[ISP_AUTO_ISO_STRENGTH_NUM];    /* RW; Range:Hi3559AV100 = [0x1, 0x8] |Hi3519AV100 = [0x1, 0x7] |Hi3516CV500 = [0x1, 0x7]|
-                                                                  Hi3516DV300 = [0x1, 0x7]|Hi3516AV300 = [0x1, 0x7]|Hi3559V200 = [0x1, 0x7] |Hi3556V200 = [0x1, 0x7]|
-                                                                  Hi3516EV200= [0x1, 0x7]|Hi3516EV300 = [0x, 0x7] |Hi3518EV300= [0x1, 0x7]|Hi3516DV200= [0x1, 0x7] ;
-                                                                  Format:4.0; Detail smooth range */
-    HI_U16  au16DetailSmoothStr[ISP_AUTO_ISO_STRENGTH_NUM];     /* RW;Range:[0x0,0x100]; Format:9.0;   Strength of detail smooth, Only used for Hi3559AV100 */
-	HI_U8   au8ColorNoiseThdF[ISP_AUTO_ISO_STRENGTH_NUM];       /* RW;Range:[0x0,0xFF]; Format:8.0;   Frequency Threshold used for ColorNoise */
-    HI_U8   au8ColorNoiseStrF[ISP_AUTO_ISO_STRENGTH_NUM];       /* RW;Range:[0x0,0x8]; Format:4.0;   Frequency Strength used for ColorNoise */
-    HI_U8   au8ColorNoiseThdY[ISP_AUTO_ISO_STRENGTH_NUM];       /* RW;Range:[0x0,0xF];Format:4.0; Range of color denoise luma*/
-    HI_U8   au8ColorNoiseStrY[ISP_AUTO_ISO_STRENGTH_NUM];       /* RW;Range:[0x0,0x3F];Format:6.0; Strength of color denoise luma*/
-} ISP_DEMOSAIC_AUTO_ATTR_S;
-
-typedef struct hiISP_DEMOSAIC_ATTR_S {
-    HI_BOOL bEnable;        /* RW; Range:[0, 1]; Format:1.0;Enable/Disable demosaic module */
-    ISP_OP_TYPE_E enOpType;
-    ISP_DEMOSAIC_MANUAL_ATTR_S stManual;
-    ISP_DEMOSAIC_AUTO_ATTR_S stAuto;
-} ISP_DEMOSAIC_ATTR_S;
-
-/* Defines the attributes of the ISP black level */
-typedef struct hiISP_BLACK_LEVEL_S {
-    ISP_OP_TYPE_E enOpType;
-    HI_U16 au16BlackLevel[ISP_BAYER_CHN_NUM]; /* RW; Range: [0x0, 0xFFF];Format:12.0;Black level values that correspond to the black levels of the R,Gr, Gb, and B components respectively. */
-} ISP_BLACK_LEVEL_S;
-
-/*
-Defines the FPN removal type
-0 = Frame mode correction
-1 = Line mode correction
-*/
-typedef enum hiISP_FPN_TYPE_E {
-    ISP_FPN_TYPE_FRAME = 0,
-    ISP_FPN_TYPE_LINE = 1,
-    ISP_FPN_TYPE_BUTT
-} ISP_FPN_TYPE_E;
-
-/* Defines the information about calibrated black frames. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_FPN_FRAME_INFO_S {
-    HI_U32              u32Iso;             /* RW;Range:[0x64,0xFFFFFFFF];Format:32.0;FPN CALIBRATE ISO */
-    HI_U32              u32Offset[VI_MAX_SPLIT_NODE_NUM];          /* RW;Range:[0,0xFFF];Format:12.0;FPN frame u32Offset (agv pixel value) */
-    HI_U32              u32FrmSize;         /* RW;FPN frame size (exactly frm size or compress len) */
-    VIDEO_FRAME_INFO_S  stFpnFrame;         /* FPN frame info, 8bpp,10bpp,12bpp,16bpp. Compression or not */
-} ISP_FPN_FRAME_INFO_S;
-
-/* Defines the calibration attribute of the FPN removal module. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_FPN_CALIBRATE_ATTR_S {
-    HI_U32                          u32Threshold;        /* RW;Range:[1,0xFFF];Format:12.0;pix value > threshold means defective pixel */
-    HI_U32                          u32FrameNum;         /* RW;Range:[1, 16];Format:5.0;Number of frames to be calibrated. The value range is {1, 2, 4, 8, 16},that is, the integer exponentiation of 2. */
-    ISP_FPN_TYPE_E                  enFpnType;           /* frame mode or line mode */
-    ISP_FPN_FRAME_INFO_S            stFpnCaliFrame;
-} ISP_FPN_CALIBRATE_ATTR_S;
-/* Defines the manual correction attribute of the FPN removal module. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_FPN_MANUAL_ATTR_S {
-    HI_U32               u32Strength;         /* RW;Range:[0,1023];Format:10.0;Manual correction strength */
-} ISP_FPN_MANUAL_ATTR_S;
-
-/* Defines the automatic correction attribute of the FPN removal module. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_FPN_AUTO_ATTR_S {
-    HI_U32               u32Strength;          /* RW;Range:[0,1023];Format:10.0;Auto correction strength */
-} ISP_FPN_AUTO_ATTR_S;
-
-/* Defines the correction attribute of the FPN removal module. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_FPN_ATTR_S {
-    HI_BOOL               bEnable;            /* RW;Range:[0,1];Format:1.0; */
-    ISP_OP_TYPE_E         enOpType;           /* manual or auto mode */
-    ISP_FPN_TYPE_E        enFpnType;          /* frame mode or line mode */
-    ISP_FPN_FRAME_INFO_S  stFpnFrmInfo;       /* input in correction mode. */
-    ISP_FPN_MANUAL_ATTR_S stManual;
-    ISP_FPN_AUTO_ATTR_S   stAuto;
-} ISP_FPN_ATTR_S;
-
-/* Defines the manual dehze attribute */
-typedef struct hiISP_DEHAZE_MANUAL_ATTR_S {
-    HI_U8              u8strength;  /* RW;Range:[0,0xFF];Format:8.0;Manual dehze strength */
-} ISP_DEHAZE_MANUAL_ATTR_S;
-
-/* Defines the automatic dehze attribute */
-typedef struct hiISP_DEHAZE_AUTO_ATTR_S {
-    HI_U8              u8strength; /* RW;Range:[0,0xFF];Format:8.0;Weighted coefficient for automatic dehaze strength. */
-} ISP_DEHAZE_AUTO_ATTR_S;
-
-/* Defines the ISP dehaze attribute */
-typedef struct hiISP_DEHAZE_ATTR_S {
-    HI_BOOL  bEnable;           /* RW;Range:[0,1];Format:1.0; */
-    HI_BOOL  bUserLutEnable;    /* RW;Range:[0,1];0:Auto Lut 1:User Lut */
-    HI_U8    au8DehazeLut[256];
-    ISP_OP_TYPE_E      enOpType;
-    ISP_DEHAZE_MANUAL_ATTR_S stManual;
-    ISP_DEHAZE_AUTO_ATTR_S   stAuto;
-    HI_U16       u16TmprfltIncrCoef; /* RW, Range: [0x0, 0x80].filter increase coeffcient. */
-    HI_U16       u16TmprfltDecrCoef; /* RW, Range: [0x0, 0x80].filter decrease coeffcient. */
-
-} ISP_DEHAZE_ATTR_S;
-
-/* Defines purple fringing correction manual attribute */
-typedef struct hiISP_DEPURPLESTR_MANUAL_ATTR_S {
-    HI_U8 u8DePurpleCrStr;               /* RW;Range: [0,8];Format:4.0;Correction strength of the R channel */
-    HI_U8 u8DePurpleCbStr;               /* RW;Range: [0,8];Format:4.0;Correction strength of the B channel */
-} ISP_DEPURPLESTR_MANUAL_ATTR_S;
-
-/* Defines purple fringing correction automatic attribute */
-typedef struct hiISP_DEPURPLESTR_AUTO_ATTR_S {
-    HI_U8 au8DePurpleCrStr[ISP_EXP_RATIO_STRENGTH_NUM];    /* RW;Range: [0,8];Format:4.0;Correction strength of the R channel */
-    HI_U8 au8DePurpleCbStr[ISP_EXP_RATIO_STRENGTH_NUM];    /* RW;Range: [0,8];Format:4.0;Correction strength of the B channel */
-} ISP_DEPURPLESTR_AUTO_ATTR_S;
-
-/* Purple fringing detection and correction attribute */
-typedef struct hiISP_LOCAL_CAC_ATTR_S {
-    HI_BOOL bEnable;                        /* RW;Range: [0,1];Format:1.0; HI_TRUE: enable local cac; HI_FALSE: disable local cac */
-    HI_U16  u16PurpleDetRange;              /* RW;Range: [0,410];Format:9.0;Purple fringing detection scope */
-    HI_U16  u16VarThr;                      /* RW;Range: [0,4095];Format:12.0;Edge detection threshold */
-    ISP_OP_TYPE_E      enOpType;            /* RW;Range: [0,1];Format:1.0;Purple fringing correction working mode */
-    ISP_DEPURPLESTR_MANUAL_ATTR_S stManual;
-    ISP_DEPURPLESTR_AUTO_ATTR_S   stAuto;
-} ISP_LOCAL_CAC_ATTR_S;
-
-/* Defines the lateral chromatic aberration correction attribute, Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-typedef struct hiISP_GLOBAL_CAC_ATTR_S {
-    HI_BOOL bEnable;            /* RW; Range: [0, 1];Format: 1.0;  enable/disable global cac */
-    HI_U16  u16VerCoordinate;   /* RW; Range: [0, 8191];Format: 13.0; limited Range: [0, ImageHeight - 1],Vertical coordinate of the optical center.  Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16  u16HorCoordinate;   /* RW; Range: [0, 8191];Format: 13.0; limited range : [0, ImageWidth - 1],Horizontal coordinate of the optical center. Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_S16  s16ParamRedA;       /* RW; Range: [-256, 255];Format: 9.0; Coefficient a of the radius polynomial corresponding to channel R. Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_S16  s16ParamRedB;       /* RW; Range: [-256, 255];Format: 9.0; Coefficient b of the radius polynomial corresponding to channel R. Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_S16  s16ParamRedC;       /* RW; Range: [-256, 255];Format: 9.0; Coefficient c of the radius polynomial corresponding to channel R. Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_S16  s16ParamBlueA;      /* RW; Range: [-256, 255];Format: 9.0; Coefficient a of the radius polynomial corresponding to channel B. Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_S16  s16ParamBlueB;      /* RW; Range: [-256, 255];Format: 9.0; Coefficient b of the radius polynomial corresponding to channel B. Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_S16  s16ParamBlueC;      /* RW; Range: [-256, 255];Format: 9.0; Coefficient c of the radius polynomial corresponding to channel B. Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   u8VerNormShift;     /* RW; Range: [0, 7];Format: 3.0; Normalized shift parameter in the vertical direction. Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   u8VerNormFactor;    /* RW; Range: [0, 31];Format: 5.0;Normalized coefficient in the vertical direction. Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   u8HorNormShift;     /* RW; Range: [0, 7];Format: 3.0; Normalized shift parameter in the horizontal direction. Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8   u8HorNormFactor;    /* RW; Range: [0, 31];Format: 5.0;Normalized coefficient in the horizontal direction.Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16  u16CorVarThr;       /* RW; Range: [0, 4095];Format: 12.0;Variance threshold of lateral chromatic aberration correction.Not support for Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_GLOBAL_CAC_ATTR_S;
-
-/* Defines the Radial Crop attribute */
-typedef struct hiISP_RC_ATTR_S {
-    HI_BOOL bEnable;       /* RW;Range:[0,1];Format:1.0; HI_TRUE: enable ridial crop; HI_FALSE: disable ridial crop.Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-    POINT_S stCenterCoor;  /* RW;the coordinate of central pixel.Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-    HI_U32  u32Radius;     /* RW;Range:[0,11586];Format:14.0; when the distance to central pixel is greater than u32Radius,the pixel value becomes 0.
-                                                 Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-} ISP_RC_ATTR_S;
-
-typedef struct hiISP_INNER_STATE_INFO_S {
-
-    HI_U16 au16TextureStr[ISP_SHARPEN_GAIN_NUM];     /* RW; range: [0, 4095]; Format:7.5;Undirectional sharpen strength for texture and detail enhancement */
-    HI_U16 au16EdgeStr[ISP_SHARPEN_GAIN_NUM];        /* RW; range: [0, 4095]; Format:7.5;Directional sharpen strength for edge enhancement */
-    HI_U16 u16TextureFreq;         /* RW; range: [0, 4095];Format:6.6; Texture frequency adjustment. Texture and detail will be finer when it increase */
-    HI_U16 u16EdgeFreq;            /* RW; range: [0, 4095];Format:6.6; Edge frequency adjustment. Edge will be narrower and thiner when it increase */
-    HI_U8  u8OverShoot;            /* RW; range: [0, 127]; Format:7.0;u8OvershootAmt */
-    HI_U8  u8UnderShoot;           /* RW; range: [0, 127]; Format:7.0;u8UndershootAmt */
-    HI_U8  u8ShootSupStr;          /* RW; range: [0, 255]; Format:8.0;overshoot and undershoot suppression strength, the amplitude and width of shoot will be decrease when shootSupSt increase */
-
-    HI_U8   u8NrLscRatio;                       /* RW;Range:[0x0,0xff];Format:8.0; Strength of reserving the random noise according to luma,Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 not support */
-    HI_U16  au16CoarseStr[ISP_BAYER_CHN_NUM];   /* RW;Range:[0x0,0x3ff];Format:10.0; Coarse Strength of noise reduction */
-    HI_U8   au8WDRFrameStr[WDR_MAX_FRAME_NUM];  /* RW;Range:[0x0,0x50];Format:7.0; Coarse strength of each frame in \nwdr mode */
-    HI_U8   au8ChromaStr[ISP_BAYER_CHN_NUM];    /* RW;Range:[0x0,0x3];Format:2.0;Strength of Chrmoa noise reduction for R/Gr/Gb/B channel,Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200
-                                                 Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 not support */
-    HI_U8   u8FineStr;              /* RW;Range:[0x0,0x80];Format:8.0;Strength of Luma noise reduction */
-    HI_U16  u16CoringWgt;           /* RW;Range:[0x0,0xC80];Format:12.0;Strength of reserving the random noise */
-
-    HI_U16 u16DeHazeStrengthActual; /* RW;Range:[0,0xFF];Format:8.0;actual dehze strength */
-    HI_U16 u16DrcStrengthActual;    /* RW;Range: Hi3559AV100 = [0x0, 0xFF] | Hi3519AV100 = [0x0, 0x3FF] | Hi3516CV500 = [0x0, 0x3FF]| Hi3516DV300 = [0x0, 0x3FF]|
-                                                                Hi3516AV300 = [0x0, 0x3FF]|Hi3559V200 = [0x0, 0x3FF]| Hi3556V200 = [0x0, 0x3FF]|
-                                                                Hi3516EV200 = [0x0, 0x3FF]|Hi3516EV300 = [0x0, 0x3FF]|Hi3518EV300 = [0x0, 0x3FF]|Hi3516DV200 = [0x0, 0x3FF] ;Strength of dynamic range compression.
-                                                                Higher values lead to higher differential gain between shadows and highlights. */
-    HI_U32 u32WDRExpRatioActual[3]; /* RW; Range:[0x40, 0x4000]; Format:26.6; 0x40 means 1 times.
-                                                                 When enExpRatioType is OP_TYPE_AUTO, u32ExpRatio is invalid.
-                                                                 When enExpRatioType is OP_TYPE_MANUAL, u32ExpRatio is quotient of long exposure time / short exposure time. */
-    HI_BOOL bWDRSwitchFinish;       /* RW; Range:[0, 1];Format:1.0;HI_TRUE: WDR switch is finished */
-    HI_BOOL bResSwitchFinish;       /* RW; Range:[0, 1];Format:1.0;HI_TRUE: Resolution switch is finished */
-    HI_U16 au16BLActual[ISP_BAYER_CHN_NUM]; /* RW; Range: [0x0, 0xFFF];Format:12.0;Actual Black level values that correspond to the black levels of the R,Gr, Gb, and B components respectively. */
-} ISP_INNER_STATE_INFO_S;
-
-/*
-The position of AE histogram in ISP BE pipeline
-0 = After DG;
-1 = After static WB;
-2 = After DRC;
-*/
-typedef enum hiISP_AE_SWITCH_E {
-    ISP_AE_AFTER_DG = 0,
-    ISP_AE_AFTER_WB,
-    ISP_AE_AFTER_DRC,
-    ISP_AE_SWITCH_BUTT
-} ISP_AE_SWITCH_E;
-
-/*
-FourPlaneMode enable
-0 : Disabled;
-1 : Enabled
-*/
-typedef enum hiISP_AE_FOUR_PLANE_MODE_E {
-    ISP_AE_FOUR_PLANE_MODE_DISABLE = 0,
-    ISP_AE_FOUR_PLANE_MODE_ENABLE,
-    ISP_AE_FOUR_PLANE_MODE_BUTT
-} ISP_AE_FOUR_PLANE_MODE_E;
-
-typedef enum hiISP_AE_HIST_SKIP_E {
-    ISP_AE_HIST_SKIP_EVERY_PIXEL = 0,
-    ISP_AE_HIST_SKIP_EVERY_2ND_PIXEL,
-    ISP_AE_HIST_SKIP_EVERY_3RD_PIXEL,
-    ISP_AE_HIST_SKIP_EVERY_4TH_PIXEL,
-    ISP_AE_HIST_SKIP_EVERY_5TH_PIXEL,
-    ISP_AE_HIST_SKIP_EVERY_8TH_PIXEL,
-    ISP_AE_HIST_SKIP_EVERY_9TH_PIXEL,
-    ISP_AE_HIST_SKIP_BUTT
-} ISP_AE_HIST_SKIP_E;
-
-typedef enum hiISP_AE_HIST_OFFSET_X_E {
-    ISP_AE_HIST_START_FORM_FIRST_COLUMN = 0,
-    ISP_AE_HIST_START_FORM_SECOND_COLUMN,
-    ISP_AE_HIST_OFFSET_X_BUTT
-} ISP_AE_HIST_OFFSET_X_E;
-
-typedef enum hiISP_AE_HIST_OFFSET_Y_E {
-    ISP_AE_HIST_START_FORM_FIRST_ROW = 0,
-    ISP_AE_HIST_START_FORM_SECOND_ROW,
-    ISP_AE_HIST_OFFSET_Y_BUTT
-} ISP_AE_HIST_OFFSET_Y_E;
-
-/* Defines the mode configuration for the sampling points during global histogram statistics. */
-typedef struct hiISP_AE_HIST_CONFIG_S {
-    ISP_AE_HIST_SKIP_E enHistSkipX;    /* RW; Range:[0,6]; Format:4.0;
-                                                                    Histogram decimation in horizontal direction: 0=every pixel; 1=every 2nd pixel; 2=every
-                                                                    3rd pixel; 3=every 4th pixel; 4=every 5th pixel; 5=every 8th pixel ; 6+=every 9th pixel */
-    ISP_AE_HIST_SKIP_E enHistSkipY;    /* RW; Range:[0,6]; Format:4.0;
-                                                                    Histogram decimation in vertical direction: 0=every pixel; 1=every 2nd pixel; 2=every
-                                                                    3rd pixel; 3=every 4th pixel; 4=every 5th pixel; 5=every 8th pixel ; 6+=every 9th pixel */
-    ISP_AE_HIST_OFFSET_X_E enHistOffsetX;  /* RW; Range:[0,1]; Format:1.0; 0= start from the first column; 1=start from second column */
-    ISP_AE_HIST_OFFSET_Y_E enHistOffsetY;  /* RW; Range:[0,1]; Format:1.0; 0= start from the first row; 1= start from second row */
-} ISP_AE_HIST_CONFIG_S;
-
-typedef enum hiISP_AE_STAT_MODE__E {
-    ISP_AE_NORMAL = 0,
-    ISP_AE_ROOT,
-    ISP_AE_MODE_BUTT
-} ISP_AE_STAT_MODE_E;
-
-/* Crops the input image of the AE module */
-typedef struct hiISP_AE_CROP_S {
-    HI_BOOL bEnable; /* RW; Range: [0,1];  Format:1.0;AE crop enable. */
-    HI_U16  u16X;    /* RW; Range: Hi3559AV100 = [0, 8192 - 256]|Hi3519AV100 = [0, 8192 - 256]|Hi3516CV500 = [0, 4608 - 256]|Hi3516DV300 = [0, 4608 - 256]|
-                                       Hi3516AV300 = [0, 4608 - 256]|Hi3559V200   = [0, 4608 - 256]|Hi3556V200  = [0, 4608 - 256]|
-                                       Hi3516EV200 = [0,3072 - 256]|Hi3516EV300 = [0,3072 - 256]|Hi3518EV300 = [0,3072 - 256]|Hi3516DV200 = [0,3072 - 256];
-                                       Format:13.0;AE image crop start x, limited range:[0, ImageWidth - 256] */
-    HI_U16  u16Y;   /* RW; Range: Hi3559AV100 = [0, 8192 - 120]|Hi3519AV100 = [0, 8192 - 120]|Hi3516CV500 = [0, 4608 - 120]|Hi3516DV300 = [0, 4608 - 120]|
-                                      Hi3516AV300 = [0, 4608 - 120]| Hi3559V200   = [0, 4608 - 120]|Hi3556V200   = [0, 4608 - 120]|
-                                      Hi3516EV200 = [0,3072 - 120]|Hi3516EV300 = [0,3072 - 120]|Hi3518EV300 = [0,3072 - 120]| Hi3516DV200 = [0,3072 - 120];
-                                      Format:13.0;AEimage crop start y, limited range:[0, ImageHeight - 120]  */
-    HI_U16  u16W;   /* RW; Range: Hi3559AV100 = [256, 8192]|Hi3519AV100 = [256, 8192]|Hi3516CV500 = [256, 4608]|Hi3516DV300 = [256, 4608] |
-                                     Hi3516AV300 = [256, 4608] |Hi3559V200   = [256, 4608]| Hi3556V200  = [256, 4608]|
-                                     Hi3516EV200 = [256, 3072]|Hi3516EV300 = [256, 3072]|Hi3518EV300 = [256, 3072]|Hi3516DV200 = [256, 3072];
-                                     Format:14.0;AE image crop width,  limited range:[256, ImageWidth] */
-    HI_U16  u16H;  /* RW; Range: Hi3559AV100 = [120, 8192]|Hi3519AV100 = [120, 8192]|Hi3516CV500 = [120, 4608]|Hi3516DV300 = [120, 4608] |
-                                    Hi3516AV300 = [120, 4608] |Hi3559V200   = [120, 4608]| Hi3556V200  = [120, 4608]|
-                                    Hi3516EV200 = [120, 3072]|Hi3516EV300 = [120, 3072]|Hi3518EV300 = [120, 3072]|Hi3516DV200 = [120, 3072];
-                                    Format:14.0;AE image crop height  limited range:[120, ImageHeight] */
-} ISP_AE_CROP_S;
-
-/* config of statistics structs */
-#define HIST_THRESH_NUM                           (4)
-typedef struct hiISP_AE_STATISTICS_CFG_S {
-    ISP_AE_SWITCH_E          enAESwitch;          /* RW; Range:[0,2]; Format:2.0;The position of AE histogram in ISP BE pipeline */
-    ISP_AE_HIST_CONFIG_S     stHistConfig;
-    ISP_AE_FOUR_PLANE_MODE_E enFourPlaneMode;     /* RW; Range:[0,1]; Format:2.0;Four Plane Mode Enable */
-    ISP_AE_STAT_MODE_E       enHistMode;          /* RW; Range:[0,1]; Format:2.0;AE Hist Rooting Mode */
-    ISP_AE_STAT_MODE_E       enAverMode;          /* RW; Range:[0,1]; Format:2.0;AE Aver Rooting Mode */
-    ISP_AE_STAT_MODE_E       enMaxGainMode;       /* RW; Range:[0,1]; Format:2.0;Max Gain Rooting Mode */
-    ISP_AE_CROP_S            stCrop;
-    HI_U8 au8Weight[AE_ZONE_ROW][AE_ZONE_COLUMN]; /* RW; Range:[0x0, 0xF]; Format:4.0; AE weighting table */
-} ISP_AE_STATISTICS_CFG_S;
-
-// Smart Info
-#define SMART_CLASS_MAX                           (2)
-
-/* Only used for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-typedef struct hiISP_SMART_ROI_S {
-    HI_BOOL  bEnable;
-    HI_BOOL  bAvailable;
-    HI_U8    u8Luma ;
-} ISP_SMART_ROI_S;
-
-/* Only used for Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-typedef struct hiISP_SMART_INFO_S {
-    ISP_SMART_ROI_S  stROI[SMART_CLASS_MAX];
-} ISP_SMART_INFO_S;
-
-/* fines whether the peak value of the zoned IIR statistics is calculated. Not support for Hi3559V200/Hi3556V200 */
-typedef enum hiISP_AF_PEAK_MODE_E {
-    ISP_AF_STA_NORM         = 0,    /* use every value of the block statistic */
-    ISP_AF_STA_PEAK,                /* use the maximum value in one line of the block statistic */
-    ISP_AF_STA_BUTT
-} ISP_AF_PEAK_MODE_E;
-
-/* Defines whether the zoned statistics are squared in square mode. Not support for Hi3559V200/Hi3556V200 */
-typedef enum hiISP_AF_SQU_MODE_E {
-    ISP_AF_STA_SUM_NORM     = 0,    /* statistic value accumlate */
-    ISP_AF_STA_SUM_SQU,             /* statistic value square then accumlate */
-    ISP_AF_STA_SUM_BUTT
-} ISP_AF_SQU_MODE_E;
-/* Crops the input image of the AF module. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_AF_CROP_S {
-    HI_BOOL bEnable; /* RW; Range: [0,1];  Format:1.0; AF crop enable */
-    HI_U16  u16X;    /* RW; Range: Hi3559AV100 = [0, 7936]|Hi3519AV100 = [0, 7936]|Hi3516CV500 = [0, 4352]|Hi3516DV300 = [0, 4352]|
-                                       Hi3516AV300 = [0, 4352]|Hi3516EV200 = [0, 2816]|Hi3516EV300 = [0, 2816]|Hi3518EV300 = [0, 2816]|Hi3516DV200 = [0, 2816];
-                                       Format:13.0;AF image crop start x, limited range:[0, ImageWidth-256] */
-    HI_U16  u16Y;    /* RW; Range: Hi3559AV100 = [0, 8072]|Hi3519AV100 = [0, 8072]|Hi3516CV500 = [0, 4488]|Hi3516DV300 = [0, 4488]|
-                                       Hi3516AV300 = [0, 4488]|Hi3516EV200 = [0, 2952]|Hi3516EV300 = [0,2952]|Hi3518EV300 = [0,2952]|Hi3516DV200 = [0,2952];
-                                       Format:13.0;AF image crop start y, limited range:[0, ImageHeight-120] */
-    HI_U16  u16W;    /* RW; Range: Hi3559AV100 = [256, 8192]|Hi3519AV100 = [256, 8192]|Hi3516CV500 = [256, 4608]|Hi3516DV300 = [256, 4608]|
-                                       Hi3516AV300 = [256, 4608]|Hi3516EV200 = [256, 3072]|Hi3516EV300 = [256, 3072]|Hi3518EV300 = [256, 3072]|Hi3516DV200 = [256, 3072];
-                                       Format:14.0;AF image crop width, limited range:[256, ImageWidth] */
-    HI_U16  u16H;    /* RW; Range: Hi3559AV100 = [120, 8192]|Hi3519AV100 = [120, 8192]|Hi3516CV500 = [120, 4608]|Hi3516DV300 = [120, 4608]|
-                                       Hi3516AV300 = [120, 4608]|Hi3516EV200 = [120,3072]|Hi3516EV300 = [120,3072]|Hi3518EV300 = [120, 3072]|Hi3516DV200 = [120, 3072];
-                                       Format:14.0;AF image crop height, limited range:[120, ImageHeight] */
-} ISP_AF_CROP_S;
-
-/* Defines the position of AF module statistics. Not support for Hi3559V200/Hi3556V200 */
-typedef enum hiISP_AF_STATISTICS_POS_E {
-    ISP_AF_STATISTICS_AFTER_DGAIN    = 0, // The AF module is placed in the raw field for statistics,AF after DGain
-    ISP_AF_STATISTICS_AFTER_DRC,         // The AF module is placed in the raw field for statistics,AF after DRC
-    ISP_AF_STATISTICS_AFTER_CSC,         // The AF module is placed in the YUV field for statistics,AF after CSC
-    ISP_AF_STATISTICS_BUTT
-} ISP_AF_STATISTICS_POS_E;
-
-/* Configures the Bayer field of the AF module. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_AF_RAW_CFG_S {
-    HI_U8               GammaGainLimit; /* RW; Range: [0x0, 0x5]; Format:3.0,Not support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U8               GammaValue;     /* RW; Range: Hi3559AV100 = [0x0, 0x6] | Hi3519AV100 = [0x0, 0x6] | Hi3516CV500 = [0x0, 0x6] | Hi3516DV300 = [0x0, 0x6]|
-                                                                       Hi3516AV300 = [0x0, 0x6]|Hi3516EV200 = [0x0, 0x1]|Hi3516EV300 = [0x0, 0x1]|Hi3518EV300 = [0x0, 0x1]|Hi3516DV200 = [0x0, 0x1]; */
-    ISP_BAYER_FORMAT_E  enPattern;      /* RW; Range: [0x0, 0x3]; Format:2.0;raw domain pattern */
-} ISP_AF_RAW_CFG_S;
-/* Configures the pre-filter of the AF module. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_AF_PRE_FILTER_CFG_S {
-    HI_BOOL             bEn;         /* RW; Range: [0,1]; Format:1.0; pre filter enable  .          */
-    HI_U16              u16strength; /* RW; Range: [0x0, 0xFFFF]; Format:16.0;pre filter strength    */
-} ISP_AF_PRE_FILTER_CFG_S;
-
-/* Defines AF statistics configuration parameters. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_AF_CFG_S {
-    HI_BOOL                 bEnable;        /* RW; Range: [0,1];   AF enable. */
-    HI_U16                  u16Hwnd;        /* RW; Range: [1, 17]; AF statistic window horizontal block.  */
-    HI_U16                  u16Vwnd;        /* RW; Range: [1, 15]; AF statistic window veritical block.  */
-    HI_U16                  u16Hsize;       /* RW; Range: Hi3559AV100 = [256, 8192]|Hi3519AV100 = [256, 8192]|Hi3516CV500 = [256, 4608]|Hi3516DV300 = [256, 4608]|
-                                                                              Hi3516AV300 = [256, 4608]|Hi3516EV200 = [256,3072]|Hi3516EV300 = [256,3072]|Hi3518EV300 = [256,3072]|Hi3516DV200 = [256,3072];
-                                                                              limited Range: [256, ImageWidth],AF image width. */
-    HI_U16                  u16Vsize;       /* RW; Range: Hi3559AV100 = [120, 8192]|Hi3519AV100 = [120, 8192]|Hi3516CV500 = [120, 4608]|Hi3516DV300 = [120, 4608]|
-                                                                              Hi3516AV300 = [120, 4608]|Hi3516EV200 = [120,3072]|Hi3516EV300 = [120,3072]|Hi3518EV300 = [120,3072]|Hi3516DV200 = [120,3072];
-                                                                              limited Range: [120, ImageHeight],AF image height. */
-    ISP_AF_PEAK_MODE_E      enPeakMode;     /* RW; Range: [0,1]; AF peak value statistic mode. */
-    ISP_AF_SQU_MODE_E       enSquMode;      /* RW; Range: [0,1]; AF statistic square accumulate. */
-    ISP_AF_CROP_S           stCrop;         /* RW; AF input image crop */
-    ISP_AF_STATISTICS_POS_E enStatisticsPos; /* RW; Range: [0,2]; AF statistic position, it can be set to yuv or raw */
-    ISP_AF_RAW_CFG_S        stRawCfg;       /* RW; When AF locate at RAW domain, these para should be cfg. */
-    ISP_AF_PRE_FILTER_CFG_S stPreFltCfg;    /* RW; pre filter cfg */
-    HI_U16                  u16HighLumaTh;  /* RW; Range: [0,0xFF]; high luma threshold. */
-} ISP_AF_CFG_S;
-/* Configures the AF level depend gain module. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_AF_LD_S {
-    HI_BOOL     bLdEn;                      /* RW; Range: [0, 1]; FILTER level depend gain enable. */
-    HI_U16      u16ThLow;                   /* RW; range: [0x0, 0xFF]; FILTER level depend th low */
-    HI_U16      u16GainLow;                 /* RW; range: [0x0, 0xFF]; FILTER level depend gain low */
-    HI_U16      u16SlpLow;                  /* RW; range: [0x0, 0xF];  FILTER level depend slope low */
-    HI_U16      u16ThHigh;                  /* RW; range: [0x0, 0xFF]; FILTER level depend th high */
-    HI_U16      u16GainHigh;                /* RW; range: [0x0, 0xFF]; FILTER level depend gain high */
-    HI_U16      u16SlpHigh;                 /* RW; range: [0x0, 0xF];  FILTER level depend slope high */
-} ISP_AF_LD_S;
-/* Configures the AF coring module. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_AF_CORING_S {
-    HI_U16      u16Th;                      /* RW; Range: [0x0, 0x7FF];FILTER coring threshold. */
-    HI_U16      u16Slp;                     /* RW; Range: [0x0, 0xF];  FILTER Coring Slope */
-    HI_U16      u16Lmt;                     /* RW; Range: [0x0, 0x7FF];FILTER coring limit */
-} ISP_AF_CORING_S ;
-
-
-#define IIR_EN_NUM                                (3)
-#define IIR_GAIN_NUM                              (7)
-#define IIR_SHIFT_NUM                             (4)
-/* Defines the IIR parameter configuration of horizontal filters for AF statistics. Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_AF_H_PARAM_S {
-    HI_BOOL         bNarrowBand;                /* RW; Range: [0, 1]; IIR narrow band enable. */
-    HI_BOOL         abIIREn[IIR_EN_NUM];        /* RW; Range: [0, 1]; IIR enable. */
-    HI_U8           u8IIRShift;                 /* RW; Range: [0, 63]; IIR Shift. Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_S16          as16IIRGain[IIR_GAIN_NUM];  /* RW; Range: [-511, 511]. IIR gain,gain0 range:[0,255]. */
-    HI_U16          au16IIRShift[IIR_SHIFT_NUM]; /* RW; Range: [0x0, 0x7];  IIR shift. */
-    ISP_AF_LD_S     stLd;                       /* RW; filter level depend. */
-    ISP_AF_CORING_S stCoring;                   /* RW; filter coring. */
-} ISP_AF_H_PARAM_S;
-
-#define FIR_GAIN_NUM                              (5)
-
-/* Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_AF_V_PARAM_S {
-    HI_S16          as16FIRH[FIR_GAIN_NUM]; /* RW; Range: [-31, 31];   FIR gain. */
-    ISP_AF_LD_S     stLd;                   /* RW; filter level depend. */
-    ISP_AF_CORING_S stCoring;               /* RW; filter coring.  */
-} ISP_AF_V_PARAM_S;
-
-#define ACC_SHIFT_H_NUM                           (2)
-#define ACC_SHIFT_V_NUM                           (2)
-
-/* Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_AF_FV_PARAM_S {
-    HI_U16 u16AccShiftY;                    /* RW; Range: [0x0, 0xF]; luminance Y statistic shift. */
-    HI_U16 au16AccShiftH[ACC_SHIFT_H_NUM];  /* RW; Range: [0x0, 0xF]; IIR statistic shift. */
-    HI_U16 au16AccShiftV[ACC_SHIFT_V_NUM];  /* RW; Range: [0x0, 0xF]; FIR statistic shift. */
-    HI_U16 u16HlCntShift;                   /* RW; Range: [0x0, 0xF]; High luminance counter shift */
-} ISP_AF_FV_PARAM_S;
-
-/* Not support for Hi3559V200/Hi3556V200 */
-typedef struct hiISP_FOCUS_STATISTICS_CFG_S {
-    ISP_AF_CFG_S        stConfig;
-    ISP_AF_H_PARAM_S    stHParam_IIR0;
-    ISP_AF_H_PARAM_S    stHParam_IIR1;
-    ISP_AF_V_PARAM_S    stVParam_FIR0;
-    ISP_AF_V_PARAM_S    stVParam_FIR1;
-    ISP_AF_FV_PARAM_S   stFVParam;
-} ISP_FOCUS_STATISTICS_CFG_S;
-
-/*
-   the main purpose of stat key was to access individual statistic info separately...
-   ...for achieving performance optimization of CPU, because of we acquire stat...
-   ... in ISP_DRV ISR for our firmware reference and USER can also use alternative MPI...
-   ... to do this job, so bit1AeStat1~bit1AfStat for MPI behavior control, and bit16IsrAccess...
-   ... for ISR access control, they were independent. but they have the same bit order, for example...
-   ... bit1AeStat1 for MPI AeStat1 access key, and bit16 of u32Key for ISR AeStat1 access key
-*/
-typedef union hiISP_STATISTICS_CTRL_U {
-    HI_U64  u64Key;
-    struct {
-        HI_U64  bit1FEAeGloStat     : 1 ;   /* [0] */
-        HI_U64  bit1FEAeLocStat     : 1 ;   /* [1] */
-        HI_U64  bit1FEAeStiGloStat  : 1 ;   /* [2] .Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bit1FEAeStiLocStat  : 1 ;   /* [3] .Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bit1BEAeGloStat     : 1 ;   /* [4] */
-        HI_U64  bit1BEAeLocStat     : 1 ;   /* [5] */
-        HI_U64  bit1BEAeStiGloStat  : 1 ;   /* [6] .Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bit1BEAeStiLocStat  : 1 ;   /* [7] .Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bit1AwbStat1        : 1 ;   /* [8] */
-        HI_U64  bit1AwbStat2        : 1 ;   /* [9] */
-        HI_U64  bit2Rsv0            : 2 ;   /* [10:11] */
-        HI_U64  bit1FEAfStat        : 1 ;   /* [12] .Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-        HI_U64  bit1BEAfStat        : 1 ;   /* [13] .Not support for Hi3559V200/Hi3556V200 */
-        HI_U64  bit2Rsv1            : 2 ;   /* [14:15] */
-        HI_U64  bit1Dehaze          : 1 ;   /* [16] */
-        HI_U64  bit1MgStat          : 1 ;   /* [17] */
-        HI_U64  bit14Rsv            : 14;   /* [18:31] */
-        HI_U64  bit32IsrAccess      : 32;   /* [32:63] */
-    };
-} ISP_STATISTICS_CTRL_U;
-
-
-/* statistics structs */
-#define HIST_NUM                                  (1024)
-#define BAYER_PATTERN_NUM                         (4)
-#define WDR_CHN_MAX                               (4)
-#define ISP_CHN_MAX_NUM                           (4)
-
-typedef struct hiISP_AE_GRID_INFO_S {
-    HI_U16 au16GridYPos[AE_ZONE_ROW + 1];   /* R */
-    HI_U16 au16GridXPos[AE_ZONE_COLUMN + 1]; /* R */
-    HI_U8  u8Status;                        /* R;0:not update, 1: update,others:reserved */
-} ISP_AE_GRID_INFO_S;
-
-typedef struct hiISP_MG_GRID_INFO_S {
-    HI_U16 au16GridYPos[MG_ZONE_ROW + 1];    /* R */
-    HI_U16 au16GridXPos[MG_ZONE_COLUMN + 1]; /* R */
-    HI_U8  u8Status;                         /* R;0:not update, 1: update,others:reserved */
-} ISP_MG_GRID_INFO_S;
-
-typedef struct hiISP_AWB_GRID_INFO_S {
-    HI_U16 au16GridYPos[AWB_ZONE_ORIG_ROW  + 1];   /* R */
-    HI_U16 au16GridXPos[AWB_ZONE_ORIG_COLUMN + 1]; /* R */
-    HI_U8  u8Status;                               /* R;0:not update, 1: update,others:reserved */
-} ISP_AWB_GRID_INFO_S;
-
-typedef struct hiISP_FOCUS_GRID_INFO_S {
-    HI_U16 au16GridYPos[AF_ZONE_ROW + 1];    /* R */
-    HI_U16 au16GridXPos[AF_ZONE_COLUMN + 1]; /* R */
-    HI_U8  u8Status;                         /* R;0:not update, 1: update,others:reserved */
-} ISP_FOCUS_GRID_INFO_S;
-
-
-typedef struct hiISP_AE_STATISTICS_S {
-    HI_U32 au32FEHist1024Value[ISP_CHN_MAX_NUM][HIST_NUM];                                 /* R; Range: [0x0, 0xFFFFFFFF]; Format:32.0; Global 1024 bins histogram of FE */
-    HI_U16 au16FEGlobalAvg[ISP_CHN_MAX_NUM][BAYER_PATTERN_NUM];                            /* R; Range: [0x0, 0xFFFF]; Format:16.0; Global average value of FE,Not support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16 au16FEZoneAvg[ISP_CHN_MAX_NUM][AE_ZONE_ROW][AE_ZONE_COLUMN][BAYER_PATTERN_NUM]; /* R; Range: [0x0, 0xFFFF]; Format:16.0; Zone average value of FE, Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200's Fe1 and Fe3,
-                                                                                                                                                           Not support Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U32 au32BEHist1024Value[HIST_NUM];                                                  /* R; Range: [0x0, 0xFFFFFFFF]; Format:32.0; Global 1024 bins histogram of BE */
-    HI_U16 au16BEGlobalAvg[BAYER_PATTERN_NUM];                                             /* R; Range: [0x0, 0xFFFF]; Format:16.0; Global average value of BE */
-    HI_U16 au16BEZoneAvg[AE_ZONE_ROW][AE_ZONE_COLUMN][BAYER_PATTERN_NUM];                  /* R; Range: [0x0, 0xFFFF]; Format:16.0; Zone average value of BE */
-    ISP_AE_GRID_INFO_S stFEGridInfo;
-    ISP_AE_GRID_INFO_S stBEGridInfo;
-} ISP_AE_STATISTICS_S;
-
-/* Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200 */
-typedef struct hiISP_AE_STITCH_STATISTICS_S {
-    HI_U32 au32FEHist1024Value[ISP_CHN_MAX_NUM][HIST_NUM];                                                  /* R; Range: [0x0, 0xFFFFFFFF]; Format:32.0; Global 1024 bins histogram of FE.Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16 au16FEGlobalAvg[ISP_CHN_MAX_NUM][BAYER_PATTERN_NUM];                                             /* R; Range: [0x0, 0xFFFF]; Format:16.0; Global average value of FE.Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16 au16FEZoneAvg[VI_MAX_PIPE_NUM][ISP_CHN_MAX_NUM][AE_ZONE_ROW][AE_ZONE_COLUMN][BAYER_PATTERN_NUM]; /* R; Range: [0x0, 0xFFFF]; Format:16.0; Zone average value of FE.Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U32 au32BEHist1024Value[HIST_NUM];                                                                   /* R; Range: [0x0, 0xFFFFFFFF]; Format:32.0; Global 1024 bins histogram of BE.Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16 au16BEGlobalAvg[BAYER_PATTERN_NUM];                                                              /* R; Range: [0x0, 0xFFFF]; Format:16.0; Global average value of BE.Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    HI_U16 au16BEZoneAvg[VI_MAX_PIPE_NUM][AE_ZONE_ROW][AE_ZONE_COLUMN][BAYER_PATTERN_NUM];                  /* R; Range: [0x0, 0xFFFF]; Format:16.0; Zone average value of BE.Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-} ISP_AE_STITCH_STATISTICS_S;
-
-typedef struct hiISP_MG_STATISTICS_S {
-    HI_U16 au16ZoneAvg[MG_ZONE_ROW][MG_ZONE_COLUMN][BAYER_PATTERN_NUM];         /* R; Range: [0x0, 0xFF]; Format:8.0; Zone average value */
-    ISP_MG_GRID_INFO_S stGridInfo;
-} ISP_MG_STATISTICS_S;
-
-
-/************ AWB*************/
-
-typedef enum hiISP_AWB_SWITCH_E {
-    ISP_AWB_AFTER_DG                   = 0,
-    ISP_AWB_AFTER_Expander,
-    ISP_AWB_AFTER_DRC,
-    ISP_AWB_SWITCH_BUTT
-} ISP_AWB_SWITCH_E;
-
-/* Crops the input image of the AWB module */
-typedef struct hiISP_AWB_CROP_S {
-    HI_BOOL bEnable;  /* RW; Range: [0,1];  Format:1.0;AWB crop enable */
-    HI_U16  u16X;     /* RW; Range: Hi3559AV100 = [0, 8192 - 60]|Hi3519AV100 = [0, 8192 - 60]|Hi3516CV500 = [0, 4608 - 60]|Hi3516DV300 = [0, 4608 - 60]|
-                                         Hi3516AV300 = [0, 4608 - 60]|Hi3559V200   = [0, 4608 - 60]|Hi3556V200   = [0, 4608 - 60]|
-                                         Hi3516EV200 = [0,3072- 60]|Hi3516EV300 = [0,3072- 60]|Hi3518EV300 = [0,3072- 60]|Hi3516DV200 = [0,3072- 60];
-                                         Format:13.0;AWB image crop start x, limited range:[0, ImageWidth - u16ZoneCol * 60] */
-    HI_U16  u16Y;     /* RW; Range: Hi3559AV100 = [0, 8192 - 14]|Hi3519AV100 = [0, 8192 - 14]|Hi3516CV500 = [0, 4608 - 14]|Hi3516DV300 = [0, 4608 - 14]|
-                                         Hi3516AV300 = [0, 4608 - 14]|Hi3559V200   = [0, 4608 - 14]|Hi3556V200   = [0, 4608 - 14]|
-                                         Hi3516EV200 = [0,3072-14]|Hi3516EV300 = [0,3072-14]|Hi3518EV300 = [0,3072-14]|Hi3516DV200 = [0,3072-14];
-                                         Format:13.0;AWB image crop start y,limited range:[0, ImageHeight - u16ZoneRow * 14] */
-    HI_U16  u16W;     /* RW; Range: Hi3559AV100 = [60, 8192]|Hi3519AV100 = [60, 8192]|Hi3516CV500 = [60, 4608]|Hi3516DV300 = [60, 4608] |
-                                         Hi3516AV300 = [60, 4608] |Hi3559V200   = [60, 4608]| Hi3556V200  = [60, 4608]|
-                                         Hi3516EV200 = [60,3072]|Hi3516EV300 = [60,3072]|Hi3518EV300 = [60,3072]|Hi3516DV200 = [60,3072];
-                                         Format:14.0;AWB image crop width, limited range:[u16ZoneCol * 60, ImageWidth] */
-    HI_U16  u16H;     /* RW; Range: Hi3559AV100 = [14, 8192]|Hi3519AV100 = [14, 8192]|Hi3516CV500 = [14, 4608]|Hi3516DV300 = [14, 4608] |
-                                         Hi3516AV300 = [14, 4608] |Hi3559V200 = [14, 4608]| Hi3556V200 = [14, 4608] |
-                                         Hi3516EV200 = [14,3072]|Hi3516EV300 = [14,3072]|Hi3518EV300 = [14,3072]|Hi3516DV200 = [14,3072];
-                                         Format:14.0;AWB image crop height, limited range:[u16ZoneRow * 14, ImageHeight] */
-} ISP_AWB_CROP_S;
-
-/* Defines the AWB statistics configuration */
-typedef struct hiISP_WB_STATISTICS_CFG_S {
-    ISP_AWB_SWITCH_E enAWBSwitch; /* RW; Range: [0x0, 0x2]; Position of AWB statistics in pipeline */
-    HI_U16 u16ZoneRow;            /* RW; Range: [0x1, 0x20]; Vertical Blocks, limited range:[1, min(32, ImageHeight /AWB_MIN_HEIGHT)] */
-    HI_U16 u16ZoneCol;            /* RW; Range: [0x1, 0x20]; Horizontal Blocks, limited range:[BlkNum, min(32, Width /AWB_MIN_WIDTH)] */
-    HI_U16 u16ZoneBin;            /* RW; Range:Hi3559AV100 = [1, 4] | Hi3519AV100 = [1, 4] | Hi3516CV500 = [1, 1]|Hi3516DV300 = [1, 1]|
-                                                         Hi3516AV300 = [1, 1]|Hi3559V200 = [1, 1]|Hi3556V200 = [1, 1]|
-                                                         Hi3516EV200 = [1,1]|Hi3516EV300 = [1,1]|Hi3518EV300 = [1,1]|Hi3516DV200 = [1,1]; Brightness Bins */
-    HI_U16 au16HistBinThresh[4]; /* RW; Range: [0x0, 0xFFFF]; Bin Threshold */
-    HI_U16 u16WhiteLevel;        /* RW; Range: [0x0, 0xFFFF];Upper limit of valid data for white region,  for Bayer statistics, [0x0, 0x3FF] for RGB statistics */
-    HI_U16 u16BlackLevel;        /* RW; Range: [0x0, 0xFFFF];limited range: [0x0, u16WhiteLevel],Lower limit of valid data for white region . for Bayer statistics, bitwidth is 12, for RGB statistics, bitwidth is 10 */
-    HI_U16 u16CbMax;             /* RW; Range: [0x0, 0xFFF];Maximum value of B/G for white region */
-    HI_U16 u16CbMin;             /* RW; Range: [0x0, 0xFFF];limited range: [0x0, u16CbMax]Minimum value of B/G for white region */
-    HI_U16 u16CrMax;             /* RW; Range: [0x0, 0xFFF];Maximum value of R/G for white region */
-    HI_U16 u16CrMin;             /* RW; Range: [0x0, 0xFFF];limited range: [0x0, u16CrMax],Minimum value of R/G for white region */
-    ISP_AWB_CROP_S stCrop;
-} ISP_WB_STATISTICS_CFG_S;
-
-typedef struct hiISP_WB_STITCH_STATISTICS_S {
-    HI_U16  u16ZoneRow;                                 /* R; Range: [0x0, 0x20]; effective horizontal block number for AWB statistic stitch window */
-    HI_U16  u16ZoneCol;                                 /* R; Range: [0x0, 0x80]; effective vetical block number for AWB statistic stitch window */
-    HI_U16  au16ZoneAvgR[AWB_ZONE_STITCH_MAX];          /* R; Range: [0x0, 0xFFFF];Zone Average R  for Stitich mode */
-    HI_U16  au16ZoneAvgG[AWB_ZONE_STITCH_MAX];          /* R; Range: [0x0, 0xFFFF];Zone Average G  for Stitich mode */
-    HI_U16  au16ZoneAvgB[AWB_ZONE_STITCH_MAX];          /* R; Range: [0x0, 0xFFFF];Zone Average B  for Stitich mode */
-    HI_U16  au16ZoneCountAll[AWB_ZONE_STITCH_MAX];      /* R; Range: [0x0, 0xFFFF];normalized number of Gray points  for Stitich mode */
-} ISP_WB_STITCH_STATISTICS_S;
-
-typedef struct hiISP_WB_STATISTICS_S {
-    HI_U16 u16GlobalR;          /* R; Range: [0x0, 0xFFFF];Global WB output Average R */
-    HI_U16 u16GlobalG;          /* R; Range: [0x0, 0xFFFF];Global WB output Average G */
-    HI_U16 u16GlobalB;          /* R; Range: [0x0, 0xFFFF];Global WB output Average B */
-    HI_U16 u16CountAll;         /* R; Range: [0x0, 0xFFFF];normalized number of Gray points */
-
-    HI_U16 au16ZoneAvgR[AWB_ZONE_NUM];            /* R; Range: [0x0, 0xFFFF];Zone Average R */
-    HI_U16 au16ZoneAvgG[AWB_ZONE_NUM];            /* R; Range: [0x0, 0xFFFF];Zone Average G */
-    HI_U16 au16ZoneAvgB[AWB_ZONE_NUM];            /* R; Range: [0x0, 0xFFFF];Zone Average B */
-    HI_U16 au16ZoneCountAll[AWB_ZONE_NUM];        /* R; Range: [0x0, 0xFFFF];normalized number of Gray points */
-    ISP_AWB_GRID_INFO_S stGridInfo;
-} ISP_WB_STATISTICS_S;
-
-typedef struct hiISP_FOCUS_ZONE_S {
-    HI_U16  u16v1;             /* R; Range: [0x0, 0xFFFF];vertical fir block1 Statistics */
-    HI_U16  u16h1;             /* R; Range: [0x0, 0xFFFF];horizontal iir block1 Statistics */
-    HI_U16  u16v2;             /* R; Range: [0x0, 0xFFFF];vertical fir block2 Statistics */
-    HI_U16  u16h2;             /* R; Range: [0x0, 0xFFFF];horizontal iir block2 Statistics */
-    HI_U16  u16y;              /* R; Range: [0x0, 0xFFFF];Y Statistics */
-    HI_U16  u16HlCnt;          /* R; Range: [0x0, 0xFFFF];HlCnt Statistics */
-} ISP_FOCUS_ZONE_S;
-
-typedef struct hiISP_FE_FOCUS_STATISTICS_S {
-    ISP_FOCUS_ZONE_S stZoneMetrics[WDR_CHN_MAX][AF_ZONE_ROW][AF_ZONE_COLUMN]; /* R; The zoned measure of contrast */
-} ISP_FE_FOCUS_STATISTICS_S;
-
-typedef struct hiISP_BE_FOCUS_STATISTICS_S {
-    ISP_FOCUS_ZONE_S stZoneMetrics[AF_ZONE_ROW][AF_ZONE_COLUMN]; /* R; The zoned measure of contrast */
-} ISP_BE_FOCUS_STATISTICS_S;
-
-typedef struct hiISP_AF_STATISTICS_S {
-    ISP_FE_FOCUS_STATISTICS_S      stFEAFStat; /* Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    ISP_BE_FOCUS_STATISTICS_S      stBEAFStat; /* Not support for Hi3559V200/Hi3556V200 */
-    ISP_FOCUS_GRID_INFO_S          stFEAFGridInfo; /* Not support for Hi3516CV500/Hi3516DV300/Hi3516AV300/Hi3559V200/Hi3556V200/Hi3516EV200/Hi3516EV300/Hi3518EV300/Hi3516DV200 */
-    ISP_FOCUS_GRID_INFO_S          stBEAFGridInfo; /* Not support for Hi3559V200/Hi3556V200 */
-} ISP_AF_STATISTICS_S;
-
-
-typedef struct hiISP_STATISTICS_CFG_S {
-    ISP_STATISTICS_CTRL_U       unKey;
-    ISP_AE_STATISTICS_CFG_S     stAECfg;
-    ISP_WB_STATISTICS_CFG_S     stWBCfg;
-    ISP_FOCUS_STATISTICS_CFG_S  stFocusCfg; /* Not support for Hi3559V200/Hi3556V200 */
-} ISP_STATISTICS_CFG_S;
-
-typedef struct hiISP_INIT_ATTR_S {
-    HI_BOOL bIsIrMode;
-    HI_U32 u32ExpTime;
-    HI_U32 u32AGain;
-    HI_U32 u32DGain;
-    HI_U32 u32ISPDGain;
-    HI_U32 u32Exposure;
-    HI_U32 u32InitIso;
-    HI_U32 u32LinesPer500ms;
-    HI_U32 u32PirisFNO;
-    HI_U16 u16WBRgain;
-    HI_U16 u16WBGgain;
-    HI_U16 u16WBBgain;
-    HI_U16 u16SampleRgain;
-    HI_U16 u16SampleBgain;
-    HI_U16 au16CCM[CCM_MATRIX_SIZE];
-} ISP_INIT_ATTR_S ;
-
-/* ISP debug information */
-typedef struct hiISP_DEBUG_INFO_S {
-    HI_BOOL bDebugEn;       /* RW; 1:enable debug, 0:disable debug */
-    HI_U64  u64PhyAddr;     /* RW; phy address of debug info */
-    HI_U32  u32Depth;       /* RW; depth of debug info */
-} ISP_DEBUG_INFO_S;
-
-typedef struct hiISP_DBG_ATTR_S {
-    HI_U32  u32Rsv;         /* H;need to add member */
-} ISP_DBG_ATTR_S;
-
-typedef struct hiISP_DBG_STATUS_S {
-    HI_U32  u32FrmNumBgn;
-    HI_U32  u32Rsv;         /* H;need to add member */
-    HI_U32  u32FrmNumEnd;
-} ISP_DBG_STATUS_S;
-
-/*
-0 = Communication between the sensor and the ISP over the I2C interface
-1 = Communication between the sensor and the ISP over the SSP interface
-*/
-typedef enum hiISP_SNS_TYPE_E {
-    ISP_SNS_I2C_TYPE = 0,
-    ISP_SNS_SSP_TYPE,
-
-    ISP_SNS_TYPE_BUTT,
-} ISP_SNS_TYPE_E;
-
-/* sensor communication bus */
-typedef union hiISP_SNS_COMMBUS_U {
-    HI_S8   s8I2cDev;
-    struct {
-        HI_S8  bit4SspDev       : 4;
-        HI_S8  bit4SspCs        : 4;
-    } s8SspDev;
-} ISP_SNS_COMMBUS_U;
-
-typedef struct hiISP_I2C_DATA_S {
-    HI_BOOL bUpdate;            /* RW; Range: [0x0, 0x1]; Format:1.0; HI_TRUE: The sensor registers are written,HI_FALSE: The sensor registers are not written */
-    HI_U8   u8DelayFrmNum;      /* RW; Number of delayed frames for the sensor register */
-    HI_U8   u8IntPos;           /* RW;Position where the configuration of the sensor register takes effect
-                                 0x0:very short frame start interrupt, 0x1:very short frame end interrupt,
-                                 0x10:short frame start interrupt, 0x11:short frame end interrupt,
-                                 0x20:middle frame start interrupt, 0x21:middle frame end interrupt,
-                                 0x30:long frame start interrupt, 0x31:long frame end interrupt */
-
-    HI_U8   u8DevAddr;          /* RW;Sensor device address */
-    HI_U32  u32RegAddr;         /* RW;Sensor register address */
-    HI_U32  u32AddrByteNum;     /* RW;Bit width of the sensor register address */
-    HI_U32  u32Data;            /* RW;Sensor register data */
-    HI_U32  u32DataByteNum;     /* RW;Bit width of sensor register data */
-} ISP_I2C_DATA_S;
-
-typedef struct hiISP_SSP_DATA_S {
-    HI_BOOL bUpdate;            /* RW; Range: [0x0, 0x1]; Format:1.0; HI_TRUE: The sensor registers are written,HI_FALSE: The sensor registers are not written */
-    HI_U8   u8DelayFrmNum;      /* RW; Number of delayed frames for the sensor register */
-    HI_U8   u8IntPos;           /* RW;Position where the configuration of the sensor register takes effect
-                                 0x0:very short frame start interrupt, 0x1:very short frame end interrupt,
-                                 0x10:short frame start interrupt, 0x11:short frame end interrupt,
-                                 0x20:middle frame start interrupt, 0x21:middle frame end interrupt,
-                                 0x30:long frame start interrupt, 0x31:long frame end interrupt */
-    HI_U32  u32DevAddr;         /* RW;Sensor device address */
-    HI_U32  u32DevAddrByteNum;  /* RW;Bit width of the sensor device address */
-    HI_U32  u32RegAddr;         /* RW;Sensor register address */
-    HI_U32  u32RegAddrByteNum;  /* RW;Bit width of the sensor register address */
-    HI_U32  u32Data;            /* RW;Sensor register data */
-    HI_U32  u32DataByteNum;     /* RW;Bit width of sensor register data */
-} ISP_SSP_DATA_S;
-
-typedef struct hiISP_SNS_REGS_INFO_S {
-    ISP_SNS_TYPE_E enSnsType;
-    HI_U32  u32RegNum;              /* RW;Number of registers required when exposure results are written to the sensor. The member value cannot be dynamically changed */
-    HI_U8   u8Cfg2ValidDelayMax;    /* RW;Maximum number of delayed frames from the time when all sensor registers are configured to the
-                                      time when configurations take effect, which is used to ensure the synchronization between sensor registers and ISP registers */
-    ISP_SNS_COMMBUS_U  unComBus;
-    union {
-        ISP_I2C_DATA_S astI2cData[ISP_MAX_SNS_REGS];
-        ISP_SSP_DATA_S astSspData[ISP_MAX_SNS_REGS];
-    };
-
-    struct {
-        HI_BOOL bUpdate;
-        HI_U8   u8DelayFrmNum;
-        HI_U32  u32SlaveVsTime;      /* RW;time of vsync. Unit: inck clock cycle */
-        HI_U32  u32SlaveBindDev;
-    } stSlvSync;
-
-    HI_BOOL bConfig;
-} ISP_SNS_REGS_INFO_S;
-
-typedef enum hiISP_VD_TYPE_E {
-    ISP_VD_FE_START   = 0,
-    ISP_VD_FE_END,
-    ISP_VD_BE_END,
-
-    ISP_VD_BUTT
-} ISP_VD_TYPE_E;
-
-/* Defines the attributes of the virtual addresses for the registers of ISP submodules */
-typedef struct hiISP_REG_ATTR_S {
-    HI_VOID *pIspExtRegAddr;        /* R;Start virtual address for the ISP external virtual registers */
-    HI_U32 u32IspExtRegSize;        /* R;Size of the ISP external virtual registers */
-    HI_VOID *pAeExtRegAddr;         /* R;Start virtual address for the AE library module */
-    HI_U32 u32AeExtRegSize;         /* R;Size of the AE library module */
-    HI_VOID *pAwbExtRegAddr;        /* R;Start virtual address for the AWB library module */
-    HI_U32 u32AwbExtRegSize;        /* R;Size of the AWB library module */
-} ISP_REG_ATTR_S;
-
-
-/******************************************************/
-/********************* AI structs ************************/
-/*
-Defines the ISP iris type
-0 = DC iris
-1 = P iris
-*/
-typedef enum hiISP_IRIS_TYPE_E {
-    ISP_IRIS_DC_TYPE = 0,
-    ISP_IRIS_P_TYPE,
-
-    ISP_IRIS_TYPE_BUTT,
-} ISP_IRIS_TYPE_E;
-
-/*
-Defines the F value of the ISP iris
-*/
-typedef enum hiISP_IRIS_F_NO_E {
-    ISP_IRIS_F_NO_32_0 = 0,
-    ISP_IRIS_F_NO_22_0,
-    ISP_IRIS_F_NO_16_0,
-    ISP_IRIS_F_NO_11_0,
-    ISP_IRIS_F_NO_8_0,
-    ISP_IRIS_F_NO_5_6,
-    ISP_IRIS_F_NO_4_0,
-    ISP_IRIS_F_NO_2_8,
-    ISP_IRIS_F_NO_2_0,
-    ISP_IRIS_F_NO_1_4,
-    ISP_IRIS_F_NO_1_0,
-
-    ISP_IRIS_F_NO_BUTT,
-} ISP_IRIS_F_NO_E;
-
-typedef struct hiISP_DCIRIS_ATTR_S {
-    HI_S32 s32Kp;                    /* RW; Range:[0, 100000]; Format:32.0; the proportional gain of PID algorithm, default value is 7000 */
-    HI_S32 s32Ki;                    /* RW; Range:[0, 1000]; Format:32.0; the integral gain of PID algorithm, default value is 100 */
-    HI_S32 s32Kd;                    /* RW; Range:[0, 100000]; Format:32.0; the derivative gain of PID algorithm, default value is 3000 */
-    HI_U32 u32MinPwmDuty;            /* RW; Range:[0, 1000]; Format:32.0; which is the min pwm duty for dciris control */
-    HI_U32 u32MaxPwmDuty;            /* RW; Range:[0, 1000]; Format:32.0; which is the max pwm duty for dciris control */
-    HI_U32 u32OpenPwmDuty;           /* RW; Range:[0, 1000]; Format:32.0; which is the open pwm duty for dciris control */
-} ISP_DCIRIS_ATTR_S;
-
-typedef struct hiISP_PIRIS_ATTR_S {
-    HI_BOOL bStepFNOTableChange;    /* W; Range:[0, 1]; Format:1.0; Step-F number mapping table change or not */
-    HI_BOOL bZeroIsMax;             /* RW; Range:[0, 1]; Format:1.0; Step 0 corresponds to max aperture or not, it's related to the specific iris */
-    HI_U16 u16TotalStep;            /* RW; Range:[1, 1024]; Format:16.0; Total steps of  Piris's aperture, it's related to the specific iris */
-    HI_U16 u16StepCount;            /* RW; Range:[1, 1024]; Format:16.0; Used steps of Piris's aperture. when Piris's aperture is too small, the F number precision is not enough,
-                                          so not all the steps can be used. It's related to the specific iris */
-    HI_U16 au16StepFNOTable[AI_MAX_STEP_FNO_NUM];   /* RW; Range:[1, 1024]; Format:16.0; Step-F number mapping table. F1.0 is expressed as 1024, F32 is expressed as 1, it's related to the specific iris */
-    ISP_IRIS_F_NO_E  enMaxIrisFNOTarget;  /* RW; Range:[0, 10]; Format:4.0; Max F number of Piris's aperture, it's related to the specific iris */
-    ISP_IRIS_F_NO_E  enMinIrisFNOTarget;  /* RW; Range:[0, 10]; Format:4.0; Min F number of Piris's aperture, it's related to the specific iris */
-
-    HI_BOOL bFNOExValid;            /* RW; Range:[0, 1]; Format:1.0; use equivalent gain to present FNO or not */
-    HI_U32 u32MaxIrisFNOTarget;    /* RW; Range:[1, 1024]; Format:16.0; Max equivalent gain of F number of Piris's aperture, only used when bFNOExValid is true, it's related to the specific iris */
-    HI_U32 u32MinIrisFNOTarget;    /* RW; Range:[1, 1024]; Format:16.0; Min equivalent gain of F number of Piris's aperture, only used when bFNOExValid is true, it's related to the specific iris */
-} ISP_PIRIS_ATTR_S;
-
-/* Defines the MI attribute */
-typedef struct hiISP_MI_ATTR_S {
-    HI_U32  u32HoldValue;            /* RW; Range:[0, 1000]; Format:32.0; iris hold value for DC-iris */
-    ISP_IRIS_F_NO_E  enIrisFNO;      /* RW; Range:[0, 10]; Format:4.0; the F number of P-iris */
-} ISP_MI_ATTR_S;
-
-/*
-Defines the ISP iris status
-0 = In this mode can set the MI holdvalue
-1 = Open Iris to the max
-2 = Close Iris to the min
-*/
-typedef enum hiISP_IRIS_STATUS_E {
-    ISP_IRIS_KEEP  = 0,
-    ISP_IRIS_OPEN  = 1,
-    ISP_IRIS_CLOSE = 2,
-    ISP_IRIS_BUTT
-} ISP_IRIS_STATUS_E;
-
-/* Defines the iris attribute */
-typedef struct hiISP_IRIS_ATTR_S {
-    HI_BOOL bEnable;                 /* RW;iris enable/disable */
-    ISP_OP_TYPE_E   enOpType;        /* auto iris or manual iris */
-    ISP_IRIS_TYPE_E enIrisType;      /* DC-iris or P-iris */
-    ISP_IRIS_STATUS_E enIrisStatus;  /* RW; status of Iris */
-    ISP_MI_ATTR_S   stMIAttr;
-} ISP_IRIS_ATTR_S;
-
-
-/******************************************************/
-/********************* AE structs ************************/
-/*
-Defines the AE mode
-0 = Automatic frame rate reduction mode (slow shutter mode)
-1 = Constant frame rate mode
-*/
-typedef enum hiISP_AE_MODE_E {
-    AE_MODE_SLOW_SHUTTER = 0,
-    AE_MODE_FIX_FRAME_RATE  = 1,
-    AE_MODE_BUTT
-} ISP_AE_MODE_E;
-/*
-Defines the AE exposure policy mode
-0 = Highlight first exposure mode
-1 = Lowlight first exposure mode
-*/
-typedef enum hiISP_AE_STRATEGY_E {
-    AE_EXP_HIGHLIGHT_PRIOR = 0,
-    AE_EXP_LOWLIGHT_PRIOR  = 1,
-    AE_STRATEGY_MODE_BUTT
-} ISP_AE_STRATEGY_E;
-/* Defines the maximum exposure time or gain and minimum exposure time or gain */
-typedef struct hiISP_AE_RANGE_S {
-    HI_U32 u32Max;  /* RW;Range:[0,0xFFFFFFFF];Format:32.0;Maximum value */
-    HI_U32 u32Min;  /* RW;Range:[0,0xFFFFFFFF];Format:32.0;limited Range:[0,u32Max],Minimum value */
-} ISP_AE_RANGE_S;
-
-/* Defines the ISP exposure delay attribute */
-typedef struct hiISP_AE_DELAY_S {
-    HI_U16 u16BlackDelayFrame;    /* RW; Range:[0, 65535]; Format:16.0; AE black delay frame count */
-    HI_U16 u16WhiteDelayFrame;    /* RW; Range:[0, 65535]; Format:16.0; AE white delay frame count */
-} ISP_AE_DELAY_S;
-
-/*
-Defines the anti-flicker mode.
-0 = The epxosure time is fixed to be the multiplies of 1/(2*frequency) sec,it may lead to over exposure in the high-luminance environments.
-1 = The anti flicker may be closed to avoid over exposure in the high-luminance environments.
-*/
-typedef enum hiISP_ANTIFLICKER_MODE_E {
-    ISP_ANTIFLICKER_NORMAL_MODE = 0x0,
-    ISP_ANTIFLICKER_AUTO_MODE   = 0x1,
-    ISP_ANTIFLICKER_MODE_BUTT
-} ISP_ANTIFLICKER_MODE_E;
-
-/* Defines the anti-flicker attribute */
-typedef struct hiISP_ANTIFLICKER_S {
-    HI_BOOL bEnable;              /* RW; Range:[0, 1]; Format:1.0; */
-    HI_U8   u8Frequency;          /* RW; Range:[0, 255]; Format:8.0; usually this value is 50 or 60  which is the frequency of the AC power supply */
-    ISP_ANTIFLICKER_MODE_E  enMode;
-} ISP_ANTIFLICKER_S;
-
-typedef struct hiISP_SUBFLICKER_S {
-    HI_BOOL bEnable; /* RW; Range:[0, 1]; Format:1.0; */
-
-    HI_U8   u8LumaDiff;     /* RW; Range:[0, 100]; Format:8.0; if subflicker mode enable, current luma is less than AE compensation plus LumaDiff,
-                                AE will keep min antiflicker shutter time(for example: 1/100s or 1/120s) to avoid flicker. while current luma is
-                                larger than AE compensation plus the LumaDiff, AE will reduce shutter time to avoid over-exposure and introduce
-                                flicker in the pircture */
-} ISP_SUBFLICKER_S;
-
-/*
-Defines the ISP FSWDR operating mode
-0 = Normal FSWDR mode
-1 = Long frame mode, only effective in LINE_WDR, when running in this mode FSWDR module only output the long frame data
-*/
-typedef enum hiISP_FSWDR_MODE_E {
-    ISP_FSWDR_NORMAL_MODE          = 0x0,
-    ISP_FSWDR_LONG_FRAME_MODE      = 0x1,
-    ISP_FSWDR_AUTO_LONG_FRAME_MODE = 0x2, /* Auto long frame mode, only effective in LINE_WDR, When running in this mode, normal WDR and long frame mode would auto switch */
-    ISP_FSWDR_MODE_BUTT
-} ISP_FSWDR_MODE_E;
-
-
-typedef struct hiISP_AE_ATTR_S {
-    /* base parameter */
-    ISP_AE_RANGE_S stExpTimeRange;   /* RW; Range:[0x0, 0xFFFFFFFF]; Format:32.0; sensor exposure time (unit: us ), it's related to the specific sensor */
-    ISP_AE_RANGE_S stAGainRange;     /* RW; Range:[0x400, 0xFFFFFFFF]; Format:22.10; sensor analog gain (unit: times, 10bit precision), it's related to the specific sensor */
-    ISP_AE_RANGE_S stDGainRange;     /* RW; Range:[0x400, 0xFFFFFFFF]; Format:22.10;  sensor digital gain (unit: times, 10bit precision), it's related to the specific sensor */
-    ISP_AE_RANGE_S stISPDGainRange;  /* RW; Range:[0x400, 0x40000]; Format:22.10;  ISP digital gain (unit: times, 10bit precision), it's related to the ISP digital gain range */
-    ISP_AE_RANGE_S stSysGainRange;   /* RW; Range:[0x400, 0xFFFFFFFF]; Format:22.10;  system gain (unit: times, 10bit precision), it's related to the specific sensor and ISP Dgain range */
-    HI_U32 u32GainThreshold;         /* RW; Range:[0x400, 0xFFFFFFFF]; Format:22.10;  Gain threshold for slow shutter mode (unit: times, 10bit precision) */
-
-    HI_U8  u8Speed;                  /* RW; Range:[0x0, 0xFF]; Format:8.0; AE adjust step for dark scene to bright scene switch */
-    HI_U16  u16BlackSpeedBias;       /* RW; Range:[0x0, 0xFFFF]; Format:16.0; AE adjust step bias for bright scene to dark scene switch */
-    HI_U8  u8Tolerance;              /* RW; Range:[0x0, 0xFF]; Format:8.0; AE adjust tolerance */
-    HI_U8  u8Compensation;           /* RW; Range:[0x0, 0xFF]; Format:8.0; AE compensation */
-    HI_U16  u16EVBias;               /* RW; Range:[0x0, 0xFFFF]; Format:16.0; AE EV bias */
-    ISP_AE_STRATEGY_E enAEStrategyMode;  /* RW; Range:[0, 1]; Format:1.0; Support Highlight prior or Lowlight prior */
-    HI_U16  u16HistRatioSlope;       /* RW; Range:[0x0, 0xFFFF]; Format:16.0; AE hist ratio slope */
-    HI_U8   u8MaxHistOffset;         /* RW; Range:[0x0, 0xFF]; Format:8.0; Max hist offset */
-
-    ISP_AE_MODE_E  enAEMode;         /* RW; Range:[0, 1]; Format:1.0; AE mode(slow shutter/fix framerate)(onvif) */
-    ISP_ANTIFLICKER_S stAntiflicker;
-    ISP_SUBFLICKER_S stSubflicker;
-    ISP_AE_DELAY_S stAEDelayAttr;
-
-    HI_BOOL bManualExpValue;         /* RW; Range:[0, 1]; Format:1.0; manual exposure value or not */
-    HI_U32 u32ExpValue;              /* RW; Range:(0x0, 0xFFFFFFFF]; Format:32.0; manual exposure value */
-
-    ISP_FSWDR_MODE_E enFSWDRMode;    /* RW; Range:[0, 2]; Format:2.0; FSWDR running mode */
-    HI_BOOL bWDRQuick;               /* RW; Range:[0, 1]; Format:1.0; WDR use delay strategy or not; If is true, WDR AE adjust will be faster */
-
-    HI_U16  u16ISOCalCoef;     /* RW; Range:[0x0, 0xFFFF]; Format:8.8; The coefficient between Standard ISO and origin ISO (unit: times, 8bit precision) */
-} ISP_AE_ATTR_S;
-
-typedef struct hiISP_ME_ATTR_S {
-    ISP_OP_TYPE_E enExpTimeOpType;
-    ISP_OP_TYPE_E enAGainOpType;
-    ISP_OP_TYPE_E enDGainOpType;
-    ISP_OP_TYPE_E enISPDGainOpType;
-
-    HI_U32 u32ExpTime;        /* RW; Range:[0x0, 0xFFFFFFFF]; Format:32.0; sensor exposure time (unit: us ), it's related to the specific sensor */
-    HI_U32 u32AGain;          /* RW; Range:[0x400, 0xFFFFFFFF]; Format:22.10; sensor analog gain (unit: times, 10bit precision), it's related to the specific sensor */
-    HI_U32 u32DGain;          /* RW; Range:[0x400, 0xFFFFFFFF]; Format:22.10; sensor digital gain (unit: times, 10bit precision), it's related to the specific sensor */
-    HI_U32 u32ISPDGain;       /* RW; Range:[0x400, 0x40000]; Format:22.10; ISP digital gain (unit: times, 10bit precision), it's related to the ISP digital gain range */
-} ISP_ME_ATTR_S;
-
-typedef struct hiISP_EXPOSURE_ATTR_S {
-    HI_BOOL         bByPass;    /* RW; Range:[0, 1]; Format:1.0; */
-    ISP_OP_TYPE_E   enOpType;
-    HI_U8     u8AERunInterval;  /* RW; Range:[0x1, 0xFF]; Format:8.0; set the AE run interval */
-    HI_BOOL   bHistStatAdjust;  /* RW; Range:[0, 1]; Format:1.0;  HI_TRUE: 256 bin histogram statistic config will adjust when large red or blue area detected.
-                                                        HI_FALSE: 256 bin histogram statistic config will not change */
-    HI_BOOL   bAERouteExValid;  /* RW; Range:[0, 1]; Format:1.0; use extend AE route or not */
-    ISP_ME_ATTR_S   stManual;
-    ISP_AE_ATTR_S   stAuto;
-    ISP_PRIOR_FRAME_E enPriorFrame;  /* RW; Range:[0, 3]; Format:1.0; AE prior frame */
-    HI_BOOL   bAEGainSepCfg;  /* RW; Range:[0, 1]; Format:1.0; long and short frame gain separately configure or not */
-} ISP_EXPOSURE_ATTR_S;
-
-
-#define ISP_AE_ROUTE_MAX_NODES                    (16)
-typedef struct hiISP_AE_ROUTE_NODE_S {
-    HI_U32  u32IntTime;          /* RW; Range:(0x0, 0xFFFFFFFF]; Format:32.0; sensor exposure time (unit: us ), it's related to the specific sensor */
-    HI_U32  u32SysGain;          /* RW; Range:[0x400, 0xFFFFFFFF]; Format:22.10; system gain (unit: times, 10bit precision), it's related to the specific sensor and ISP Dgain range */
-    ISP_IRIS_F_NO_E  enIrisFNO;  /* RW; Range:[0, 10]; Format:4.0; the F number of the iris's aperture, only support for Piris */
-    HI_U32  u32IrisFNOLin;       /* RW; Range:[0x1, 0x400]; Format:32.0; the equivalent gain of F number of the iris's aperture, only support for Piris */
-} ISP_AE_ROUTE_NODE_S;
-
-typedef struct hiISP_AE_ROUTE_S {
-    HI_U32 u32TotalNum;     /* RW; Range:[0, 0x10]; Format:8.0; total node number of AE route */
-    ISP_AE_ROUTE_NODE_S astRouteNode[ISP_AE_ROUTE_MAX_NODES];
-} ISP_AE_ROUTE_S;
-
-#define ISP_AE_ROUTE_EX_MAX_NODES                 (16)
-typedef struct hiISP_AE_ROUTE_EX_NODE_S {
-    HI_U32  u32IntTime;     /* RW; Range:(0x0, 0xFFFFFFFF]; Format:32.0;  sensor exposure time (unit: us ), it's related to the specific sensor */
-    HI_U32  u32Again;       /* RW; Range:[0x400, 0x3FFFFF]; Format:22.10;  sensor analog gain (unit: times, 10bit precision), it's related to the specific sensor */
-    HI_U32  u32Dgain;       /* RW; Range:[0x400, 0x3FFFFF]; Format:22.10;  sensor digital gain (unit: times, 10bit precision), it's related to the specific sensor */
-    HI_U32  u32IspDgain;    /* RW; Range:[0x400, 0x40000]; Format:22.10;  ISP digital gain (unit: times, 10bit precision) */
-    ISP_IRIS_F_NO_E  enIrisFNO;  /* RW; Range:[0, 10]; Format:4.0; the F number of the iris's aperture, only support for Piris */
-    HI_U32  u32IrisFNOLin;  /* RW; Range:[0x1, 0x400]; Format:32.0; the equivalent gain of F number of the iris's aperture, only support for Piris */
-} ISP_AE_ROUTE_EX_NODE_S;
-
-typedef struct hiISP_AE_ROUTE_EX_S {
-    HI_U32 u32TotalNum;       /* RW; Range:[0, 0x10]; Format:8.0; total node number of extend AE route */
-    ISP_AE_ROUTE_EX_NODE_S astRouteExNode[ISP_AE_ROUTE_EX_MAX_NODES];
-} ISP_AE_ROUTE_EX_S;
-
-typedef struct hiISP_EXP_INFO_S {
-    HI_U32 u32ExpTime;                 /* R; Range:[0x0, 0xFFFFFFFF]; Format:32.0; */
-    HI_U32 u32ShortExpTime;            /* R; Range:[0x0, 0xFFFFFFFF]; Format:32.0; */
-    HI_U32 u32MedianExpTime;           /* R; Range:[0x0, 0xFFFFFFFF]; Format:32.0; */
-    HI_U32 u32LongExpTime;             /* R; Range:[0x0, 0xFFFFFFFF]; Format:32.0; */
-    HI_U32 u32AGain;                   /* R; Range:[0x400, 0xFFFFFFFF]; Format:22.10; */
-    HI_U32 u32DGain;                   /* R; Range:[0x400, 0xFFFFFFFF]; Format:22.10; */
-    HI_U32 u32AGainSF;                 /* R; Range:[0x400, 0xFFFFFFFF]; Format:22.10; */
-    HI_U32 u32DGainSF;                 /* R; Range:[0x400, 0xFFFFFFFF]; Format:22.10; */
-    HI_U32 u32ISPDGain;                /* R; Range:[0x400, 0xFFFFFFFF]; Format:22.10; */
-    HI_U32 u32Exposure;                /* R; Range:[0x40, 0xFFFFFFFF]; Format:26.6; */
-    HI_BOOL bExposureIsMAX;            /* R; Range:[0, 1]; Format:1.0; */
-    HI_S16 s16HistError;               /* R; Range:[-32768, 32767]; Format:16.0; */
-    HI_U32 au32AE_Hist1024Value[HIST_NUM]; /* R; Range:[0x0, 0xFFFFFFFF]; Format:32.0; 1024 bins histogram for channel 1 */
-
-    HI_U8  u8AveLum;                   /* R; Range:[0x0, 0xFF]; Format:8.0; */
-    HI_U32 u32LinesPer500ms;           /* R; Range:[0x0, 0xFFFFFFFF]; Format:32.0; exposure lines per 500ms */
-    HI_U32 u32PirisFNO;                /* R; Range:[0x0, 0x400]; Format:32.0; */
-    HI_U32 u32Fps;                     /* R; Range:[0x0, 0xFFFFFFFF]; Format:32.0; actual fps */
-    HI_U32 u32ISO;                     /* R; Range:[0x64, 0xFFFFFFFF]; Format:32.0; */
-    HI_U32 u32ISOSF;                   /* R; Range:[0x64, 0xFFFFFFFF]; Format:32.0; */
-    HI_U32 u32ISOCalibrate;            /* R; Range:[0x0, 0xFFFFFFFF]; Format:32.0; */
-    HI_U32 u32RefExpRatio;             /* R; Range:[0x40, 0x4000]; Format:26.6; */
-    HI_U32 u32FirstStableTime;         /* R; Range:[0x0, 0xFFFFFFFF]; Format:32.0; AE first stable time for quick start */
-    ISP_AE_ROUTE_S stAERoute;          /* R; Actual AE route */
-    ISP_AE_ROUTE_EX_S stAERouteEx;     /* R; Actual AE route_ex */
-    ISP_AE_ROUTE_S stAERouteSF;          /* R; Actual AE route_sf */
-    ISP_AE_ROUTE_EX_S stAERouteSFEx;     /* R; Actual AE route_sf_ex */
-} ISP_EXP_INFO_S;
-
-
-#define EXP_RATIO_NUM                             (3)
-typedef struct hiISP_WDR_EXPOSURE_ATTR_S {
-    ISP_OP_TYPE_E enExpRatioType;   /* RW; Range:[0, 1]; Format:1.0; OP_TYPE_AUTO: The ExpRatio used in ISP is generated by firmware; OP_TYPE_MANUAL: The ExpRatio used in ISP is set by u32ExpRatio */
-    HI_U32 au32ExpRatio[EXP_RATIO_NUM];             /* RW; Range:[0x40, 0xFFF]; Format:26.6; 0x40 means 1 times.
-                                            When enExpRatioType is OP_TYPE_AUTO, u32ExpRatio is invalid.
-                                            When enExpRatioType is OP_TYPE_MANUAL, u32ExpRatio is quotient of long exposure time / short exposure time. */
-    HI_U32 u32ExpRatioMax;          /* RW; Range:[0x40, 0x4000]; Format:26.6; 0x40 means 1 times.
-                                            When enExpRatioType is OP_TYPE_AUTO, u32ExpRatioMax is max(upper limit) of ExpRatio generated by firmware.
-                                            When enExpRatioType is OP_TYPE_MANUAL, u32ExpRatioMax is invalid. */
-    HI_U32 u32ExpRatioMin;          /* RW; Range:[0x40, 0x4000]; Format:26.6; limited Range:[0x40, u32ExpRatioMax],0x40 means 1 times.
-                                            When enExpRatioType is OP_TYPE_AUTO, u32ExpRatioMin is min(lower limit) of ExpRatio generated by firmware.
-                                            When enExpRatioType is OP_TYPE_MANUAL, u32ExpRatioMin is invalid. */
-    HI_U16 u16Tolerance;            /* RW; Range:[0x0, 0xFF]; Format:8.0;et the dynamic range tolerance. Format: unsigned 6.2-bit fixed-point. 0x4 means 1dB. */
-    HI_U16 u16Speed;                /* RW; Range:[0x0, 0xFF]; Format:8.0; exposure ratio adjust speed */
-    HI_U16 u16RatioBias;            /* RW; Range:[0x0, 0xFFFF]; Format:16.0; exposure ratio bias */
-
-} ISP_WDR_EXPOSURE_ATTR_S;
-
-typedef struct hiISP_HDR_EXPOSURE_ATTR_S {
-    ISP_OP_TYPE_E enExpHDRLvType;   /* RW; Range:[0, 1]; Format:1.0; OP_TYPE_AUTO: The ExpHDRLv used in ISP is generated by firmware; OP_TYPE_MANUAL: The ExpHDRLv used in ISP is set by u32ExpHDRLv */
-    HI_U32 u32ExpHDRLv;             /* RW; Range:[0x40, 0x400]; Format:26.6; 0x40 means 1 times.
-                                            When enExpHDRLvType is OP_TYPE_AUTO, u32ExpHDRLv is invalid.
-                                            When enExpHDRLvType is OP_TYPE_MANUAL, u32ExpHDRLv is the quotient of exposure / linear exposure. */
-    HI_U32 u32ExpHDRLvMax;          /* RW; Range:[0x40, 0x400]; Format:26.6; 0x40 means 1 times.
-                                            When enExpHDRLvType is OP_TYPE_AUTO, u32ExpHDRLvMax is max(upper limit) of ExpHDRLv generated by firmware.
-                                            When enExpHDRLvType is OP_TYPE_MANUAL, u32ExpHDRLvMax is invalid. */
-    HI_U32 u32ExpHDRLvMin;          /* RW; Range:[0x40, 0x400]; Format:26.6; limited range:[0x40, u32ExpHDRLvMax],0x40 means 1 times.
-                                            When enExpHDRLvType is OP_TYPE_AUTO, u32ExpHDRLvMin is min(lower limit) of ExpHDRLv generated by firmware.
-                                            When enExpHDRLvType is OP_TYPE_MANUAL, u32ExpHDRLvMin is invalid. */
-    HI_U32 u32ExpHDRLvWeight;       /* RW; Range:[0x0, 0x400]; Format:16.0; exposure HDR level weight. */
-
-} ISP_HDR_EXPOSURE_ATTR_S;
-
-typedef struct hiISP_SMART_EXPOSURE_ATTR_S {
-    HI_BOOL bEnable;                /* RW; Range:[0, 1]; Format:1.0; smart ae enable or not */
-    HI_BOOL bIRMode;                /* RW; Range:[0, 1]; Format:1.0; smart ae IR mode or not */
-    ISP_OP_TYPE_E enSmartExpType;   /* RW; Range:[0, 1]; Format:1.0; OP_TYPE_AUTO: The ExpCoef used in ISP is generated by firmware; OP_TYPE_MANUAL: The ExpCoef used in ISP is set by u32ExpCoef */
-    HI_U16  u16ExpCoef;             /* RW; Range:[0x0, 0xFFFF]; Format:6.10; 0x400 means 1 times.
-                                            When enExpHDRLvType is OP_TYPE_AUTO, u32ExpCoef is invalid.
-                                            When enExpHDRLvType is OP_TYPE_MANUAL, u32ExpCoef is the quotient of exposure. */
-    HI_U8   u8LumaTarget;           /* RW; Range:[0x0, 0xFF]; Format:8.0; luma target of smart ae. */
-    HI_U16  u16ExpCoefMax;          /* RW; Range:[0x0, 0xFFFF]; Format:6.10; 0x400 means 1 times.
-                                            When enExpHDRLvType is OP_TYPE_AUTO, u32ExpCoefvMax is max(upper limit) of ExpCoef generated by firmware.
-                                            When enExpHDRLvType is OP_TYPE_MANUAL, u32ExpCoefMax is invalid. */
-    HI_U16  u16ExpCoefMin;          /* RW; Range:[0x0, 0xFFFF]; Format:6.10; 0x400 means 1 times.
-                                            When enExpHDRLvType is OP_TYPE_AUTO, u32ExpCoefMax is min(lower limit) of ExpCoef generated by firmware.
-                                            When enExpHDRLvType is OP_TYPE_MANUAL, u32ExpCoefMin is invalid. */
-    HI_U8   u8SmartInterval;        /*RW; Range:[0x1, 0xFF]; Format:8.0; smart ae run interval*/
-    HI_U8   u8SmartSpeed;           /*RW; Range:[0x0, 0xFF]; Format:8.0; smart ae adjust step*/
-    HI_U16  u16SmartDelayNum;       /*RW; Range:[0x0, 0x400]; Format:16.0; smart ae adjust delay frame num */
-} ISP_SMART_EXPOSURE_ATTR_S;
-
-
-/********************* AWB structs ************************/
-/*
-Defines the AWB online calibration type
-u16AvgRgain: the avg value of Rgain after online calibration
-u16AvgBgain: the avg value of Bgain after online calibration
-*/
-typedef struct hiISP_AWB_Calibration_Gain_S {
-    HI_U16 u16AvgRgain;
-    HI_U16 u16AvgBgain;
-} ISP_AWB_Calibration_Gain_S;
-/*
-Defines the AWB algorithm type
-0 = Improved gray world algorithm.
-1 = AWB algorithm that classifies the statistics and re-filters the white blocks
-*/
-typedef enum hiISP_AWB_ALG_TYPE_E {
-    AWB_ALG_LOWCOST = 0,
-    AWB_ALG_ADVANCE = 1,
-    AWB_ALG_BUTT
-} ISP_AWB_ALG_TYPE_E;
-
-/*
-Defines the AWB policy in the multi-illuminant scenario
-0 = Automatic saturation adjustment in the multi-illuminant scenario
-1 = Automatic ccm adjustment in the multi-illuminant scenario
-*/
-typedef enum hiISP_AWB_MULTI_LS_TYPE_E {
-    AWB_MULTI_LS_SAT = 0,
-    AWB_MULTI_LS_CCM = 1,
-    AWB_MULTI_LS_BUTT
-} ISP_AWB_MULTI_LS_TYPE_E;
-
-typedef enum hiISP_AWB_INDOOR_OUTDOOR_STATUS_E {
-    AWB_INDOOR_MODE = 0,
-    AWB_OUTDOOR_MODE = 1,
-    AWB_INDOOR_OUTDOOR_BUTT
-} ISP_AWB_INDOOR_OUTDOOR_STATUS_E;
-
-/* Defines the AWB gain range */
-typedef struct hiISP_AWB_CT_LIMIT_ATTR_S {
-    HI_BOOL bEnable;
-    ISP_OP_TYPE_E   enOpType;
-
-    HI_U16 u16HighRgLimit;     /* RW; Range:[0x0, 0xFFF]; Format:4.8; in Manual Mode, user define the Max Rgain of High Color Temperature */
-    HI_U16 u16HighBgLimit;     /* RW; Range:[0x0, 0xFFF]; Format:4.8; in Manual Mode, user define the Min Bgain of High Color Temperature */
-    HI_U16 u16LowRgLimit;      /* RW; Range:[0x0, 0xFFF]; Format:4.8; limited range:[0x0, u16HighRgLimit),in Manual Mode, user define the Min Rgain of Low Color Temperature */
-    HI_U16 u16LowBgLimit;      /* RW; Range:[0, 0xFFF]; Format:4.8; limited Range:(u16HighBgLimit, 0xFFF],in Manual Mode, user define the Max Bgain of Low Color Temperature */
-} ISP_AWB_CT_LIMIT_ATTR_S;
-
-typedef struct hiISP_AWB_IN_OUT_ATTR_S {
-    HI_BOOL bEnable;                                    /* RW; Range:[0, 1]; Format:1.0; Outdoor/Indoor scenario determination enable */
-    ISP_OP_TYPE_E   enOpType;
-    ISP_AWB_INDOOR_OUTDOOR_STATUS_E  enOutdoorStatus;   /* RW;User should config indoor or outdoor status in Manual Mode */
-    HI_U32 u32OutThresh;                                /* RW;Format:32.0;shutter time(in us) to judge indoor or outdoor */
-    HI_U16 u16LowStart;                                 /* RW;Format:16.0;5000K is recommend */
-    HI_U16 u16LowStop;                                  /* RW;Format:16.0;limited range:(0,u16LowStart),4500K is recommend, should be smaller than u8LowStart */
-    HI_U16 u16HighStart;                                /* RW;Format:16.0;limited range:(u16LowStart,0xFFFF],6500K is recommend, shoule be larger than u8LowStart */
-    HI_U16 u16HighStop;                                 /* RW;Format:16.0;limited range:(u16HighStart,0xFFFF],8000K is recommend, should be larger than u8HighStart */
-    HI_BOOL bGreenEnhanceEn;                            /* RW; Range:[0, 1]; Format:1.0;If this is enabled, Green channel will be enhanced based on the ratio of green plant */
-    HI_U8   u8OutShiftLimit;                            /* RW; Range:[0, 0xFF]; Format:8.0;Max white point zone distance to Planckian Curve */
-} ISP_AWB_IN_OUT_ATTR_S;
-
-typedef struct hiISP_AWB_CBCR_TRACK_ATTR_S {
-    HI_BOOL bEnable;                                /* RW; Range:[0, 1]; Format:1.0;If enabled, statistic parameter cr, cb will change according to iso */
-
-    HI_U16  au16CrMax[ISP_AUTO_ISO_STRENGTH_NUM];   /* RW; Range:[0x0, 0xFFF]; au16CrMax[i] >= au16CrMin[i] */
-    HI_U16  au16CrMin[ISP_AUTO_ISO_STRENGTH_NUM];   /* RW; Range:[0x0, 0xFFF] */
-    HI_U16  au16CbMax[ISP_AUTO_ISO_STRENGTH_NUM];   /* RW; Range:[0x0, 0xFFF]; au16CbMax[i] >= au16CbMin[i] */
-    HI_U16  au16CbMin[ISP_AUTO_ISO_STRENGTH_NUM];   /* RW; Range:[0x0, 0xFFF] */
-} ISP_AWB_CBCR_TRACK_ATTR_S;
-
-#define AWB_LUM_HIST_NUM                          (6)
-/* Defines the parameters of the luminance histogram statistics for white balance */
-typedef struct hiISP_AWB_LUM_HISTGRAM_ATTR_S {
-    HI_BOOL bEnable;                          /* RW; Range:[0, 1]; Format:1.0; If enabled, zone weight to awb is combined with zone luma */
-    ISP_OP_TYPE_E   enOpType;                 /* In auto mode, the weight distribution follows Gaussian distribution */
-    HI_U8   au8HistThresh[AWB_LUM_HIST_NUM];  /* RW; Range:[0x0, 0xFF]; Format:8.0; In manual mode, user define luma thresh, thresh[0] = 0, thresh[5] = 0xFF,  thresh[i] >=  thresh[i-1] */
-    HI_U16  au16HistWt[AWB_LUM_HIST_NUM];     /* RW; Range:[0x0, 0xFFFF]; Format:16.0; user can define luma weight in both manual and auto mode. */
-} ISP_AWB_LUM_HISTGRAM_ATTR_S;
-
-/* Defines the information about a separate illuminant */
-typedef struct hiISP_AWB_LIGHTSOURCE_INFO_S {
-    HI_U16 u16WhiteRgain;         /* RW;Range:[0x0, 0xFFF]; Format:4.8; G/R of White points at this light source */
-    HI_U16 u16WhiteBgain;         /* RW;Range:[0x0, 0xFFF]; Format:4.8; G/B of White points at this light source */
-    HI_U16 u16ExpQuant;           /* RW;shutter time * again * dgain >> 4, Not support Now */
-    HI_U8  u8LightStatus;         /* RW;Range:[0,2]; Format:2.0; idle  1:add light source  2:delete sensitive color */
-    HI_U8  u8Radius;              /* RW;Range:[0x0, 0xFF];  Format:8.0; Radius of light source, */
-} ISP_AWB_EXTRA_LIGHTSOURCE_INFO_S;
-
-#define AWB_LS_NUM                                (4)
-#define AWB_MULTI_CT_NUM                          (8)
-/* extended AWB attributes */
-typedef struct hiISP_AWB_ATTR_EX_S {
-    HI_U8  u8Tolerance;                                 /* RW; Range:[0x0, 0xFF]; Format:8.0; AWB adjust tolerance */
-    HI_U8  u8ZoneRadius;                                /* RW; Range:[0x0, 0xFF]; Format:8.0; radius of AWB blocks */
-    HI_U16 u16CurveLLimit;                              /* RW; Range:[0x0, 0x100]; Format:9.0; Left limit of AWB Curve, recomend for indoor 0xE0, outdoor 0xE0 */
-    HI_U16 u16CurveRLimit;                              /* RW; Range:[0x100, 0xFFF]; Format:12.0; Right Limit of AWB Curve,recomend for indoor 0x130, outdoor 0x120 */
-
-    HI_BOOL  bExtraLightEn;                             /* RW; Range:[0, 1]; Format:1.0; Enable special light source function */
-    ISP_AWB_EXTRA_LIGHTSOURCE_INFO_S    stLightInfo[AWB_LS_NUM];
-    ISP_AWB_IN_OUT_ATTR_S               stInOrOut;
-
-    HI_BOOL bMultiLightSourceEn;                        /* RW; Range:[0, 1]; Format:1.0; If enabled, awb will do special process in multi light source enviroment */
-    ISP_AWB_MULTI_LS_TYPE_E enMultiLSType;              /* Saturation or CCM Tunning */
-    HI_U16  u16MultiLSScaler;                           /* RW; Range:[0x0, 0x100];  Format:12.0; In saturation type, it means the max saturation it can achieve, in ccm type, it means the strenght of multi process. */
-    HI_U16  au16MultiCTBin[AWB_MULTI_CT_NUM];           /* RW; Range:[0, 0XFFFF]; Format:16.0;AWB Support divide the color temperature range by 8 bins */
-    HI_U16  au16MultiCTWt[AWB_MULTI_CT_NUM];            /* RW; Range:[0x0, 0x400];Weight for different color temperature, same value of 8 means CT weight does't work, */
-
-    HI_BOOL bFineTunEn;                                 /* RW; Range:[0x0, 0x1]; Format:1.0;If enabled, skin color scene will be optimized */
-    HI_U8   u8FineTunStrength;                          /* RW; Range:[0x0, 0xFF]; Format:8.0;larger value means better performance of skin color scene, but will increase error probability in low color temperature scene */
-} ISP_AWB_ATTR_EX_S;
-
-#define AWB_CURVE_PARA_NUM                        (6)
-typedef struct hiISP_AWB_ATTR_S {
-    HI_BOOL bEnable;               /* RW; Range:[0x0, 0x1]; Format:1.0;If AWB is disabled, static wb gain will be used, otherwise auto wb gain will be used */
-
-    HI_U16 u16RefColorTemp;        /* RW; Range:[0x0, 0xFFFF]; Format:16.0; Calibration Information */
-    HI_U16 au16StaticWB[ISP_BAYER_CHN_NUM];        /* RW; Range:[0x0, 0xFFF]; Format:12.0;Calibration Information */
-    HI_S32 as32CurvePara[AWB_CURVE_PARA_NUM];       /* RW; Format:32.0;Calibration Information,limited Range:as32CurvePara[3] != 0, as32CurvePara[4]==128 */
-
-    ISP_AWB_ALG_TYPE_E          enAlgType;
-
-    HI_U8  u8RGStrength;                            /* RW; Range: [0x0, 0xFF]; Format:8.0; AWB Strength of R Channel */
-    HI_U8  u8BGStrength;                            /* RW; Range: [0x0, 0xFF]; Format:8.0; AWB Strength of B Channel */
-    HI_U16 u16Speed;                                /* RW; Range: [0x0, 0xFFF]; Format:12.0; Convergence speed of AWB  */
-    HI_U16 u16ZoneSel;                              /* RW; Range: [0, 255]; Format:8.0; A value of 0 or 0xFF means global AWB, A value between 0 and 0xFF means zoned AWB */
-    HI_U16 u16HighColorTemp;                        /* RW; Range: [0, 65535]; Format:16.0; AWB max temperature, Recommended: [8500, 10000] */
-    HI_U16 u16LowColorTemp;                         /* RW; Range: [0, 65535]; Format:16.0; Limited Range:[0, u16HighColorTemp), AWB min temperature, Recommended: [2000, 2500] */
-    ISP_AWB_CT_LIMIT_ATTR_S   stCTLimit;
-    HI_BOOL bShiftLimitEn;                          /* RW; Range: [0, 1]; Format:1.0; If enabled, when the statistic information is out of range, it should be project back */
-    HI_U8  u8ShiftLimit;                            /* RW; Range: [0x0, 0xFF];  Format:8.0; planckian curve range, Recommended: [0x30, 0x50] */
-    HI_BOOL bGainNormEn;                            /* RW; Range: [0, 1]; Format:1.0; if enabled, the min of RGB gain is fixed. */
-    HI_BOOL bNaturalCastEn;                         /* RW, Range: [0, 1]; Format:1.0; if enabled, the color performance will be natural in lowlight and low color temperature */
-
-    ISP_AWB_CBCR_TRACK_ATTR_S stCbCrTrack;
-    ISP_AWB_LUM_HISTGRAM_ATTR_S stLumaHist;
-    HI_BOOL bAWBZoneWtEn;                           /* RW, Range: [0, 1]; Format:1.0; if enabled, user can set weight for each zones */
-    HI_U8   au8ZoneWt[AWB_ZONE_ORIG_ROW *AWB_ZONE_ORIG_COLUMN];   /* RW; Range: [0, 255]; Format:8.0;Zone Wt Table */
-} ISP_AWB_ATTR_S;
-
-/* Attr for SPC AWB */
-#define SPECAWB_FACTTBL_ELMNUM                    (7)          /* Table number. */
-#define SPECAWB_FACTTBL_SIZE                      (64)         /* Table size for weight for light source detection. */
-#define SPECAWB_BBL_SIZE                          (40)         /* Table size for BlackBodyTable. */
-
-typedef struct hiISP_SPECAWB_BBL_TBL_S {
-    HI_S16 s16Kelvin;   /* RW;Range:[-32768, 32767];Kelvin */
-    HI_S16 s16Wbr;      /* RW;Range:[-32768, 32767];WBR value */
-    HI_S16 s16Wbb;      /* RW;Range:[-32768, 32767];WBB value */
-} ISP_SPECAWB_BBL_TBL_S;
-
-typedef struct hiISP_SPECAWB_KELVIN_DBB_MAP_S {
-    HI_S16 s16Kelvin; /* RW;Range:[-32768, 32767];kevin */
-    HI_S16 s16DBB;   /* RW;Range:[-32768, 32767];DeltaBlackBody */
-} ISP_SPECAWB_KELVIN_DBB_MAP_S;
-
-typedef struct  hiISP_SPECKCWB_S {
-    HI_S32    s32RGain; /* RW;Range:[-2147483648, 2147483647]; RgainValue */
-    HI_S32    s32BGain; /* RW;Range:[-2147483648, 2147483647]; BgainValue */
-} ISP_SPECKCWB_S;
-
-typedef struct  hiISP_SPECKCWBS16_S {
-    HI_S16    s16RGain; /* RW;Range:[-32768, 32767]; RgainValue(16bit) */
-    HI_S16    s16BGain; /* RW;Range:[-32768, 32767]; BgainValue(16bit) */
-} ISP_SPECKCWBS16_S;
-
-typedef struct  hiISP_SPECAWB_FACTTBL_ELEMENT_S {
-    HI_S16    s16Bv;                             /* RW;Range:[-32768, 32767]; The center value of the Bv value targeted by this table. */
-    HI_U8     u8FactTbl[SPECAWB_FACTTBL_SIZE][SPECAWB_FACTTBL_SIZE];     /* RW;Range:[0, 0xFF]; Weight for light source detection. */
-} ISP_SPECAWB_FACTTBL_ELEMENT_S;
-
-typedef struct  hiISP_SPECAWB_ATTR_S {
-    ISP_SPECKCWB_S                       stWBCenter;                 /* RW;WB gain value at the center of the table: The table index is calculated as a relative value from this gain. */
-    ISP_SPECKCWB_S                       stWBMin;                    /* RW;Minimum value of WB gain that the table covers. */
-    ISP_SPECKCWB_S                       stWBMax;                    /* RW;Maximum value of WB gain that the table covers. */
-    ISP_SPECKCWB_S                       stLogFact;                  /* RW;Range covered by the table: 1/exp(stLogFact) to exp(stLogFact). For example, if it is 1.0, WBDelta will be 1/e to e. However, e = 2.71828 ... (base of natural logarithm) */
-    HI_S32                               s32LimitFactMin;            /* RW;Range:[0, s32LimitFactMax];AWB statics threshold value : minimum threshold value of ratio to pixel maximum value. */
-    HI_S32                               s32LimitFactMax;            /* RW;Range:[s32LimitFactMin, 0xFFFF];AWB statics threshold value : maximum threshold value of ratio to pixel maximum value. */
-    HI_S32                               s32LimitFactLimit;          /* RW;Range:[0x600, 0x4000];AWB statics limit value : ratio to (pixel maximum value * s32LimitFactMax) */
-    HI_S32                               s32FactOffset;              /* RW;Range:[0, 0x800];The offset value of the weight when calculating the AWB statics. */
-    HI_S32                               s32BFact;                   /* RW;Range:[0x399, 0x500];The value of specular weight when calculating the AWB statics. */
-    HI_S32                               s32ACntMin;                 /* RW;Range:[0, 0x20];Threshold for block adoption.  If the integrated value of the AWB statics is less than m_ACntMin, the block is ignored. */
-    ISP_SPECKCWB_S                       stWBNeutral;                /* RW;WB gain returned when AWB calculation can not be performed. */
-    HI_U8                                bLastIsFlash;               /* RW;Range:[1]: The last table is used for flash. 0: Used for unknown Bv value. */
-    HI_S16                               s16BvFlashELimit;           /* RW;Range:[-32768, 32767];Threshold of Bv value before strobe lighting when using table for strobe. If bLastIsFlash == TRUE and the Bv value before strobe flash is less than this value, use the table for strobe. */
-    HI_S32                               s32APercent;                /* RW;Range:[0, 100];A value percent of the WB statics */
-    ISP_SPECKCWBS16_S                    stWBCnvTbl[SPECAWB_FACTTBL_SIZE][SPECAWB_FACTTBL_SIZE];     /* RW; WB gain conversion table (incomplete chromatic adaptation table). */
-    HI_U8                                u8ElementNum;                                               /* RW; Range:[7];Number of connected ISP_SPECAWB_FACTTBL_ELEMENT. */
-    ISP_SPECAWB_FACTTBL_ELEMENT_S        stFactElement[SPECAWB_FACTTBL_ELMNUM];                      /* RW; Weight Table */
-    ISP_SPECAWB_KELVIN_DBB_MAP_S         stKelvinDBBTbl[SPECAWB_FACTTBL_SIZE][SPECAWB_FACTTBL_SIZE]; /* RW;KelvinDbb table. */
-    ISP_SPECAWB_BBL_TBL_S                stBlackBodyTbl[SPECAWB_BBL_SIZE];                           /* RW;BlackBody table. */
-    HI_U16                               u16Fno;                                                     /* RW; Range:[10, 100];F number of the len,F1.4=14,F2.8=28,F36 =360... */
-} ISP_SPECAWB_ATTR_S;
-
-typedef struct  hiISP_SPECAWB_CONTROL_ATTR_S {
-    HI_S16 s16BlendHighBvThresh;          /* RW; Range: [-32768, 32767]; High Bv threshold for inner blending function */
-    HI_U16 u16BlendHighBvWt;              /* RW; Range: [0, 2048]; High Bv  weight for inner blending function */
-    HI_S16 s16BlendLowBvThresh;           /* RW; Range: [-32768, s16BlendHighBvThresh); Low Bv threshold for inner blending function */
-    HI_U16 u16BlendLowBvWt;               /* RW; Range: [0, 2048]; Low Bv  weight for inner blending function */
-} ISP_SPECAWB_CONTROL_ATTR_S;
-
-#define SPECAWB_MAX_CAA_NUM                       3
-#define SPECAWB_KEVIN_CONVER_MAX_NUM              8
-
-typedef struct  hiISP_SPECAWB_CAA_CONVERSION_S {
-    HI_S32 s32SrcKelvin;    /* RW;Range:[-2147483648, 2147483647]; Source kelvin */
-    HI_S32 s32DstKelvin;    /* RW;Range:[-2147483648, 2147483647]; Destination kelvin */
-} ISP_SPECAWB_CAA_CONVERSION_S;
-typedef struct  hiISP_SPECAWB_CAA_TBL_S {
-    HI_U8   u8Enable;       /* RW;Range:[0,1]; lut enable */
-    HI_S16  s16Bv;          /* RW;Range:[-32768, 32767]; Bv value */
-    ISP_SPECAWB_CAA_CONVERSION_S stKelvinCon[SPECAWB_KEVIN_CONVER_MAX_NUM];
-    ISP_SPECKCWBS16_S stWBCnvTbl[SPECAWB_FACTTBL_SIZE][SPECAWB_FACTTBL_SIZE];
-} ISP_SPECAWB_CAA_TBL_S;
-
-typedef struct  hiISP_SPECAWB_CAA_CONTROl_S {
-    ISP_SPECAWB_CAA_TBL_S stControl[SPECAWB_MAX_CAA_NUM];
-} ISP_SPECAWB_CAA_CONTROl_S;
-typedef struct hiISP_MWB_ATTR_S {
-    HI_U16 u16Rgain;            /* RW; Range: [0x0, 0xFFF]; Format:4.8; Multiplier for R  color channel  */
-    HI_U16 u16Grgain;           /* RW; Range: [0x0, 0xFFF]; Format:4.8; Multiplier for Gr color channel */
-    HI_U16 u16Gbgain;           /* RW; Range: [0x0, 0xFFF]; Format:4.8; Multiplier for Gb color channel */
-    HI_U16 u16Bgain;            /* RW; Range: [0x0, 0xFFF]; Format:4.8; Multiplier for B  color channel */
-} ISP_MWB_ATTR_S;
-
-typedef enum hiISP_AWB_ALG_E {
-    ALG_AWB         = 0,
-    ALG_AWB_SPEC    = 1,
-    ALG_BUTT
-} ISP_AWB_ALG_E;
-typedef struct hiISP_WB_ATTR_S {
-    HI_BOOL bByPass;              /* RW; Range: [0, 1];  Format:1.0; If enabled, awb will be bypassed */
-    HI_U8   u8AWBRunInterval;         /* RW; Range: [0x1, 0xFF];  Format:8.0; set the AWB run interval */
-    ISP_OP_TYPE_E   enOpType;
-    ISP_MWB_ATTR_S  stManual;
-    ISP_AWB_ATTR_S  stAuto;
-    ISP_AWB_ALG_E enAlgType;
-} ISP_WB_ATTR_S;
-
-typedef struct hiISP_COLORMATRIX_MANUAL_S {
-    HI_BOOL bSatEn;                           /* RW; Range: [0, 1]; Format:1.0; If bSatEn=1, the active CCM = SatMatrix * ManualMatrix, else tha active CCM =  ManualMatrix */
-    HI_U16 au16CCM[CCM_MATRIX_SIZE];          /* RW; Range: [0x0, 0xFFFF]; Format:8.8; Manul CCM matrix, */
-} ISP_COLORMATRIX_MANUAL_S;
-
-typedef struct hiISP_COLORMATRIX_PARAM_S {
-    HI_U16 u16ColorTemp;                   /* RW; Range: [500, 30000]; Format:16.0; the current color temperature */
-    HI_U16 au16CCM[CCM_MATRIX_SIZE];       /* RW; Range: [0x0, 0xFFFF]; Format:8.8; CCM matrixes for different color temperature */
-} ISP_COLORMATRIX_PARAM_S;
-
-typedef struct hiISP_COLORMATRIX_AUTO_S {
-    HI_BOOL bISOActEn;                     /* RW; Range: [0, 1]; Format:1.0; if enabled, CCM will bypass in low light */
-    HI_BOOL bTempActEn;                    /* RW; Range: [0, 1]; Format:1.0; if enabled, CCM will bypass when color temperature is larger than 8000K or less than 2500K */
-    HI_U16  u16CCMTabNum;                  /* RW; Range: [0x3, 0x7]; Format:16.0; The number of CCM matrixes */
-    ISP_COLORMATRIX_PARAM_S astCCMTab[CCM_MATRIX_NUM];
-} ISP_COLORMATRIX_AUTO_S;
-
-typedef struct hiISP_COLORMATRIX_ATTR_S {
-    ISP_OP_TYPE_E enOpType;
-    ISP_COLORMATRIX_MANUAL_S stManual;
-    ISP_COLORMATRIX_AUTO_S stAuto;
-} ISP_COLORMATRIX_ATTR_S;
-
-typedef struct hiISP_SATURATION_MANUAL_S {
-    HI_U8   u8Saturation;        /* RW; Range: [0, 0xFF]; Format:8.0; set the manual saturation of CCM */
-} ISP_SATURATION_MANUAL_S;
-
-typedef struct hiISP_SATURATION_AUTO_S {
-    HI_U8   au8Sat[ISP_AUTO_ISO_STRENGTH_NUM];           /* RW; Range: [0, 0xFF]; should be decreased with increasing ISO */
-} ISP_SATURATION_AUTO_S;
-
-typedef struct hiISP_SATURATION_ATTR_S {
-    ISP_OP_TYPE_E enOpType;
-    ISP_SATURATION_MANUAL_S stManual;
-    ISP_SATURATION_AUTO_S stAuto;
-} ISP_SATURATION_ATTR_S;
-
-typedef struct hiISP_COLOR_TONE_ATTR_S {
-    HI_U16 u16RedCastGain;        /* RW; Range: [0x100, 0x180]; Format:4.8; R channel gain after CCM */
-    HI_U16 u16GreenCastGain;      /* RW; Range: [0x100, 0x180]; Format:4.8; G channel gain after CCM */
-    HI_U16 u16BlueCastGain;       /* RW; Range: [0x100, 0x180]; Format:4.8; B channel gain after CCM */
-} ISP_COLOR_TONE_ATTR_S;
-
-typedef struct hiISP_WB_INFO_S {
-    HI_U16 u16Rgain;                /* R; Range: [0x0, 0xFFF]; Format:8.8;AWB result of R color channel */
-    HI_U16 u16Grgain;               /* R; Range: [0x0, 0xFFF]; Format:8.8; AWB result of Gr color channel */
-    HI_U16 u16Gbgain;               /* R; Range: [0x0, 0xFFF]; Format:8.8; AWB result of Gb color channel */
-    HI_U16 u16Bgain;                /* R; Range: [0x0, 0xFFF]; Format:8.8; AWB result of B color channel */
-    HI_U16 u16Saturation;           /* R; Range: [0x0, 0xFF];Format:8.0;Current saturation */
-    HI_U16 u16ColorTemp;            /* R; Range: [0x0, 0xFFFF];Format:16.0;Detect color temperature, maybe out of color cemeprature range */
-    HI_U16 au16CCM[CCM_MATRIX_SIZE];              /* R; Range: [0x0, 0xFFFF];Format:16.0;Current color correction matrix */
-
-    HI_U16 u16LS0CT;                                 /* R; Range: [0x0, 0xFFFF];Format:16.0;color tempearture of primary light source */
-    HI_U16 u16LS1CT;                                 /* R; Range: [0x0, 0xFFFF];Format:16.0;color tempearture of secondary light source */
-    HI_U16 u16LS0Area;                               /* R; Range: [0x0, 0xFF];Format:8.0;area of primary light source */
-    HI_U16 u16LS1Area;                               /* R; Range: [0x0, 0xFF];Format:8.0;area of secondary light source */
-    HI_U8  u8MultiDegree;                            /* R; Range: [0x0, 0xFF];0 means uniform light source, larger value means multi light source */
-    HI_U16 u16ActiveShift;                           /* R; Range;[0x0,0xFF] */
-    HI_U32 u32FirstStableTime;                       /* R, Range: [0x0, 0xFFFFFFFF];Format:32.0;AWB first stable frame number */
-    ISP_AWB_INDOOR_OUTDOOR_STATUS_E enInOutStatus;   /* R; indoor or outdoor status */
-    HI_S16  s16Bv;                                   /* R; Range;[-32768, 32767]; Bv value */
-} ISP_WB_INFO_S;
-
-
-
-/********************* AF structs ************************/
-
-typedef struct hiISP_AF_ATTR_S {
-    HI_S32 s32DistanceMax; /* RW;the focuse range */
-    HI_S32 s32DistanceMin;
-    HI_U8 u8Weight[AF_ZONE_ROW][AF_ZONE_COLUMN]; /* RW;weighting table */
-} ISP_AF_ATTR_S;
-typedef struct hiISP_MF_ATTR_S {
-    HI_S32 s32DefaultSpeed;     /* RW;1,default speed(unit:m/s).(onvif) */
-} ISP_MF_ATTR_S;
-typedef struct hiISP_FOCUS_ATTR_S {
-    ISP_OP_TYPE_E  enOpType;
-    ISP_MF_ATTR_S  stManual;
-    ISP_AF_ATTR_S  stAuto;
-} ISP_FOCUS_ATTR_S;
-
-/*
-DNG cfalayout type
-1 = Rectangular (or square) layout
-2 = Staggered layout A: even columns are offset down by 1/2 row
-3 = Staggered layout B: even columns are offset up by 1/2 row
-4 = Staggered layout C: even rows are offset right by 1/2 column
-5 = Staggered layout D: even rows are offset left by 1/2 column
-6 = Staggered layout E: even rows are offset up by 1/2 row, even columns are offset left by 1/2 column
-7 = Staggered layout F: even rows are offset up by 1/2 row, even columns are offset right by 1/2 column
-8 = Staggered layout G: even rows are offset down by 1/2 row, even columns are offset left by 1/2 column
-9 = Staggered layout H: even rows are offset down by 1/2 row, even columns are offset right by 1/2 column
-*/
-typedef enum hiDNG_CFALAYOUT_TYPE_E {
-    CFALAYOUT_TYPE_RECTANGULAR = 1,
-    CFALAYOUT_TYPE_A,        /* a,b,c... not support */
-    CFALAYOUT_TYPE_B,
-    CFALAYOUT_TYPE_C,
-    CFALAYOUT_TYPE_D,
-    CFALAYOUT_TYPE_E,
-    CFALAYOUT_TYPE_F,
-    CFALAYOUT_TYPE_G,
-    CFALAYOUT_TYPE_H,
-    CFALAYOUT_TYPE_BUTT
-} DNG_CFALAYOUT_TYPE_E;
-
-typedef struct hiDNG_SRATIONAL_S {
-    HI_S32 s32Numerator;   /* represents the numerator of a fraction, */
-    HI_S32 s32Denominator; /* the denominator. */
-} DNG_SRATIONAL_S;
-
-typedef struct hiDNG_BLCREPEATDIM_S {
-    HI_U16 u16BlcRepeatRows;
-    HI_U16 u16BlcRepeatCols;
-} DNG_BLCREPEATDIM_S;
-
-typedef struct hiDNG_DEFAULTSCALE_S {
-    DNG_RATIONAL_S stDefaultScaleH;
-    DNG_RATIONAL_S stDefaultScaleV;
-} DNG_DEFAULTSCALE_S;
-
-typedef struct hiDNG_REPEATPATTERNDIM_S {
-    HI_U16 u16RepeatPatternDimRows;
-    HI_U16 u16RepeatPatternDimCols;
-} DNG_REPEATPATTERNDIM_S;
-
-/*
-Defines the structure of dng raw format.
-*/
-typedef struct hiDNG_RAW_FORMAT_S {
-    HI_U8 u8BitsPerSample;                        /* RO;Format:8.0; Indicate the bit numbers of raw data */
-    HI_U8 au8CfaPlaneColor[CFACOLORPLANE];        /* RO;Format:8.0; Indicate the planer numbers of raw data; 0:red 1:green 2: blue */
-    DNG_CFALAYOUT_TYPE_E enCfaLayout;             /* RO;Range:[1,9]; Describes the spatial layout of the CFA */
-    DNG_BLCREPEATDIM_S stBlcRepeatDim;            /* Specifies repeat pattern size for the BlackLevel */
-    HI_U32 u32WhiteLevel;                         /* RO;Format:32.0; Indicate the WhiteLevel of the raw data */
-    DNG_DEFAULTSCALE_S stDefaultScale;            /* Specifies the default scale factors for each direction to convert the image to square pixels */
-    DNG_REPEATPATTERNDIM_S stCfaRepeatPatternDim; /* Specifies the pixel number of repeat color planer in each direction */
-    HI_U8 au8CfaPattern[ISP_BAYER_CHN];           /* RO;Format:8.0; Indicate the bayer start order; 0:red 1:green 2: blue */
-} DNG_RAW_FORMAT_S;
-
-/*
-Defines the structure of dng image static infomation. read only
-*/
-typedef struct hiDNG_IMAGE_STATIC_INFO_S {
-    DNG_RAW_FORMAT_S stDngRawFormat;
-    DNG_SRATIONAL_S astColorMatrix1[CCM_MATRIX_SIZE];       /* defines a transformation matrix that converts XYZ values to reference camera native color space values, under the first calibration illuminant. */
-    DNG_SRATIONAL_S astColorMatrix2[CCM_MATRIX_SIZE];       /* defines a transformation matrix that converts XYZ values to reference camera native color space values, under the second calibration illuminant. */
-    DNG_SRATIONAL_S astCameraCalibration1[CCM_MATRIX_SIZE]; /* defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the first calibration illuminant */
-    DNG_SRATIONAL_S astCameraCalibration2[CCM_MATRIX_SIZE]; /* defines a calibration matrix that transforms reference camera native space values to individual camera native space values under the second calibration illuminant */
-    DNG_SRATIONAL_S astForwadMatrix1[CCM_MATRIX_SIZE];      /* defines a matrix that maps white balanced camera colors to XYZ D50 colors */
-    DNG_SRATIONAL_S astForwadMatrix2[CCM_MATRIX_SIZE];      /* defines a matrix that maps white balanced camera colors to XYZ D50 colors */
-
-    HI_U8  u8CalibrationIlluminant1;                       /* RO;Format:8.0;Light source, actually this means white balance setting. '0' means unknown, '1' daylight, '2'
-                                                                 fluorescent, '3' tungsten, '10' flash, '17' standard light A, '18' standard light B, '19' standard light
-                                                                 C, '20' D55, '21' D65, '22' D75, '255' other */
-    HI_U8  u8CalibrationIlluminant2;                       /* RO;Format:8.0;Light source, actually this means white balance setting. '0' means unknown, '1' daylight, '2'
-                                                                 fluorescent, '3' tungsten, '10' flash, '17' standard light A, '18' standard light B, '19' standard light
-                                                                 C, '20' D55, '21' D65, '22' D75, '255' other */
-} DNG_IMAGE_STATIC_INFO_S;
-
-/*
-Defines the structure of DNG WB gain used for calculate DNG colormatrix.
-*/
-typedef struct hiISP_DNG_WBGAIN_S {
-    HI_U16 u16Rgain;            /* RW;Range: [0x0, 0xFFF]; Multiplier for R  color channel */
-    HI_U16 u16Ggain;            /* RW;Range: [0x0, 0xFFF]; Multiplier for G  color channel */
-    HI_U16 u16Bgain;            /* RW;Range: [0x0, 0xFFF]; Multiplier for B  color channel */
-} ISP_DNG_WBGAIN_S;
-
-/*
-Defines the structure of DNG color parameters.
-*/
-typedef struct hiISP_DNG_COLORPARAM_S {
-    ISP_DNG_WBGAIN_S stWbGain1; /* the calibration White balance gain of colorcheker in low colortemper light source */
-    ISP_DNG_WBGAIN_S stWbGain2; /* the calibration White balance gain of colorcheker in high colortemper light source */
-} ISP_DNG_COLORPARAM_S;
-
-
-typedef enum hiISP_IR_STATUS_E {
-    ISP_IR_STATUS_NORMAL = 0,
-    ISP_IR_STATUS_IR     = 1,
-    ISP_IR_BUTT
-} ISP_IR_STATUS_E;
-
-typedef enum hiISP_IR_SWITCH_STATUS_E {
-    ISP_IR_SWITCH_NONE      = 0,
-    ISP_IR_SWITCH_TO_NORMAL = 1,
-    ISP_IR_SWITCH_TO_IR     = 2,
-    ISP_IR_SWITCH_BUTT
-} ISP_IR_SWITCH_STATUS_E;
-
-
-typedef struct hiISP_IR_AUTO_ATTR_S {
-    HI_BOOL bEnable;            /* RW, HI_TRUE: enable IR_auto function;  HI_TRUE: disable IR_auto function. */
-    HI_U32  u32Normal2IrIsoThr; /* RW, Range: [0, 0xFFFFFFFF]. ISO threshold of switching from normal to IR mode. */
-    HI_U32  u32Ir2NormalIsoThr; /* RW, Range: [0, 0xFFFFFFFF]. ISO threshold of switching from IR to normal mode. */
-    HI_U32  u32RGMax;           /* RW, Range: [0x0, 0xFFF].    Maximum value of R/G in IR scene, 4.8-bit fix-point. */
-    HI_U32  u32RGMin;           /* RW, Range: [0x0, u32RGMax]. Minimum value of R/G in IR scene, 4.8-bit fix-point. */
-    HI_U32  u32BGMax;           /* RW, Range: [0x0, 0xFFF].    Maximum value of B/G in IR scene, 4.8-bit fix-point. */
-    HI_U32  u32BGMin;           /* RW, Range: [0x0, u32BGMax]. Minimum value of B/G in IR scene, 4.8-bit fix-point. */
-
-    ISP_IR_STATUS_E enIrStatus; /* RW. Current IR status. */
-
-    ISP_IR_SWITCH_STATUS_E enIrSwitch; /* RO, IR switch status. */
-} ISP_IR_AUTO_ATTR_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* __HI_COMM_ISP_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_ive.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_ive.h
deleted file mode 100644
index 8ba18b41..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_ive.h
+++ /dev/null
@@ -1,462 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2001-2014, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_comm_ive.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software (IVE) group
-  Created       : 2011/05/16
-  Description   :
-  1.Date        : 2011/05/16
-    Modification: Created file
-
-  2.Date        : 2013/07/01~2014/08/08
-    Modification: Add MPI function
-******************************************************************************/
-#ifndef _HI_COMM_IVE_H_
-#define _HI_COMM_IVE_H_
-
-#include "hi_type.h"
-#include "hi_errno.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif
-
-/* -----------------------------------------------*
- * The fixed-point data type, will be used to    *
- * represent float data in hardware calculations.*
- * ----------------------------------------------- */
-/* --u8bit---------------------------------------- */
-typedef unsigned char HI_U0Q8;
-typedef unsigned char HI_U1Q7;
-typedef unsigned char HI_U5Q3;
-typedef unsigned char HI_U3Q5;
-
-/* --u16bit--------------------------------------- */
-typedef unsigned short HI_U0Q16;
-typedef unsigned short HI_U4Q12;
-typedef unsigned short HI_U6Q10;
-typedef unsigned short HI_U8Q8;
-typedef unsigned short HI_U9Q7;
-typedef unsigned short HI_U12Q4;
-typedef unsigned short HI_U14Q2;
-typedef unsigned short HI_U5Q11;
-typedef unsigned short HI_U1Q15;
-typedef unsigned short HI_U2Q14;
-typedef HI_U6Q10 HI_UFP16;
-/* --s16bit--------------------------------------- */
-typedef short HI_S9Q7;
-typedef short HI_S14Q2;
-typedef short HI_S1Q15;
-
-/* --u32bit--------------------------------------- */
-typedef unsigned int HI_U22Q10;
-typedef unsigned int HI_U25Q7;
-typedef unsigned int HI_U21Q11;
-typedef unsigned int HI_U14Q18;
-typedef unsigned int HI_U8Q24;
-typedef unsigned int HI_U4Q28;
-
-/* --s32bit--------------------------------------- */
-typedef int HI_S25Q7;
-typedef int HI_S16Q16;
-typedef int HI_S14Q18;
-typedef int HI_S20Q12;
-
-typedef int HI_S24Q8;
-
-/* -----------------------------------------------*
- * The fixed-point data type combine with flag_bits.*
- * ----------------------------------------------- */
-/* 8bits unsigned integer,4bits decimal fraction,4bits flag_bits */
-typedef unsigned short HI_U8Q4F4;
-
-/* -----------------------------------------------*
- * The fixed-point data type, will be used to    *
- * represent float data in hardware calculations. linux code style.*
- * ----------------------------------------------- */
-/* --u8bit---------------------------------------- */
-typedef HI_U0Q8 hi_u0q8;
-typedef HI_U1Q7 hi_u1q7;
-typedef HI_U5Q3 hi_u5q3;
-typedef HI_U3Q5 hi_u3q5;
-
-/* --u16bit--------------------------------------- */
-typedef HI_U0Q16 hi_u0q16;
-typedef HI_U4Q12 hi_u4q12;
-typedef HI_U6Q10 hi_u6q10;
-typedef HI_U8Q8  hi_u8q8;
-typedef HI_U9Q7  hi_u9q7;
-typedef HI_U12Q4 hi_u12q4;
-typedef HI_U14Q2 hi_u14q2;
-typedef HI_U5Q11 hi_u5q11;
-typedef HI_U1Q15 hi_u1q15;
-typedef HI_U2Q14 hi_u2q14;
-typedef HI_UFP16 hi_ufp16;
-/* 8bits unsigned integer,4bits decimal fraction,4bits flag_bits */
-typedef HI_U8Q4F4 hi_u8q4f4;
-
-/* --s16bit--------------------------------------- */
-typedef HI_S9Q7  hi_s9q7;
-typedef HI_S14Q2 hi_s14q2;
-typedef HI_S1Q15 hi_s1q15;
-
-/* --u32bit--------------------------------------- */
-typedef HI_U22Q10 hi_u22q10;
-typedef HI_U25Q7  hi_u25q7;
-typedef HI_U21Q11 hi_u21q11;
-typedef HI_U14Q18 hi_u14q18;
-typedef HI_U8Q24  hi_u8q24;
-typedef HI_U4Q28  hi_u4q28;
-
-/* --s32bit--------------------------------------- */
-typedef HI_S25Q7  hi_s25q7;
-typedef HI_S16Q16 hi_s16q16;
-typedef HI_S14Q18 hi_s14q18;
-typedef HI_S20Q12 hi_s20q12;
-typedef HI_S24Q8  hi_s24q8;
-
-
-/* Type of the IVE_IMAGE_S data.Aded by tanbing 2013-7-22 */
-typedef enum hiIVE_IMAGE_TYPE_E {
-    IVE_IMAGE_TYPE_U8C1 = 0x0,
-    IVE_IMAGE_TYPE_S8C1 = 0x1,
-
-    IVE_IMAGE_TYPE_YUV420SP = 0x2, /* YUV420 SemiPlanar */
-    IVE_IMAGE_TYPE_YUV422SP = 0x3, /* YUV422 SemiPlanar */
-    IVE_IMAGE_TYPE_YUV420P = 0x4,  /* YUV420 Planar */
-    IVE_IMAGE_TYPE_YUV422P = 0x5,  /* YUV422 planar */
-
-    IVE_IMAGE_TYPE_S8C2_PACKAGE = 0x6,
-    IVE_IMAGE_TYPE_S8C2_PLANAR = 0x7,
-
-    IVE_IMAGE_TYPE_S16C1 = 0x8,
-    IVE_IMAGE_TYPE_U16C1 = 0x9,
-
-    IVE_IMAGE_TYPE_U8C3_PACKAGE = 0xa,
-    IVE_IMAGE_TYPE_U8C3_PLANAR = 0xb,
-
-    IVE_IMAGE_TYPE_S32C1 = 0xc,
-    IVE_IMAGE_TYPE_U32C1 = 0xd,
-
-    IVE_IMAGE_TYPE_S64C1 = 0xe,
-    IVE_IMAGE_TYPE_U64C1 = 0xf,
-
-    IVE_IMAGE_TYPE_BUTT
-
-} IVE_IMAGE_TYPE_E;
-
-/* Definition of the IVE_IMAGE_S. Added by Tan Bing, 2013-7-22. */
-typedef struct hiIVE_IMAGE_S {
-    HI_U64 au64PhyAddr[3];   /* RW;The physical address of the image */
-    HI_U64 au64VirAddr[3];   /* RW;The virtual address of the image */
-    HI_U32 au32Stride[3];    /* RW;The stride of the image */
-    HI_U32 u32Width;         /* RW;The width of the image */
-    HI_U32 u32Height;        /* RW;The height of the image */
-    IVE_IMAGE_TYPE_E enType; /* RW;The type of the image */
-} IVE_IMAGE_S;
-
-typedef IVE_IMAGE_S IVE_SRC_IMAGE_S;
-typedef IVE_IMAGE_S IVE_DST_IMAGE_S;
-
-/*
-* Definition of the IVE_MEM_INFO_S.This struct special purpose for input or ouput, such as Hist, CCL, ShiTomasi.
-* Added by Chen Quanfu, 2013-7-23.
-*/
-typedef struct hiIVE_MEM_INFO_S {
-    HI_U64 u64PhyAddr; /* RW;The physical address of the memory */
-    HI_U64 u64VirAddr; /* RW;The virtual address of the memory */
-    HI_U32 u32Size;    /* RW;The size of memory */
-} IVE_MEM_INFO_S;
-typedef IVE_MEM_INFO_S IVE_SRC_MEM_INFO_S;
-typedef IVE_MEM_INFO_S IVE_DST_MEM_INFO_S;
-
-/* Data struct ,created by Chen Quanfu 2013-07-19 */
-typedef struct hiIVE_DATA_S {
-    HI_U64 u64PhyAddr; /* RW;The physical address of the data */
-    HI_U64 u64VirAddr; /* RW;The virtaul address of the data */
-
-    HI_U32 u32Stride; /* RW;The stride of 2D data by byte */
-    HI_U32 u32Width;  /* RW;The width of 2D data by byte */
-    HI_U32 u32Height; /* RW;The height of 2D data by byte */
-
-    HI_U32 u32Reserved;
-} IVE_DATA_S;
-typedef IVE_DATA_S IVE_SRC_DATA_S;
-typedef IVE_DATA_S IVE_DST_DATA_S;
-
-/* Definition of the union of IVE_8BIT_U.Added by Tan Bing, 2013-7-22. */
-typedef union hiIVE_8BIT_U {
-    HI_S8 s8Val;
-    HI_U8 u8Val;
-} IVE_8BIT_U;
-
-/* Definition of u16 point */
-typedef struct hiIVE_POINT_U16_S {
-    HI_U16 u16X; /* RW;The X coordinate of the point */
-    HI_U16 u16Y; /* RW;The Y coordinate of the point */
-} IVE_POINT_U16_S;
-
-/*
-* Definition of s16 point
-*/
-typedef struct hiIVE_POINT_S16_S {
-    HI_U16 s16X; /* RW;The X coordinate of the point */
-    HI_U16 s16Y; /* RW;The Y coordinate of the point */
-} IVE_POINT_S16_S;
-
-/*
-* Float point represented by Fixed-point SQ25.7
-*/
-typedef struct hiIVE_POINT_S25Q7_S {
-    HI_S25Q7 s25q7X; /* RW;The X coordinate of the point */
-    HI_S25Q7 s25q7Y; /* RW;The Y coordinate of the point */
-} IVE_POINT_S25Q7_S;
-
-/*
-* Point u14q2
-*/
-typedef struct hiIVE_POINT_U14Q2_S {
-    HI_U14Q2 u14q2X;
-    HI_U14Q2 u14q2Y;
-} IVE_POINT_U14Q2_S;
-
-/* Definition of rectangle */
-typedef struct hiIVE_RECT_U16_S {
-    HI_U16 u16X;      /* RW;The location of X axis of the rectangle */
-    HI_U16 u16Y;      /* RW;The location of Y axis of the rectangle */
-    HI_U16 u16Width;  /* RW;The width of the rectangle */
-    HI_U16 u16Height; /* RW;The height of the rectangle */
-} IVE_RECT_U16_S;
-
-typedef struct hiIVE_RECT_U32_S {
-    HI_U32 u32X;      /* RW;The location of X axis of the rectangle */
-    HI_U32 u32Y;      /* RW;The location of Y axis of the rectangle */
-    HI_U32 u32Width;  /* RW;The width of the rectangle */
-    HI_U32 u32Height; /* RW;The height of the rectangle */
-} IVE_RECT_U32_S;
-
-typedef struct hiIVE_RECT_S24Q8_S {
-    HI_S24Q8 s24q8X;
-    HI_S24Q8 s24q8Y;
-    HI_U32 u32Width;
-    HI_U32 u32Height;
-} IVE_RECT_S24Q8_S;
-
-typedef struct hiIVE_LOOK_UP_TABLE_S {
-    IVE_MEM_INFO_S stTable;
-    HI_U16 u16ElemNum; /* RW;LUT's elements number */
-
-    HI_U8 u8TabInPreci;
-    HI_U8 u8TabOutNorm;
-
-    HI_S32 s32TabInLower; /* RW;LUT's original input lower limit */
-    HI_S32 s32TabInUpper; /* RW;LUT's original input upper limit */
-} IVE_LOOK_UP_TABLE_S;
-
-/* Blob type */
-typedef enum hiIVE_BLOB_TYPE_E {
-    IVE_BLOB_TYPE_S32 = 0x0,
-
-    IVE_BLOB_TYPE_U8 = 0x1,
-
-    /* channel = 3 */
-    IVE_BLOB_TYPE_YVU420SP = 0x2,
-    /* channel = 3 */
-    IVE_BLOB_TYPE_YVU422SP = 0x3,
-
-    IVE_BLOB_TYPE_VEC_S32 = 0x4,
-
-    IVE_BLOB_TYPE_SEQ_S32 = 0x5,
-
-    IVE_BLOB_TYPE_U16 = 0x6,
-
-    IVE_BLOB_TYPE_S8 = 0x7,
-
-    IVE_BLOB_TYPE_F32 = 0x8,
-
-    IVE_BLOB_TYPE_BUTT
-} IVE_BLOB_TYPE_E;
-
-/****************************** Blob struct ******************************
-In Caffe, the blob contain shape info as the following order:
-Image\FeatureMap:               N       C       H       W
-FC(normal vector):              N       C
-RNN\LSTM(Recurrent) vector:     T       N       D
-
-The relationship of the following blob struct with Caffe blob is as follows:
-Image\FeatureMap:               Num    Chn    Height   With
-FC(VEC_S32):                    Num    Width
-RNN\LSTM(SEQ_S32) vector:       Step   Num     Dim
-The stride, which measuring unit is byte, is always algined by the width or
-dim direction.
-**************************************************************************/
-typedef struct hiIVE_BLOB_S {
-    IVE_BLOB_TYPE_E enType; /* Blob type */
-    HI_U32 u32Stride;       /* Stride, a line bytes num */
-
-    HI_U64 u64VirAddr; /* virtual addr */
-    HI_U64 u64PhyAddr; /* physical addr */
-
-    HI_U32 u32Num; /* N: frame num or sequence num,correspond to caffe blob's n */
-    union {
-        struct {
-            HI_U32 u32Width;  /* W: frame width, correspond to caffe blob's w */
-            HI_U32 u32Height; /* H: frame height, correspond to caffe blob's h */
-            HI_U32 u32Chn;    /* C: frame channel,correspond to caffe blob's c */
-        } stWhc;
-        struct {
-            HI_U32 u32Dim;         /* D: vecotr dimension */
-            HI_U64 u64VirAddrStep; /* T: virtual adress of   time steps array in each sequence */
-        } stSeq;
-    } unShape;
-
-} IVE_BLOB_S;
-
-typedef IVE_BLOB_S IVE_SRC_BLOB_S;
-typedef IVE_BLOB_S IVE_DST_BLOB_S;
-
-typedef enum hiEN_IVE_ERR_CODE_E {
-    ERR_IVE_SYS_TIMEOUT = 0x40,   /* IVE process timeout */
-    ERR_IVE_QUERY_TIMEOUT = 0x41, /* IVE query timeout */
-    ERR_IVE_OPEN_FILE = 0x42,     /* IVE open file error */
-    ERR_IVE_READ_FILE = 0x43,     /* IVE read file error */
-    ERR_IVE_WRITE_FILE = 0x44,    /* IVE write file error */
-    ERR_IVE_BUS_ERR = 0x45,
-
-    ERR_IVE_BUTT
-} EN_IVE_ERR_CODE_E;
-
-typedef enum hiEN_FD_ERR_CODE_E {
-    ERR_FD_SYS_TIMEOUT = 0x40,   /* FD process timeout */
-    ERR_FD_CFG = 0x41,           /* FD configuration error */
-    ERR_FD_FACE_NUM_OVER = 0x42, /* FD candidate face number over */
-    ERR_FD_OPEN_FILE = 0x43,     /* FD open file error */
-    ERR_FD_READ_FILE = 0x44,     /* FD read file error */
-    ERR_FD_WRITE_FILE = 0x45,    /* FD write file error */
-
-    ERR_FD_BUTT
-} EN_FD_ERR_CODE_E;
-
-/************************************************IVE error code ***********************************/
-/* Invalid device ID */
-#define HI_ERR_IVE_INVALID_DEVID HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_DEVID)
-/* Invalid channel ID */
-#define HI_ERR_IVE_INVALID_CHNID HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-/* At least one parameter is illegal. For example, an illegal enumeration value exists. */
-#define HI_ERR_IVE_ILLEGAL_PARAM HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-/* The channel exists. */
-#define HI_ERR_IVE_EXIST HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_EXIST)
-/* The UN exists. */
-#define HI_ERR_IVE_UNEXIST HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-/* A null point is used. */
-#define HI_ERR_IVE_NULL_PTR HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-/* Try to enable or initialize the system, device, or channel before configuring attributes. */
-#define HI_ERR_IVE_NOT_CONFIG HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_CONFIG)
-/* The operation is not supported currently. */
-#define HI_ERR_IVE_NOT_SURPPORT HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-/* The operation, changing static attributes for example, is not permitted. */
-#define HI_ERR_IVE_NOT_PERM HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-/* A failure caused by the malloc memory occurs. */
-#define HI_ERR_IVE_NOMEM HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-/* A failure caused by the malloc buffer occurs. */
-#define HI_ERR_IVE_NOBUF HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-/* The buffer is empty. */
-#define HI_ERR_IVE_BUF_EMPTY HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-/* No buffer is provided for storing new data. */
-#define HI_ERR_IVE_BUF_FULL HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-/* The system is not ready because it may be not initialized or loaded.
- * The error code is returned when a device file fails to be opened. */
-#define HI_ERR_IVE_NOTREADY HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-/* The source address or target address is incorrect during the operations such as calling 
-copy_from_user or copy_to_user. */
-#define HI_ERR_IVE_BADADDR HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_BADADDR)
-/* The resource is busy during the operations such as destroying a VENC channel 
-without deregistering it. */
-#define HI_ERR_IVE_BUSY HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-/* IVE process timeout: 0xA01D8040 */
-#define HI_ERR_IVE_SYS_TIMEOUT HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, ERR_IVE_SYS_TIMEOUT)
-/* IVE query timeout: 0xA01D8041 */
-#define HI_ERR_IVE_QUERY_TIMEOUT HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, ERR_IVE_QUERY_TIMEOUT)
-/* IVE open file error: 0xA01D8042 */
-#define HI_ERR_IVE_OPEN_FILE HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, ERR_IVE_OPEN_FILE)
-/* IVE read file error: 0xA01D8043 */
-#define HI_ERR_IVE_READ_FILE HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, ERR_IVE_READ_FILE)
-/* IVE read file error: 0xA01D8044 */
-#define HI_ERR_IVE_WRITE_FILE HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, ERR_IVE_WRITE_FILE)
-/* IVE Bus error: 0xA01D8045 */
-#define HI_ERR_IVE_BUS_ERR HI_DEF_ERR(HI_ID_IVE, EN_ERR_LEVEL_ERROR, ERR_IVE_BUS_ERR)
-
-/************************************************FD error code ***********************************/
-/* Invalid device ID */
-#define HI_ERR_FD_INVALID_DEVID HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_DEVID)
-/* Invalid channel ID */
-#define HI_ERR_FD_INVALID_CHNID HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-/* At least one parameter is illegal. For example, an illegal enumeration value exists. */
-#define HI_ERR_FD_ILLEGAL_PARAM HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-/* The channel exists. */
-#define HI_ERR_FD_EXIST HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_EXIST)
-/* The UN exists. */
-#define HI_ERR_FD_UNEXIST HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-/* A null point is used. */
-#define HI_ERR_FD_NULL_PTR HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-/* Try to enable or initialize the system, device, or channel before configuring attributes. */
-#define HI_ERR_FD_NOT_CONFIG HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_CONFIG)
-/* The operation is not supported currently. */
-#define HI_ERR_FD_NOT_SURPPORT HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-/* The operation, changing static attributes for example, is not permitted. */
-#define HI_ERR_FD_NOT_PERM HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-/* A failure caused by the malloc memory occurs. */
-#define HI_ERR_FD_NOMEM HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-/* A failure caused by the malloc buffer occurs. */
-#define HI_ERR_FD_NOBUF HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-/* The buffer is empty. */
-#define HI_ERR_FD_BUF_EMPTY HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-/* No buffer is provided for storing new data. */
-#define HI_ERR_FD_BUF_FULL HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-/* The system is not ready because it may be not initialized or loaded.
- * The error code is returned when a device file fails to be opened. */
-#define HI_ERR_FD_NOTREADY HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-/* The source address or target address is incorrect during the operations such as calling 
-copy_from_user or copy_to_user. */
-#define HI_ERR_FD_BADADDR HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_BADADDR)
-/* The resource is busy during the operations such as destroying a VENC channel 
-without deregistering it. */
-#define HI_ERR_FD_BUSY HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-/* FD process timeout:         0xA02F8040 */
-#define HI_ERR_FD_SYS_TIMEOUT HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, ERR_FD_SYS_TIMEOUT)
-/* FD configuration error:     0xA02F8041 */
-#define HI_ERR_FD_CFG HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, ERR_FD_CFG)
-/* FD candidate face number over: 0xA02F8042 */
-#define HI_ERR_FD_FACE_NUM_OVER HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, ERR_FD_FACE_NUM_OVER)
-/* FD open file error: 0xA02F8043 */
-#define HI_ERR_FD_OPEN_FILE HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, ERR_FD_OPEN_FILE)
-/* FD read file error: 0xA02F8044 */
-#define HI_ERR_FD_READ_FILE HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, ERR_FD_READ_FILE)
-/* FD read file error: 0xA02F8045 */
-#define HI_ERR_FD_WRITE_FILE HI_DEF_ERR(HI_ID_FD, EN_ERR_LEVEL_ERROR, ERR_FD_WRITE_FILE)
-
-/************************************************ODT error code ***********************************/
-/* ODT Invalid channel ID: 0xA0308002 */
-#define HI_ERR_ODT_INVALID_CHNID HI_DEF_ERR(HI_ID_ODT, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-/* ODT exist: 0xA0308004 */
-#define HI_ERR_ODT_EXIST HI_DEF_ERR(HI_ID_ODT, EN_ERR_LEVEL_ERROR, EN_ERR_EXIST)
-/* ODT unexist: 0xA0308005 */
-#define HI_ERR_ODT_UNEXIST HI_DEF_ERR(HI_ID_ODT, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-/* ODT The operation, changing static attributes for example, is not permitted: 0xA0308009 */
-#define HI_ERR_ODT_NOT_PERM HI_DEF_ERR(HI_ID_ODT, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-/* ODT the system is not ready because it may be not initialized: 0xA0308010 */
-#define HI_ERR_ODT_NOTREADY HI_DEF_ERR(HI_ID_ODT, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-/* ODT busy: 0xA0308012 */
-#define HI_ERR_ODT_BUSY HI_DEF_ERR(HI_ID_ODT, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-#endif /* __HI_COMM_IVE_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_rc.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_rc.h
deleted file mode 100644
index 872cdee9..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_rc.h
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2016-2017. All rights reserved.
- * Description:
- * Author: Hisilicon multimedia software group
- * Create: 2016/11/15
- */
-#ifndef __HI_COMM_RC_H__
-#define __HI_COMM_RC_H__
-
-#include "hi_defines.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-typedef HI_U32 HI_FR32;
-
-/* rc mode */
-typedef enum hiVENC_RC_MODE_E {
-    VENC_RC_MODE_H264CBR = 1,
-    VENC_RC_MODE_H264VBR,
-    VENC_RC_MODE_H264AVBR, /* Not support for Hi3556AV100/Hi3556V200/Hi3559V200 */
-    VENC_RC_MODE_H264QVBR,
-    VENC_RC_MODE_H264CVBR,
-    VENC_RC_MODE_H264FIXQP,
-    VENC_RC_MODE_H264QPMAP, /* Not support for Hi3556AV100/Hi3556V200/Hi3559V200 */
-
-    VENC_RC_MODE_MJPEGCBR,
-    VENC_RC_MODE_MJPEGVBR,
-    VENC_RC_MODE_MJPEGFIXQP,
-
-    VENC_RC_MODE_H265CBR,
-    VENC_RC_MODE_H265VBR,
-    VENC_RC_MODE_H265AVBR, /* Not support for Hi3556AV100/Hi3556V200/Hi3559V200 */
-    VENC_RC_MODE_H265QVBR,
-    VENC_RC_MODE_H265CVBR,
-    VENC_RC_MODE_H265FIXQP,
-    VENC_RC_MODE_H265QPMAP, /* Not support for Hi3556AV100/Hi3556V200/Hi3559V200 */
-
-    VENC_RC_MODE_BUTT,
-} VENC_RC_MODE_E;
-
-/* qpmap mode */
-typedef enum hiVENC_RC_QPMAP_MODE_E {
-    VENC_RC_QPMAP_MODE_MEANQP = 0,
-    VENC_RC_QPMAP_MODE_MINQP,
-    VENC_RC_QPMAP_MODE_MAXQP,
-
-    VENC_RC_QPMAP_MODE_BUTT,
-} VENC_RC_QPMAP_MODE_E;
-
-/* the attribute of h264e fixqp */
-typedef struct hiVENC_H264_FIXQP_S {
-    HI_U32      u32Gop;                    /* RW; Range:[1, 65536]; the interval of ISLICE. */
-    HI_U32      u32SrcFrameRate;           /* RW; Range:[1, 240]; the input frame rate of the venc chnnel */
-    HI_FR32     fr32DstFrameRate ;         /* RW; Range:[0.015625, 240]; the target frame rate of the venc chnnel,can not be larger than u32SrcFrameRate */
-    HI_U32      u32IQp;                    /* RW; Range:[0, 51]; qp of the i frame */
-    HI_U32      u32PQp;                    /* RW; Range:[0, 51]; qp of the p frame */
-    HI_U32      u32BQp;                    /* RW; Range:[0, 51]; qp of the b frame */
-} VENC_H264_FIXQP_S;
-
-/* the attribute of h264e cbr */
-typedef struct hiVENC_H264_CBR_S {
-    HI_U32      u32Gop;                    /* RW; Range:[1, 65536]; the interval of I Frame. */
-    HI_U32      u32StatTime;               /* RW; Range:[1, 60]; the rate statistic time, the unit is senconds(s) */
-    HI_U32      u32SrcFrameRate;           /* RW; Range:[1, 240]; the input frame rate of the venc chnnel */
-    HI_FR32     fr32DstFrameRate ;         /* RW; Range:[0.015625, 240]; the target frame rate of the venc chnnel,can not be larger than u32SrcFrameRate */
-    HI_U32      u32BitRate;                /* RW; Range:[2, 614400]; average bitrate */
-} VENC_H264_CBR_S;
-
-/* the attribute of h264e vbr */
-typedef struct hiVENC_H264_VBR_S {
-    HI_U32      u32Gop;                     /* RW; Range:[1, 65536]; the interval of ISLICE. */
-    HI_U32      u32StatTime;                /* RW; Range:[1, 60]; the rate statistic time, the unit is senconds(s) */
-    HI_U32      u32SrcFrameRate;            /* RW; Range:[1, 240]; the input frame rate of the venc chnnel */
-    HI_FR32     fr32DstFrameRate ;          /* RW; Range:[0.015625, 240]; the target frame rate of the venc chnnel,can not be larger than u32SrcFrameRate */
-    HI_U32      u32MaxBitRate;              /* RW; Range:[2, 614400];the max bitrate */
-} VENC_H264_VBR_S;
-
-/* the attribute of h264e cvbr */
-typedef struct hiVENC_H264_CVBR_S {
-    HI_U32      u32Gop;                     /* RW; Range:[1, 65536]; the interval of ISLICE. */
-    HI_U32      u32StatTime;                /* RW; Range:[1, 60]; the rate statistic time, the unit is senconds(s) */
-    HI_U32      u32SrcFrameRate;            /* RW; Range:[1, 240]; the input frame rate of the venc chnnel */
-    HI_FR32     fr32DstFrameRate ;          /* RW; Range:[0.015625, 240]; the target frame rate of the venc chnnel,can not be larger than u32SrcFrameRate */
-    HI_U32      u32MaxBitRate;              /* RW; Range:[2, 614400];the max bitrate */
-
-    HI_U32      u32ShortTermStatTime;       /* RW; Range:[1, 120]; the long-term rate statistic time, the unit is second (s)*/
-    HI_U32      u32LongTermStatTime;        /* RW; Range:[1, 1440]; the long-term rate statistic time, the unit is u32LongTermStatTimeUnit*/
-    HI_U32      u32LongTermMaxBitrate ;     /* RW; Range:[2, 614400];the long-term target max bitrate, can not be larger than u32MaxBitRate,the unit is kbps */
-    HI_U32      u32LongTermMinBitrate ;     /* RW; Range:[0, 614400];the long-term target min bitrate,  can not be larger than u32LongTermMaxBitrate,the unit is kbps */
-} VENC_H264_CVBR_S;
-
-/* the attribute of h264e avbr */
-typedef struct hiVENC_H264_AVBR_S {
-    HI_U32      u32Gop;                  /* RW; Range:[1, 65536]; the interval of ISLICE. */
-    HI_U32      u32StatTime;             /* RW; Range:[1, 60]; the rate statistic time, the unit is senconds(s) */
-    HI_U32      u32SrcFrameRate;         /* RW; Range:[1, 240]; the input frame rate of the venc chnnel */
-    HI_FR32     fr32DstFrameRate ;       /* RW; Range:[0.015625, 240]; the target frame rate of the venc chnnel,can not be larger than u32SrcFrameRate */
-    HI_U32      u32MaxBitRate;           /* RW; Range:[2, 614400];the max bitrate */
-} VENC_H264_AVBR_S;
-
-/* the attribute of h264e qpmap */
-typedef struct hiVENC_H264_QPMAP_S {
-    HI_U32      u32Gop;                   /* RW; Range:[1, 65536]; the interval of ISLICE. */
-    HI_U32      u32StatTime;              /* RW; Range:[1, 60]; the rate statistic time, the unit is senconds(s) */
-    HI_U32      u32SrcFrameRate;          /* RW; Range:[1, 240]; the input frame rate of the venc chnnel */
-    HI_FR32     fr32DstFrameRate ;        /* RW; Range:[0.015625, 240]; the target frame rate of the venc chnnel,can not be larger than u32SrcFrameRate */
-} VENC_H264_QPMAP_S;
-
-typedef struct hiVENC_H264_QVBR_S {
-    HI_U32      u32Gop;                   /* RW; Range:[1, 65536];the interval of ISLICE. */
-    HI_U32      u32StatTime;              /* RW; Range:[1, 60]; the rate statistic time, the unit is senconds(s) */
-    HI_U32      u32SrcFrameRate;          /* RW; Range:[1, 240]; the input frame rate of the venc chnnel */
-    HI_FR32     fr32DstFrameRate ;        /* RW; Range:[0.015625, 240]; the target frame rate of the venc chnnel,can not be larger than u32SrcFrameRate */
-    HI_U32      u32TargetBitRate;         /* RW; Range:[2, 614400]; the target bitrate */
-}VENC_H264_QVBR_S;
-
-/* the attribute of h265e qpmap */
-typedef struct hiVENC_H265_QPMAP_S {
-    HI_U32      u32Gop;                   /* RW; Range:[1, 65536]; the interval of ISLICE. */
-    HI_U32      u32StatTime;              /* RW; Range:[1, 60]; the rate statistic time, the unit is senconds(s) */
-    HI_U32      u32SrcFrameRate;          /* RW; Range:[1, 240]; the input frame rate of the venc chnnel */
-    HI_FR32     fr32DstFrameRate ;        /* RW; Range:[0.015625, 240]; the target frame rate of the venc chnnel,can not be larger than u32SrcFrameRate */
-    VENC_RC_QPMAP_MODE_E enQpMapMode;     /* RW;  the QpMap Mode.*/
-} VENC_H265_QPMAP_S;
-
-typedef struct hiVENC_H264_CBR_S   VENC_H265_CBR_S;
-typedef struct hiVENC_H264_VBR_S   VENC_H265_VBR_S;
-typedef struct hiVENC_H264_AVBR_S  VENC_H265_AVBR_S;
-typedef struct hiVENC_H264_FIXQP_S VENC_H265_FIXQP_S;
-typedef struct hiVENC_H264_QVBR_S  VENC_H265_QVBR_S;
-typedef struct hiVENC_H264_CVBR_S  VENC_H265_CVBR_S;
-
-/* the attribute of mjpege fixqp */
-typedef struct hiVENC_MJPEG_FIXQP_S {
-    HI_U32      u32SrcFrameRate;          /* RW; Range:[1, 240]; the input frame rate of the venc chnnel */
-    HI_FR32     fr32DstFrameRate;         /* RW; Range:[0.015625, 240]; the target frame rate of the venc chnnel,can not be larger than u32SrcFrameRate */
-    HI_U32      u32Qfactor;               /* RW; Range:[1,99];image quality. */
-} VENC_MJPEG_FIXQP_S;
-
-/* the attribute of mjpege cbr */
-typedef struct hiVENC_MJPEG_CBR_S {
-    HI_U32      u32StatTime;              /* RW; Range:[1, 60]; the rate statistic time, the unit is senconds(s) */
-    HI_U32      u32SrcFrameRate;          /* RW; Range:[1, 240]; the input frame rate of the venc chnnel */
-    HI_FR32     fr32DstFrameRate ;        /* RW; Range:[0.015625, 240]; the target frame rate of the venc chnnel,can not be larger than u32SrcFrameRate */
-    HI_U32      u32BitRate;               /* RW; Range:[2, 614400]; average bitrate */
-} VENC_MJPEG_CBR_S;
-
-/* the attribute of mjpege vbr */
-typedef struct hiVENC_MJPEG_VBR_S {
-    HI_U32      u32StatTime;              /* RW; Range:[1, 60]; the rate statistic time, the unit is senconds(s) */
-    HI_U32      u32SrcFrameRate;          /* RW; Range:[1, 240]; the input frame rate of the venc chnnel */
-    HI_FR32     fr32DstFrameRate;         /* RW; Range:[0.015625, 240]; the target frame rate of the venc chnnel,can not be larger than u32SrcFrameRate */
-    HI_U32      u32MaxBitRate;            /* RW; Range:[2, 614400];the max bitrate */
-}VENC_MJPEG_VBR_S;
-
-/* the attribute of rc */
-typedef struct hiVENC_RC_ATTR_S {
-    VENC_RC_MODE_E enRcMode;              /* RW; the type of rc*/
-    union {
-        VENC_H264_CBR_S    stH264Cbr;
-        VENC_H264_VBR_S    stH264Vbr;
-        VENC_H264_AVBR_S   stH264AVbr;
-        VENC_H264_QVBR_S   stH264QVbr;
-        VENC_H264_CVBR_S   stH264CVbr;
-        VENC_H264_FIXQP_S  stH264FixQp;
-        VENC_H264_QPMAP_S  stH264QpMap;
-
-        VENC_MJPEG_CBR_S   stMjpegCbr;
-        VENC_MJPEG_VBR_S   stMjpegVbr;
-        VENC_MJPEG_FIXQP_S stMjpegFixQp;
-
-        VENC_H265_CBR_S    stH265Cbr;
-        VENC_H265_VBR_S    stH265Vbr;
-        VENC_H265_AVBR_S   stH265AVbr;
-        VENC_H265_QVBR_S   stH265QVbr;
-        VENC_H265_CVBR_S   stH265CVbr;
-        VENC_H265_FIXQP_S  stH265FixQp;
-        VENC_H265_QPMAP_S  stH265QpMap;
-    };
-} VENC_RC_ATTR_S;
-
-/* the super frame mode */
-typedef enum hiRC_SUPERFRM_MODE_E {
-    SUPERFRM_NONE=0,                    /* sdk don't care super frame */
-    SUPERFRM_DISCARD,                   /* the super frame is discarded */
-    SUPERFRM_REENCODE,                  /* the super frame is re-encode */
-    SUPERFRM_BUTT
-} VENC_SUPERFRM_MODE_E;
-
-/* The param of H264e cbr */
-typedef struct hiVENC_PARAM_H264_CBR_S {
-    HI_U32  u32MinIprop;                /* RW; Range:[1, 100]; the min ratio of i frame and p frame */
-    HI_U32  u32MaxIprop;                /* RW; Range:[1, 100]; the max ratio of i frame and p frame,can not be smaller than u32MinIprop */
-    HI_U32  u32MaxQp;                   /* RW; Range:[0, 51];the max QP value */
-    HI_U32  u32MinQp;                   /* RW; Range:[0, 51]; the min QP value,can not be larger than u32MaxQp */
-    HI_U32  u32MaxIQp;                  /* RW; Range:[0, 51]; max qp for i frame */
-    HI_U32  u32MinIQp;                  /* RW; Range:[0, 51]; min qp for i frame,can not be larger than u32MaxIQp */
-    HI_S32  s32MaxReEncodeTimes;        /* RW; Range:[0, 3]; Range:max number of re-encode times.*/
-    HI_BOOL bQpMapEn;                   /* RW; Range:[0, 1]; enable qpmap.*/
-} VENC_PARAM_H264_CBR_S;
-
-/* The param of H264e vbr */
-typedef struct hiVENC_PARAM_H264_VBR_S {
-    HI_S32  s32ChangePos;               /* RW; Range:[50, 100]; Indicates the ratio of the current bit rate to the maximum
-                                            bit rate when the QP value starts to be adjusted */
-    HI_U32  u32MinIprop;                /* RW; Range:[1, 100] ; the min ratio of i frame and p frame */
-    HI_U32  u32MaxIprop;                /* RW; Range:[1, 100] ; the max ratio of i frame and p frame,can not be smaller than u32MinIprop*/
-    HI_S32  s32MaxReEncodeTimes;        /* RW; Range:[0, 3]; max number of re-encode times */
-    HI_BOOL bQpMapEn;                   /* RW; Range:[0, 1]; enable qpmap.*/
-
-    HI_U32  u32MaxQp;                   /* RW; Range:[0, 51]; the max P B qp */
-    HI_U32  u32MinQp;                   /* RW; Range:[0, 51]; the min P B qp,can not be larger than u32MaxQp */
-    HI_U32  u32MaxIQp;                  /* RW; Range:[0, 51]; the max I qp */
-    HI_U32  u32MinIQp;                  /* RW; Range:[0, 51]; the min I qp ,can not be larger than u32MaxIQp*/
-} VENC_PARAM_H264_VBR_S;
-
-/* The param of H264e avbr */
-typedef struct hiVENC_PARAM_H264_AVBR_S {
-    HI_S32  s32ChangePos;               /* RW; Range:[50, 100]; Indicates the ratio of the current bit rate to the maximum
-                                            bit rate when the QP value starts to be adjusted */
-    HI_U32  u32MinIprop;                /* RW; Range:[1, 100] ; the min ratio of i frame and p frame,can not be smaller than u32MinIprop */
-    HI_U32  u32MaxIprop;                /* RW; Range:[1, 100] ; the max ratio of i frame and p frame */
-    HI_S32  s32MaxReEncodeTimes;        /* RW; Range:[0, 3]; max number of re-encode times */
-    HI_BOOL bQpMapEn;                   /* RW; Range:[0, 1]; enable qpmap.*/
-
-    HI_S32  s32MinStillPercent;         /* RW; Range:[5, 100]; the min percent of target bitrate for still scene */
-    HI_U32  u32MaxStillQP;              /* RW; Range:[0, 51]; the max QP value of I frame for still scene,
-                                               can not be smaller than u32MinIQp and can not be larger than su32MaxIQp*/
-    HI_U32  u32MinStillPSNR;            /* RW; reserved,Invalid member currently */
-
-    HI_U32  u32MaxQp;                   /* RW; Range:[0, 51]; the max P B qp */
-    HI_U32  u32MinQp;                   /* RW; Range:[0, 51]; the min P B qp,can not be larger than u32MaxQp */
-    HI_U32  u32MaxIQp;                  /* RW; Range:[0, 51]; the max I qp */
-    HI_U32  u32MinIQp;                  /* RW; Range:[0, 51]; the min I qp,can not be larger than u32MaxIQp */
-    HI_U32  u32MinQpDelta;              /* RW; Range:[0, 4];Difference between FrameLevelMinQp and MinQp, FrameLevelMinQp = MinQp(or MinIQp) + MinQpDelta  */
-    HI_U32  u32MotionSensitivity;       /* RW; Range:[0, 100]; Motion Sensitivity */
-} VENC_PARAM_H264_AVBR_S;
-
-typedef struct hiVENC_PARAM_H264_QVBR_S {
-    HI_U32  u32MinIprop;               /* RW; Range:[1, 100]; the min ratio of i frame and p frame */
-    HI_U32  u32MaxIprop;               /* RW; Range:[1, 100] ;the max ratio of i frame and p frame,can not be smaller than u32MinIprop */
-    HI_S32  s32MaxReEncodeTimes;       /* RW; Range:[0, 3];max number of re-encode times [0, 3]*/
-    HI_BOOL bQpMapEn;                  /* RW; Range:[0, 1]; enable qpmap.*/
-
-    HI_U32  u32MaxQp;                  /* RW; Range:[0, 51]; the max P B qp */
-    HI_U32  u32MinQp;                  /* RW; Range:[0, 51]; the min P B qp,can not be larger than u32MaxQp*/
-    HI_U32  u32MaxIQp;                 /* RW; Range:[0, 51]; the max I qp */
-    HI_U32  u32MinIQp;                 /* RW; Range:[0, 51]; the min I qp,can not be larger than u32MaxIQp */
-
-    HI_S32  s32BitPercentUL;           /* RW; Range:[30, 180]; Indicate the ratio of bitrate  upper limit*/
-    HI_S32  s32BitPercentLL;           /* RW; Range:[30, 180]; Indicate the ratio of bitrate  lower limit,can not be larger than s32BitPercentUL*/
-    HI_S32  s32PsnrFluctuateUL;        /* RW; Range:[18, 40]; Reduce the target bitrate when the value of psnr approch the upper limit*/
-    HI_S32  s32PsnrFluctuateLL;        /* RW; Range:[18, 40]; Increase the target bitrate when the value of psnr approch the lower limit,
-                                                              can not be larger than s32PsnrFluctuateUL*/
-} VENC_PARAM_H264_QVBR_S;
-
-/* The param of H264e cvbr */
-typedef struct hiVENC_PARAM_H264_CVBR_S {
-    HI_U32  u32MinIprop;                /* RW; Range:[1, 100] ; the min ratio of i frame and p frame */
-    HI_U32  u32MaxIprop;                /* RW; Range:[1, 100] ; the max ratio of i frame and p frame,can not be smaller than u32MinIprop */
-    HI_S32  s32MaxReEncodeTimes;        /* RW; Range:[0, 3]; max number of re-encode times */
-    HI_BOOL bQpMapEn;                   /* RW; Range:[0, 1]; enable qpmap.*/
-
-    HI_U32  u32MaxQp;                   /* RW; Range:[0, 51]; the max P B qp */
-    HI_U32  u32MinQp;                   /* RW; Range:[0, 51]; the min P B qp,can not be larger than u32MaxQp */
-    HI_U32  u32MaxIQp;                  /* RW; Range:[0, 51]; the max I qp */
-    HI_U32  u32MinIQp;                  /* RW; Range:[0, 51]; the min I qp,can not be larger than u32MaxIQp */
-
-    HI_U32  u32MinQpDelta;              /* RW; Range:[0, 4];Difference between FrameLevelMinQp and MinQp, FrameLevelMinQp = MinQp(or MinIQp) + MinQpDelta  */
-    HI_U32  u32MaxQpDelta;              /* RW; Range:[0, 4];Difference between FrameLevelMaxQp and MaxQp, FrameLevelMaxQp = MaxQp(or MaxIQp) - MaxQpDelta  */
-
-    HI_U32  u32ExtraBitPercent;         /* RW; Range:[0, 1000];the extra bits that can be allocated when the actual bitrate goes above the target bitrate*/
-    HI_U32  u32LongTermStatTimeUnit;    /* RW; Range:[1, 1800]; the time unit of LongTermStatTime,, the unit is senconds(s)*/
-} VENC_PARAM_H264_CVBR_S;
-
-/* The param of mjpege cbr */
-typedef struct hiVENC_PARAM_MJPEG_CBR_S {
-    HI_U32  u32MaxQfactor;               /* RW; Range:[1, 99]; the max Qfactor value*/
-    HI_U32  u32MinQfactor;               /* RW; Range:[1, 99]; the min Qfactor value ,can not be larger than u32MaxQfactor */
-} VENC_PARAM_MJPEG_CBR_S;
-
-/* The param of mjpege vbr */
-typedef struct hiVENC_PARAM_MJPEG_VBR_S {
-    HI_S32 s32ChangePos;                 /* RW; Range:[50, 100]; Indicates the ratio of the current bit rate to the maximum
-                                                          bit rate when the Qfactor value starts to be adjusted */
-    HI_U32 u32MaxQfactor;                /* RW; Range:[1, 99]; max image quailty allowed */
-    HI_U32 u32MinQfactor;                /* RW; Range:[1, 99]; min image quality allowed ,can not be larger than u32MaxQfactor*/
-} VENC_PARAM_MJPEG_VBR_S;
-
-/* The param of h265e cbr */
-typedef struct hiVENC_PARAM_H265_CBR_S {
-    HI_U32  u32MinIprop;                 /* RW; Range:[1, 100]; the min ratio of i frame and p frame */
-    HI_U32  u32MaxIprop;                 /* RW; Range:[1, 100];the max ratio of i frame and p frame,can not be smaller than u32MinIprop */
-    HI_U32  u32MaxQp;                    /* RW; Range:[0, 51];the max QP value */
-    HI_U32  u32MinQp;                    /* RW; Range:[0, 51];the min QP value ,can not be larger than u32MaxQp*/
-    HI_U32  u32MaxIQp;                   /* RW; Range:[0, 51];max qp for i frame */
-    HI_U32  u32MinIQp;                   /* RW; Range:[0, 51];min qp for i frame,can not be larger than u32MaxIQp */
-    HI_S32  s32MaxReEncodeTimes;         /* RW; Range:[0, 3]; Range:max number of re-encode times.*/
-    HI_BOOL bQpMapEn;                    /* RW; Range:[0, 1]; enable qpmap.*/
-    VENC_RC_QPMAP_MODE_E enQpMapMode;    /* RW; Qpmap Mode*/
-} VENC_PARAM_H265_CBR_S;
-
-/* The param of h265e vbr */
-typedef struct hiVENC_PARAM_H265_VBR_S {
-    HI_S32  s32ChangePos;               /* RW; Range:[50, 100];Indicates the ratio of the current bit rate to the maximum                                             bit rate when the QP value starts to be adjusted */
-    HI_U32  u32MinIprop;                /* RW; [1, 100]the min ratio of i frame and p frame */
-    HI_U32  u32MaxIprop;                /* RW; [1, 100]the max ratio of i frame and p frame,can not be smaller than u32MinIprop */
-    HI_S32  s32MaxReEncodeTimes;        /* RW; Range:[0, 3]; Range:max number of re-encode times.*/
-
-    HI_U32  u32MaxQp;                   /* RW; Range:[0, 51]; the max P B qp */
-    HI_U32  u32MinQp;                   /* RW; Range:[0, 51]; the min P B qp ,can not be larger than u32MaxQp*/
-    HI_U32  u32MaxIQp;                  /* RW; Range:[0, 51]; the max I qp */
-    HI_U32  u32MinIQp;                  /* RW; Range:[0, 51]; the min I qp,can not be larger than u32MaxIQp */
-
-    HI_BOOL bQpMapEn;                   /* RW; Range:[0, 1]; enable qpmap.*/
-    VENC_RC_QPMAP_MODE_E enQpMapMode;   /* RW; Qpmap Mode*/
-} VENC_PARAM_H265_VBR_S;
-
-/* The param of h265e vbr */
-typedef struct hiVENC_PARAM_H265_AVBR_S {
-    HI_S32  s32ChangePos;               /* RW; Range:[50, 100];Indicates the ratio of the current bit rate to the maximum
-                                            bit rate when the QP value starts to be adjusted */
-    HI_U32  u32MinIprop;                /* RW; [1, 100]the min ratio of i frame and p frame */
-    HI_U32  u32MaxIprop;                /* RW; [1, 100]the max ratio of i frame and p frame,can not be smaller than u32MinIprop */
-    HI_S32  s32MaxReEncodeTimes;        /* RW; Range:[0, 3]; Range:max number of re-encode times.*/
-
-    HI_S32  s32MinStillPercent;         /* RW; Range:[5, 100]; the min percent of target bitrate for still scene */
-    HI_U32  u32MaxStillQP;              /* RW; Range:[0, 51]; the max QP value of I frame for still scene,
-                                               can not be smaller than u32MinIQp and can not be larger than su32MaxIQp*/
-    HI_U32  u32MinStillPSNR;            /* RW; reserved */
-
-    HI_U32  u32MaxQp;                   /* RW; Range:[0, 51];the max P B qp */
-    HI_U32  u32MinQp;                   /* RW; Range:[0, 51];the min P B qp,can not be larger than u32MaxQp */
-    HI_U32  u32MaxIQp;                  /* RW; Range:[0, 51];the max I qp */
-    HI_U32  u32MinIQp;                  /* RW; Range:[0, 51];the min I qp,can not be larger than u32MaxIQp */
-
-    HI_U32  u32MinQpDelta;              /* RW; Range:[0, 4];Difference between FrameLevelMinQp and MinQp, FrameLevelMinQp = MinQp(or MinIQp) + MinQpDelta  */
-    HI_U32  u32MotionSensitivity;       /* RW; Range:[0, 100]; Motion Sensitivity */
-
-    HI_BOOL bQpMapEn;                   /* RW; Range:[0, 1]; enable qpmap.*/
-    VENC_RC_QPMAP_MODE_E enQpMapMode;   /* RW; Qpmap Mode*/
-} VENC_PARAM_H265_AVBR_S;
-
-typedef struct hiVENC_PARAM_H265_QVBR_S {
-    HI_U32  u32MinIprop;                /* RW; [1, 100];the min ratio of i frame and p frame */
-    HI_U32  u32MaxIprop;                /* RW; [1, 100];the max ratio of i frame and p frame,can not be smaller than u32MinIprop */
-    HI_S32  s32MaxReEncodeTimes;        /* RW; [0, 3]; max number of re-encode times [0, 3]*/
-
-    HI_BOOL bQpMapEn;                   /* RW; Range:[0, 1]; enable qpmap.*/
-    VENC_RC_QPMAP_MODE_E enQpMapMode;   /* RW; Qpmap Mode*/
-
-    HI_U32  u32MaxQp;                   /* RW; Range:[0, 51]; the max P B qp */
-    HI_U32  u32MinQp;                   /* RW; Range:[0, 51]; the min P B qp,can not be larger than u32MaxQp */
-    HI_U32  u32MaxIQp;                  /* RW; Range:[0, 51]; the max I qp */
-    HI_U32  u32MinIQp;                  /* RW; Range:[0, 51]; the min I qp,can not be larger than u32MaxIQp */
-
-    HI_S32  s32BitPercentUL;            /* RW; Range:[30, 180]; Indicate the ratio of bitrate  upper limit*/
-    HI_S32  s32BitPercentLL;            /* RW; Range:[30, 180]; Indicate the ratio of bitrate  lower limit,can not be larger than s32BitPercentUL*/
-    HI_S32  s32PsnrFluctuateUL;         /* RW; Range:[18, 40];  Reduce the target bitrate when the value of psnr approch the upper limit*/
-    HI_S32  s32PsnrFluctuateLL;         /* RW; Range:[18, 40];  Increase the target bitrate when the value of psnr approch the lower limit,
-                                                              can not be larger than s32PsnrFluctuateUL*/
-} VENC_PARAM_H265_QVBR_S;
-
-typedef struct hiVENC_PARAM_H265_CVBR_S {
-    HI_U32  u32MinIprop;                /* RW; Range:[1, 100] ; the min ratio of i frame and p frame */
-    HI_U32  u32MaxIprop;                /* RW; Range:[1, 100] ; the max ratio of i frame and p frame,can not be smaller than u32MinIprop */
-    HI_S32  s32MaxReEncodeTimes;        /* RW; Range:[0, 3]; max number of re-encode times */
-    HI_BOOL bQpMapEn;
-    VENC_RC_QPMAP_MODE_E enQpMapMode;   /* RW; Qpmap Mode*/
-
-    HI_U32  u32MaxQp;                   /* RW; Range:[0, 51]; the max P B qp */
-    HI_U32  u32MinQp;                   /* RW; Range:[0, 51]; the min P B qp,can not be larger than u32MaxQp */
-    HI_U32  u32MaxIQp;                  /* RW; Range:[0, 51]; the max I qp */
-    HI_U32  u32MinIQp;                  /* RW; Range:[0, 51]; the min I qp,can not be larger than u32MaxIQp */
-
-    HI_U32  u32MinQpDelta;              /* RW; Range:[0, 4];Difference between FrameLevelMinQp and MinQp, FrameLevelMinQp = MinQp(or MinIQp) + MinQpDelta  */
-    HI_U32  u32MaxQpDelta;              /* RW; Range:[0, 4];Difference between FrameLevelMaxQp and MaxQp, FrameLevelMaxQp = MaxQp(or MaxIQp) - MaxQpDelta  */
-
-    HI_U32  u32ExtraBitPercent;         /* RW; Range:[0, 1000];the extra ratio of bitrate that can be allocated when the actual bitrate goes above the long-term target bitrate*/
-    HI_U32  u32LongTermStatTimeUnit;    /* RW; Range:[1, 1800]; the time unit of LongTermStatTime, the unit is senconds(s)*/
-} VENC_PARAM_H265_CVBR_S;
-
-typedef struct hiVENC_SCENE_CHANGE_DETECT_S {
-    HI_BOOL bDetectSceneChange;         /* RW; Range:[0, 1]; enable detect scene change.*/
-    HI_BOOL bAdaptiveInsertIDRFrame;    /* RW; Range:[0, 1]; enable a daptive insertIDR frame.*/
-} VENC_SCENE_CHANGE_DETECT_S;
-
-/* The param of rc */
-typedef struct hiVENC_RC_PARAM_S {
-    HI_U32 u32ThrdI[RC_TEXTURE_THR_SIZE];   /* RW; Range:[0, 255]; Mad threshold for controlling the macroblock-level bit rate of I frames */
-    HI_U32 u32ThrdP[RC_TEXTURE_THR_SIZE];   /* RW; Range:[0, 255]; Mad threshold for controlling the macroblock-level bit rate of P frames */
-    HI_U32 u32ThrdB[RC_TEXTURE_THR_SIZE];   /* RW; Range:[0, 255]; Mad threshold for controlling the macroblock-level bit rate of B frames */
-    HI_U32 u32DirectionThrd;                /* RW; Range:[0, 16]; The direction for controlling the macroblock-level bit rate*/
-    HI_U32 u32RowQpDelta;                   /* RW; Range:[0, 10];the start QP value of each macroblock row relative to the start QP value */
-    HI_S32 s32FirstFrameStartQp;            /* RW; Range:[-1, 51];Start QP value of the first frame*/
-    VENC_SCENE_CHANGE_DETECT_S stSceneChangeDetect;/* RW;*/
-    union {
-        VENC_PARAM_H264_CBR_S     stParamH264Cbr;
-        VENC_PARAM_H264_VBR_S     stParamH264Vbr;
-        VENC_PARAM_H264_AVBR_S    stParamH264AVbr;
-        VENC_PARAM_H264_QVBR_S    stParamH264QVbr;
-        VENC_PARAM_H264_CVBR_S    stParamH264CVbr;
-        VENC_PARAM_H265_CBR_S     stParamH265Cbr;
-        VENC_PARAM_H265_VBR_S     stParamH265Vbr;
-        VENC_PARAM_H265_AVBR_S    stParamH265AVbr;
-        VENC_PARAM_H265_QVBR_S    stParamH265QVbr;
-        VENC_PARAM_H265_CVBR_S    stParamH265CVbr;
-        VENC_PARAM_MJPEG_CBR_S    stParamMjpegCbr;
-        VENC_PARAM_MJPEG_VBR_S    stParamMjpegVbr;
-    };
-} VENC_RC_PARAM_S;
-
-/* the frame lost mode */
-typedef enum hiVENC_FRAMELOST_MODE_E {
-    FRMLOST_NORMAL=0,                               /*normal mode*/
-    FRMLOST_PSKIP,                                  /*pskip*/
-    FRMLOST_BUTT,
-} VENC_FRAMELOST_MODE_E;
-
-/* The param of the frame lost mode */
-typedef struct hiVENC_FRAMELOST_S {
-    HI_BOOL                bFrmLostOpen;          /* RW; Range:[0,1];Indicates whether to discard frames to ensure stable bit rate when the instant bit rate is exceeded */
-    HI_U32                 u32FrmLostBpsThr;      /* RW; the instant bit rate threshold */
-    VENC_FRAMELOST_MODE_E  enFrmLostMode;         /* RW; frame lost strategy*/
-    HI_U32                 u32EncFrmGaps;         /* RW; Range:[0,65535]; the gap of frame lost*/
-} VENC_FRAMELOST_S;
-
-/* the rc priority */
-typedef enum hiVENC_RC_PRIORITY_E {
-    VENC_RC_PRIORITY_BITRATE_FIRST = 1,           /* bitrate first */
-    VENC_RC_PRIORITY_FRAMEBITS_FIRST,             /* framebits first*/
-    VENC_RC_PRIORITY_BUTT,
-} VENC_RC_PRIORITY_E;
-
-/* the config of the superframe */
-typedef struct hiVENC_SUPERFRAME_CFG_S {
-    VENC_SUPERFRM_MODE_E  enSuperFrmMode;          /* RW; Indicates the mode of processing the super frame*/
-    HI_U32                u32SuperIFrmBitsThr;     /* RW; Range:[0, 4294967295];Indicate the threshold of the super I frame for enabling the super frame processing mode */
-    HI_U32                u32SuperPFrmBitsThr;     /* RW; Range:[0, 4294967295];Indicate the threshold of the super P frame for enabling the super frame processing mode */
-    HI_U32                u32SuperBFrmBitsThr;     /* RW; Range:[0, 4294967295];Indicate the threshold of the super B frame for enabling the super frame processing mode */
-    VENC_RC_PRIORITY_E    enRcPriority;            /* RW; Rc Priority*/
-} VENC_SUPERFRAME_CFG_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_COMM_RC_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_region.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_region.h
deleted file mode 100644
index 8fec3444..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_region.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2010-2019. All rights reserved.
- * Description: hi_comm_region.h
- * Author:
- * Create: 2010-12-13
- */
-#ifndef __HI_COMM_REGION_H__
-#define __HI_COMM_REGION_H__
-
-#include "hi_common.h"
-#include "hi_comm_video.h"
-#include "hi_errno.h"
-#include "hi_defines.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif
-
-#define RGN_COLOR_LUT_NUM      2
-#define RGN_MAX_BMP_UPDATE_NUM 16
-#define RGN_BATCHHANDLE_MAX    24
-
-typedef HI_U32 RGN_HANDLE;
-typedef HI_U32 RGN_HANDLEGROUP;
-
-/* type of video regions */
-typedef enum hiRGN_TYPE_E {
-    OVERLAY_RGN = 0, /* video overlay region */
-    COVER_RGN,
-    COVEREX_RGN,
-    OVERLAYEX_RGN,
-    MOSAIC_RGN,
-    RGN_BUTT
-} RGN_TYPE_E;
-
-typedef enum hiINVERT_COLOR_MODE_E {
-    LESSTHAN_LUM_THRESH = 0, /* the lum of the video is less than the lum threshold which is set by u32LumThresh  */
-    MORETHAN_LUM_THRESH,     /* the lum of the video is more than the lum threshold which is set by u32LumThresh  */
-    INVERT_COLOR_BUTT
-} INVERT_COLOR_MODE_E;
-
-typedef struct hiOVERLAY_QP_INFO_S {
-    HI_BOOL bAbsQp;
-    HI_S32 s32Qp;
-    HI_BOOL bQpDisable;
-} OVERLAY_QP_INFO_S;
-
-typedef struct hiOVERLAY_INVERT_COLOR_S {
-    SIZE_S stInvColArea;  // It must be multipe of 16 but not more than 64.
-    HI_U32 u32LumThresh;  // The threshold to decide whether invert the OSD's color or not.
-    INVERT_COLOR_MODE_E enChgMod;
-    HI_BOOL bInvColEn;  // The switch of inverting color.
-} OVERLAY_INVERT_COLOR_S;
-
-typedef enum hiATTACH_DEST_E {
-    ATTACH_JPEG_MAIN = 0,
-    ATTACH_JPEG_MPF0,
-    ATTACH_JPEG_MPF1,
-    ATTACH_JPEG_BUTT
-} ATTACH_DEST_E;
-
-typedef struct hiOVERLAY_ATTR_S {
-    /* bitmap pixel format,now only support ARGB1555 or ARGB4444 */
-    PIXEL_FORMAT_E enPixelFmt;
-
-    /* background color, pixel format depends on "enPixelFmt" */
-    HI_U32 u32BgColor;
-
-    /* region size,W:[2,RGN_OVERLAY_MAX_WIDTH],align:2,H:[2,RGN_OVERLAY_MAX_HEIGHT],align:2 */
-    SIZE_S stSize;
-    HI_U32 u32CanvasNum;
-} OVERLAY_ATTR_S;
-
-typedef struct hiOVERLAY_CHN_ATTR_S {
-    /* X:[0,OVERLAY_MAX_X_VENC],align:2,Y:[0,OVERLAY_MAX_Y_VENC],align:2 */
-    POINT_S stPoint;
-
-    /* background an foreground transparence when pixel format is ARGB1555
-      * the pixel format is ARGB1555,when the alpha bit is 1 this alpha is value!
-      * range:[0,128]
-      */
-    HI_U32 u32FgAlpha;
-
-    /* background an foreground transparence when pixel format is ARGB1555
-      * the pixel format is ARGB1555,when the alpha bit is 0 this alpha is value!
-      * range:[0,128]
-      */
-    HI_U32 u32BgAlpha;
-
-    HI_U32 u32Layer; /* OVERLAY region layer range:[0,7] */
-
-    OVERLAY_QP_INFO_S stQpInfo;
-
-    OVERLAY_INVERT_COLOR_S stInvertColor;
-
-    ATTACH_DEST_E enAttachDest;
-
-    HI_U16 u16ColorLUT[RGN_COLOR_LUT_NUM];
-} OVERLAY_CHN_ATTR_S;
-
-typedef enum hiRGN_AREA_TYPE_E {
-    AREA_RECT = 0,
-    AREA_QUAD_RANGLE,
-    AREA_BUTT
-} RGN_AREA_TYPE_E;
-
-typedef enum hiRGN_COORDINATE_E {
-    RGN_ABS_COOR = 0, /* Absolute coordinate */
-    RGN_RATIO_COOR    /* Ratio coordinate */
-} RGN_COORDINATE_E;
-
-typedef struct hiRGN_QUADRANGLE_S {
-    HI_BOOL bSolid;     /* whether solid or dashed quadrangle */
-    HI_U32 u32Thick;    /* Line Width of quadrangle, valid when dashed quadrangle */
-    POINT_S stPoint[4]; /* points of quadrilateral */
-} RGN_QUADRANGLE_S;
-
-typedef struct hiCOVER_CHN_ATTR_S {
-    RGN_AREA_TYPE_E enCoverType; /* rect or arbitary quadrilateral COVER */
-    union {
-        RECT_S stRect;                 /* config of rect */
-        RGN_QUADRANGLE_S stQuadRangle; /* config of arbitary quadrilateral COVER */
-    };
-    HI_U32 u32Color;
-    HI_U32 u32Layer;               /* COVER region layer */
-    RGN_COORDINATE_E enCoordinate; /* ratio coordiante or abs coordinate */
-} COVER_CHN_ATTR_S;
-
-typedef struct hiCOVEREX_CHN_ATTR_S {
-    RGN_AREA_TYPE_E enCoverType; /* rect or arbitary quadrilateral COVER */
-    union {
-        RECT_S stRect;                 /* config of rect */
-        RGN_QUADRANGLE_S stQuadRangle; /* config of arbitary quadrilateral COVER */
-    };
-    HI_U32 u32Color;
-    HI_U32 u32Layer; /* COVEREX region layer range */
-} COVEREX_CHN_ATTR_S;
-
-typedef enum hiMOSAIC_BLK_SIZE_E {
-    MOSAIC_BLK_SIZE_8 = 0, /* block size 8*8 of MOSAIC */
-    MOSAIC_BLK_SIZE_16,    /* block size 16*16 of MOSAIC */
-    MOSAIC_BLK_SIZE_32,    /* block size 32*32 of MOSAIC */
-    MOSAIC_BLK_SIZE_64,    /* block size 64*64 of MOSAIC */
-    MOSAIC_BLK_SIZE_BUTT
-} MOSAIC_BLK_SIZE_E;
-
-typedef struct hiMOSAIC_CHN_ATTR_S {
-    RECT_S stRect;               /* location of MOSAIC */
-    MOSAIC_BLK_SIZE_E enBlkSize; /* block size of MOSAIC */
-    HI_U32 u32Layer;             /* MOSAIC region layer range:[0,3] */
-} MOSAIC_CHN_ATTR_S;
-
-typedef struct hiOVERLAYEX_COMM_ATTR_S {
-    PIXEL_FORMAT_E enPixelFmt;
-
-    /* background color, pixel format depends on "enPixelFmt" */
-    HI_U32 u32BgColor;
-
-    /* region size,W:[2,RGN_OVERLAY_MAX_WIDTH],align:2,H:[2,RGN_OVERLAY_MAX_HEIGHT],align:2 */
-    SIZE_S stSize;
-    HI_U32 u32CanvasNum;
-} OVERLAYEX_ATTR_S;
-
-typedef struct hiOVERLAYEX_CHN_ATTR_S {
-    /* X:[0,RGN_OVERLAY_MAX_X],align:2,Y:[0,RGN_OVERLAY_MAX_Y],align:2 */
-    POINT_S stPoint;
-
-    /* background an foreground transparence when pixel format is ARGB1555
-      * the pixel format is ARGB1555,when the alpha bit is 1 this alpha is value!
-      * range:[0,255]
-      */
-    HI_U32 u32FgAlpha;
-
-    /* background an foreground transparence when pixel format is ARGB1555
-      * the pixel format is ARGB1555,when the alpha bit is 0 this alpha is value!
-      * range:[0,255]
-      */
-    HI_U32 u32BgAlpha;
-
-    HI_U32 u32Layer; /* OVERLAYEX region layer range:[0,15] */
-
-    HI_U16 u16ColorLUT[RGN_COLOR_LUT_NUM];
-} OVERLAYEX_CHN_ATTR_S;
-
-typedef union hiRGN_ATTR_U {
-    OVERLAY_ATTR_S stOverlay;     /* attribute of overlay region */
-    OVERLAYEX_ATTR_S stOverlayEx; /* attribute of overlayex region */
-} RGN_ATTR_U;
-
-typedef union hiRGN_CHN_ATTR_U {
-    OVERLAY_CHN_ATTR_S stOverlayChn;     /* attribute of overlay region */
-    COVER_CHN_ATTR_S stCoverChn;         /* attribute of cover region */
-    COVEREX_CHN_ATTR_S stCoverExChn;     /* attribute of coverex region */
-    OVERLAYEX_CHN_ATTR_S stOverlayExChn; /* attribute of overlayex region */
-    MOSAIC_CHN_ATTR_S stMosaicChn;       /* attribute of mosic region */
-} RGN_CHN_ATTR_U;
-
-/* attribute of a region */
-typedef struct hiRGN_ATTR_S {
-    RGN_TYPE_E enType; /* region type */
-    RGN_ATTR_U unAttr; /* region attribute */
-} RGN_ATTR_S;
-
-/* attribute of a region */
-typedef struct hiRGN_CHN_ATTR_S {
-    HI_BOOL bShow;
-    RGN_TYPE_E enType;        /* region type */
-    RGN_CHN_ATTR_U unChnAttr; /* region attribute */
-} RGN_CHN_ATTR_S;
-
-typedef struct hiRGN_BMP_UPDATE_S {
-    POINT_S stPoint;
-    BITMAP_S stBmp;
-    HI_U32 u32Stride;
-} RGN_BMP_UPDATE_S;
-
-typedef struct hiRGN_BMP_UPDATE_CFG_S {
-    HI_U32 u32BmpCnt;
-    RGN_BMP_UPDATE_S astBmpUpdate[RGN_MAX_BMP_UPDATE_NUM];
-} RGN_BMP_UPDATE_CFG_S;
-
-typedef struct hiRGN_CANVAS_INFO_S {
-    HI_U64 u64PhyAddr;
-    HI_U64 u64VirtAddr;
-    SIZE_S stSize;
-    HI_U32 u32Stride;
-    PIXEL_FORMAT_E enPixelFmt;
-} RGN_CANVAS_INFO_S;
-
-/* PingPong buffer change when set attr, it needs to remap memory in mpi interface */
-#define HI_NOTICE_RGN_BUFFER_CHANGE HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_NOTICE, HI_SUCCESS)
-
-/* invlalid device ID */
-#define HI_ERR_RGN_INVALID_DEVID HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_DEVID)
-/* invlalid channel ID */
-#define HI_ERR_RGN_INVALID_CHNID HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-/* at lease one parameter is illagal ,eg, an illegal enumeration value  */
-#define HI_ERR_RGN_ILLEGAL_PARAM HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-/* channel exists */
-#define HI_ERR_RGN_EXIST HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_EXIST)
-/* UN exist */
-#define HI_ERR_RGN_UNEXIST HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-/* using a NULL point */
-#define HI_ERR_RGN_NULL_PTR HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-/* try to enable or initialize system,device or channel, before configing attribute */
-#define HI_ERR_RGN_NOT_CONFIG HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_CONFIG)
-/* operation is not supported by NOW */
-#define HI_ERR_RGN_NOT_SUPPORT HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-/* operation is not permitted ,eg, try to change stati attribute */
-#define HI_ERR_RGN_NOT_PERM HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-/* failure caused by malloc memory */
-#define HI_ERR_RGN_NOMEM HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-/* failure caused by malloc buffer */
-#define HI_ERR_RGN_NOBUF HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-/* no data in buffer */
-#define HI_ERR_RGN_BUF_EMPTY HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-/* no buffer for new data */
-#define HI_ERR_RGN_BUF_FULL HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-/* bad address, eg. used for copy_from_user & copy_to_user */
-#define HI_ERR_RGN_BADADDR HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_BADADDR)
-/* resource is busy, eg. destroy a venc chn without unregistering it */
-#define HI_ERR_RGN_BUSY HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-
-/* System is not ready,maybe not initialed or loaded.
- * Returning the error code when opening a device file failed.
- */
-#define HI_ERR_RGN_NOTREADY HI_DEF_ERR(HI_ID_RGN, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-#endif /* __HI_COMM_REGION_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_snap.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_snap.h
deleted file mode 100644
index 530fe401..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_snap.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2012-2018. All rights reserved.
- * Description: hi_comm_snap.h
- * Author:
- * Create: 2017-06-19
- */
-
-#ifndef __HI_COMM_SNAP_H__
-#define __HI_COMM_SNAP_H__
-
-#include "hi_common.h"
-#include "hi_comm_video.h"
-#include "hi_comm_isp.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-typedef enum hiSNAP_TYPE_E {
-    SNAP_TYPE_NORMAL, /* ZSL and none-ZSL type */
-    SNAP_TYPE_PRO, /* Professional type support HDR, AEB, LongExposure */
-    SNAP_TYPE_BUTT
-} SNAP_TYPE_E;
-
-typedef struct hiSNAP_PRO_MANUAL_PARAM_S {
-    HI_U32 au32ManExpTime[PRO_MAX_FRAME_NUM]; /* RW;  Range: [0x0, 0xFFFFFFFF];sensor exposure time (unit: us),
-                                                                    it's related to the specific sensor */
-    HI_U32 au32ManSysgain[PRO_MAX_FRAME_NUM]; /* RW;  Range: [0x400, 0xFFFFFFFF];system gain (unit: times,
-                                                                    10bit precision), it's related to the specific
-                                                                    sensor and ISP Dgain range */
-} SNAP_PRO_MANUAL_PARAM_S;
-
-typedef struct hiSNAP_PRO_AUTO_PARAM_S {
-    HI_U16 au16ProExpStep[PRO_MAX_FRAME_NUM]; /* RW; Range:[0x0, 0xFFFF];Professional exposure step
-                                                                    (unit: times, 8bit precision) */
-} SNAP_PRO_AUTO_PARAM_S;
-
-typedef struct hiSNAP_PRO_PARAM_S {
-    OPERATION_MODE_E enOperationMode;
-    SNAP_PRO_AUTO_PARAM_S stAutoParam;
-    SNAP_PRO_MANUAL_PARAM_S stManualParam;
-} SNAP_PRO_PARAM_S;
-
-typedef struct hiSNAP_NORMAL_ATTR_S {
-    HI_U32  u32FrameCnt;         /* RW;Set capture frame counts */
-    HI_U32  u32RepeatSendTimes;  /* [0, 2]; When FE-BE is offline, the first raw frame that is triggered should be sent
-                                                    repeatedly to the BE. */
-
-    /* ZSL struct */
-    HI_BOOL bZSL;           /* RW;statical attrs */
-    HI_U32  u32FrameDepth;  /* buffer depth: [1,8] */
-    HI_U32  u32RollbackMs;  /* RW;Rollback time, unit(ms), invalid when bZSL is HI_FALSE  */
-    HI_U32  u32Interval;    /* RW;For continuous capture, select frame every u32Intercal frames */
-} SNAP_NORMAL_ATTR_S;
-
-typedef struct hiSNAP_PRO_ATTR_S {
-    HI_U32  u32FrameCnt;          /* [1, PRO_MAX_FRAME_NUM] */
-    HI_U32  u32RepeatSendTimes;   /* [0, 2];When FE-BE is offline, the first raw frame that is triggered should be sent
-                                                    repeatedly to the BE. */
-    SNAP_PRO_PARAM_S stProParam;
-} SNAP_PRO_ATTR_S;
-
-typedef struct hiSNAP_USER_ATTR_S {
-    HI_U32 u32FrameDepth;
-} SNAP_USER_ATTR_S;
-
-typedef struct hiSNAP_ATTR_S {
-    SNAP_TYPE_E enSnapType;
-    HI_BOOL bLoadCCM;    /* HI_TRUE:use CCM of SnapIspInfo, HI_FALSE: Algorithm calculate */
-    union {
-        SNAP_NORMAL_ATTR_S     stNormalAttr;
-        SNAP_PRO_ATTR_S        stProAttr;
-    };
-} SNAP_ATTR_S;
-
-typedef struct hiISP_PRO_BNR_PARAM_S {
-    HI_BOOL bEnable;
-    HI_U32 u32ParamNum;
-    ISP_NR_AUTO_ATTR_S *pastNrAttr;
-} ISP_PRO_BNR_PARAM_S;
-
-typedef struct hiISP_PRO_SHARPEN_PARAM_S {
-    HI_BOOL bEnable;
-    HI_U32 u32ParamNum;
-    ISP_SHARPEN_AUTO_ATTR_S *pastShpAttr;
-} ISP_PRO_SHARPEN_PARAM_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_sns.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_sns.h
deleted file mode 100644
index 295df709..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_sns.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_comm_sns.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2011/01/05
-  Description   :
-  History       :
-  1.Date        : 2011/01/05
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-
-#ifndef __HI_COMM_SNS_H__
-#define __HI_COMM_SNS_H__
-
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_comm_isp.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-typedef struct hiISP_CMOS_BLACK_LEVEL_S {
-    HI_BOOL bUpdate;
-    HI_U16  au16BlackLevel[ISP_BAYER_CHN_NUM];
-} ISP_CMOS_BLACK_LEVEL_S;
-
-typedef struct hiISP_SNS_ATTR_INFO_S {
-    SENSOR_ID            eSensorId;
-} ISP_SNS_ATTR_INFO_S;
-
-#define ISP_SPLIT_POINT_NUM    (5)
-#define ISP_EXPANDER_POINT_NUM (5)
-
-typedef struct hiISP_CMOS_DEMOSAIC_S {
-    HI_BOOL bEnable;
-    HI_U8   au8NonDirStr[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8   au8NonDirMFDetailEhcStr[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8   au8NonDirHFDetailEhcStr[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8   au8DetailSmoothRange[ISP_AUTO_ISO_STRENGTH_NUM];
-} ISP_CMOS_DEMOSAIC_S;
-
-#define WDR_MAX_FRAME          (4)
-
-typedef struct hiISP_CMOS_BAYERNR_S {
-    HI_BOOL  bEnable;
-    HI_BOOL  bBnrMonoSensorEn;
-    HI_BOOL  bNrLscEnable;
-    HI_U8    u8BnrLscMaxGain;
-    HI_U16   u16BnrLscCmpStrength;
-
-    HI_U8    au8LutFineStr[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8    au8ChromaStr[ISP_BAYER_CHN_NUM][ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8    au8WDRFrameStr[WDR_MAX_FRAME_NUM];
-    HI_U8    au8FusionFrameStr[WDR_MAX_FRAME_NUM];
-    HI_U16   au16CoarseStr[ISP_BAYER_CHN_NUM][ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U16   au16LutCoringWgt[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U16   au16LutCoringRatio[HI_ISP_BAYERNR_LUT_LENGTH];
-} ISP_CMOS_BAYERNR_S;
-
-typedef struct hiISP_CMOS_NOISE_CALIBRATION_S {
-    HI_U16   u16CalibrationLutNum;
-    HI_FLOAT afCalibrationCoef[BAYER_CALIBTAION_MAX_NUM][3];
-} ISP_CMOS_NOISE_CALIBRATION_S;
-
-typedef struct hiISP_CMOS_DETAIL_S {
-    ISP_DE_ATTR_S stAttr;
-} ISP_CMOS_DETAIL_S;
-
-typedef struct HiISP_CMOS_SHARPEN_MANUAL_S { //
-    HI_U8  au8LumaWgt[ISP_SHARPEN_LUMA_NUM];     /* RW; Range: Hi3559AV100 =[0,127]|Hi3519AV100=[0,127]|Hi3516CV500 = [0, 127]|Hi3516DV300 =[0, 31]; Format:0.5;Adjust the sharpen strength according to luma. Sharpen strength will be weaker when it decrease. */
-    HI_U16 au16TextureStr[ISP_SHARPEN_GAIN_NUM];        /* RW; Range: [0, 4095]; Format:7.5;Undirectional sharpen strength for texture and detail enhancement */
-    HI_U16 au16EdgeStr[ISP_SHARPEN_GAIN_NUM];        /* RW; Range: [0, 4095]; Format:7.5;Directional sharpen strength for edge enhancement */
-    HI_U16 u16TextureFreq;         /* RW; Range: [0, 4095];Format:6.6; Texture frequency adjustment. Texture and detail will be finer when it increase */
-    HI_U16 u16EdgeFreq;            /* RW; Range: [0, 4095];Format:6.6; Edge frequency adjustment. Edge will be narrower and thiner when it increase */
-    HI_U8  u8OverShoot;            /* RW; Range: [0, 127]; Format:7.0;u8OvershootAmt */
-    HI_U8  u8UnderShoot;           /* RW; Range: [0, 127]; Format:7.0;u8UndershootAmt */
-    HI_U8  u8ShootSupStr;          /* RW; Range: [0, 255]; Format:8.0;overshoot and undershoot suppression strength, the amplitude and width of shoot will be decrease when shootSupSt increase */
-    HI_U8  u8ShootSupAdj;          /* RW; Range: [0, 15]; Format:4.0;overshoot and undershoot suppression adjusting, adjust the edge shoot suppression strength */
-    HI_U8  u8DetailCtrl;           /* RW; Range: [0, 255]; Format:8.0;Different sharpen strength for detail and edge. When it is bigger than 128, detail sharpen strength will be stronger than edge. */
-    HI_U8  u8DetailCtrlThr;        /* RW; Range: [0, 255]; Format:8.0; The threshold of DetailCtrl, it is used to distinguish detail and edge. */
-    HI_U8  u8EdgeFiltStr;          /* RW; Range: [0, 63]; Format:6.0;The strength of edge filtering. */
-    HI_U8  u8EdgeFiltMaxCap;       /* RW; Range: [0, 47]; Format:6.0;The max capacity of edge filtering.*/
-    HI_U8  u8RGain;                /* RW; Range: [0, 31];   Format:5.0;Sharpen Gain for Red Area */
-    HI_U8  u8GGain;                /* RW; Range: [0, 255]; Format:8.0;Sharpen Gain for Green Area */
-    HI_U8  u8BGain;                /* RW; Range: [0, 31];   Format:5.0;Sharpen Gain for Blue Area */
-    HI_U8  u8SkinGain;             /* RW; Range: [0, 31]; Format:5.0;Sharpen Gain for Skin Area */
-    HI_U16 u16MaxSharpGain;        /* RW; Range: [0, 0x7FF]; Format:8.3; Maximum sharpen gain */
-    HI_U8  u8WeakDetailGain;       /* RW; Range: [0, 127]; Format:7.0;Only support for Hi3516EV200; sharpen Gain for weakdetail */
-} ISP_CMOS_SHARPEN_MANUAL_S;
-
-
-typedef struct HiISP_CMOS_SHARPEN_AUTO_S { //
-    HI_U8  au8LumaWgt[ISP_SHARPEN_LUMA_NUM][ISP_AUTO_ISO_STRENGTH_NUM];      /* RW; Range:Hi3559AV100 =[0,127]|Hi3519AV100=[0,127]|Hi3516CV500 = [0, 127]|Hi3516DV300 =[0, 31];; Format:0.5;Adjust the sharpen strength according to luma. Sharpen strength will be weaker when it decrease. */
-    HI_U16 au16TextureStr[ISP_SHARPEN_GAIN_NUM][ISP_AUTO_ISO_STRENGTH_NUM];     /* RW; Range: [0, 4095]; Format:7.5;Undirectional sharpen strength for texture and detail enhancement */
-    HI_U16 au16EdgeStr[ISP_SHARPEN_GAIN_NUM][ISP_AUTO_ISO_STRENGTH_NUM];        /* RW; Range: [0, 4095]; Format:7.5;Directional sharpen strength for edge enhancement */
-    HI_U16 au16TextureFreq[ISP_AUTO_ISO_STRENGTH_NUM];         /* RW; Range: [0, 4095]; Format:6.6;Texture frequency adjustment. Texture and detail will be finer when it increase */
-    HI_U16 au16EdgeFreq[ISP_AUTO_ISO_STRENGTH_NUM];            /* RW; Range: [0, 4095]; Format:6.6;Edge frequency adjustment. Edge will be narrower and thiner when it increase */
-    HI_U8  au8OverShoot[ISP_AUTO_ISO_STRENGTH_NUM];            /* RW; Range: [0, 127];  Format:7.0;u8OvershootAmt */
-    HI_U8  au8UnderShoot[ISP_AUTO_ISO_STRENGTH_NUM];           /* RW; Range: [0, 127];  Format:7.0;u8UndershootAmt */
-    HI_U8  au8ShootSupStr[ISP_AUTO_ISO_STRENGTH_NUM];          /* RW; Range: [0, 255]; Format:8.0;overshoot and undershoot suppression strength, the amplitude and width of shoot will be decrease when shootSupSt increase */
-    HI_U8  au8ShootSupAdj[ISP_AUTO_ISO_STRENGTH_NUM];          /* RW; Range: [0, 15]; Format:4.0;overshoot and undershoot suppression adjusting, adjust the edge shoot suppression strength */
-    HI_U8  au8DetailCtrl[ISP_AUTO_ISO_STRENGTH_NUM];           /* RW; Range: [0, 255]; Format:8.0;Different sharpen strength for detail and edge. When it is bigger than 128, detail sharpen strength will be stronger than edge. */
-    HI_U8  au8DetailCtrlThr[ISP_AUTO_ISO_STRENGTH_NUM];        /* RW; Range: [0, 255]; Format:8.0; The threshold of DetailCtrl, it is used to distinguish detail and edge. */
-    HI_U8  au8EdgeFiltStr[ISP_AUTO_ISO_STRENGTH_NUM];          /* RW; Range: [0, 63]; Format:6.0;The strength of edge filtering. */
-    HI_U8  au8EdgeFiltMaxCap[ISP_AUTO_ISO_STRENGTH_NUM];        /* RW; Range: [0, 47]; Format:6.0;The max capacity of edge filtering.*/
-    HI_U8  au8RGain[ISP_AUTO_ISO_STRENGTH_NUM];                /* RW; Range: [0, 31];   Format:5.0;Sharpen Gain for Red Area */
-    HI_U8  au8GGain[ISP_AUTO_ISO_STRENGTH_NUM];                /* RW; Range: [0, 255]; Format:8.0;Sharpen Gain for Green Area */
-    HI_U8  au8BGain[ISP_AUTO_ISO_STRENGTH_NUM];                /* RW; Range: [0, 31];   Format:5.0;Sharpen Gain for Blue Area */
-    HI_U8  au8SkinGain[ISP_AUTO_ISO_STRENGTH_NUM];             /* RW; Range: [0, 31]; Format:5.0; */
-    HI_U16 au16MaxSharpGain[ISP_AUTO_ISO_STRENGTH_NUM];        /* RW; Range: [0, 0x7FF]; Format:8.3; */
-    HI_U8  au8WeakDetailGain[ISP_AUTO_ISO_STRENGTH_NUM];       /* RW; Range: [0, 127]; Format:7.0;Only support for Hi3516EV200; sharpen Gain for weakdetail */
-} ISP_CMOS_SHARPEN_AUTO_S;
-
-
-typedef struct hiISP_CMOS_SHARPEN_S {
-    HI_U8 u8SkinUmin;
-    HI_U8 u8SkinVmin;
-    HI_U8 u8SkinUmax;
-    HI_U8 u8SkinVmax;
-    ISP_CMOS_SHARPEN_MANUAL_S stManual;
-    ISP_CMOS_SHARPEN_AUTO_S   stAuto;
-} ISP_CMOS_SHARPEN_S;
-
-
-typedef struct hiISP_CMOS_DRC_S {
-    HI_BOOL bEnable;
-    ISP_OP_TYPE_E enOpType;
-
-    HI_U16  u16ManualStrength;
-    HI_U16  u16AutoStrength;
-
-    HI_U8   u8SpatialFltCoef;
-    HI_U8   u8RangeFltCoef;
-    HI_U8   u8ContrastControl;
-    HI_S8   s8DetailAdjustFactor;
-    HI_U8   u8RangeAdaMax;
-
-    HI_U8   u8FltScaleFine;
-    HI_U8   u8FltScaleCoarse;
-    HI_U8   u8GradRevMax;
-    HI_U8   u8GradRevThr;
-
-    HI_U8   u8BrightGainLmt;
-    HI_U8   u8BrightGainLmtStep;
-    HI_U8   u8DarkGainLmtY;
-    HI_U8   u8DarkGainLmtC;
-    HI_U8   u8PDStrength;
-    HI_U8   u8LocalMixingBrightMax;
-    HI_U8   u8LocalMixingBrightMin;
-    HI_U8   u8LocalMixingBrightThr;
-    HI_S8   s8LocalMixingBrightSlo;
-    HI_U8   u8LocalMixingDarkMax;
-    HI_U8   u8LocalMixingDarkMin;
-    HI_U8   u8LocalMixingDarkThr;
-    HI_S8   s8LocalMixingDarkSlo;
-    HI_U16  u16ColorCorrectionLut[33];
-    HI_U16  u16ToneMappingValue[200];
-
-    HI_U8   u8Asymmetry;
-    HI_U8   u8SecondPole;
-    HI_U8   u8Stretch;
-    HI_U8   u8Compress;
-
-    HI_U8   u8CurveSel;
-
-    HI_U16 au16Xpoint[5];
-    HI_U16 au16Ypoint[5];
-    HI_U16 au16Slope[5];
-} ISP_CMOS_DRC_S;
-
-typedef struct hiISP_CMOS_WDR_S {
-    HI_BOOL  bFusionMode;
-    HI_BOOL  bMotionComp;
-
-    HI_U16   u16ShortThr;
-    HI_U16   u16LongThr;
-
-    HI_BOOL  bForceLong;
-    HI_U16   u16ForceLongLowThr;
-    HI_U16   u16ForceLongHigThr;
-    HI_BOOL  bShortExpoChk;
-    HI_U16   u16ShortCheckThd;
-
-    HI_U8    au8MdThrLowGain[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8    au8MdThrHigGain[ISP_AUTO_ISO_STRENGTH_NUM];
-
-    HI_U16   au16FusionThr[WDR_MAX_FRAME];
-    HI_U8    u8MdtStillThd;
-    HI_U8    u8MdtLongBlend;
-} ISP_CMOS_WDR_S;
-
-typedef struct HiISP_CMOS_DEHAZE_S {
-    HI_BOOL  bEnable;           /* RW;Range:[0,1];Format:1.0; */
-    HI_BOOL  bUserLutEnable;    /* RW;Range:[0,1];0:Auto Lut 1:User Lut */
-
-    ISP_OP_TYPE_E      enOpType;
-    HI_U8    u8AutoStrength;
-    HI_U8    u8ManualStrength;
-} ISP_CMOS_DEHAZE_S;
-
-typedef struct hiISP_CMOS_PREGAMMA_S {
-    HI_BOOL bEnable;
-    HI_U32  au32PreGamma[PREGAMMA_NODE_NUM];
-} ISP_CMOS_PREGAMMA_S;
-
-#define GAMMA_NODE_NUMBER      257      // Update NODE NUMBER
-#define GAMMA_EXT_NODE_NUMBER  1025  // Update NODE NUMBER
-#define GAMMA_OUTSEG_NUMBER    8        // Update NODE NUMBER
-typedef struct hiISP_CMOS_GAMMA_S {
-    HI_U16  au16Gamma[GAMMA_EXT_NODE_NUMBER];
-} ISP_CMOS_GAMMA_S;
-
-#define RGBIR_CVTMATRIX_NUMBER 12
-typedef struct hiISP_CMOS_RGBIR_S {
-    HI_BOOL  bEnable;
-    HI_S16  as16CvtMatrix[RGBIR_CVTMATRIX_NUMBER];
-} ISP_CMOS_RGBIR_S;
-
-typedef struct hiISP_CMOS_SENSOR_MAX_RESOLUTION_S {
-    HI_U32  u32MaxWidth;
-    HI_U32  u32MaxHeight;
-} ISP_CMOS_SENSOR_MAX_RESOLUTION_S;
-
-typedef struct hiISP_CMOS_DPC_S {
-    HI_U16  au16Strength[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U16  au16BlendRatio[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8   u8DpcPos;    /* DPC module position. Linear Mode Range: [0, 1]; WDR Mode Range: [0]. 
-                            0 for after drc, 1 for before wdr. Default:0 */
-} ISP_CMOS_DPC_S;
-
-typedef struct hiISP_LSC_CABLI_TABLE_S {
-    HI_U16 au16R_Gain[HI_ISP_LSC_GRID_POINTS];
-    HI_U16 au16Gr_Gain[HI_ISP_LSC_GRID_POINTS];
-    HI_U16 au16Gb_Gain[HI_ISP_LSC_GRID_POINTS];
-    HI_U16 au16B_Gain[HI_ISP_LSC_GRID_POINTS];
-} ISP_LSC_CABLI_TABLE_S;
-
-typedef struct hiISP_CMOS_LSC_S {
-    HI_U16  u16MeshStrength;
-    HI_U8   u8MeshScale;
-    ISP_LSC_CABLI_TABLE_S astLscCalibTable[2];
-} ISP_CMOS_LSC_S;
-
-typedef struct hiISP_CMOS_LCAC_MANUAL_S
-{
-    HI_U8 u8DePurpleCrStr;
-	HI_U8 u8DePurpleCbStr;
-}ISP_CMOS_LCAC_MANUAL_S;
-
-typedef struct hiISP_CMOS_LCAC_AUTO_S
-{
-    HI_U8 au8DePurpleCrStr[ISP_EXP_RATIO_STRENGTH_NUM];
-	HI_U8 au8DePurpleCbStr[ISP_EXP_RATIO_STRENGTH_NUM];          
-}ISP_CMOS_LCAC_AUTO_S;
-
-typedef struct hiISP_CMOS_LCAC_S {
-    HI_BOOL bEnable;
-	HI_U16  u16PurpleDetRange;
-	HI_U16  VarThr;
-	ISP_OP_TYPE_E enOpMode;
-	ISP_CMOS_LCAC_MANUAL_S stManual;
-	ISP_CMOS_LCAC_AUTO_S   stAuto;
-} ISP_CMOS_LCAC_S;
-
-typedef struct hiISP_CMOS_CA_S {
-    HI_BOOL   bEnable;
-    HI_U16    au16YRatioLut[HI_ISP_CA_YRATIO_LUT_LENGTH];  // 1.10bit  Y Ratio For UV ; Max = 2047 FW Limit
-    HI_S16    as16ISORatio[ISP_AUTO_ISO_STRENGTH_NUM];     // 1.10bit  ISO Ratio  For UV,Max = 2047 FW Limi
-} ISP_CMOS_CA_S;
-
-typedef struct hiISP_CMOS_EXPANDER_POINT_S {
-    HI_U16 u16X;                    /* RW;Range:[0x0,0x81];Format:8.0;The X point of the knee */
-    HI_U32 u32Y;                    /* RW;Range:[0x0,0x8000];Format:16.0;The Y point of the  knee */
-} ISP_CMOS_EXPANDER_POINT_S;
-
-typedef struct hiISP_CMOS_EXPANDER_S {
-    HI_BOOL bEnable;
-    HI_U8   u8BitDepthIn;            /* RW;Range:[0xC,0x14];Format:5.0;The Bit depth of input */
-    HI_U8   u8BitDepthOut;           /* RW;Range:[0xC,0x14];Format:5.0;The Bit depth of output */
-    ISP_CMOS_EXPANDER_POINT_S astExpanderPoint[ISP_EXPANDER_POINT_NUM];
-} ISP_CMOS_EXPANDER_S;
-
-typedef struct hiISP_CMOS_GE_S {
-    HI_BOOL bEnable;                                 /* RW,Range: [   0, 1]      */
-    HI_U8  u8Slope;                                  /* RW,Range: [   0, 0xE]    */
-    HI_U8  u8SensiSlope;                             /* RW,Range: [   0, 0xE]    */
-    HI_U16 u16SensiThr;                              /* RW,Range: [   0, 0x3FFF] */
-    HI_U16 au16Threshold[ISP_AUTO_ISO_STRENGTH_NUM]; /* RW,Range: [   0, 0x3FFF] */
-    HI_U16 au16Strength[ISP_AUTO_ISO_STRENGTH_NUM];  /* RW,Range: [   0, 0x100]  */
-    HI_U16 au16NpOffset[ISP_AUTO_ISO_STRENGTH_NUM];  /* RW,Range: [0x200, 0x3FFF] */
-} ISP_CMOS_GE_S;
-
-typedef struct hiISP_CMOS_ANTIFALSECOLOR_S {
-    HI_BOOL bEnable;                                                     /* RW;Range:[0x0,0x1];Format:1.0; AntiFalseColor Enable */
-    HI_U8   au8AntiFalseColorThreshold[ISP_AUTO_ISO_STRENGTH_NUM];       /* RW;Range:[0x0,0x20];Format:6.0;Threshold for antifalsecolor */
-    HI_U8   au8AntiFalseColorStrength[ISP_AUTO_ISO_STRENGTH_NUM];        /* RW;Range:[0x0,0x1F];Format:5.0;Strength of antifalsecolor */
-} ISP_CMOS_ANTIFALSECOLOR_S;
-
-typedef struct hiISP_CMOS_LDCI_S {
-    HI_BOOL  bEnable;
-    HI_U8    u8GaussLPFSigma;
-    HI_U8    au8HePosWgt[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8    au8HePosSigma[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8    au8HePosMean[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8    au8HeNegWgt[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8    au8HeNegSigma[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U8    au8HeNegMean[ISP_AUTO_ISO_STRENGTH_NUM];
-    HI_U16   au16BlcCtrl[ISP_AUTO_ISO_STRENGTH_NUM];
-} ISP_CMOS_LDCI_S;
-
-typedef struct hiISP_CMOS_SENSOR_MODE_S {
-    HI_U32  u32SensorID;
-    HI_U8   u8SensorMode;
-    HI_BOOL bValidDngRawFormat;
-    DNG_RAW_FORMAT_S stDngRawFormat;
-} ISP_CMOS_SENSOR_MODE_S;
-
-typedef struct hiISP_CMOS_DNG_COLORPARAM_S {
-    ISP_DNG_WBGAIN_S stWbGain1; /* the calibration White balance gain of colorcheker in A Light */
-    ISP_DNG_WBGAIN_S stWbGain2; /* the calibration White balance gain of colorcheker in D50 Light */
-} ISP_CMOS_DNG_COLORPARAM_S;
-
-typedef struct hiISP_CMOS_WDR_SWITCH_ATTR_S {
-    HI_U32   au32ExpRatio[EXP_RATIO_NUM];
-} ISP_CMOS_WDR_SWITCH_ATTR_S;
-
-typedef union hiISP_CMOS_ALG_KEY_U {
-    HI_U64  u64Key;
-    struct {
-        HI_U64  bit1Drc             : 1 ;   /* [0] */
-        HI_U64  bit1Demosaic        : 1 ;   /* [1] */
-        HI_U64  bit1PreGamma        : 1 ;   /* [2] */
-        HI_U64  bit1Gamma           : 1 ;   /* [3] */
-        HI_U64  bit1Sharpen         : 1 ;   /* [4] */
-        HI_U64  bit1Ldci            : 1 ;   /* [5] */
-        HI_U64  bit1Dpc             : 1 ;   /* [6] */
-        HI_U64  bit1Lsc             : 1 ;   /* [7] */
-        HI_U64  bit1Ge              : 1 ;   /* [8] */
-        HI_U64  bit1AntiFalseColor  : 1 ;   /* [9] */
-        HI_U64  bit1BayerNr         : 1 ;   /* [10] */
-        HI_U64  bit1Ca              : 1 ;   /* [11] */
-        HI_U64  bit1Expander        : 1 ;   /* [12] */
-        HI_U64  bit1Wdr             : 1 ;   /* [13] */
-        HI_U64  bit1Dehaze          : 1 ;   /* [14] */
-        HI_U64  bit1Rgbir           : 1 ;   /* [15] */
-		HI_U64  bit1Lcac            : 1 ;   /* [16] */
-        HI_U64  bit44Rsv            : 47;   /* [17:63] */
-    };
-} ISP_CMOS_ALG_KEY_U;
-
-typedef struct hiISP_CMOS_DEFAULT_S {
-    ISP_CMOS_ALG_KEY_U               unKey;
-    const ISP_CMOS_DRC_S             *pstDrc;
-    const ISP_CMOS_DEMOSAIC_S        *pstDemosaic;
-    const ISP_CMOS_PREGAMMA_S        *pstPreGamma;
-    const ISP_CMOS_GAMMA_S           *pstGamma;
-    const ISP_CMOS_SHARPEN_S         *pstSharpen;
-    // const ISP_CMOS_EDGEMARK_S        *pstEdgeMark;
-    // const ISP_CMOS_HLC_S             *pstHlc;
-    const ISP_CMOS_LDCI_S            *pstLdci;
-    const ISP_CMOS_DPC_S             *pstDpc;
-    const ISP_CMOS_LSC_S             *pstLsc;
-    const ISP_CMOS_GE_S              *pstGe;
-    const ISP_CMOS_ANTIFALSECOLOR_S  *pstAntiFalseColor;
-    const ISP_CMOS_BAYERNR_S         *pstBayerNr;
-    // const ISP_CMOS_DETAIL_S          *pstDetail;
-    const ISP_CMOS_CA_S              *pstCa;
-    const ISP_CMOS_EXPANDER_S        *pstExpander;
-    const ISP_CMOS_RGBIR_S           *pstRgbir;
-    // const ISP_CMOS_CLUT_S            *pstClut;
-    const ISP_CMOS_WDR_S             *pstWdr;
-    const ISP_CMOS_DEHAZE_S          *pstDehaze;
-    const ISP_CMOS_LCAC_S            *pstLcac;	
-    ISP_CMOS_NOISE_CALIBRATION_S     stNoiseCalibration;
-    ISP_CMOS_SENSOR_MAX_RESOLUTION_S stSensorMaxResolution;
-    ISP_CMOS_SENSOR_MODE_S           stSensorMode;
-    ISP_CMOS_DNG_COLORPARAM_S        stDngColorParam;
-    ISP_CMOS_WDR_SWITCH_ATTR_S       stWdrSwitchAttr;
-} ISP_CMOS_DEFAULT_S;
-
-typedef struct hiISP_CMOS_SENSOR_IMAGE_MODE_S {
-    HI_U16   u16Width;
-    HI_U16   u16Height;
-    HI_FLOAT f32Fps;
-    HI_U8    u8SnsMode;
-} ISP_CMOS_SENSOR_IMAGE_MODE_S;
-
-typedef struct hiISP_SENSOR_EXP_FUNC_S {
-    HI_VOID (*pfn_cmos_sensor_init)(VI_PIPE ViPipe);
-    HI_VOID (*pfn_cmos_sensor_exit)(VI_PIPE ViPipe);
-    HI_VOID (*pfn_cmos_sensor_global_init)(VI_PIPE ViPipe);
-    HI_S32 (*pfn_cmos_set_image_mode)(VI_PIPE ViPipe, ISP_CMOS_SENSOR_IMAGE_MODE_S *pstSensorImageMode);
-    HI_S32 (*pfn_cmos_set_wdr_mode)(VI_PIPE ViPipe, HI_U8 u8Mode);
-
-    /* the algs get data which is associated with sensor, except 3a */
-    HI_S32 (*pfn_cmos_get_isp_default)(VI_PIPE ViPipe, ISP_CMOS_DEFAULT_S *pstDef);
-    HI_S32 (*pfn_cmos_get_isp_black_level)(VI_PIPE ViPipe, ISP_CMOS_BLACK_LEVEL_S *pstBlackLevel);
-    HI_S32 (*pfn_cmos_get_sns_reg_info)(VI_PIPE ViPipe, ISP_SNS_REGS_INFO_S *pstSnsRegsInfo);
-
-    /* the function of sensor set pixel detect */
-    HI_VOID (*pfn_cmos_set_pixel_detect)(VI_PIPE ViPipe, HI_BOOL bEnable);
-} ISP_SENSOR_EXP_FUNC_S;
-
-typedef struct hiISP_SENSOR_REGISTER_S {
-    ISP_SENSOR_EXP_FUNC_S stSnsExp;
-} ISP_SENSOR_REGISTER_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* __HI_COMM_SNS_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_sys.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_sys.h
deleted file mode 100644
index ee605e7b..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_sys.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2007-2019. All rights reserved.
- * Description: chip specific configure data structure of sys
- * Author: Hisilicon multimedia software group
- * Create: 2007-01-30
- */
-
-#ifndef __HI_COMM_SYS_H__
-#define __HI_COMM_SYS_H__
-
-#include "hi_type.h"
-#include "hi_errno.h"
-#include "hi_debug.h"
-#include "hi_comm_video.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#define BIND_DEST_MAXNUM         64
-
-#define HI_UNIQUE_ID_NUM 6
-
-#define HI_TRACE_SYS(level, fmt, ...)                                                                         \
-    do {                                                                                                      \
-        HI_TRACE(level, HI_ID_SYS, "[Func]:%s [Line]:%d [Info]:" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__); \
-    } while (0)
-
-typedef struct hiVPSS_VENC_WRAP_PARAM_S {
-    HI_BOOL bAllOnline;
-
-    HI_U32 u32FrameRate; /* Input frame rate of VIPROC(linear/Frame mode WDR is the sensor frame rate,
-                          * and the line mode WDR is the frame rate after synthesis) */
-    HI_U32 u32FullLinesStd; /* Total height of sensor, include of VBlank */
-
-    SIZE_S stLargeStreamSize; /* VENC Large Stream Size */
-    SIZE_S stSmallStreamSize; /* VENC Small Stream Size */
-
-} VPSS_VENC_WRAP_PARAM_S;
-
-typedef struct hiMPP_SYS_CONFIG_S {
-    HI_U32 u32Align;
-
-} MPP_SYS_CONFIG_S;
-
-typedef struct hiSYS_VIRMEM_INFO_S {
-    HI_U64 u64PhyAddr;
-    HI_BOOL bCached;
-} SYS_VIRMEM_INFO_S;
-
-typedef struct hiMPP_BIND_DEST_S {
-    HI_U32 u32Num;
-    MPP_CHN_S astMppChn[BIND_DEST_MAXNUM];
-} MPP_BIND_DEST_S;
-
-typedef enum hiSCALE_RANGE_E {
-    SCALE_RANGE_0 = 0, /* scale range <   8/64 */
-    SCALE_RANGE_1, /* scale range >=  8/64 */
-    SCALE_RANGE_2, /* scale range >= 10/64 */
-    SCALE_RANGE_3, /* scale range >= 15/64 */
-    SCALE_RANGE_4, /* scale range >= 19/64 */
-    SCALE_RANGE_5, /* scale range >= 24/64 */
-    SCALE_RANGE_6, /* scale range >= 29/64 */
-    SCALE_RANGE_7, /* scale range >= 33/64 */
-    SCALE_RANGE_8, /* scale range >= 35/64 */
-    SCALE_RANGE_9, /* scale range >= 38/64 */
-    SCALE_RANGE_10, /* scale range >= 42/64 */
-    SCALE_RANGE_11, /* scale range >= 45/64 */
-    SCALE_RANGE_12, /* scale range >= 48/64 */
-    SCALE_RANGE_13, /* scale range >= 51/64 */
-    SCALE_RANGE_14, /* scale range >= 53/64 */
-    SCALE_RANGE_15, /* scale range >= 55/64 */
-    SCALE_RANGE_16, /* scale range >= 57/64 */
-    SCALE_RANGE_17, /* scale range >= 60/64 */
-    SCALE_RANGE_18, /* scale range >  1     */
-    SCALE_RANGE_BUTT,
-} SCALE_RANGE_E;
-
-typedef enum hiCOEFF_LEVEL_E {
-    COEFF_LEVEL_0 = 0, /* coefficient level 0 */
-    COEFF_LEVEL_1, /* coefficient level 1 */
-    COEFF_LEVEL_2, /* coefficient level 2 */
-    COEFF_LEVEL_3, /* coefficient level 3 */
-    COEFF_LEVEL_4, /* coefficient level 4 */
-    COEFF_LEVEL_5, /* coefficient level 5 */
-    COEFF_LEVEL_6, /* coefficient level 6 */
-    COEFF_LEVEL_7, /* coefficient level 7 */
-    COEFF_LEVEL_8, /* coefficient level 8 */
-    COEFF_LEVEL_9, /* coefficient level 9 */
-    COEFF_LEVEL_10, /* coefficient level 10 */
-    COEFF_LEVEL_11, /* coefficient level 11 */
-    COEFF_LEVEL_12, /* coefficient level 12 */
-    COEFF_LEVEL_13, /* coefficient level 13 */
-    COEFF_LEVEL_14, /* coefficient level 14 */
-    COEFF_LEVEL_15, /* coefficient level 15 */
-    COEFF_LEVEL_16, /* coefficient level 16 */
-    COEFF_LEVEL_17, /* coefficient level 17 */
-    COEFF_LEVEL_18, /* coefficient level 18 */
-    COEFF_LEVEL_BUTT,
-} COEFF_LEVEL_E;
-
-typedef struct hiSCALE_COEFF_LEVEL_S {
-    COEFF_LEVEL_E enHorLum; /* horizontal luminance   coefficient level */
-    COEFF_LEVEL_E enHorChr; /* horizontal chrominance coefficient level */
-    COEFF_LEVEL_E enVerLum; /* vertical   luminance   coefficient level */
-    COEFF_LEVEL_E enVerChr; /* vertical   chrominance coefficient level */
-} SCALE_COEFF_LEVEL_S;
-
-typedef struct hiSCALE_RANGE_S {
-    SCALE_RANGE_E enHorizontal;
-    SCALE_RANGE_E enVertical;
-} SCALE_RANGE_S;
-
-typedef struct hiSCALE_COEFF_INFO_S {
-    SCALE_RANGE_S stScaleRange;
-    SCALE_COEFF_LEVEL_S stScaleCoeffLevel;
-} SCALE_COEFF_INFO_S;
-
-typedef struct hiGPS_INFO_S {
-    HI_CHAR chGPSLatitudeRef; /* GPS LatitudeRef Indicates whether the latitude is north or south latitude,
-                               * 'N'/'S', default 'N' */
-    HI_U32 au32GPSLatitude[3][2]; /* GPS Latitude is expressed as degrees, minutes and seconds, a typical format
-                                   * like "dd/1, mm/1, ss/1", default 0/0, 0/0, 0/0 */
-    HI_CHAR chGPSLongitudeRef; /* GPS LongitudeRef Indicates whether the longitude is east or west longitude,
-                                * 'E'/'W', default 'E' */
-    HI_U32 au32GPSLongitude[3][2]; /* GPS Longitude is expressed as degrees, minutes and seconds, a typical format
-                                    * like "dd/1, mm/1, ss/1", default 0/0, 0/0, 0/0 */
-    HI_U8 u8GPSAltitudeRef; /* GPS AltitudeRef Indicates the reference altitude used, 0 - above sea level,
-                             * 1 - below sea level default 0 */
-    HI_U32 au32GPSAltitude[2]; /* GPS AltitudeRef Indicates the altitude based on the reference u8GPSAltitudeRef,
-                                * the reference unit is meters, default 0/0 */
-} GPS_INFO_S;
-
-typedef enum hiVI_VPSS_MODE_E {
-    VI_OFFLINE_VPSS_OFFLINE = 0,
-    VI_OFFLINE_VPSS_ONLINE,
-    VI_ONLINE_VPSS_OFFLINE,
-    VI_ONLINE_VPSS_ONLINE,
-    VI_PARALLEL_VPSS_OFFLINE,
-    VI_PARALLEL_VPSS_PARALLEL,
-    VI_VPSS_MODE_BUTT
-} VI_VPSS_MODE_E;
-
-typedef struct hiVI_VPSS_MODE_S {
-    VI_VPSS_MODE_E aenMode[VI_MAX_PIPE_NUM];
-} VI_VPSS_MODE_S;
-
-typedef struct hiRAW_FRAME_COMPRESS_PARAM_S {
-    HI_U32 u32CompRatio_10Bit; /* compression ratio of 10 bit */
-    HI_U32 u32CompRatio_12Bit; /* compression ratio of 12 bit */
-    HI_U32 u32CompRatio_14Bit; /* compression ratio of 14 bit */
-} RAW_FRAME_COMPRESS_PARAM_S;
-
-
-typedef struct hiHI_UNIQUE_ID_S {
-    HI_U32 u32Id[HI_UNIQUE_ID_NUM];
-} HI_UNIQUE_ID_S;
-
-
-
-#define HI_ERR_SYS_NULL_PTR      HI_DEF_ERR(HI_ID_SYS, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-#define HI_ERR_SYS_NOTREADY      HI_DEF_ERR(HI_ID_SYS, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-#define HI_ERR_SYS_NOT_PERM      HI_DEF_ERR(HI_ID_SYS, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-#define HI_ERR_SYS_NOMEM         HI_DEF_ERR(HI_ID_SYS, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-#define HI_ERR_SYS_ILLEGAL_PARAM HI_DEF_ERR(HI_ID_SYS, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-#define HI_ERR_SYS_BUSY          HI_DEF_ERR(HI_ID_SYS, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-#define HI_ERR_SYS_NOT_SUPPORT   HI_DEF_ERR(HI_ID_SYS, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_COMM_SYS_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vb.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vb.h
deleted file mode 100644
index 296f9a4c..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vb.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-* Copyright (c) Hisilicon Technologies Co., Ltd. 2012-2019. All rights reserved.
-* Description:
-* Author: Hisilicon multimedia software group
-* Create: 2011/06/28
-*/
-
-#ifndef __HI_COMM_VB_H__
-#define __HI_COMM_VB_H__
-
-#include "hi_type.h"
-#include "hi_errno.h"
-#include "hi_debug.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif
-
-#define VB_INVALID_POOLID              (-1U)
-#define VB_INVALID_HANDLE              (-1U)
-
-#define VB_MAX_COMM_POOLS              16
-#define VB_MAX_MOD_COMM_POOLS          16
-
-/* user ID for VB */
-#define VB_MAX_USER                    VB_UID_BUTT
-
-typedef enum hiVB_UID_E {
-    VB_UID_VI = 0,
-    VB_UID_VO = 1,
-    VB_UID_VGS = 2,
-    VB_UID_VENC = 3,
-    VB_UID_VDEC = 4,
-    VB_UID_H265E = 5,
-    VB_UID_H264E = 6,
-    VB_UID_JPEGE = 7,
-    VB_UID_H264D = 8,
-    VB_UID_JPEGD = 9,
-    VB_UID_VPSS = 10,
-    VB_UID_DIS = 11,
-    VB_UID_USER = 12,
-    VB_UID_PCIV = 13,
-    VB_UID_AI = 14,
-    VB_UID_AENC = 15,
-    VB_UID_RC = 16,
-    VB_UID_VFMW = 17,
-    VB_UID_GDC = 18,
-    VB_UID_AVS = 19,
-    VB_UID_DPU_RECT = 20,
-    VB_UID_DPU_MATCH = 21,
-    VB_UID_MCF = 22,
-    VB_UID_BUTT = 23,
-} VB_UID_E;
-
-/* Generall common pool use this owner id, module common pool use VB_UID as owner id */
-#define POOL_OWNER_COMMON              -1
-
-/* Private pool use this owner id */
-#define POOL_OWNER_PRIVATE             -2
-
-typedef HI_U32 VB_POOL;
-typedef HI_U32 VB_BLK;
-
-#define RESERVE_MMZ_NAME               "window"
-
-typedef enum hiVB_REMAP_MODE_E {
-    VB_REMAP_MODE_NONE = 0, /* no remap */
-    VB_REMAP_MODE_NOCACHE = 1, /* no cache remap */
-    VB_REMAP_MODE_CACHED = 2, /* cache remap, if you use this mode, you should flush cache by yourself */
-    VB_REMAP_MODE_BUTT
-} VB_REMAP_MODE_E;
-
-typedef struct hiVB_POOL_CONFIG_S {
-    HI_U64 u64BlkSize;
-    HI_U32 u32BlkCnt;
-    VB_REMAP_MODE_E enRemapMode;
-    HI_CHAR acMmzName[MAX_MMZ_NAME_LEN];
-} VB_POOL_CONFIG_S;
-
-typedef struct hiVB_CONFIG_S {
-    HI_U32 u32MaxPoolCnt;
-    VB_POOL_CONFIG_S astCommPool[VB_MAX_COMM_POOLS];
-} VB_CONFIG_S;
-
-typedef struct hiVB_POOL_STATUS_S {
-    HI_U32 bIsCommPool;
-    HI_U32 u32BlkCnt;
-    HI_U32 u32FreeBlkCnt;
-} VB_POOL_STATUS_S;
-
-#define VB_SUPPLEMENT_JPEG_MASK        0x1
-#define VB_SUPPLEMENT_ISPINFO_MASK     0x2
-#define VB_SUPPLEMENT_MOTION_DATA_MASK 0x4
-#define VB_SUPPLEMENT_DNG_MASK         0x8
-
-typedef struct hiVB_SUPPLEMENT_CONFIG_S {
-    HI_U32 u32SupplementConfig;
-} VB_SUPPLEMENT_CONFIG_S;
-
-#define HI_ERR_VB_NULL_PTR             HI_DEF_ERR(HI_ID_VB, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-#define HI_ERR_VB_NOMEM                HI_DEF_ERR(HI_ID_VB, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-#define HI_ERR_VB_NOBUF                HI_DEF_ERR(HI_ID_VB, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-#define HI_ERR_VB_UNEXIST              HI_DEF_ERR(HI_ID_VB, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-#define HI_ERR_VB_ILLEGAL_PARAM        HI_DEF_ERR(HI_ID_VB, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-#define HI_ERR_VB_NOTREADY             HI_DEF_ERR(HI_ID_VB, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-#define HI_ERR_VB_BUSY                 HI_DEF_ERR(HI_ID_VB, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-#define HI_ERR_VB_NOT_PERM             HI_DEF_ERR(HI_ID_VB, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-#define HI_ERR_VB_SIZE_NOT_ENOUGH      HI_DEF_ERR(HI_ID_VB, EN_ERR_LEVEL_ERROR, EN_ERR_SIZE_NOT_ENOUGH)
-
-#define HI_ERR_VB_2MPOOLS              HI_DEF_ERR(HI_ID_VB, EN_ERR_LEVEL_ERROR, EN_ERR_BUTT + 1)
-
-#define HI_TRACE_VB(level, fmt, ...)                                                                         \
-    do {                                                                                                     \
-        HI_TRACE(level, HI_ID_VB, "[Func]:%s [Line]:%d [Info]:" fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__); \
-    } while (0)
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_COMM_VB_H_ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_venc.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_venc.h
deleted file mode 100644
index 36f1102d..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_venc.h
+++ /dev/null
@@ -1,908 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2016-2017. All rights reserved.
- * Description:
- * Author: Hisilicon multimedia software group
- * Create: 2016/11/15
- */
-#ifndef __HI_COMM_VENC_H__
-#define __HI_COMM_VENC_H__
-
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_errno.h"
-#include "hi_comm_video.h"
-#include "hi_comm_rc.h"
-#include "hi_comm_vb.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-/* invlalid channel ID */
-#define HI_ERR_VENC_INVALID_CHNID HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-/* at lease one parameter is illagal ,eg, an illegal enumeration value  */
-#define HI_ERR_VENC_ILLEGAL_PARAM HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-/* channel exists */
-#define HI_ERR_VENC_EXIST         HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_EXIST)
-/* channel exists */
-#define HI_ERR_VENC_UNEXIST       HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-/* using a NULL point */
-#define HI_ERR_VENC_NULL_PTR      HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-/* try to enable or initialize system,device or channel, before configing attribute */
-#define HI_ERR_VENC_NOT_CONFIG    HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_CONFIG)
-/* operation is not supported by NOW */
-#define HI_ERR_VENC_NOT_SUPPORT   HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-/* operation is not permitted ,eg, try to change stati attribute */
-#define HI_ERR_VENC_NOT_PERM      HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-/* failure caused by malloc memory */
-#define HI_ERR_VENC_NOMEM         HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-/* failure caused by malloc buffer */
-#define HI_ERR_VENC_NOBUF         HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-/* no data in buffer */
-#define HI_ERR_VENC_BUF_EMPTY     HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-/* no buffer for new data */
-#define HI_ERR_VENC_BUF_FULL      HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-/* system is not ready,had not initialed or loaded */
-#define HI_ERR_VENC_SYS_NOTREADY  HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-/* system is busy */
-#define HI_ERR_VENC_BUSY          HI_DEF_ERR(HI_ID_VENC, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-
-/* the nalu type of H264E */
-typedef enum hiH264E_NALU_TYPE_E {
-    H264E_NALU_BSLICE = 0,                         /*B SLICE types*/
-    H264E_NALU_PSLICE = 1,                         /*P SLICE types*/
-    H264E_NALU_ISLICE = 2,                         /*I SLICE types*/
-    H264E_NALU_IDRSLICE = 5,                       /*IDR SLICE types*/
-    H264E_NALU_SEI    = 6,                         /*SEI types*/
-    H264E_NALU_SPS    = 7,                         /*SPS types*/
-    H264E_NALU_PPS    = 8,                         /*PPS types*/
-    H264E_NALU_BUTT
-} H264E_NALU_TYPE_E;
-
-/* the nalu type of H265E */
-typedef enum hiH265E_NALU_TYPE_E {
-    H265E_NALU_BSLICE = 0,                          /*B SLICE types*/
-    H265E_NALU_PSLICE = 1,                          /*P SLICE types*/
-    H265E_NALU_ISLICE = 2,                          /*I SLICE types*/
-    H265E_NALU_IDRSLICE = 19,                       /*IDR SLICE types*/
-    H265E_NALU_VPS    = 32,                         /*VPS types*/
-    H265E_NALU_SPS    = 33,                         /*SPS types*/
-    H265E_NALU_PPS    = 34,                         /*PPS types*/
-    H265E_NALU_SEI    = 39,                         /*SEI types*/
-
-    H265E_NALU_BUTT
-} H265E_NALU_TYPE_E;
-
-/* the reference type of H264E slice */
-typedef enum hiH264E_REFSLICE_TYPE_E {
-    H264E_REFSLICE_FOR_1X = 1,                     /*Reference slice for H264E_REF_MODE_1X*/
-    H264E_REFSLICE_FOR_2X = 2,                     /*Reference slice for H264E_REF_MODE_2X*/
-    H264E_REFSLICE_FOR_4X = 5,                     /*Reference slice for H264E_REF_MODE_4X*/
-    H264E_REFSLICE_FOR_BUTT                        /* slice not for reference*/
-} H264E_REFSLICE_TYPE_E;
-
-/* the pack type of JPEGE */
-typedef enum hiJPEGE_PACK_TYPE_E {
-    JPEGE_PACK_ECS = 5,                            /*ECS types*/
-    JPEGE_PACK_APP = 6,                            /*APP types*/
-    JPEGE_PACK_VDO = 7,                            /*VDO types*/
-    JPEGE_PACK_PIC = 8,                            /*PIC types*/
-    JPEGE_PACK_DCF = 9,                            /*DCF types*/
-    JPEGE_PACK_DCF_PIC = 10,                       /*DCF PIC types*/
-    JPEGE_PACK_BUTT
-} JPEGE_PACK_TYPE_E;
-
-/* the pack type of PRORES */
-typedef enum hiPRORES_PACK_TYPE_E {
-    PRORES_PACK_PIC = 1,                            /*PIC types*/
-    PRORES_PACK_BUTT
-} PRORES_PACK_TYPE_E;
-
-/* the data type of VENC */
-typedef union hiVENC_DATA_TYPE_U {
-    H264E_NALU_TYPE_E    enH264EType;               /* R; H264E NALU types*/
-    JPEGE_PACK_TYPE_E    enJPEGEType;               /* R; JPEGE pack types*/
-    H265E_NALU_TYPE_E    enH265EType;               /* R; H264E NALU types*/
-    PRORES_PACK_TYPE_E   enPRORESType;
-} VENC_DATA_TYPE_U;
-
-/* the pack info of VENC */
-typedef struct hiVENC_PACK_INFO_S {
-    VENC_DATA_TYPE_U  u32PackType;                    /* R; the pack type*/
-    HI_U32 u32PackOffset;
-    HI_U32 u32PackLength;
-} VENC_PACK_INFO_S;
-
-/* Defines a stream packet */
-typedef struct hiVENC_PACK_S {
-    HI_U64               u64PhyAddr;                 /* R; the physics address of stream */
-    HI_U8                ATTRIBUTE* pu8Addr;         /* R; the virtual address of stream */
-    HI_U32               ATTRIBUTE u32Len;           /* R; the length of stream */
-
-    HI_U64               u64PTS;                     /* R; PTS */
-    HI_BOOL              bFrameEnd;                  /* R; frame end */
-
-    VENC_DATA_TYPE_U     DataType;                   /* R; the type of stream */
-    HI_U32               u32Offset;                  /* R; the offset between the Valid data and the start address */
-    HI_U32               u32DataNum;                 /* R; the  stream packets num */
-    VENC_PACK_INFO_S     stPackInfo[8];              /* R; the stream packet Information */
-} VENC_PACK_S;
-
-/* Defines the frame type and reference attributes of the H.264 frame skipping reference streams */
-typedef enum hiH264E_REF_TYPE_E {
-    BASE_IDRSLICE = 0,                              /* the Idr frame at Base layer*/
-    BASE_PSLICE_REFTOIDR,                           /* the P frame at Base layer, referenced by other frames at Base layer and reference to Idr frame*/
-    BASE_PSLICE_REFBYBASE,                          /* the P frame at Base layer, referenced by other frames at Base layer*/
-    BASE_PSLICE_REFBYENHANCE,                       /* the P frame at Base layer, referenced by other frames at Enhance layer*/
-    ENHANCE_PSLICE_REFBYENHANCE,                    /* the P frame at Enhance layer, referenced by other frames at Enhance layer*/
-    ENHANCE_PSLICE_NOTFORREF,                       /* the P frame at Enhance layer ,not referenced*/
-    ENHANCE_PSLICE_BUTT
-} H264E_REF_TYPE_E;
-
-typedef enum hiH264E_REF_TYPE_E H265E_REF_TYPE_E;
-
-/* Defines the features of an H.264 stream */
-typedef struct hiVENC_STREAM_INFO_H264_S {
-    HI_U32                 u32PicBytesNum;              /* R; the coded picture stream byte number */
-    HI_U32                 u32Inter16x16MbNum;          /* R; the inter16x16 macroblock num */
-    HI_U32                 u32Inter8x8MbNum;            /* R; the inter8x8 macroblock num */
-    HI_U32                 u32Intra16MbNum;             /* R; the intra16x16 macroblock num */
-    HI_U32                 u32Intra8MbNum;              /* R; the intra8x8 macroblock num */
-    HI_U32                 u32Intra4MbNum;              /* R; the inter4x4 macroblock num */
-
-    H264E_REF_TYPE_E       enRefType;                   /* R; Type of encoded frames in advanced frame skipping reference mode*/
-    HI_U32                 u32UpdateAttrCnt;            /* R; Number of times that channel attributes or parameters (including RC parameters) are set*/
-    HI_U32                 u32StartQp;                  /* R; the start Qp of encoded frames*/
-    HI_U32                 u32MeanQp;                   /* R; the mean Qp of encoded frames*/
-    HI_BOOL                bPSkip;
-} VENC_STREAM_INFO_H264_S;
-
-/* Defines the features of an H.265 stream */
-typedef struct hiVENC_STREAM_INFO_H265_S {
-    HI_U32                 u32PicBytesNum;              /* R; the coded picture stream byte number */
-    HI_U32                 u32Inter64x64CuNum;          /* R; the inter64x64 cu num  */
-    HI_U32                 u32Inter32x32CuNum;          /* R; the inter32x32 cu num  */
-    HI_U32                 u32Inter16x16CuNum;          /* R; the inter16x16 cu num  */
-    HI_U32                 u32Inter8x8CuNum;            /* R; the inter8x8   cu num  */
-    HI_U32                 u32Intra32x32CuNum;          /* R; the Intra32x32 cu num  */
-    HI_U32                 u32Intra16x16CuNum;          /* R; the Intra16x16 cu num  */
-    HI_U32                 u32Intra8x8CuNum;            /* R; the Intra8x8   cu num  */
-    HI_U32                 u32Intra4x4CuNum;            /* R; the Intra4x4   cu num  */
-
-    H265E_REF_TYPE_E       enRefType;                   /* R; Type of encoded frames in advanced frame skipping reference mode*/
-    HI_U32                 u32UpdateAttrCnt;            /* R; Number of times that channel attributes or parameters (including RC parameters) are set*/
-    HI_U32                 u32StartQp;                  /* R; the start Qp of encoded frames*/
-    HI_U32                 u32MeanQp;                   /* R; the mean Qp of encoded frames*/
-    HI_BOOL                bPSkip;
-} VENC_STREAM_INFO_H265_S;
-
-/* the sse info */
-typedef struct hiVENC_SSE_INFO_S {
-    HI_BOOL bSSEEn;        /* RW; Range:[0,1]; Region SSE enable */
-    HI_U32  u32SSEVal;     /* R; Region SSE value */
-} VENC_SSE_INFO_S;
-
-/* the advance information of the h264e */
-typedef struct hiVENC_STREAM_ADVANCE_INFO_H264_S {
-    HI_U32             u32ResidualBitNum;                    /* R; the residual num */
-    HI_U32             u32HeadBitNum;                        /* R; the head bit num */
-    HI_U32             u32MadiVal;                           /* R; the madi value */
-    HI_U32             u32MadpVal;                           /* R; the madp value */
-    HI_DOUBLE          dPSNRVal;                             /* R; the PSNR value */
-    HI_U32             u32MseLcuCnt;                         /* R; the lcu cnt of the mse */
-    HI_U32             u32MseSum;                            /* R; the sum of the mse */
-    VENC_SSE_INFO_S    stSSEInfo[8];                         /* R; the information of the sse */
-    HI_U32             u32QpHstgrm[VENC_QP_HISGRM_NUM];      /* R; the Qp histogram value */
-    HI_U32             u32MoveScene16x16Num;                 /* R; the 16x16 cu num of the move scene*/
-    HI_U32             u32MoveSceneBits;                     /* R; the stream bit num of the move scene */
-} VENC_STREAM_ADVANCE_INFO_H264_S;
-
-/* the advance information of the Jpege */
-typedef struct hiVENC_STREAM_ADVANCE_INFO_JPEG_S {
-    // HI_U32 u32Reserved;
-} VENC_STREAM_ADVANCE_INFO_JPEG_S;
-
-/* the advance information of the Prores */
-typedef struct hiVENC_STREAM_ADVANCE_INFO_PRORES_S {
-    // HI_U32 u32Reserved;
-} VENC_STREAM_ADVANCE_INFO_PRORES_S;
-
-/* the advance information of the h265e */
-typedef struct hiVENC_STREAM_ADVANCE_INFO_H265_S {
-    HI_U32             u32ResidualBitNum;               /* R; the residual num */
-    HI_U32             u32HeadBitNum;                   /* R; the head bit num */
-    HI_U32             u32MadiVal;                      /* R; the madi value */
-    HI_U32             u32MadpVal;                      /* R; the madp value */
-    HI_DOUBLE          dPSNRVal;                        /* R; the PSNR value */
-    HI_U32             u32MseLcuCnt;                    /* R; the lcu cnt of the mse */
-    HI_U32             u32MseSum;                       /* R; the sum of the mse */
-    VENC_SSE_INFO_S    stSSEInfo[8];                    /* R; the information of the sse */
-    HI_U32             u32QpHstgrm[VENC_QP_HISGRM_NUM]; /* R; the Qp histogram value */
-    HI_U32             u32MoveScene32x32Num;            /* R; the 32x32 cu num of the move scene*/
-    HI_U32             u32MoveSceneBits;                /* R; the stream bit num of the move scene */
-} VENC_STREAM_ADVANCE_INFO_H265_S;
-
-/* Defines the features of an jpege stream */
-typedef struct hiVENC_STREAM_INFO_PRORES_S {
-    HI_U32 u32PicBytesNum;
-    HI_U32 u32UpdateAttrCnt;
-} VENC_STREAM_INFO_PRORES_S;
-
-/* Defines the features of an jpege stream */
-typedef struct hiVENC_STREAM_INFO_JPEG_S {
-    HI_U32 u32PicBytesNum;                      /* R; the coded picture stream byte number */
-    HI_U32 u32UpdateAttrCnt;                    /* R; Number of times that channel attributes or parameters (including RC parameters) are set*/
-    HI_U32 u32Qfactor;                          /* R; image quality */
-} VENC_STREAM_INFO_JPEG_S;
-
-/* Defines the features of an stream */
-typedef struct hiVENC_STREAM_S {
-    VENC_PACK_S ATTRIBUTE* pstPack;            /* R; stream pack attribute*/
-    HI_U32      ATTRIBUTE u32PackCount;        /* R; the pack number of one frame stream*/
-    HI_U32      u32Seq;                        /* R; the list number of stream*/
-
-    union {
-        VENC_STREAM_INFO_H264_S   stH264Info;                        /* R; the stream info of h264*/
-        VENC_STREAM_INFO_JPEG_S   stJpegInfo;                        /* R; the stream info of jpeg*/
-        VENC_STREAM_INFO_H265_S   stH265Info;                        /* R; the stream info of h265*/
-        VENC_STREAM_INFO_PRORES_S stProresInfo;                      /* R; the stream info of prores*/
-    };
-
-    union {
-        VENC_STREAM_ADVANCE_INFO_H264_S   stAdvanceH264Info;         /* R; the stream info of h264*/
-        VENC_STREAM_ADVANCE_INFO_JPEG_S   stAdvanceJpegInfo;         /* R; the stream info of jpeg*/
-        VENC_STREAM_ADVANCE_INFO_H265_S   stAdvanceH265Info;         /* R; the stream info of h265*/
-        VENC_STREAM_ADVANCE_INFO_PRORES_S stAdvanceProresInfo;       /* R; the stream info of prores*/
-    };
-} VENC_STREAM_S;
-
-typedef struct hiVENC_STREAM_INFO_S {
-    H265E_REF_TYPE_E enRefType;  /* R;Type of encoded frames in advanced frame skipping reference mode*/
-
-    HI_U32  u32PicBytesNum;      /* R;the coded picture stream byte number */
-    HI_U32  u32PicCnt;           /* R;When channel attributes 'bByFrame == 1', it means count of frames.
-                                      When channel attributes 'bByFrame == 0', it means count of packets.*/
-    HI_U32  u32StartQp;          /* R;the start Qp of encoded frames*/
-    HI_U32  u32MeanQp;           /* R;the mean Qp of encoded frames*/
-    HI_BOOL bPSkip;
-
-    HI_U32  u32ResidualBitNum;   /* R;residual*/
-    HI_U32  u32HeadBitNum;       /* R;head information*/
-    HI_U32  u32MadiVal;          /* R;madi*/
-    HI_U32  u32MadpVal;          /* R;madp*/
-    HI_U32  u32MseSum;           /* R;Sum of MSE value */
-    HI_U32  u32MseLcuCnt;        /* R;Sum of LCU number */
-    HI_DOUBLE dPSNRVal;          /* R;PSNR*/
-} VENC_STREAM_INFO_S;
-
-/* the size of array is 2,that is the maximum */
-typedef struct hiVENC_MPF_CFG_S {
-    HI_U8   u8LargeThumbNailNum;      /* RW; Range:[0,2]; the large thumbnail pic num of the MPF */
-    SIZE_S  astLargeThumbNailSize[2]; /* RW; The resolution of large ThumbNail*/
-} VENC_MPF_CFG_S;
-
-typedef enum hiVENC_PIC_RECEIVE_MODE_E {
-    VENC_PIC_RECEIVE_SINGLE = 0,
-    VENC_PIC_RECEIVE_MULTI,
-
-    VENC_PIC_RECEIVE_BUTT
-} VENC_PIC_RECEIVE_MODE_E;
-
-/* the attribute of jpege */
-typedef struct hiVENC_ATTR_JPEG_S {
-    HI_BOOL                     bSupportDCF;    /*RW; Range:[0,1]; support dcf */
-    VENC_MPF_CFG_S              stMPFCfg;       /*RW; Range:[0,1]; config of Mpf*/
-    VENC_PIC_RECEIVE_MODE_E  	enReceiveMode;  /*RW; Config the receive mode;Not support for Hi3559AV100*/
-} VENC_ATTR_JPEG_S;
-
-/* the attribute of mjpege */
-typedef struct hiVENC_ATTR_MJPEG_S {
-    // reserved
-} VENC_ATTR_MJPEG_S;
-
-/* the attribute of h264e */
-typedef struct hiVENC_ATTR_H264_S {
-    HI_BOOL bRcnRefShareBuf;                 /* RW; Range:[0, 1]; Whether to enable the Share Buf of Rcn and Ref .*/
-    //reserved
-} VENC_ATTR_H264_S;
-
-/* the attribute of h265e */
-typedef struct hiVENC_ATTR_H265_S {
-    HI_BOOL bRcnRefShareBuf;                 /* RW; Range:[0, 1]; Whether to enable the Share Buf of Rcn and Ref .*/
-    //reserved
-} VENC_ATTR_H265_S;
-
-/* the frame rate of PRORES */
-typedef enum hiPRORES_FRAMERATE {
-    PRORES_FR_UNKNOWN = 0,
-    PRORES_FR_23_976,
-    PRORES_FR_24,
-    PRORES_FR_25,
-    PRORES_FR_29_97,
-    PRORES_FR_30,
-    PRORES_FR_50,
-    PRORES_FR_59_94,
-    PRORES_FR_60,
-    PRORES_FR_100,
-    PRORES_FR_119_88,
-    PRORES_FR_120,
-    PRORES_FR_BUTT
-} PRORES_FRAMERATE;
-
-/* the aspect ratio of PRORES */
-typedef enum hiPRORES_ASPECT_RATIO {
-    PRORES_ASPECT_RATIO_UNKNOWN = 0,
-    PRORES_ASPECT_RATIO_SQUARE,
-    PRORES_ASPECT_RATIO_4_3,
-    PRORES_ASPECT_RATIO_16_9,
-    PRORES_ASPECT_RATIO_BUTT
-} PRORES_ASPECT_RATIO;
-
-/* the attribute of PRORES */
-typedef struct hiVENC_ATTR_PRORES_S {
-    HI_CHAR             cIdentifier[4];
-    PRORES_FRAMERATE    enFrameRateCode;
-    PRORES_ASPECT_RATIO enAspectRatio;
-} VENC_ATTR_PRORES_S;
-
-/* the attribute of the Venc */
-typedef struct hiVENC_ATTR_S {
-    PAYLOAD_TYPE_E  enType;                         /* RW; the type of payload*/
-
-    HI_U32  u32MaxPicWidth;                         /* RW; Range:[0,16384];maximum width of a picture to be encoded, in pixel*/
-    HI_U32  u32MaxPicHeight;                        /* RW; Range:[0,16384];maximum height of a picture to be encoded, in pixel*/
-
-    HI_U32  u32BufSize;                             /* RW; stream buffer size*/
-    HI_U32  u32Profile;                             /* RW; Range:[0,3];
-                                                          H.264:   0: baseline; 1:MP; 2:HP; 3: SVC-T [0,3];
-                                                          H.265:   0:MP; 1:Main 10  [0 1];
-                                                          Jpege/MJpege:   0:Baseline
-                                                          prores: 0:ProRes Proxy; 1:ProRes 422(LT); 2:ProRes 422; 3:ProRes 422(HQ);*/
-    HI_BOOL bByFrame;                               /* RW; Range:[0,1]; get stream mode is slice mode or frame mode*/
-    HI_U32  u32PicWidth;                            /* RW; Range:[0,16384];width of a picture to be encoded, in pixel*/
-    HI_U32  u32PicHeight;                           /* RW; Range:[0,16384];height of a picture to be encoded, in pixel*/
-    union {
-        VENC_ATTR_H264_S stAttrH264e;               /* attributes of H264e */
-        VENC_ATTR_H265_S stAttrH265e;               /* attributes of H265e */
-        VENC_ATTR_MJPEG_S stAttrMjpege;             /* attributes of Mjpeg */
-        VENC_ATTR_JPEG_S  stAttrJpege;              /* attributes of jpeg  */
-        VENC_ATTR_PRORES_S stAttrProres;            /* attributes of prores  */
-    };
-} VENC_ATTR_S;
-
-/* the gop mode */
-typedef enum hiVENC_GOP_MODE_E {
-    VENC_GOPMODE_NORMALP    = 0,     /* NORMALP */
-    VENC_GOPMODE_DUALP      = 1,     /* DUALP;  Not support for Hi3556AV100*/
-    VENC_GOPMODE_SMARTP     = 2,     /* SMARTP; Not support for Hi3556AV100 */
-    VENC_GOPMODE_ADVSMARTP  = 3,     /* ADVSMARTP ; Only used for Hi3559AV100*/
-    VENC_GOPMODE_BIPREDB    = 4,     /* BIPREDB ;Only used for Hi3559AV100/Hi3519AV100*/
-    VENC_GOPMODE_LOWDELAYB  = 5,     /* LOWDELAYB; Not support */
-
-    VENC_GOPMODE_BUTT,
-} VENC_GOP_MODE_E;
-
-/* the attribute of the normalp */
-typedef struct hiVENC_GOP_NORMALP_S {
-    HI_S32   s32IPQpDelta;           /* RW; Range:[-10,30]; QP variance between P frame and I frame */
-} VENC_GOP_NORMALP_S;
-
-/* the attribute of the dualp */
-typedef struct hiVENC_GOP_DUALP_S {
-    HI_U32 u32SPInterval;            /* RW; Range:[0, 65536]; Interval of the special P frames,1 is not supported and should be less than Gop */
-    HI_S32 s32SPQpDelta;             /* RW; Range:[-10,30]; QP variance between P frame and special P frame */
-    HI_S32 s32IPQpDelta;             /* RW; Range:[-10,30]; QP variance between P frame and I frame */
-} VENC_GOP_DUALP_S;
-
-/* the attribute of the smartp */
-typedef struct hiVENC_GOP_SMARTP_S {
-    HI_U32  u32BgInterval;           /* RW; Interval of the long-term reference frame, can not be less than gop*/
-    HI_S32  s32BgQpDelta;            /* RW; Range:[-10,30]; QP variance between P frame and Bg frame */
-    HI_S32  s32ViQpDelta;            /* RW; Range:[-10,30]; QP variance between P frame and virtual I  frame */
-} VENC_GOP_SMARTP_S;
-
-/* the attribute of the advsmartp */
-typedef struct hiVENC_GOP_ADVSMARTP_S {
-    HI_U32  u32BgInterval;           /* RW; Interval of the long-term reference frame, can not be less than gop*/
-    HI_S32  s32BgQpDelta;            /* RW; Range:[-10,30]; QP variance between P frame and Bg frame */
-    HI_S32  s32ViQpDelta;            /* RW; Range:[-10,30]; QP variance between P frame and virtual I  frame */
-} VENC_GOP_ADVSMARTP_S;
-
-/* the attribute of the bipredb */
-typedef struct hiVENC_GOP_BIPREDB_S {
-    HI_U32 u32BFrmNum;              /* RW; Range:[1,3]; Number of B frames */
-    HI_S32 s32BQpDelta;             /* RW; Range:[-10,30]; QP variance between P frame and B frame */
-    HI_S32 s32IPQpDelta;            /* RW; Range:[-10,30]; QP variance between P frame and I frame */
-} VENC_GOP_BIPREDB_S;
-
-/* the attribute of the gop */
-typedef struct hiVENC_GOP_ATTR_S {
-    VENC_GOP_MODE_E enGopMode;                   /* RW; Encoding GOP type */
-    union {
-        VENC_GOP_NORMALP_S   stNormalP;          /*attributes of normal P*/
-        VENC_GOP_DUALP_S     stDualP;            /*attributes of dual   P*/
-        VENC_GOP_SMARTP_S    stSmartP;           /*attributes of Smart P*/
-        VENC_GOP_ADVSMARTP_S stAdvSmartP;        /*attributes of AdvSmart P*/
-        VENC_GOP_BIPREDB_S   stBipredB;          /*attributes of b */
-    };
-
-} VENC_GOP_ATTR_S;
-
-/* the attribute of the venc chnl */
-typedef struct hiVENC_CHN_ATTR_S {
-    VENC_ATTR_S     stVencAttr;                   /*the attribute of video encoder*/
-    VENC_RC_ATTR_S  stRcAttr;                     /*the attribute of rate  ctrl*/
-    VENC_GOP_ATTR_S stGopAttr;                    /*the attribute of gop*/
-} VENC_CHN_ATTR_S;
-
-/* the param of receive picture */
-typedef struct hiVENC_RECV_PIC_PARAM_S {
-    HI_S32 s32RecvPicNum;                         /* RW; Range:[-1, 2147483647]; Number of frames received and encoded by the encoding channel,0 is not supported*/
-} VENC_RECV_PIC_PARAM_S;
-
-/* the status of the venc chnl */
-typedef struct hiVENC_CHN_STATUS_S {
-    HI_U32 u32LeftPics;                           /* R; left picture number */
-    HI_U32 u32LeftStreamBytes;                    /* R; left stream bytes*/
-    HI_U32 u32LeftStreamFrames;                   /* R; left stream frames*/
-    HI_U32 u32CurPacks;                           /* R; pack number of current frame*/
-    HI_U32 u32LeftRecvPics;                       /* R; Number of frames to be received. This member is valid after HI_MPI_VENC_StartRecvPicEx is called.*/
-    HI_U32 u32LeftEncPics;                        /* R; Number of frames to be encoded. This member is valid after HI_MPI_VENC_StartRecvPicEx is called.*/
-    HI_BOOL bJpegSnapEnd;                         /* R; the end of Snap.*/
-    VENC_STREAM_INFO_S stVencStrmInfo;
-} VENC_CHN_STATUS_S;
-
-/* the param of the h264e slice split */
-typedef struct hiVENC_H264_SLICE_SPLIT_S {
-    HI_BOOL bSplitEnable;                         /* RW; Range:[0,1]; slice split enable, HI_TRUE:enable, HI_FALSE:diable, default value:HI_FALSE*/
-    HI_U32  u32MbLineNum;                         /* RW; the max number is (Picture height + 15)/16; this value presents the mb line number of one slice*/
-} VENC_H264_SLICE_SPLIT_S;
-
-/* the param of the h264e intra pred */
-typedef struct hiVENC_H264_INTRA_PRED_S {
-    HI_U32     constrained_intra_pred_flag;       /* RW; Range:[0,1];default: HI_FALSE, see the H.264 protocol for the meaning*/
-} VENC_H264_INTRA_PRED_S;
-
-/* the param of the h264e trans */
-typedef struct hiVENC_H264_TRANS_S {
-    HI_U32     u32IntraTransMode;                 /* RW; Range:[0,2]; Conversion mode for intra-prediction,0: trans4x4, trans8x8; 1: trans4x4, 2: trans8x8 */
-    HI_U32     u32InterTransMode;                 /* RW; Range:[0,2]; Conversion mode for inter-prediction,0: trans4x4, trans8x8; 1: trans4x4, 2: trans8x8 */
-
-    HI_BOOL    bScalingListValid;                 /* RW; Range:[0,1]; enable Scaling,default: HI_FALSE  */
-    HI_U8      InterScalingList8X8[64];           /* RW; Range:[1,255]; A quantization table for 8x8 inter-prediction*/
-    HI_U8      IntraScalingList8X8[64];           /* RW; Range:[1,255]; A quantization table for 8x8 intra-prediction*/
-
-    HI_S32     chroma_qp_index_offset;            /* RW; Range:[-12,12];default value: 0, see the H.264 protocol for the meaning*/
-} VENC_H264_TRANS_S;
-
-/* the param of the h264e entropy */
-typedef struct hiVENC_H264_ENTROPY_S {
-    HI_U32 u32EntropyEncModeI;                     /* RW; Range:[0,1]; Entropy encoding mode for the I frame, 0:cavlc, 1:cabac */
-    HI_U32 u32EntropyEncModeP;                     /* RW; Range:[0,1]; Entropy encoding mode for the P frame, 0:cavlc, 1:cabac */
-    HI_U32 u32EntropyEncModeB;                     /* RW; Range:[0,1]; Entropy encoding mode for the B frame, 0:cavlc, 1:cabac */
-    HI_U32 cabac_init_idc;                         /* RW; Range:[0,2]; see the H.264 protocol for the meaning */
-} VENC_H264_ENTROPY_S;
-
-/* the config of the h264e poc */
-typedef struct hiVENC_H264_POC_S {
-    HI_U32 pic_order_cnt_type;                     /* RW; Range:[0,2]; see the H.264 protocol for the meaning */
-
-} VENC_H264_POC_S;
-
-/* the param of the h264e deblocking */
-typedef struct hiVENC_H264_DBLK_S {
-    HI_U32 disable_deblocking_filter_idc;          /*  RW; Range:[0,2]; see the H.264 protocol for the meaning */
-    HI_S32 slice_alpha_c0_offset_div2;             /*  RW; Range:[-6,+6]; see the H.264 protocol for the meaning */
-    HI_S32 slice_beta_offset_div2;                 /*  RW; Range:[-6,+6]; see the H.264 protocol for the meaning */
-} VENC_H264_DBLK_S;
-
-/* the param of the h264e vui timing info */
-typedef struct hiVENC_H264_VUI_TIME_INFO_S {
-    HI_U8  timing_info_present_flag;               /* RW; Range:[0,1]; If 1, timing info belows will be encoded into vui.*/
-    HI_U8  fixed_frame_rate_flag;                  /* RW; Range:[0,1]; see the H.264 protocol for the meaning. */
-    HI_U32 num_units_in_tick;                      /* RW; Range:(0,4294967295]; see the H.264 protocol for the meaning */
-    HI_U32 time_scale;                             /* RW; Range:(0,4294967295]; see the H.264 protocol for the meaning */
-} VENC_VUI_H264_TIME_INFO_S;
-
-/* the param of the vui aspct ratio */
-typedef struct hiVENC_VUI_ASPECT_RATIO_S {
-    HI_U8  aspect_ratio_info_present_flag;        /* RW; Range:[0,1]; If 1, aspectratio info belows will be encoded into vui */
-    HI_U8  aspect_ratio_idc;                      /* RW; Range:[0,255]; 17~254 is reserved,see the protocol for the meaning.*/
-    HI_U8  overscan_info_present_flag;            /* RW; Range:[0,1]; If 1, oversacan info belows will be encoded into vui.*/
-    HI_U8  overscan_appropriate_flag;             /* RW; Range:[0,1]; see the protocol for the meaning. */
-    HI_U16 sar_width;                             /* RW; Range:(0, 65535]; see the protocol for the meaning. */
-    HI_U16 sar_height ;                           /* RW; Range:(0, 65535]; see the protocol for the meaning.
-                                                    notes: sar_width  and  sar_height  shall  be  relatively  prime.*/
-} VENC_VUI_ASPECT_RATIO_S;
-
-/* the param of the vui video signal */
-typedef struct hiVENC_VUI_VIDEO_SIGNAL_S {
-    HI_U8  video_signal_type_present_flag ;        /* RW; Range:[0,1]; If 1, video singnal info will be encoded into vui. */
-    HI_U8  video_format ;                          /* RW; H.264e Range:[0,7], H.265e Range:[0,5]; see the protocol for the meaning. */
-    HI_U8  video_full_range_flag;                  /* RW; Range: [0,1]; see the protocol for the meaning.*/
-    HI_U8  colour_description_present_flag ;       /* RO; Range: [0,1]; see the protocol for the meaning.*/
-    HI_U8  colour_primaries ;                      /* RO; Range: [0,255]; see the protocol for the meaning. */
-    HI_U8  transfer_characteristics;               /* RO; Range: [0,255]; see the protocol for the meaning. */
-    HI_U8  matrix_coefficients;                    /* RO; Range:[0,255]; see the protocol for the meaning. */
-} VENC_VUI_VIDEO_SIGNAL_S;
-
-/* the param of the vui video signal */
-typedef struct hiVENC_VUI_BITSTREAM_RESTRIC_S {
-    HI_U8  bitstream_restriction_flag ;            /* RW; Range: [0,1]; see the protocol for the meaning.*/
-} VENC_VUI_BITSTREAM_RESTRIC_S;
-
-/* the param of the h264e vui */
-typedef struct hiVENC_H264_VUI_S {
-    VENC_VUI_ASPECT_RATIO_S           stVuiAspectRatio;
-    VENC_VUI_H264_TIME_INFO_S          stVuiTimeInfo;
-    VENC_VUI_VIDEO_SIGNAL_S           stVuiVideoSignal;
-    VENC_VUI_BITSTREAM_RESTRIC_S      stVuiBitstreamRestric;
-} VENC_H264_VUI_S;
-
-/* the param of the h265e vui timing info */
-typedef struct hiVENC_VUI_H265_TIME_INFO_S {
-    HI_U32 timing_info_present_flag;               /* RW; Range:[0,1]; If 1, timing info belows will be encoded into vui.*/
-    HI_U32 num_units_in_tick;                      /* RW; Range:[0,4294967295]; see the H.265 protocol for the meaning. */
-    HI_U32 time_scale;                             /* RW; Range:(0,4294967295]; see the H.265 protocol for the meaning */
-    HI_U32 num_ticks_poc_diff_one_minus1;          /* RW; Range:(0,4294967294]; see the H.265 protocol for the meaning */
-} VENC_VUI_H265_TIME_INFO_S;
-
-/* the param of the h265e vui */
-typedef struct hiVENC_H265_VUI_S {
-    VENC_VUI_ASPECT_RATIO_S        stVuiAspectRatio;
-    VENC_VUI_H265_TIME_INFO_S     stVuiTimeInfo;
-    VENC_VUI_VIDEO_SIGNAL_S       stVuiVideoSignal;
-    VENC_VUI_BITSTREAM_RESTRIC_S  stVuiBitstreamRestric;
-} VENC_H265_VUI_S;
-
-/* the param of the jpege */
-typedef struct hiVENC_JPEG_PARAM_S {
-    HI_U32 u32Qfactor;                     /* RW; Range:[1,99]; Qfactor value  */
-    HI_U8  u8YQt[64];                      /* RW; Range:[1, 255]; Y quantization table */
-    HI_U8  u8CbQt[64];                     /* RW; Range:[1, 255]; Cb quantization table */
-    HI_U8  u8CrQt[64];                     /* RW; Range:[1, 255]; Cr quantization table */
-    HI_U32 u32MCUPerECS;                   /* RW; the max MCU number is (picwidth + 15) >> 4 x (picheight +
-                                            15) >> 4 x 2]; MCU number of one ECS*/
-} VENC_JPEG_PARAM_S;
-
-/* the param of the mjpege */
-typedef struct hiVENC_MJPEG_PARAM_S {
-    HI_U8 u8YQt[64];                       /* RW; Range:[1, 255]; Y quantization table */
-    HI_U8 u8CbQt[64];                      /* RW; Range:[1, 255]; Cb quantization table */
-    HI_U8 u8CrQt[64];                      /* RW; Range:[1, 255]; Cr quantization table */
-    HI_U32 u32MCUPerECS;                   /* RW; the max MCU number is (picwidth + 15) >> 4 x (picheight +
-                                            15) >> 4 x 2]; MCU number of one ECS*/
-} VENC_MJPEG_PARAM_S;
-
-/* the param of the ProRes */
-typedef struct hiVENC_PRORES_PARAM_S {
-    HI_U8 u8LumaQt[64];                   /* RW; Range:[1, 255]; Luma quantization table */
-    HI_U8 u8ChromaQt[64];                 /* RW; Range:[1, 255]; Chroma quantization table */
-    HI_CHAR encoder_identifier[4];        /* RW:  identifies the encoder vendor or product that generated the compressed frame*/
-} VENC_PRORES_PARAM_S;
-
-/* the attribute of the roi */
-typedef struct hiVENC_ROI_ATTR_S {
-    HI_U32  u32Index;                     /* RW; Range:[0, 7]; Index of an ROI. The system supports indexes ranging from 0 to 7 */
-    HI_BOOL bEnable;                      /* RW; Range:[0, 1]; Whether to enable this ROI */
-    HI_BOOL bAbsQp;                       /* RW; Range:[0, 1]; QP mode of an ROI.HI_FALSE: relative QP.HI_TURE: absolute QP.*/
-    HI_S32  s32Qp;                        /* RW; Range:[-51, 51]; QP value,only relative mode can QP value less than 0. */
-    RECT_S  stRect;                       /* RW; Region of an ROI*/
-} VENC_ROI_ATTR_S;
-
-/* ROI struct */
-typedef struct hiVENC_ROI_ATTR_EX_S {
-    HI_U32  u32Index;                     /* RW; Range:[0, 7]; Index of an ROI. The system supports indexes ranging from 0 to 7 */
-    HI_BOOL bEnable[3];                   /* RW; Range:[0, 1]; Subscript of array   0: I Frame; 1: P/B Frame; 2: VI Frame; other params are the same. */
-    HI_BOOL bAbsQp[3];                    /* RW; Range:[0, 1]; QP mode of an ROI.HI_FALSE: relative QP.HI_TURE: absolute QP.*/
-    HI_S32  s32Qp[3];                     /* RW; Range:[-51, 51]; QP value,only relative mode can QP value less than 0. */
-    RECT_S  stRect[3];                    /* RW;Region of an ROI*/
-}VENC_ROI_ATTR_EX_S;
-
-/* the param of the roibg frame rate */
-typedef struct hiVENC_ROIBG_FRAME_RATE_S {
-    HI_S32 s32SrcFrmRate;                  /* RW; Range:[-1, 2147483647];Source frame rate of a non-ROI,can not be configured 0*/
-    HI_S32 s32DstFrmRate;                  /* RW; Range:[-1, 2147483647];Target frame rate of a non-ROI,can not be larger than s32SrcFrmRate*/
-} VENC_ROIBG_FRAME_RATE_S;
-
-/* the param of the roibg frame rate */
-typedef struct hiVENC_REF_PARAM_S {
-    HI_U32       u32Base;                          /* RW; Range:[0,4294967295]; Base layer period*/
-    HI_U32       u32Enhance;                       /* RW; Range:[0,255]; Enhance layer period*/
-    HI_BOOL      bEnablePred;                      /* RW; Range:[0, 1]; Whether some frames at the base layer are referenced by other frames at the base layer. When bEnablePred is HI_FALSE, all frames at the base layer reference IDR frames.*/
-} VENC_REF_PARAM_S;
-
-/* Jpeg snap mode */
-typedef enum hiVENC_JPEG_ENCODE_MODE_E {
-    JPEG_ENCODE_ALL   = 0,                        /* Jpeg channel snap all the pictures when started. */
-    JPEG_ENCODE_SNAP  = 1,                        /* Jpeg channel snap the flashed pictures when started. */
-    JPEG_ENCODE_BUTT,
-} VENC_JPEG_ENCODE_MODE_E;
-
-
-/* the information of the stream */
-typedef struct hiVENC_STREAM_BUF_INFO_S {
-    HI_U64   u64PhyAddr[MAX_TILE_NUM];             /* R; Start physical address for a stream buffer */
-    HI_VOID ATTRIBUTE* pUserAddr[MAX_TILE_NUM];    /* R; Start virtual address for a stream buffer */
-    HI_U64  ATTRIBUTE u64BufSize[MAX_TILE_NUM];    /* R; Stream buffer size */
-} VENC_STREAM_BUF_INFO_S;
-
-/* the param of the h265e slice split */
-typedef struct hiVENC_H265_SLICE_SPLIT_S {
-    HI_BOOL bSplitEnable;                          /* RW; Range:[0,1]; slice split enable, HI_TRUE:enable, HI_FALSE:diable, default value:HI_FALSE */
-    HI_U32  u32LcuLineNum;                         /* RW; Range:(Picture height + lcu size minus one)/lcu size;this value presents lcu line number */
-} VENC_H265_SLICE_SPLIT_S;
-
-/* the param of the h265e pu */
-typedef struct hiVENC_H265_PU_S {
-    HI_U32    constrained_intra_pred_flag;         /* RW; Range:[0,1]; see the H.265 protocol for the meaning. */
-    HI_U32    strong_intra_smoothing_enabled_flag; /* RW; Range:[0,1]; see the H.265 protocol for the meaning. */
-} VENC_H265_PU_S;
-
-/* the param of the h265e trans */
-typedef struct hiVENC_H265_TRANS_S {
-    HI_S32  cb_qp_offset;                          /* RW; Range:[-12,12]; see the H.265 protocol for the meaning. */
-    HI_S32  cr_qp_offset;                          /* RW; Range:[-12,12]; see the H.265 protocol for the meaning. */
-
-    HI_BOOL bScalingListEnabled;                   /* RW; Range:[0,1]; If 1, specifies that a scaling list is used.*/
-
-    HI_BOOL bScalingListTu4Valid;                  /* RW; Range:[0,1]; If 1, ScalingList4X4 belows will be encoded.*/
-    HI_U8   InterScalingList4X4[2][16];            /* RW; Range:[1,255]; Scaling List for inter 4X4 block.*/
-    HI_U8   IntraScalingList4X4[2][16];            /* RW; Range:[1,255]; Scaling List for intra 4X4 block.*/
-
-    HI_BOOL bScalingListTu8Valid;                  /* RW; Range:[0,1]; If 1, ScalingList8X8 belows will be encoded.*/
-    HI_U8   InterScalingList8X8[2][64];            /* RW; Range:[1,255]; Scaling List for inter 8X8 block.*/
-    HI_U8   IntraScalingList8X8[2][64];            /* RW; Range:[1,255]; Scaling List for intra 8X8 block.*/
-
-    HI_BOOL bScalingListTu16Valid;                 /* RW; Range:[0,1]; If 1, ScalingList16X16 belows will be encoded.*/
-    HI_U8   InterScalingList16X16[2][64];          /* RW; Range:[1,255]; Scaling List for inter 16X16 block..*/
-    HI_U8   IntraScalingList16X16[2][64];          /* RW; Range:[1,255]; Scaling List for inter 16X16 block.*/
-
-    HI_BOOL bScalingListTu32Valid;                 /* RW; Range:[0,1]; If 1, ScalingList32X32 belows will be encoded.*/
-    HI_U8   InterScalingList32X32[64];             /* RW; Range:[1,255]; Scaling List for inter 32X32 block..*/
-    HI_U8   IntraScalingList32X32[64];             /* RW; Range:[1,255]; Scaling List for inter 32X32 block.*/
-
-} VENC_H265_TRANS_S;
-
-/* the param of the h265e entroy */
-typedef struct hiVENC_H265_ENTROPY_S {
-    HI_U32 cabac_init_flag;                         /* RW; Range:[0,1]; see the H.265 protocol for the meaning. */
-} VENC_H265_ENTROPY_S;
-
-/* the param of the h265e deblocking */
-typedef struct hiVENC_H265_DBLK_S {
-    HI_U32 slice_deblocking_filter_disabled_flag;   /* RW; Range:[0,1]; see the H.265 protocol for the meaning. */
-    HI_S32 slice_beta_offset_div2;                  /* RW; Range:[-6,6]; see the H.265 protocol for the meaning. */
-    HI_S32 slice_tc_offset_div2;                    /* RW; Range:[-6,6]; see the H.265 protocol for the meaning. */
-} VENC_H265_DBLK_S;
-
-/* the param of the h265e sao */
-typedef struct hiVENC_H265_SAO_S {
-    HI_U32  slice_sao_luma_flag;      /*RW; Range:[0,1]; Indicates whether SAO filtering is performed on the luminance component of the current slice. */
-    HI_U32  slice_sao_chroma_flag;    /*RW; Range:[0,1]; Indicates whether SAO filtering is performed on the chrominance component of the current slice*/
-} VENC_H265_SAO_S;
-
-/* venc mode type */
-typedef enum hiVENC_INTRA_REFRESH_MODE_E {
-    INTRA_REFRESH_ROW = 0,                      /* Line mode */
-    INTRA_REFRESH_COLUMN,                       /* Column mode */
-    INTRA_REFRESH_BUTT
-} VENC_INTRA_REFRESH_MODE_E;
-
-
-/* the param of the intra refresh */
-typedef struct hiVENC_INTRA_REFRESH_S {
-    HI_BOOL                     bRefreshEnable;     /*RW; Range:[0,1]; intra refresh enable, HI_TRUE:enable, HI_FALSE:diable, default value:HI_FALSE*/
-    VENC_INTRA_REFRESH_MODE_E   enIntraRefreshMode; /*RW; The mode of intra refresh*/
-    HI_U32                      u32RefreshNum;      /*RW; Number of rows/column to be refreshed during each I macroblock refresh*/
-    HI_U32                      u32ReqIQp;          /*RW; Range:[0,51]; QP value of the I frame*/
-} VENC_INTRA_REFRESH_S;
-
-/* venc mode type */
-typedef enum hiVENC_MODTYPE_E {
-    MODTYPE_VENC = 1,                   /* VENC */
-    MODTYPE_H264E,                     /* H264e */
-    MODTYPE_H265E,                       /* H265e */
-    MODTYPE_JPEGE,                       /* Jpege */
-    MODTYPE_RC,              /* Rc */
-    MODTYPE_BUTT
-} VENC_MODTYPE_E;
-
-/* the param of the h264e mod */
-typedef struct hiVENC_MOD_H264E_S {
-    HI_U32          u32OneStreamBuffer;     /* RW; Range:[0,1]; one stream buffer*/
-    HI_U32          u32H264eMiniBufMode;    /* RW; Range:[0,1]; H264e MiniBufMode*/
-    HI_U32          u32H264ePowerSaveEn;    /* RW; Range:[0,1]; H264e PowerSaveEn*/
-    VB_SOURCE_E     enH264eVBSource;        /* RW; H264e VBSource*/
-    HI_BOOL         bQpHstgrmEn;            /* RW; Range:[0,1]*/
-} VENC_MOD_H264E_S;
-
-/* the param of the h265e mod */
-typedef struct hiVENC_MOD_H265E_S {
-    HI_U32          u32OneStreamBuffer;      /* RW; Range:[0,1]; one stream buffer*/
-    HI_U32          u32H265eMiniBufMode;     /* RW; Range:[0,1]; H265e MiniBufMode*/
-    HI_U32          u32H265ePowerSaveEn;     /* RW; Range:[0,2]; H265e PowerSaveEn*/
-    VB_SOURCE_E     enH265eVBSource;         /* RW; H265e VBSource*/
-    HI_BOOL         bQpHstgrmEn;             /* RW; Range:[0,1]*/
-} VENC_MOD_H265E_S;
-
-/* the param of the jpege mod */
-typedef struct hiVENC_MOD_JPEGE_S {
-    HI_U32  u32OneStreamBuffer;         /* RW; Range:[0,1]; one stream buffer*/
-    HI_U32  u32JpegeMiniBufMode;        /* RW; Range:[0,1]; Jpege MiniBufMode*/
-    HI_U32  u32JpegClearStreamBuf;      /* RW; Range:[0,1]; JpegClearStreamBuf*/
-    HI_U32  u32JpegeDeringMode;         /* RW; Range:[0,1]; Jpege Dering Mode */
-} VENC_MOD_JPEGE_S;
-
-typedef struct hiVENC_MOD_RC_S {
-    HI_U32  u32ClrStatAfterSetBr;
-} VENC_MOD_RC_S;
-/* the param of the venc mod */
-typedef struct hiVENC_MOD_VENC_S {
-    HI_U32 u32VencBufferCache;  /* RW; Range:[0,1]; VencBufferCache*/
-    HI_U32 u32FrameBufRecycle;  /* RW; Range:[0,1]; FrameBufRecycle*/
-} VENC_MOD_VENC_S;
-
-/* the param of the mod */
-typedef struct hiVENC_MODPARAM_S {
-    VENC_MODTYPE_E enVencModType;        /* RW; VencModType*/
-    union {
-        VENC_MOD_VENC_S  stVencModParam;
-        VENC_MOD_H264E_S stH264eModParam;
-        VENC_MOD_H265E_S stH265eModParam;
-        VENC_MOD_JPEGE_S stJpegeModParam;
-        VENC_MOD_RC_S    stRcModParam;
-    };
-} VENC_PARAM_MOD_S;
-
-typedef enum hiVENC_FRAME_TYPE_E {
-    VENC_FRAME_TYPE_NONE = 1,
-    VENC_FRAME_TYPE_IDR,
-    VENC_FRAME_TYPE_BUTT
-} VENC_FRAME_TYPE_E;
-
-/* the information of the user rc*/
-typedef struct hiUSER_RC_INFO_S {
-    HI_BOOL bQpMapValid;           /* RW; Range:[0,1]; Indicates whether the QpMap mode is valid for the current frame*/
-    HI_BOOL bSkipWeightValid;      /* RW; Range:[0,1]; Indicates whether the SkipWeight mode is valid for the current frame*/
-    HI_U32  u32BlkStartQp;         /* RW; Range:[0,51];QP value of the first 16 x 16 block in QpMap mode */
-    HI_U64  u64QpMapPhyAddr;       /* RW; Physical address of the QP table in QpMap mode*/
-    HI_U64  u64SkipWeightPhyAddr;  /* RW; Physical address of the SkipWeight table in QpMap mode*/
-    VENC_FRAME_TYPE_E enFrameType; /* RW; Encoding frame type of the current frame */
-} USER_RC_INFO_S;
-
-
-/* the information of the user frame*/
-typedef struct hiUSER_FRAME_INFO_S {
-    VIDEO_FRAME_INFO_S stUserFrame;
-    USER_RC_INFO_S     stUserRcInfo;
-} USER_FRAME_INFO_S;
-
-/* the config of the sse*/
-typedef struct hiVENC_SSE_CFG_S {
-    HI_U32  u32Index;       /* RW; Range:[0, 7]; Index of an SSE. The system supports indexes ranging from 0 to 7 */
-    HI_BOOL bEnable;        /* RW; Range:[0, 1]; Whether to enable SSE */
-    RECT_S  stRect;         /* RW; */
-} VENC_SSE_CFG_S;
-
-
-/* the param of the crop */
-typedef struct hiVENC_CROP_INFO_S {
-    HI_BOOL bEnable;                       /* RW; Range:[0, 1]; Crop region enable */
-    RECT_S  stRect;                        /* RW; Crop region, note: s32X must be multi of 16 */
-} VENC_CROP_INFO_S;
-
-/* the param of the venc frame rate */
-typedef struct hiVENC_FRAME_RATE_S {
-    HI_S32 s32SrcFrmRate;                  /* RW; Range:[0, 240]; Input frame rate of a  channel*/
-    HI_S32 s32DstFrmRate;                  /* RW; Range:[0, 240]; Output frame rate of a channel*/
-} VENC_FRAME_RATE_S;
-
-/* the param of the venc encode chnl */
-typedef struct hiVENC_CHN_PARAM_S {
-    HI_BOOL bColor2Grey;                /* RW; Range:[0, 1]; Whether to enable Color2Grey.*/
-    HI_U32  u32Priority;                /* RW; Range:[0, 1]; The priority of the coding chnl.*/
-    HI_U32  u32MaxStrmCnt;              /* RW: Range:[0,4294967295]; Maximum number of frames in a stream buffer*/
-    HI_U32  u32PollWakeUpFrmCnt;        /* RW: Range:(0,4294967295]; the frame num needed to wake up  obtaining streams */
-    VENC_CROP_INFO_S    stCropCfg;
-    VENC_FRAME_RATE_S   stFrameRate;
-} VENC_CHN_PARAM_S;
-
-/*the ground protect of FOREGROUND*/
-typedef struct hiVENC_FOREGROUND_PROTECT_S {
-    HI_BOOL bForegroundCuRcEn;
-    HI_U32  u32ForegroundDirectionThresh;              /*RW; Range:[0, 16]; The direction for controlling the macroblock-level bit rate*/
-    HI_U32  u32ForegroundThreshGain;                   /*RW; Range:[0, 15]; The gain of the thresh*/
-    HI_U32  u32ForegroundThreshOffset;                 /*RW; Range:[0, 255]; The offset of the thresh*/
-    HI_U32  u32ForegroundThreshP[RC_TEXTURE_THR_SIZE]; /*RW; Range:[0, 255]; Mad threshold for controlling the foreground macroblock-level bit rate of P frames */
-    HI_U32  u32ForegroundThreshB[RC_TEXTURE_THR_SIZE]; /*RW; Range:[0, 255]; Mad threshold for controlling the foreground macroblock-level bit rate of B frames */
-} VENC_FOREGROUND_PROTECT_S;
-
-/* the scene mode of the venc encode chnl */
-typedef enum hiVENC_SCENE_MODE_E {
-    SCENE_0  = 0,              /* RW; A scene in which the camera does not move or periodically moves continuously*/
-    SCENE_1  = 1,              /* RW; Motion scene at high bit rate*/
-    SCENE_2  = 2,              /* RW; It has regular continuous motion at medium bit rate and the encoding pressure is relatively large*/
-    SCENE_BUTT
-} VENC_SCENE_MODE_E;
-
-
-/* not support for Hi3559AV100/Hi3559v200/Hi3556v200 */
-typedef struct hiVENC_DEBREATHEFFECT_S {
-    HI_BOOL   bEnable;                 /* RW; Range:[0,1];default: 0, DeBreathEffect enable */
-    HI_S32    s32Strength0;            /* RW; Range:[0,35];The Strength0 of DeBreathEffect.*/
-    HI_S32    s32Strength1;            /* RW; Range:[0,35];The Strength1 of DeBreathEffect.*/
-} VENC_DEBREATHEFFECT_S;
-
-typedef struct hiVENC_CU_PREDICTION_S {
-     OPERATION_MODE_E enPredMode;     /* RW; CU tendency configuration mode  */
-
-     HI_U32 u32Intra32Cost;           /* RW; Range:[0,15]; Tendency adjustment in Intra32 mode*/
-     HI_U32 u32Intra16Cost;           /* RW; Range:[0,15]; Tendency adjustment in Intra16 mode*/
-     HI_U32 u32Intra8Cost;            /* RW; Range:[0,15]; Tendency adjustment in Intra8 mode*/
-     HI_U32 u32Intra4Cost;            /* RW; Range:[0,15]; Tendency adjustment in Intra4 mode*/
-
-     HI_U32 u32Inter64Cost;           /* RW; Range:[0,15]; Tendency adjustment in Intra64 mode*/
-     HI_U32 u32Inter32Cost;           /* RW; Range:[0,15]; Tendency adjustment in Inter32 mode*/
-     HI_U32 u32Inter16Cost;           /* RW; Range:[0,15]; Tendency adjustment in Inter16 mode*/
-     HI_U32 u32Inter8Cost;            /* RW; Range:[0,15]; Tendency adjustment in Inter8 mode*/
-} VENC_CU_PREDICTION_S;
-
-typedef struct hiVENC_SKIP_BIAS_S {
-     HI_BOOL   bSkipBiasEn;             /* RW; Range:[0,1];   Flag indicating whether the skip tendency function is enabled*/
-     HI_U32    u32SkipThreshGain;       /* RW; Range:[0,15];  used to calculate the SAD threshold for foreground detection*/
-     HI_U32    u32SkipThreshOffset;     /* RW; Range:[0,255]; used to calculate the SAD threshold for foreground detection*/
-     HI_U32    u32SkipBackgroundCost;   /* RW; Range:[0,15];  Skip tendency adjustment in the background*/
-     HI_U32    u32SkipForegroundCost;   /* RW; Range:[0,15];  Skip tendency adjustment in the foreground*/
-} VENC_SKIP_BIAS_S;
-
-typedef struct hiVENC_HIERARCHICAL_QP_S {
-    HI_BOOL     bHierarchicalQpEn;              /* RW; Range:[0,1];    Hierarchical QP enable*/
-	HI_S32      s32HierarchicalQpDelta[4];      /* RW; Range:[-10,10]; QP delta of the frames at each layer relative to the P-frame at layer 0*/
-    HI_S32      s32HierarchicalFrameNum[4];     /* RW; Range:[0,5];    Number of frames at each layer*/
-} VENC_HIERARCHICAL_QP_S;
-
-typedef struct hiVENC_CHN_POOL_S {
-    VB_POOL hPicVbPool;     /* RW;  vb pool id for pic buffer */
-    VB_POOL hPicInfoVbPool; /* RW;  vb pool id for pic info buffer */
-} VENC_CHN_POOL_S;
-
-typedef struct hiVENC_RC_ADVPARAM_S {
-    HI_U32 u32ClearStatAfterSetAttr; /* RW; Range:[0,1]; Clear Stat After SetAttr enable */
-} VENC_RC_ADVPARAM_S;
-
-typedef enum hiFG_REGION_TYPE_E {
-    FG_REGION_PEOPLE = 0,
-    FG_REGION_FACE,
-    FG_REGION_BUTT
-} FG_REGION_TYPE_E;
-
-typedef struct {
-    HI_U8 u8QpmapValueI;   /* RW;Range: [0, 255] */
-    HI_U8 u8QpmapValueP;   /* RW;Range: [0, 255] */
-    HI_U8 u8SkipmapValue;  /* RW;Range: [0, 255] */
-} VENC_SVC_MAP_PARAM_S;
-
-typedef struct {
-    VENC_SVC_MAP_PARAM_S  stFgRegion[FG_REGION_BUTT];
-    VENC_SVC_MAP_PARAM_S  stActivityRegion;
-    VENC_SVC_MAP_PARAM_S  stBgRegion;
-    HI_BOOL bFgProtectAdaptiveEn; /* RW;Range: [0, 1] */
-} VENC_SVC_PARAM_S;
-
-
-typedef struct {
-    HI_U16 u16SceneComplexity; /* R;Range: [0, 65535], Proportional to total area of detected objects */
-    HI_U8  u8ObjectLevel;      /* R;Range: [0, 2], Related to total number of detected objects */
-} VENC_SVC_DETECT_RESULT_S;
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_COMM_VENC_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vgs.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vgs.h
deleted file mode 100644
index a252cb9a..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vgs.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2013-2019. All rights reserved.
- * Description: Common struct definition for VGS
- * Author: Hisilicon multimedia software group
- * Create: 2013-07-24
- */
-
-#ifndef __HI_COMM_VGS_H__
-#define __HI_COMM_VGS_H__
-
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_errno.h"
-#include "hi_comm_video.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-/* failure caused by malloc buffer */
-#define HI_ERR_VGS_NOBUF         HI_DEF_ERR(HI_ID_VGS, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-#define HI_ERR_VGS_BUF_EMPTY     HI_DEF_ERR(HI_ID_VGS, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-#define HI_ERR_VGS_NULL_PTR      HI_DEF_ERR(HI_ID_VGS, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-#define HI_ERR_VGS_ILLEGAL_PARAM HI_DEF_ERR(HI_ID_VGS, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-#define HI_ERR_VGS_BUF_FULL      HI_DEF_ERR(HI_ID_VGS, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-#define HI_ERR_VGS_SYS_NOTREADY  HI_DEF_ERR(HI_ID_VGS, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-#define HI_ERR_VGS_NOT_SUPPORT   HI_DEF_ERR(HI_ID_VGS, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-#define HI_ERR_VGS_NOT_PERMITTED HI_DEF_ERR(HI_ID_VGS, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-
-#define VGS_PRIVATE_DATA_LEN 6
-
-typedef HI_S32 VGS_HANDLE;
-
-typedef enum hiVGS_COLOR_REVERT_MODE_E {
-    VGS_COLOR_REVERT_NONE = 0, /* Not revert */
-    VGS_COLOR_REVERT_RGB,      /* Revert RGB */
-    VGS_COLOR_REVERT_ALPHA,    /* Revert alpha */
-    VGS_COLOR_REVERT_BOTH,     /* Revert RGB and alpha */
-    VGS_COLOR_REVERT_BUTT
-} VGS_COLOR_REVERT_MODE_E;
-
-typedef struct hiVGS_OSD_REVERT_S {
-    RECT_S stSrcRect;                          /* OSD color revert area */
-    VGS_COLOR_REVERT_MODE_E enColorRevertMode; /* OSD color revert mode */
-} VGS_OSD_REVERT_S;
-
-typedef struct hiVGS_TASK_ATTR_S {
-    VIDEO_FRAME_INFO_S stImgIn;  /* Input picture */
-    VIDEO_FRAME_INFO_S stImgOut; /* Output picture */
-    HI_U64 au64PrivateData[4];   /* RW; Private data of task */
-    HI_U32 reserved;             /* RW; Debug information,state of current picture */
-} VGS_TASK_ATTR_S;
-
-typedef struct hiVGS_DRAW_LINE_S {
-    POINT_S stStartPoint; /* Line start point */
-    POINT_S stEndPoint;   /* Line end point */
-    HI_U32 u32Thick;      /* RW; Width of line */
-    HI_U32 u32Color;      /* RW; Range: [0,0xFFFFFF]; Color of line */
-} VGS_DRAW_LINE_S;
-
-typedef enum hiVGS_COVER_TYPE_E {
-    COVER_RECT = 0,    /* Retangle cover */
-    COVER_QUAD_RANGLE, /* Quadrangle cover */
-    COVER_BUTT
-} VGS_COVER_TYPE_E;
-
-typedef struct hiVGS_QUADRANGLE_COVER_S {
-    HI_BOOL bSolid;     /* Solid or hollow cover */
-    HI_U32 u32Thick;    /* RW; Range: [2,8]; Thick of the hollow quadrangle */
-    POINT_S stPoint[4]; /* Four points of the quadrangle */
-} VGS_QUADRANGLE_COVER_S;
-
-typedef struct hiVGS_ADD_COVER_S {
-    VGS_COVER_TYPE_E enCoverType; /* Cover type */
-    union {
-        RECT_S stDstRect;                    /* The rectangle area */
-        VGS_QUADRANGLE_COVER_S stQuadRangle; /* The quadrangle area */
-    };
-
-    HI_U32 u32Color; /* RW; Range: [0,0xFFFFFF]; Color of cover */
-} VGS_ADD_COVER_S;
-
-typedef struct hiVGS_ADD_OSD_S {
-    RECT_S stRect;                /* Osd area */
-    HI_U32 u32BgColor;            /* RW; Background color of osd, depends on pixel format of osd,
-                                        ARGB8888:[0,0xFFFFFFFF], ARGB4444:[0,0xFFFF], ARGB1555:[0,0x1FFF] */
-    PIXEL_FORMAT_E enPixelFmt;    /* Pixel format of osd */
-    HI_U64 u64PhyAddr;            /* RW; Physical address of osd */
-    HI_U32 u32Stride;             /* RW; Range: [32,8192]; Stride of osd */
-    HI_U32 u32BgAlpha;            /* RW; Range: [0,255]; Background alpha of osd */
-    HI_U32 u32FgAlpha;            /* RW; Range: [0,255]; Foreground alpha of osd */
-    HI_BOOL bOsdRevert;           /* RW; Enable osd color revert */
-    VGS_OSD_REVERT_S stOsdRevert; /* Osd color revert information */
-    HI_U16 u16ColorLUT[2];
-} VGS_ADD_OSD_S;
-
-typedef enum hiVGS_SCLCOEF_MODE_E {
-    VGS_SCLCOEF_NORMAL = 0, /* normal scale coefficient */
-    VGS_SCLCOEF_TAP2 = 1,   /* scale coefficient of 2 tap */
-    VGS_SCLCOEF_TAP4 = 2,   /* scale coefficient of 4 tap */
-    VGS_SCLCOEF_TAP6 = 3,   /* scale coefficient of 6 tap */
-    VGS_SCLCOEF_TAP8 = 4,   /* scale coefficient of 8 tap */
-    VGS_SCLCOEF_BUTT
-} VGS_SCLCOEF_MODE_E;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_COMM_VGS_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vi.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vi.h
deleted file mode 100644
index 44c242b8..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vi.h
+++ /dev/null
@@ -1,849 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2012-2018. All rights reserved.
- * Description: hi_comm_vi.h
- * Author:
- * Create: 2016-09-19
- */
-
-#ifndef __HI_COMM_VI_H__
-#define __HI_COMM_VI_H__
-
-#include "hi_common.h"
-#include "hi_errno.h"
-#include "hi_comm_video.h"
-#include "hi_comm_gdc.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-#define VI_MAX_ADCHN_NUM              (4UL)
-
-#define VI_PMFCOEF_NUM                (9UL)
-#define VI_COMPMASK_NUM               (2UL)
-#define VI_PRO_MAX_FRAME_NUM          (8UL)
-
-#define VI_INVALID_FRMRATE            (-1)
-#define VI_CHN0                       0
-#define VI_CHN1                       1
-#define VI_CHN2                       2
-#define VI_CHN3                       3
-#define VI_INVALID_CHN                (-1)
-
-#define VI_MAX_VC_NUM                 4
-
-typedef struct hiVI_LOW_DELAY_INFO_S {
-    HI_BOOL bEnable;          /* RW; Low delay enable. */
-    HI_U32 u32LineCnt;        /* RW; Range: [32, 16384]; Low delay shoreline. */
-} VI_LOW_DELAY_INFO_S;
-
-/* Information of raw data cmpresss param */
-typedef struct hiVI_CMP_PARAM_S {
-    HI_U8 au8CmpParam[VI_CMP_PARAM_SIZE];
-} VI_CMP_PARAM_S;
-
-typedef enum hi_VI_USERPIC_MODE_E {
-    VI_USERPIC_MODE_PIC = 0,            /* YUV picture */
-    VI_USERPIC_MODE_BGC,                /* Background picture only with a color */
-    VI_USERPIC_MODE_BUTT,
-} VI_USERPIC_MODE_E;
-
-typedef struct hiVI_USERPIC_BGC_S {
-    HI_U32 u32BgColor;
-} VI_USERPIC_BGC_S;
-
-typedef struct hiVI_USERPIC_ATTR_S {
-    VI_USERPIC_MODE_E       enUsrPicMode;  /* User picture mode */
-    union {
-        VIDEO_FRAME_INFO_S  stUsrPicFrm;   /* Information about a YUV picture */
-        VI_USERPIC_BGC_S    stUsrPicBg;    /* Information about a background picture only with a color */
-    } unUsrPic;
-} VI_USERPIC_ATTR_S;
-
-typedef enum hiEN_VI_ERR_CODE_E {
-    ERR_VI_FAILED_NOTENABLE = 64,       /* device or channel not enable */
-    ERR_VI_FAILED_NOTDISABLE,           /* device not disable */
-    ERR_VI_FAILED_CHNOTDISABLE,         /* channel not disable */
-    ERR_VI_CFG_TIMEOUT,                 /* config timeout */
-    ERR_VI_NORM_UNMATCH,                /* video norm of ADC and VIU is unmatch */
-    ERR_VI_INVALID_WAYID,               /* invlalid way ID */
-    ERR_VI_INVALID_PHYCHNID,            /* invalid phychn id */
-    ERR_VI_FAILED_NOTBIND,              /* device or channel not bind */
-    ERR_VI_FAILED_BINDED,               /* device or channel not unbind */
-    ERR_VI_DIS_PROCESS_FAIL             /* dis process failed */
-} EN_VI_ERR_CODE_E;
-
-#define HI_ERR_VI_INVALID_PARA        HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-#define HI_ERR_VI_INVALID_DEVID       HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_DEVID)
-#define HI_ERR_VI_INVALID_PIPEID      HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_PIPEID)
-#define HI_ERR_VI_INVALID_STITCHGRPID HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_STITCHGRPID)
-#define HI_ERR_VI_INVALID_CHNID       HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-#define HI_ERR_VI_INVALID_NULL_PTR    HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-#define HI_ERR_VI_FAILED_NOTCONFIG    HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_CONFIG)
-#define HI_ERR_VI_SYS_NOTREADY        HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-#define HI_ERR_VI_BUF_EMPTY           HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-#define HI_ERR_VI_BUF_FULL            HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_FULL)
-#define HI_ERR_VI_NOMEM               HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-#define HI_ERR_VI_NOT_SUPPORT         HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-#define HI_ERR_VI_BUSY                HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-#define HI_ERR_VI_NOT_PERM            HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-
-#define HI_ERR_VI_FAILED_NOTENABLE    HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, ERR_VI_FAILED_NOTENABLE)
-#define HI_ERR_VI_FAILED_NOTDISABLE   HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, ERR_VI_FAILED_NOTDISABLE)
-#define HI_ERR_VI_FAILED_CHNOTDISABLE HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, ERR_VI_FAILED_CHNOTDISABLE)
-#define HI_ERR_VI_CFG_TIMEOUT         HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, ERR_VI_CFG_TIMEOUT)
-#define HI_ERR_VI_NORM_UNMATCH        HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, ERR_VI_NORM_UNMATCH)
-#define HI_ERR_VI_INVALID_WAYID       HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, ERR_VI_INVALID_WAYID)
-#define HI_ERR_VI_INVALID_PHYCHNID    HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, ERR_VI_INVALID_PHYCHNID)
-#define HI_ERR_VI_FAILED_NOTBIND      HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, ERR_VI_FAILED_NOTBIND)
-#define HI_ERR_VI_FAILED_BINDED       HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, ERR_VI_FAILED_BINDED)
-
-#define HI_ERR_VI_PIPE_EXIST          HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_EXIST)
-#define HI_ERR_VI_PIPE_UNEXIST        HI_DEF_ERR(HI_ID_VI, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-
-/* interface mode of video input */
-typedef enum hiVI_INTF_MODE_E {
-    VI_MODE_BT656 = 0,              /* ITU-R BT.656 YUV4:2:2 */
-    VI_MODE_BT656_PACKED_YUV,       /* ITU-R BT.656 packed YUV4:2:2 */
-    VI_MODE_BT601,                  /* ITU-R BT.601 YUV4:2:2 */
-    VI_MODE_DIGITAL_CAMERA,         /* digatal camera mode */
-    VI_MODE_BT1120_STANDARD,        /* BT.1120 progressive mode */
-    VI_MODE_BT1120_INTERLEAVED,     /* BT.1120 interstage mode */
-    VI_MODE_MIPI,                   /* MIPI RAW mode */
-    VI_MODE_MIPI_YUV420_NORMAL,     /* MIPI YUV420 normal mode */
-    VI_MODE_MIPI_YUV420_LEGACY,     /* MIPI YUV420 legacy mode */
-    VI_MODE_MIPI_YUV422,            /* MIPI YUV422 mode */
-    VI_MODE_LVDS,                   /* LVDS mode */
-    VI_MODE_HISPI,                  /* HiSPi mode */
-    VI_MODE_SLVS,                   /* SLVS mode */
-
-    VI_MODE_BUTT
-} VI_INTF_MODE_E;
-
-/* Input mode */
-typedef enum hiVI_INPUT_MODE_E {
-    VI_INPUT_MODE_BT656 = 0,        /* ITU-R BT.656 YUV4:2:2 */
-    VI_INPUT_MODE_BT601,            /* ITU-R BT.601 YUV4:2:2 */
-    VI_INPUT_MODE_DIGITAL_CAMERA,   /* digatal camera mode */
-    VI_INPUT_MODE_INTERLEAVED,      /* interstage mode */
-    VI_INPUT_MODE_MIPI,             /* MIPI mode */
-    VI_INPUT_MODE_LVDS,             /* LVDS mode */
-    VI_INPUT_MODE_HISPI,            /* HiSPi mode */
-    VI_INPUT_MODE_SLVS,             /* SLVS mode */
-
-    VI_INPUT_MODE_BUTT
-} VI_INPUT_MODE_E;
-
-/* Work mode */
-typedef enum hiVI_WORK_MODE_E {
-    VI_WORK_MODE_1Multiplex = 0,    /* 1 Multiplex mode */
-    VI_WORK_MODE_2Multiplex,        /* 2 Multiplex mode */
-    VI_WORK_MODE_3Multiplex,        /* 3 Multiplex mode */
-    VI_WORK_MODE_4Multiplex,        /* 4 Multiplex mode */
-
-    VI_WORK_MODE_BUTT
-} VI_WORK_MODE_E;
-
-/* whether an input picture is interlaced or progressive */
-typedef enum hiVI_SCAN_MODE_E {
-    VI_SCAN_INTERLACED  = 0,        /* interlaced mode */
-    VI_SCAN_PROGRESSIVE,            /* progressive mode */
-
-    VI_SCAN_BUTT
-} VI_SCAN_MODE_E;
-
-/* Sequence of YUV data */
-typedef enum hiVI_YUV_DATA_SEQ_E {
-    VI_DATA_SEQ_VUVU = 0,   /* The input sequence of the second component(only contains u and v) in BT.
-                            1120 mode is VUVU */
-    VI_DATA_SEQ_UVUV,       /* The input sequence of the second component(only contains u and v) in BT.
-                            1120 mode is UVUV */
-
-    VI_DATA_SEQ_UYVY,       /* The input sequence of YUV is UYVY */
-    VI_DATA_SEQ_VYUY,       /* The input sequence of YUV is VYUY */
-    VI_DATA_SEQ_YUYV,       /* The input sequence of YUV is YUYV */
-    VI_DATA_SEQ_YVYU,       /* The input sequence of YUV is YVYU */
-
-    VI_DATA_SEQ_BUTT
-} VI_YUV_DATA_SEQ_E;
-
-/* Clock edge mode */
-typedef enum hiVI_CLK_EDGE_E {
-    VI_CLK_EDGE_SINGLE_UP = 0,         /* single-edge mode and in rising edge */
-    VI_CLK_EDGE_SINGLE_DOWN,           /* single-edge mode and in falling edge */
-
-    VI_CLK_EDGE_BUTT
-} VI_CLK_EDGE_E;
-
-/* Component mode */
-typedef enum hiVI_COMPONENT_MODE_E {
-    VI_COMPONENT_MODE_SINGLE = 0,           /* single component mode */
-    VI_COMPONENT_MODE_DOUBLE,               /* double component mode */
-
-    VI_COMPONENT_MODE_BUTT
-} VI_COMPONENT_MODE_E;
-
-/* Y/C composite or separation mode */
-typedef enum hiVI_COMBINE_MODE_E {
-    VI_COMBINE_COMPOSITE = 0,     /* Composite mode */
-    VI_COMBINE_SEPARATE,          /* Separate mode */
-
-    VI_COMBINE_BUTT
-} VI_COMBINE_MODE_E;
-
-/* Attribute of the vertical synchronization signal */
-typedef enum hiVI_VSYNC_E {
-    VI_VSYNC_FIELD = 0,           /* Field/toggle mode:a signal reversal means a new frame or a field */
-    VI_VSYNC_PULSE,               /* Pusle/effective mode:a pusle or an effective signal means a new frame or a field */
-
-    VI_VSYNC_BUTT
-} VI_VSYNC_E;
-
-/* Polarity of the vertical synchronization signal */
-typedef enum hiVI_VSYNC_NEG_E {
-    VI_VSYNC_NEG_HIGH = 0,        /* if VIU_VSYNC_E = VIU_VSYNC_FIELD, then the vertical synchronization signal of
-                                    even field is high-level,
-                                    if VIU_VSYNC_E = VIU_VSYNC_PULSE,then the vertical synchronization
-                                    pulse is positive pulse. */
-    VI_VSYNC_NEG_LOW,             /* if VIU_VSYNC_E = VIU_VSYNC_FIELD, then the vertical synchronization signal
-                                    of even field is low-level,
-                                    if VIU_VSYNC_E = VIU_VSYNC_PULSE,then the vertical synchronization
-                                    pulse is negative pulse. */
-    VI_VSYNC_NEG_BUTT
-} VI_VSYNC_NEG_E;
-
-/* Attribute of the horizontal synchronization signal */
-typedef enum hiVI_HSYNC_E {
-    VI_HSYNC_VALID_SINGNAL = 0,   /* the horizontal synchronization is valid signal mode */
-    VI_HSYNC_PULSE,               /* the horizontal synchronization is pulse mode, a new pulse means
-                                    the beginning of a new line */
-
-    VI_HSYNC_BUTT
-} VI_HSYNC_E;
-
-/* Polarity of the horizontal synchronization signal */
-typedef enum hiVI_HSYNC_NEG_E {
-    VI_HSYNC_NEG_HIGH = 0,        /* if VI_HSYNC_E = VI_HSYNC_VALID_SINGNAL, then the valid horizontal
-                                    synchronization signal is high-level;
-                                    if VI_HSYNC_E = VI_HSYNC_PULSE,then the horizontal synchronization
-                                    pulse is positive pulse */
-    VI_HSYNC_NEG_LOW,             /* if VI_HSYNC_E = VI_HSYNC_VALID_SINGNAL, then the valid horizontal
-                                    synchronization signal is low-level;
-                                    if VI_HSYNC_E = VI_HSYNC_PULSE, then the horizontal synchronization
-                                    pulse is negative pulse */
-    VI_HSYNC_NEG_BUTT
-} VI_HSYNC_NEG_E;
-
-/* Attribute of the valid vertical synchronization signal */
-typedef enum hiVI_VSYNC_VALID_E {
-    VI_VSYNC_NORM_PULSE = 0,      /* the vertical synchronization is pusle mode, a pusle means a new frame or field  */
-    VI_VSYNC_VALID_SINGAL,        /* the vertical synchronization is effective mode, a effective signal
-                                    means a new frame or field */
-
-    VI_VSYNC_VALID_BUTT
-} VI_VSYNC_VALID_E;
-
-/* Polarity of the valid vertical synchronization signal */
-typedef enum hiVI_VSYNC_VALID_NEG_E {
-    VI_VSYNC_VALID_NEG_HIGH = 0,  /* if VI_VSYNC_VALID_E = VI_VSYNC_NORM_PULSE, a positive pulse means vertical
-                                    synchronization pulse;
-                                    if VI_VSYNC_VALID_E = VI_VSYNC_VALID_SINGAL, the valid vertical synchronization
-                                    signal is high-level */
-    VI_VSYNC_VALID_NEG_LOW,       /* if VI_VSYNC_VALID_E = VI_VSYNC_NORM_PULSE, a negative pulse
-                                    means vertical synchronization pulse;
-                                    if VI_VSYNC_VALID_E = VI_VSYNC_VALID_SINGAL, the valid vertical
-                                    synchronization signal is low-level */
-    VI_VSYNC_VALID_NEG_BUTT
-} VI_VSYNC_VALID_NEG_E;
-
-/* Blank information of the input timing */
-typedef struct hiVI_TIMING_BLANK_S {
-    HI_U32 u32HsyncHfb ;    /* RW;Horizontal front blanking width */
-    HI_U32 u32HsyncAct ;    /* RW;Horizontal effetive width */
-    HI_U32 u32HsyncHbb ;    /* RW;Horizontal back blanking width */
-    HI_U32 u32VsyncVfb ;    /* RW;Vertical front blanking height of one frame or odd-field frame picture */
-    HI_U32 u32VsyncVact ;   /* RW;Vertical effetive width of one frame or odd-field frame picture */
-    HI_U32 u32VsyncVbb ;    /* RW;Vertical back blanking height of one frame or odd-field frame picture */
-    HI_U32 u32VsyncVbfb ;   /* RW;Even-field vertical front blanking height when input mode is interlace
-                            (invalid when progressive input mode) */
-    HI_U32 u32VsyncVbact ;  /* RW;Even-field vertical effetive width when input mode is interlace
-                            (invalid when progressive input mode) */
-    HI_U32 u32VsyncVbbb ;   /* RW;Even-field vertical back blanking height when input mode is interlace
-                            (invalid when progressive input mode) */
-} VI_TIMING_BLANK_S;
-
-/* synchronization information about the BT.601 or DC timing */
-typedef struct hiVI_SYNC_CFG_S {
-    VI_VSYNC_E              enVsync;
-    VI_VSYNC_NEG_E          enVsyncNeg;
-    VI_HSYNC_E              enHsync;
-    VI_HSYNC_NEG_E          enHsyncNeg;
-    VI_VSYNC_VALID_E        enVsyncValid;
-    VI_VSYNC_VALID_NEG_E    enVsyncValidNeg;
-    VI_TIMING_BLANK_S       stTimingBlank;
-} VI_SYNC_CFG_S;
-
-/* the highest bit of the BT.656 timing reference code */
-typedef enum hiVI_BT656_FIXCODE_E {
-    VI_BT656_FIXCODE_1 = 0,       /* The highest bit of the EAV/SAV data over the BT.656 protocol is always 1. */
-    VI_BT656_FIXCODE_0,           /* The highest bit of the EAV/SAV data over the BT.656 protocol is always 0. */
-
-    VI_BT656_FIXCODE_BUTT
-} VI_BT656_FIXCODE_E;
-
-/* Polarity of the field indicator bit (F) of the BT.656 timing reference code */
-typedef enum hiVI_BT656_FIELD_POLAR_E {
-    VI_BT656_FIELD_POLAR_STD = 0, /* the standard BT.656 mode,the first filed F=0,the second filed F=1 */
-    VI_BT656_FIELD_POLAR_NSTD,    /* the non-standard BT.656 mode,the first filed F=1,the second filed F=0 */
-
-    VI_BT656_FIELD_POLAR_BUTT
-} VI_BT656_FIELD_POLAR_E;
-
-/* synchronization information about the BT.656 */
-typedef struct hiVI_BT656_SYNC_CFG_S {
-    VI_BT656_FIXCODE_E     enFixCode;
-    VI_BT656_FIELD_POLAR_E enFieldPolar;
-} VI_BT656_SYNC_CFG_S;
-
-/* Input data type */
-typedef enum hiVI_DATA_TYPE_E {
-    VI_DATA_TYPE_YUV = 0,
-    VI_DATA_TYPE_RGB,
-
-    VI_DATA_TYPE_BUTT
-} VI_DATA_TYPE_E;
-
-typedef enum hiVI_REPHASE_MODE_E {
-    VI_REPHASE_MODE_NONE = 0,
-    VI_REPHASE_MODE_SKIP_1_2,            /* skip 1/2 */
-    VI_REPHASE_MODE_SKIP_1_3,            /* skip 1/3 */
-    VI_REPHASE_MODE_BINNING_1_2,          /* binning 1/2 */
-    VI_REPHASE_MODE_BINNING_1_3,        /* binning 1/3 */
-
-    VI_REPHASE_MODE_BUTT
-} VI_REPHASE_MODE_E;
-
-typedef struct hiVI_BAS_REPHASE_ATTR_S {
-    VI_REPHASE_MODE_E enHRephaseMode;
-    VI_REPHASE_MODE_E enVRephaseMode;
-} VI_BAS_REPHASE_ATTR_S;
-
-/* Attribute of bas scale */
-typedef struct hiVI_BAS_SCALE_ATTR_S {
-    SIZE_S stBasSize; /* RW;bayer scale size. */
-} VI_BAS_SCALE_ATTR_S;
-
-/* Attribute of bayer scale */
-typedef struct hiVI_BAS_ATTR_S {
-    VI_BAS_SCALE_ATTR_S     stSacleAttr;
-    VI_BAS_REPHASE_ATTR_S   stRephaseAttr;
-} VI_BAS_ATTR_S;
-
-/* Attribute of wdr */
-typedef struct hiVI_WDR_ATTR_S {
-    WDR_MODE_E  enWDRMode;          /* RW; WDR mode. */
-    HI_U32      u32CacheLine;       /* RW; WDR cache line. */
-} VI_WDR_ATTR_S;
-
-/* the extended attributes of VI device */
-typedef struct hiVI_DEV_ATTR_EX_S {
-    VI_INPUT_MODE_E         enInputMode;                    /* RW;Input mode */
-    VI_WORK_MODE_E          enWorkMode;                     /* RW; Work mode */
-
-    VI_COMBINE_MODE_E       enCombineMode;                  /* RW;Y/C composite or separation mode */
-    VI_COMPONENT_MODE_E     enComponentMode;                /* RW;Component mode (single-component or dual-component) */
-    VI_CLK_EDGE_E           enClkEdge;                      /* RW;Clock edge mode (sampling on the rising or
-                                                            falling edge) */
-
-    HI_U32                  au32ComponentMask[VI_COMPMASK_NUM]; /* RW;Component mask */
-
-    VI_SCAN_MODE_E          enScanMode;                     /* RW;Input scanning mode (progressive or interlaced) */
-    HI_S32                  as32AdChnId[VI_MAX_ADCHN_NUM];  /* RW;AD channel ID. Typically, the default
-                                                            value -1 is recommended */
-
-    VI_YUV_DATA_SEQ_E       enDataSeq;                  /* RW;Input data sequence (only the YUV format is supported) */
-    VI_SYNC_CFG_S           stSynCfg;                       /* RW;Sync timing. This member must be configured in BT.
-                                                            601 mode or DC mode */
-
-    VI_BT656_SYNC_CFG_S     stBT656SynCfg;                  /* RW;Sync timing. This member must be configured in BT.
-                                                            656 mode */
-
-    VI_DATA_TYPE_E          enInputDataType;                /* RW;RGB: CSC-709 or CSC-601, PT YUV444 disable;
-                                                            YUV: default yuv CSC coef PT YUV444 enable. */
-
-    HI_BOOL                 bDataReverse;                   /* RW;Data reverse */
-
-    SIZE_S                  stSize;                         /* RW;Input size */
-
-    VI_BAS_ATTR_S           stBasAttr;                      /* RW;Attribute of BAS */
-
-    VI_WDR_ATTR_S           stWDRAttr;                      /* RW;Attribute of WDR */
-
-    DATA_RATE_E             enDataRate;                     /* RW;Data rate of Device */
-} VI_DEV_ATTR_EX_S;
-
-/* The attributes of a VI device */
-typedef struct hiVI_DEV_ATTR_S {
-    VI_INTF_MODE_E      enIntfMode;                     /* RW;Interface mode */
-    VI_WORK_MODE_E      enWorkMode;                     /* RW;Work mode */
-
-    HI_U32              au32ComponentMask[VI_COMPMASK_NUM];  /* RW;Component mask */
-    VI_SCAN_MODE_E      enScanMode;                     /* RW;Input scanning mode (progressive or interlaced) */
-    HI_S32              as32AdChnId[VI_MAX_ADCHN_NUM];  /* RW;AD channel ID. Typically, the default value -1
-                                                        is recommended */
-
-    /* The below members must be configured in BT.601 mode or DC mode and are invalid in other modes */
-    VI_YUV_DATA_SEQ_E   enDataSeq;                      /* RW;Input data sequence (only the YUV format is supported) */
-    VI_SYNC_CFG_S       stSynCfg;                       /* RW;Sync timing. This member must be configured in BT.
-                                                        601 mode or DC mode */
-
-    VI_DATA_TYPE_E      enInputDataType;                /* RW;RGB: CSC-709 or CSC-601, PT YUV444 disable; YUV: default
-                                                        yuv CSC coef PT YUV444 enable. */
-
-    HI_BOOL             bDataReverse;                   /* RW;Data reverse */
-
-    SIZE_S              stSize;                         /* RW;Input size */
-
-    VI_BAS_ATTR_S       stBasAttr;                      /* RW;Attribute of BAS */
-
-    VI_WDR_ATTR_S       stWDRAttr;                      /* RW;Attribute of WDR */
-
-    DATA_RATE_E         enDataRate;                     /* RW;Data rate of Device */
-} VI_DEV_ATTR_S;
-
-/* Information of pipe binded to device */
-typedef struct hiVI_DEV_BIND_PIPE_S {
-    HI_U32  u32Num;                                     /* RW;Range [1,VI_MAX_PHY_PIPE_NUM] */
-    VI_PIPE PipeId[VI_MAX_PHY_PIPE_NUM];                /* RW;Array of pipe ID */
-} VI_DEV_BIND_PIPE_S;
-
-/* Source of 3DNR reference frame */
-typedef enum hiVI_NR_REF_SOURCE_E {
-    VI_NR_REF_FROM_RFR = 0,                             /* Reference frame from reconstruction frame */
-    VI_NR_REF_FROM_CHN0,                                /* Reference frame from CHN0's frame */
-
-    VI_NR_REF_FROM_BUTT
-} VI_NR_REF_SOURCE_E;
-
-typedef enum hiVI_PIPE_BYPASS_MODE_E {
-    VI_PIPE_BYPASS_NONE,
-    VI_PIPE_BYPASS_FE,
-    VI_PIPE_BYPASS_BE,
-
-    VI_PIPE_BYPASS_BUTT
-} VI_PIPE_BYPASS_MODE_E;
-
-/* The attributes of 3DNR */
-typedef struct hiVI_NR_ATTR_S {
-    PIXEL_FORMAT_E      enPixFmt;                       /* RW;Pixel format of reference frame */
-    DATA_BITWIDTH_E     enBitWidth;                     /* RW;Bit Width of reference frame */
-    VI_NR_REF_SOURCE_E  enNrRefSource;                  /* RW;Source of 3DNR reference frame */
-    COMPRESS_MODE_E     enCompressMode;                 /* RW;Reference frame compress mode */
-} VI_NR_ATTR_S;
-
-/* The attributes of pipe */
-typedef struct hiVI_PIPE_ATTR_S {
-    VI_PIPE_BYPASS_MODE_E enPipeBypassMode;
-    HI_BOOL               bYuvSkip;               /* RW;YUV skip enable */
-    HI_BOOL               bIspBypass;             /* RW;Range:[0, 1];ISP bypass enable */
-    HI_U32                u32MaxW;                /* RW;Range:[0, 1];Range[VI_PIPE_MIN_WIDTH, VI_PIPE_MAX_WIDTH];
-                                                Maximum width */
-    HI_U32                u32MaxH;                /* RW;Range[VI_PIPE_MIN_HEIGHT, VI_PIPE_MAX_HEIGHT];Maximum height */
-    PIXEL_FORMAT_E        enPixFmt;               /* RW;Pixel format */
-    COMPRESS_MODE_E       enCompressMode;         /* RW;Range:[0, 4];Compress mode. */
-    DATA_BITWIDTH_E       enBitWidth;             /* RW;Range:[0, 4];Bit width */
-    HI_BOOL               bNrEn;                  /* RW;Range:[0, 1];3DNR enable */
-    VI_NR_ATTR_S          stNrAttr;               /* RW;Attribute of 3DNR */
-    HI_BOOL               bSharpenEn;             /* RW;Range:[0, 1];Sharpen enable */
-    FRAME_RATE_CTRL_S     stFrameRate;            /* RW;Frame rate */
-    HI_BOOL               bDiscardProPic;         /* RW;Range:[0, 1];when professional mode snap, whether to discard
-                                                long exposure picture in the video pipe. */
-} VI_PIPE_ATTR_S;
-
-typedef enum hiVI_STITCH_ISP_CFG_MODE_E {
-    VI_STITCH_ISP_CFG_NORMAL = 0,
-    VI_STITCH_ISP_CFG_SYNC,
-    VI_STITCH_ISP_CFG_BUTT
-} VI_STITCH_ISP_CFG_MODE_E;
-
-/* Information of stitch group */
-typedef struct hiVI_STITCH_GRP_ATTR_S {
-    HI_BOOL                     bStitch;
-    VI_STITCH_ISP_CFG_MODE_E    enMode;
-    HI_U32                      u32MaxPTSGap;            /* RW;MAX PTS Gap between frame of pipe,unit:us */
-    HI_U32                      u32PipeNum;              /* RW;Range [2, VI_MAX_PIPE_NUM] */
-    VI_PIPE                     PipeId[VI_MAX_PIPE_NUM]; /* RW;Array of pipe ID */
-} VI_STITCH_GRP_ATTR_S;
-
-typedef enum hiVI_PIPE_REPEAT_MODE_E {
-    VI_PIPE_REPEAT_NONE = 0,
-    VI_PIPE_REPEAT_ONCE = 1,
-    VI_PIPE_REPEAT_BUTT
-} VI_PIPE_REPEAT_MODE_E;
-
-typedef struct {
-    HI_U8   IES;              /* RW; Range:[0, 255];Format 8.0;the absolute strength of image enhancement for edge */
-    HI_U8   IESS;             /* RW; Range:[0, 255];Format 8.0;the absolute strength of image enhancement for
-                            texture and shadow */
-    HI_U16  IEDZ;             /* RW; Range:[0, 8192];Format 14.0;the threshold of image enhancement
-                            for controlling noise */
-} tV59aIEy;
-
-typedef struct {
-    HI_U8   SBF     : 2;      /* RW; Range:[0, 3];Format 2.0;the band type of spatial filter, notice: SBF0, SBF1
-                            range is [2, 3];SBF2,SBF3,SBF4 range is [0,3], where SBF4 is related to SBFk */
-    HI_U8   STR     : 4;      /* RW; Range:[0, 13];Format 4.0;the relative strength of spatial filter refer to
-                            the previous frame */
-    HI_U8   STHp    : 2;      /* RW; Range:[0, 2];Format 2.0;Not recommended for debugging */
-    HI_U8   SFT     : 5;      /* RW; Range:[0, 31];Format 5.0;Not recommended for debugging */
-    HI_U8   kPro    : 3;      /* RW; Range:[0, 7];Format 3.0;notice: the kPro of SFy2 range is [0, 7], the kPro of
-                            SFy3 range is [0, 4] */
-
-    HI_U16  STH[3];           /* RW; Range:[0, 999];Format 10.0;the edge-preserve threshold for spatial filter */
-    HI_U16  SBS[3];           /* RW; Range:[0, 9999];Format 14.0;the noise reduction strength of spatial filter
-                            for the relative bright pixel */
-    HI_U16  SDS[3];           /* RW; Range:[0, 9999];Format 14.0;the noise reduction strength of spatial filter
-                            for the relative dark pixel */
-
-} tV59aSFy;
-
-typedef struct {
-    HI_U16  MATH    : 10;    /* RW; Range:[0, 1023];Format 10.0;the motion detection threshold for temporal filter */
-    HI_U16  MATE    : 4;     /* RW; Range:[0, 11];Format 4.0;the motion detection index of flat area
-                            for temporal filter */
-    HI_U16  MATW    : 2;     /* RW; Range:[0, 3];Format 2.0;the index of suppressing trailing for temporal filter */
-    HI_U8   MASW    : 4;     /* RW; Range:[0, 12];Format 4.0;the index of suppressing raindrop noise
-                            for temporal filter */
-    HI_U8   MABW    : 3;     /* RW; Range:[0, 4];Format 3.0;the window of motion detection for temporal filter */
-    HI_U8   MAXN    : 1;     /* RW; Range:[0, 1];Format 1.0;Not recommended for debugging */
-
-} tV59aMDy;
-
-typedef struct {
-    HI_U8   TFR[4];         /* RW; Range:[0, 255];Format 8.0;the relative strength of temporal
-                            filter for the static area */
-    HI_U16  TDZ : 14;       /* RW; Range:[0, 999];Format 10.0;the threshold of dead-area of temporal filter */
-    HI_U16  TDX : 2;        /* RW; Range:[0, 2];Format 2.0;Not recommended for debugging */
-    HI_U16  TFS : 6;        /* RW; Range:[0, 63];Format 6.0;the absolute strength of temporal filter  */
-} tV59aTFy;
-
-typedef struct {
-    HI_U16  SFC     : 10;   /* RW; Range:[0, 1023];Format 10.0;the strength of spatial filter for NRC0 */
-    HI_U16  TFC     : 6;    /* RW; Range:[0, 63];Format 6.0;the strength of temporal filter for NRC0 */
-    HI_U16  CSFS    : 14;   /* RW; Range:[0, 999];Format 10.0;the strength of spatial filter for NRC1 */
-    HI_U16  CSFk    : 2;    /* RW; Range:[0, 3];Format 2.0;Not recommended for debugging */
-    HI_U16  CTFS    : 4;    /* RW; Range:[0, 15];Format 4.0;the strength of temporal filter for NRC1 */
-    HI_U16  CIIR    : 1;    /* RW; Range:[0, 1];Format 1.0;the mode of spatial filter for NRC1 */
-    HI_U16  CTFR    : 11;   /* RW; Range:[0, 999];Format 10.0;the relative strength of temporal filter for NRC1 */
-
-} tV59aNRc;
-
-/* 3DNR Spatial Filter: SFy0,SFy1,SFy2,SFy3; Temporal Filter:TFy0,TFy1;Chroma Noise Reduction: NRC0,NRC1 */
-typedef struct {
-    tV59aIEy  IEy;
-    tV59aSFy  SFy[5];
-    tV59aMDy  MDy[2];
-    tV59aTFy  TFy[2];
-
-    HI_U16  HdgType : 1;   /* RW; Range:[0, 1];Format 1.0;the type of complexed mixed spatial filter whether
-                            is SFi or SFk */
-    HI_U16  BriType : 1;   /* RW; Range:[0, 1];Format 1.0;the mode decide SFy3 whether is SFk type or SFi type */
-    HI_U16  HdgMode : 2;   /* RW; Range:[0, 3];Format 2.0;the mode decide complexed mixed spatial filter band
-                            for flat area */
-    HI_U16  kTab2   : 1;   /* RW; Range:[0, 1];Format 1.0;the parameter decide SFy2 whether or not based on the image
-                            absolute luminance */
-    HI_U16  HdgWnd  : 1;   /* RW; Range:[0, 1];Format 1.0;the sampling window of complexed mixed spatial filter for
-                            noise detection */
-    HI_U16  kTab3   : 1;   /* RW; Range:[0, 1];Format 1.0;the parameter decide SFy3 whether or not based on the image
-                            absolute luminance */
-    HI_U16  HdgSFR  : 4;   /* RW; Range:[0, 13];Format 4.0;the trend of the noise reduction of complexed mixed spatial
-                            filter for flat area */
-    HI_U16  nOut    : 5;   /* RW; Range:[0, 27];Format 5.0;the parameter for output intermediate result of SFy3 */
-    HI_U8   HdgIES;        /* RW; Range:[0, 255];Format 8.0;the strength of image enhancement for complexed
-                            mixed spatial filter */
-    HI_U8   nRef    : 1;   /* RW; Range:[0, 1];Format 1.0;Not recommended for debugging */
-
-    HI_U8   IEyMode : 1;   /* RW; Range:[0, 1];Format 1.0;the image enhancement mode selection. */
-    HI_U8   IEyEx[4];      /* RW; Range:[0, 255];Format 8.0;the image enhancement strength for different frequency. */
-
-    HI_U8   SFRi[4];       /* RW; Range:[0, 255];Format 8.0;the relative strength of SFy3 when the filter type is SFi */
-    HI_U8   SFRk[4];       /* RW; Range:[0, 255];Format 8.0;the relative strength of SFy3 when the filter type is SFk */
-    HI_U16  SBSk2[32];     /* RW; Range:[0, 9999];Format 14.0;the noise reduction strength of SFy2 for the
-                            relative bright pixel based on the image absolute luminance */
-    HI_U16  SBSk3[32];     /* RW; Range:[0, 9999];Format 14.0;the noise reduction strength of SFy3 for the
-                            relative bright pixel based on the image absolute luminance */
-    HI_U16  SDSk2[32];     /* RW; Range:[0, 9999];Format 14.0;the noise reduction strength of SFy2 for the
-                            relative dark pixel based on the image absolute luminance */
-    HI_U16  SDSk3[32];     /* RW; Range:[0, 9999];Format 14.0;the noise reduction strength of SFy3 for the
-                            relative dark pixel based on the image absolute luminance */
-    HI_U16  BriThr[16];    /* RW; Range:[0, 1024];Format 11.0;the threshold decide SFy3 choose the SFi type filter
-                            or SFk type filter in dark and bright area */
-
-    tV59aNRc NRc;
-} VI_PIPE_NRX_PARAM_V1_S;
-
-typedef enum hiVI_NR_VERSION_E {
-    VI_NR_V1 = 1,
-    VI_NR_V2 = 2,
-    VI_NR_V3 = 3,
-    VI_NR_V4 = 4,
-    VI_NR_BUTT
-} VI_NR_VERSION_E;
-
-typedef struct hiNRX_PARAM_MANUAL_V1_S {
-    VI_PIPE_NRX_PARAM_V1_S stNRXParamV1;
-} NRX_PARAM_MANUAL_V1_S;
-
-typedef struct hiNRX_PARAM_AUTO_V1_S {
-    HI_U32                              u32ParamNum;
-    HI_U32                  ATTRIBUTE   *pau32ISO;
-    VI_PIPE_NRX_PARAM_V1_S  ATTRIBUTE   *pastNRXParamV1;
-} NRX_PARAM_AUTO_V1_S;
-
-typedef struct hiNRX_PARAM_V1_S {
-    OPERATION_MODE_E        enOptMode;            /* RW;Adaptive NR */
-    NRX_PARAM_MANUAL_V1_S   stNRXManualV1;        /* RW;NRX V1 param for manual */
-    NRX_PARAM_AUTO_V1_S     stNRXAutoV1;          /* RW;NRX V1 param for auto */
-} NRX_PARAM_V1_S;
-
-typedef struct {
-    HI_U8  IES0, IES1, IES2, IES3;  /* IES0~4 ; Range: [0, 255]; The gains of edge and texture enhancement.
-                                    0~3 for different frequency response. */
-    HI_U16 IEDZ : 10, _rb_ : 6;     /* IEDZ   ; Range: [0, 999]; The threshold to control the generated artifacts. */
-} tV500_VI_IEy;
-
-typedef struct {
-    HI_U8  SPN6 : 3, SFR  : 5;      /* SPN6; Range: [0, 5];  The selection of filters to be mixed for NO.6 filter. */
-                                    /* SFR ; Range: [0, 31];  The relative NR strength in the SFi and SFk filter. */
-    HI_U8  SBN6 : 3, PBR6 : 5;      /* SBN6; Range: [0, 5];  The selection of filters to be mixed for NO.6 filter. */
-                                    /* PBR6; Range: [0, 16];  The mix ratio between SPN6 and SBN6. */
-    HI_U16 SRT0 : 5, SRT1 : 5, JMODE : 3, DeIdx : 3;    /* JMODE;      Range: [0, 4]; The selection modes
-                                                         for the blending of spatial filters */
-                                                        /* STR0, STR1; Range: [0, 16]; The blending ratio
-                                                         of different filters. (Used in serial filtering mode (SFM).) */
-                                                        /* DeIdx;      Range: [3, 6]; The selection number of
-                                                         filters that textures and details will be added to. */
-    HI_U8  DeRate, SFR6[3];                             /* DeRate;     Range: [0, 255]; The enhancement strength
-                                                         for the SFM (When DeRate > 0, the SFM will be activated) */
-                                                        /* SFR6;       Range: [0, 31]; The relative NR strength
-                                                         for NO.6 filter. (Effective when JMODE = 4) */
-    HI_U8  SFS1, SFT1, SBR1;                            /* SFS1, SFT1, SBR1; Range: [0, 255];  The NR strength
-                                                         parameters for NO.1 filter. */
-    HI_U8  SFS2, SFT2, SBR2;                            /* SFS2, SFT2, SBR2; Range: [0, 255];  The NR strength
-                                                         parameters for NO.2 filter. */
-    HI_U8  SFS4, SFT4, SBR4;                            /* SFS4, SFT4, SBR4; Range: [0, 255];  The NR strength
-                                                         parameters for NO.3 and NO.4 filters. */
-
-    HI_U16 STH1 : 9, SFN1 : 3, NRyEn : 1, SFN0  : 3;    /* STH1~3; Range: [0, 511]; The thresholds for protection
-                                                         of edges from blurring */
-                                                        /* NRyEn ; Range: [0, 1]; The NR switches */
-    HI_U16 STH2 : 9, SFN2 : 3, BWSF4 : 1, kMode : 3;    /* SFN0~3; Range: [0, 6]; Filter selection for different
-                                                         image areas based on STH1~3. */
-                                                        /* BWSF4 ; Range: [0, 1]; The NR window size for the
-                                                         NO.3 and NO.4 filters.  */
-    HI_U16 STH3 : 9, SFN3 : 3, TriTh : 1, _rb0_ : 3;    /* KMode ; Range: [0, 3]; The denoise mode based
-                                                         on image brightness. */
-                                                        /* Trith ; Range: [0, 1]; The switch to choose 3 STH
-                                                         threshold or 2 STH threshold */
-} tV500_VI_SFy;
-
-typedef struct {
-    tV500_VI_IEy IEy;
-    tV500_VI_SFy SFy;
-} VI_PIPE_NRX_PARAM_V2_S;
-
-typedef struct hiNRX_PARAM_MANUAL_V2_S {
-    VI_PIPE_NRX_PARAM_V2_S stNRXParamV2;
-} NRX_PARAM_MANUAL_V2_S;
-
-typedef struct hiNRX_PARAM_AUTO_V2_S {
-    HI_U32                              u32ParamNum;
-    HI_U32                  ATTRIBUTE   *pau32ISO;
-    VI_PIPE_NRX_PARAM_V2_S  ATTRIBUTE   *pastNRXParamV2;
-} NRX_PARAM_AUTO_V2_S;
-
-typedef struct hiNRX_PARAM_V2_S {
-    OPERATION_MODE_E        enOptMode;           /* RW;Adaptive NR */
-    NRX_PARAM_MANUAL_V2_S   stNRXManualV2;       /* RW;NRX V2 param for manual */
-    NRX_PARAM_AUTO_V2_S     stNRXAutoV2;         /* RW;NRX V2 param for auto */
-} NRX_PARAM_V2_S;
-
-typedef struct hiVI_PIPE_NRX_PARAM_S {
-    VI_NR_VERSION_E enNRVersion; /* RW;3DNR Version */
-    union {
-        NRX_PARAM_V1_S stNRXParamV1; /* RW;3DNR X param version 1 */
-        NRX_PARAM_V2_S stNRXParamV2; /* RW;3DNR X param version 2 */
-    };
-} VI_PIPE_NRX_PARAM_S;
-
-/* The attributes of channel */
-typedef struct hiVI_CHN_ATTR_S {
-    SIZE_S              stSize;             /* RW;Channel out put size */
-    PIXEL_FORMAT_E      enPixelFormat;      /* RW;Pixel format */
-    DYNAMIC_RANGE_E     enDynamicRange;     /* RW;Dynamic Range */
-    VIDEO_FORMAT_E      enVideoFormat;      /* RW;Video format */
-    COMPRESS_MODE_E     enCompressMode;     /* RW;256B Segment compress or no compress. */
-    HI_BOOL             bMirror;            /* RW;Mirror enable */
-    HI_BOOL             bFlip;              /* RW;Flip enable */
-    HI_U32              u32Depth;           /* RW;Range [0,8];Depth */
-    FRAME_RATE_CTRL_S   stFrameRate;        /* RW;Frame rate */
-} VI_CHN_ATTR_S;
-
-/* The status of pipe */
-typedef struct hiVI_PIPE_STATUS_S {
-    HI_BOOL bEnable;                        /* RO;Whether this pipe is enabled */
-    HI_U32  u32IntCnt;                      /* RO;The video frame interrupt count */
-    HI_U32  u32FrameRate;                   /* RO;Current frame rate */
-    HI_U32  u32LostFrame;                   /* RO;Lost frame count */
-    HI_U32  u32VbFail;                      /* RO;Video buffer malloc failure */
-    SIZE_S  stSize;                         /* RO;Current pipe output size */
-} VI_PIPE_STATUS_S;
-
-/* VS signal output mode */
-typedef enum hiVI_VS_SIGNAL_MODE_E {
-    VI_VS_SIGNAL_ONCE = 0,                      /* output one time */
-    VI_VS_SIGNAL_FREQ,                          /* output frequently */
-
-    VI_VS_SIGNAL_MODE_BUTT
-} VI_VS_SIGNAL_MODE_E;
-
-/* The attributes of VS signal */
-typedef struct hiVI_VS_SIGNAL_ATTR_S {
-    VI_VS_SIGNAL_MODE_E enMode;             /* RW;output one time, output frequently */
-    HI_U32              u32StartTime;       /* RW;output start time,unit: sensor pix clk. */
-    HI_U32              u32Duration;        /* RW;output high duration, unit: sensor pix clk. */
-    HI_U32              u32CapFrmIndex;     /* RW;VS signal will be output after trigger by which vframe,
-                                            default is 0. */
-    HI_U32              u32Interval;        /* RW;output frequently interval, unit: frame */
-} VI_VS_SIGNAL_ATTR_S;
-
-typedef struct hiBNR_DUMP_ATTR_S {
-    HI_BOOL bEnable;
-    HI_U32 u32Depth;
-} BNR_DUMP_ATTR_S;
-
-typedef enum hiVI_EXT_CHN_SOURCE_E {
-    VI_EXT_CHN_SOURCE_TAIL,
-    VI_EXT_CHN_SOURCE_HEAD,
-
-    VI_EXT_CHN_SOURCE_BUTT
-} VI_EXT_CHN_SOURCE_E;
-
-typedef struct hiVI_EXT_CHN_ATTR_S {
-    VI_EXT_CHN_SOURCE_E enSource;
-    VI_CHN              s32BindChn;     /* RW;Range [VI_CHN0, VI_MAX_PHY_CHN_NUM);The channel num which extend
-                                        channel will bind to */
-    SIZE_S              stSize;         /* RW;Channel out put size */
-    PIXEL_FORMAT_E      enPixFormat;    /* RW;Pixel format */
-    DYNAMIC_RANGE_E     enDynamicRange; /* RW;Dynamic Range */
-    COMPRESS_MODE_E     enCompressMode; /* RW;256B Segment compress or no compress. */
-    HI_U32              u32Depth;       /* RW;Range [0,8];Depth */
-    FRAME_RATE_CTRL_S   stFrameRate;    /* RW;Frame rate */
-} VI_EXT_CHN_ATTR_S;
-
-typedef enum hiVI_CROP_COORDINATE_E {
-    VI_CROP_RATIO_COOR = 0,             /* Ratio coordinate */
-    VI_CROP_ABS_COOR,                   /* Absolute coordinate */
-    VI_CROP_BUTT
-} VI_CROP_COORDINATE_E;
-
-/* Information of chn crop */
-typedef struct hiVI_CROP_INFO_S {
-    HI_BOOL                 bEnable;            /* RW;CROP enable */
-    VI_CROP_COORDINATE_E    enCropCoordinate;   /* RW;Coordinate mode of the crop start point */
-    RECT_S                  stCropRect;         /* RW;CROP rectangular */
-} VI_CROP_INFO_S;
-
-/* The attributes of LDC */
-typedef struct hiVI_LDC_ATTR_S {
-    HI_BOOL bEnable; /* RW;Range [0,1];Whether LDC is enbale */
-    LDC_ATTR_S stAttr;
-} VI_LDC_ATTR_S;
-
-/* The attributes of LDCV2 */
-typedef struct hiVI_LDCV2_ATTR_S {
-    HI_BOOL bEnable; /* RW;Whether LDC is enbale */
-    LDCV2_ATTR_S stAttr;
-} VI_LDCV2_ATTR_S;
-
-/* The attributes of LDCV3 */
-typedef struct hiVI_LDCV3_ATTR_S {
-    HI_BOOL bEnable; /* RW;Whether LDC is enbale */
-    LDCV3_ATTR_S stAttr;
-} VI_LDCV3_ATTR_S;
-
-typedef struct hiVI_ROTATION_EX_ATTR_S {
-    HI_BOOL       bEnable;                 /* RW;Range [0,1];Whether ROTATE_EX_S is enbale */
-    ROTATION_EX_S stRotationEx;
-} VI_ROTATION_EX_ATTR_S;
-
-/* The status of chn */
-typedef struct hiVI_CHN_STATUS_S {
-    HI_BOOL bEnable;                    /* RO;Whether this channel is enabled */
-    HI_U32  u32FrameRate;               /* RO;current frame rate */
-    HI_U32  u32LostFrame;               /* RO;Lost frame count */
-    HI_U32  u32VbFail;                  /* RO;Video buffer malloc failure */
-    SIZE_S  stSize;                     /* RO;chn output size */
-
-} VI_CHN_STATUS_S;
-
-typedef struct hiVI_PMF_ATTR_S {
-    HI_BOOL bEnable;                            /* RW;Whether PMF is enable */
-    SIZE_S  stDestSize;                         /* RW;Target size */
-    HI_S64  as64PMFCoef[VI_PMFCOEF_NUM];        /* RW; Array of PMF coefficients */
-} VI_PMF_ATTR_S;
-
-typedef enum hiVI_DUMP_TYPE_E {
-    VI_DUMP_TYPE_RAW = 0,
-    VI_DUMP_TYPE_YUV = 1,
-    VI_DUMP_TYPE_IR = 2,
-    VI_DUMP_TYPE_BUTT
-} VI_DUMP_TYPE_E;
-
-typedef struct hiVI_DUMP_ATTR_S {
-    HI_BOOL         bEnable;              /* RW;Whether dump is enable */
-    HI_U32          u32Depth;             /* RW;Range [0,8];Depth */
-    VI_DUMP_TYPE_E  enDumpType;
-} VI_DUMP_ATTR_S;
-
-typedef enum hiVI_PIPE_FRAME_SOURCE_E {
-    VI_PIPE_FRAME_SOURCE_DEV = 0, /* RW;Source from dev */
-    VI_PIPE_FRAME_SOURCE_USER_FE, /* RW;User send to FE */
-    VI_PIPE_FRAME_SOURCE_USER_BE, /* RW;User send to BE */
-
-    VI_PIPE_FRAME_SOURCE_BUTT
-} VI_PIPE_FRAME_SOURCE_E;
-
-typedef struct hi_VI_RAW_INFO_S {
-    VIDEO_FRAME_INFO_S      stVideoFrame;
-    ISP_CONFIG_INFO_S       stIspInfo;
-} VI_RAW_INFO_S;
-
-/* module params */
-typedef struct hiVI_MOD_PARAM_S {
-    HI_S32      s32DetectErrFrame;
-    HI_U32      u32DropErrFrame;
-    VB_SOURCE_E enViVbSource;
-} VI_MOD_PARAM_S;
-
-typedef struct hiVI_DEV_TIMING_ATTR_S {
-    HI_BOOL bEnable;               /* RW;Range:[0,1];Whether enable VI generate timing */
-    HI_S32  s32FrmRate;            /* RW;Range:(0,0xffffff];;Generate timing Frame rate */
-} VI_DEV_TIMING_ATTR_S;
-
-typedef struct hiVI_EARLY_INTERRUPT_S {
-    HI_BOOL bEnable;
-    HI_U32 u32LineCnt;
-} VI_EARLY_INTERRUPT_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_video.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_video.h
deleted file mode 100644
index a3191fc8..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_video.h
+++ /dev/null
@@ -1,638 +0,0 @@
-
-/******************************************************************************
-Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-******************************************************************************
-File Name      : hi_comm_video.h
-Version       : Initial Draft
-Author          : Hisilicon multimedia software group
-Created       : 2016/07/15
-Last Modified :
-Description   : The common defination
-Function List :
-******************************************************************************/
-
-#ifndef __HI_COMM_VIDEO_H__
-#define __HI_COMM_VIDEO_H__
-
-#include "hi_type.h"
-//#include "hi_defines.h"
-#include "hi_common.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-#define SRC_LENS_COEF_SEG  2
-#define DST_LENS_COEF_SEG  3
-#define SRC_LENS_COEF_NUM  4
-#define DST_LENS_COEF_NUM  4
-#define DST_LENS_COEF_SEG_POINT  (DST_LENS_COEF_SEG - 1)
-
-#define ISP_BAYER_CHN   (4)
-
-
-typedef enum hiOPERATION_MODE_E
-{
-    OPERATION_MODE_AUTO   = 0,
-    OPERATION_MODE_MANUAL = 1,
-    OPERATION_MODE_BUTT
-} OPERATION_MODE_E;
-
-
-/*Angle of rotation*/
-typedef enum hiROTATION_E
-{
-    ROTATION_0   = 0,
-    ROTATION_90  = 1,
-    ROTATION_180 = 2,
-    ROTATION_270 = 3,
-    ROTATION_BUTT
-} ROTATION_E;
-
-typedef enum hiVB_SOURCE_E
-{
-    VB_SOURCE_COMMON  = 0,
-    VB_SOURCE_MODULE  = 1,
-    VB_SOURCE_PRIVATE = 2,
-    VB_SOURCE_USER    = 3,
-    VB_SOURCE_BUTT
-} VB_SOURCE_E;
-
-typedef enum hiDATA_RATE_E
-{
-    DATA_RATE_X1 = 0,         /* RW; output 1 pixel per clock */
-    DATA_RATE_X2 = 1,         /* RW; output 2 pixel per clock */
-
-    DATA_RATE_BUTT
-} DATA_RATE_E;
-
-typedef struct hiBORDER_S
-{
-    HI_U32 u32TopWidth;
-    HI_U32 u32BottomWidth;
-    HI_U32 u32LeftWidth;
-    HI_U32 u32RightWidth;
-    HI_U32 u32Color;
-} BORDER_S;
-
-
-typedef struct hiPOINT_S
-{
-    HI_S32 s32X;
-    HI_S32 s32Y;
-} POINT_S;
-
-typedef struct hiSIZE_S
-{
-    HI_U32 u32Width;
-    HI_U32 u32Height;
-} SIZE_S;
-
-typedef struct hiRECT_S
-{
-    HI_S32 s32X;
-    HI_S32 s32Y;
-    HI_U32 u32Width;
-    HI_U32 u32Height;
-} RECT_S;
-
-typedef struct hiVIDEO_REGION_INFO_S
-{
-    HI_U32           u32RegionNum;       /* W; count of the region */
-    RECT_S ATTRIBUTE* pstRegion;         /* W; region attribute */
-} VIDEO_REGION_INFO_S;
-
-
-typedef struct hiCROP_INFO_S
-{
-    HI_BOOL bEnable;
-    RECT_S  stRect;
-} CROP_INFO_S;
-
-typedef struct hiFRAME_RATE_CTRL_S
-{
-    HI_S32  s32SrcFrameRate;        /* RW; source frame rate */
-    HI_S32  s32DstFrameRate;        /* RW; dest frame rate */
-} FRAME_RATE_CTRL_S;
-
-typedef enum hiASPECT_RATIO_E
-{
-    ASPECT_RATIO_NONE   = 0,        /* full screen */
-    ASPECT_RATIO_AUTO   = 1,        /* ratio no change, 1:1*/
-    ASPECT_RATIO_MANUAL = 2,        /* ratio manual set */
-    ASPECT_RATIO_BUTT
-
-}ASPECT_RATIO_E;
-
-typedef struct hiASPECT_RATIO_S
-{
-    ASPECT_RATIO_E enMode;          /* aspect ratio mode: none/auto/manual */
-    HI_U32         u32BgColor;      /* background color, RGB 888 */
-    RECT_S         stVideoRect;     /* valid in ASPECT_RATIO_MANUAL mode */
-
-} ASPECT_RATIO_S;
-
-
-
-/* we ONLY define picture format used, all unused will be deleted!*/
-typedef enum hiPIXEL_FORMAT_E
-{
-    PIXEL_FORMAT_RGB_444 = 0,
-    PIXEL_FORMAT_RGB_555,
-    PIXEL_FORMAT_RGB_565,
-    PIXEL_FORMAT_RGB_888,
-
-    PIXEL_FORMAT_BGR_444,
-    PIXEL_FORMAT_BGR_555,
-    PIXEL_FORMAT_BGR_565,
-    PIXEL_FORMAT_BGR_888,
-
-    PIXEL_FORMAT_ARGB_1555,
-    PIXEL_FORMAT_ARGB_4444,
-    PIXEL_FORMAT_ARGB_8565,
-    PIXEL_FORMAT_ARGB_8888,
-    PIXEL_FORMAT_ARGB_2BPP,
-
-    PIXEL_FORMAT_ABGR_1555,
-    PIXEL_FORMAT_ABGR_4444,
-    PIXEL_FORMAT_ABGR_8565,
-    PIXEL_FORMAT_ABGR_8888,
-
-    PIXEL_FORMAT_RGB_BAYER_8BPP,
-    PIXEL_FORMAT_RGB_BAYER_10BPP,
-    PIXEL_FORMAT_RGB_BAYER_12BPP,
-    PIXEL_FORMAT_RGB_BAYER_14BPP,
-    PIXEL_FORMAT_RGB_BAYER_16BPP,
-
-
-    PIXEL_FORMAT_YVU_PLANAR_422,
-    PIXEL_FORMAT_YVU_PLANAR_420,
-    PIXEL_FORMAT_YVU_PLANAR_444,
-
-    PIXEL_FORMAT_YVU_SEMIPLANAR_422,
-    PIXEL_FORMAT_YVU_SEMIPLANAR_420,
-    PIXEL_FORMAT_YVU_SEMIPLANAR_444,
-
-    PIXEL_FORMAT_YUV_SEMIPLANAR_422,
-    PIXEL_FORMAT_YUV_SEMIPLANAR_420,
-    PIXEL_FORMAT_YUV_SEMIPLANAR_444,
-
-    PIXEL_FORMAT_YUYV_PACKAGE_422,
-    PIXEL_FORMAT_YVYU_PACKAGE_422,
-    PIXEL_FORMAT_UYVY_PACKAGE_422,
-    PIXEL_FORMAT_VYUY_PACKAGE_422,
-    PIXEL_FORMAT_YYUV_PACKAGE_422,
-    PIXEL_FORMAT_YYVU_PACKAGE_422,
-    PIXEL_FORMAT_UVYY_PACKAGE_422,
-    PIXEL_FORMAT_VUYY_PACKAGE_422,
-    PIXEL_FORMAT_VY1UY0_PACKAGE_422,
-
-    PIXEL_FORMAT_YUV_400,
-    PIXEL_FORMAT_UV_420,
-
-
-    /* SVP data format */
-    PIXEL_FORMAT_BGR_888_PLANAR,
-    PIXEL_FORMAT_HSV_888_PACKAGE,
-    PIXEL_FORMAT_HSV_888_PLANAR,
-    PIXEL_FORMAT_LAB_888_PACKAGE,
-    PIXEL_FORMAT_LAB_888_PLANAR,
-    PIXEL_FORMAT_S8C1,
-    PIXEL_FORMAT_S8C2_PACKAGE,
-    PIXEL_FORMAT_S8C2_PLANAR,
-    PIXEL_FORMAT_S8C3_PLANAR,
-    PIXEL_FORMAT_S16C1,
-    PIXEL_FORMAT_U8C1,
-    PIXEL_FORMAT_U16C1,
-    PIXEL_FORMAT_S32C1,
-    PIXEL_FORMAT_U32C1,
-    PIXEL_FORMAT_U64C1,
-    PIXEL_FORMAT_S64C1,
-
-    PIXEL_FORMAT_BUTT
-} PIXEL_FORMAT_E;
-
-
-typedef enum hiVIDEO_FIELD_E
-{
-    VIDEO_FIELD_TOP         = 0x1,    /* even field */
-    VIDEO_FIELD_BOTTOM      = 0x2,    /* odd field */
-    VIDEO_FIELD_INTERLACED  = 0x3,    /* two interlaced fields */
-    VIDEO_FIELD_FRAME       = 0x4,    /* frame */
-
-    VIDEO_FIELD_BUTT
-} VIDEO_FIELD_E;
-
-typedef enum hiVIDEO_FORMAT_E
-{
-    VIDEO_FORMAT_LINEAR = 0,       /* nature video line */
-    VIDEO_FORMAT_TILE_64x16,       /* tile cell: 64pixel x 16line */
-    VIDEO_FORMAT_TILE_16x8,        /* tile cell: 16pixel x 8line */
-    VIDEO_FORMAT_LINEAR_DISCRETE,  /* The data bits are aligned in bytes */
-    VIDEO_FORMAT_BUTT
-} VIDEO_FORMAT_E;
-
-
-
-typedef enum hiCOMPRESS_MODE_E
-{
-    COMPRESS_MODE_NONE = 0,   /* no compress */
-    COMPRESS_MODE_SEG,        /* compress unit is 256x1 bytes as a segment.*/
-    COMPRESS_MODE_TILE,       /* compress unit is a tile.*/
-    COMPRESS_MODE_LINE,       /* compress unit is the whole line.  raw for VI  */
-    COMPRESS_MODE_FRAME,      /* compress unit is the whole frame. YUV for VI(3DNR), RGB for TDE(write)/VO(read) */
-
-    COMPRESS_MODE_BUTT
-} COMPRESS_MODE_E;
-
-
-typedef enum hiVIDEO_DISPLAY_MODE_E
-{
-    VIDEO_DISPLAY_MODE_PREVIEW  = 0x0,
-    VIDEO_DISPLAY_MODE_PLAYBACK = 0x1,
-
-    VIDEO_DISPLAY_MODE_BUTT
-} VIDEO_DISPLAY_MODE_E;
-
-typedef struct hiLUMA_INFO_S
-{
-    HI_U64 u64LumaPixSum;      /* Luma sum of current frame */
-    HI_U32 u32LumaPixAverage;  /* Luma average of current frame */
-    HI_U64 u64PTS;             /* PTS of current frame  */
-} LUMA_INFO_S;
-
-#define LDCI_STAT_WND_X             24
-#define LDCI_STAT_WND_Y             16
-
-#define DCF_DRSCRIPTION_LENGTH      32
-#define DCF_CAPTURE_TIME_LENGTH     20
-
-typedef struct hiISP_DCF_CONST_INFO_S
-{
-    HI_U8       au8ImageDescription[DCF_DRSCRIPTION_LENGTH];        /*Describes image*/
-    HI_U8       au8Make[DCF_DRSCRIPTION_LENGTH];                    /*Shows manufacturer of digital cameras*/
-    HI_U8       au8Model[DCF_DRSCRIPTION_LENGTH];                   /*Shows model number of digital cameras*/
-    HI_U8       au8Software[DCF_DRSCRIPTION_LENGTH];                /*Shows firmware (internal software of digital cameras) version number*/
-
-    HI_U8       u8LightSource;                                      /*Light source, actually this means white balance setting. '0' means unknown, '1' daylight, '2'
-                                                                               fluorescent, '3' tungsten, '10' flash, '17' standard light A, '18' standard light B, '19' standard light
-                                                                               C, '20' D55, '21' D65, '22' D75, '255' other*/
-    HI_U32      u32FocalLength;                                     /*Focal length of lens used to take image. Unit is millimeter*/
-    HI_U8       u8SceneType;                                        /*Indicates the type of scene. Value '0x01' means that the image was directly photographed.*/
-    HI_U8       u8CustomRendered;                                   /*Indicates the use of special processing on image data, such as rendering geared to output.
-                                                                               0 = Normal process  1 = Custom process   */
-    HI_U8       u8FocalLengthIn35mmFilm;                            /*Indicates the equivalent focal length assuming a 35mm film camera, in mm*/
-    HI_U8       u8SceneCaptureType;                                 /*Indicates the type of scene that was shot. 0 = Standard,1 = Landscape,2 = Portrait,3 = Night scene. */
-    HI_U8       u8GainControl;                                      /*Indicates the degree of overall image gain adjustment. 0 = None,1 = Low gain up,2 = High gain up,3 = Low gain down,4 = High gain down. */
-    HI_U8       u8Contrast;                                         /*Indicates the direction of contrast processing applied by the camera when the image was shot.
-                                                                               0 = Normal,1 = Soft,2 = Hard */
-    HI_U8       u8Saturation;                                       /*Indicates the direction of saturation processing applied by the camera when the image was shot.
-                                                                              0 = Normal,1 = Low saturation,2 = High saturation*/
-    HI_U8       u8Sharpness;                                        /*Indicates the direction of sharpness processing applied by the camera when the image was shot.
-                                                                              0 = Normal,1 = Soft,2 = Hard .*/
-    HI_U8       u8MeteringMode;                                     /*Exposure metering method. '0' means unknown, '1' average, '2' center weighted average, '3'
-                                                                              spot, '4' multi-spot, '5' multi-segment, '6' partial, '255' other*/
-} ISP_DCF_CONST_INFO_S;
-
-typedef struct hiISP_DCF_UPDATE_INFO_S
-{
-    HI_U32      u32ISOSpeedRatings;                                 /*CCD sensitivity equivalent to Ag-Hr film speedrate*/
-    HI_U32      u32ExposureTime;                                    /*Exposure time (reciprocal of shutter speed).*/
-    HI_U32      u32ExposureBiasValue;                               /*Exposure bias (compensation) value of taking picture*/
-    HI_U8       u8ExposureProgram;                                  /*Exposure program that the camera used when image was taken. '1' means manual control, '2'
-                                                                              program normal, '3' aperture priority, '4' shutter priority, '5' program creative (slow program),
-                                                                              '6' program action(high-speed program), '7' portrait mode, '8' landscape mode*/
-    HI_U32      u32FNumber;                                         /*The actual F-number (F-stop) of lens when the image was taken*/
-    HI_U32      u32MaxApertureValue;                                /*Maximum aperture value of lens.*/
-    HI_U8       u8ExposureMode;                                     /*Indicates the exposure mode set when the image was shot.
-                                                                              0 = Auto exposure,1 = Manual exposure, 2 = Auto bracket*/
-    HI_U8       u8WhiteBalance;                                     /* Indicates the white balance mode set when the image was shot.
-                                                                                0 = Auto white balance ,1 = Manual white balance */
-} ISP_DCF_UPDATE_INFO_S;
-
-typedef struct hiISP_DCF_INFO_S
-{
-    ISP_DCF_CONST_INFO_S  stIspDCFConstInfo;
-    ISP_DCF_UPDATE_INFO_S stIspDCFUpdateInfo;
-} ISP_DCF_INFO_S;
-
-typedef struct hiJPEG_DCF_S
-{
-    HI_U8           au8CaptureTime[DCF_CAPTURE_TIME_LENGTH];            /*The date and time when the picture data was generated*/
-    HI_BOOL         bFlash;                                             /*whether the picture is captured when a flash lamp is on*/
-    HI_U32          u32DigitalZoomRatio;                                /*Indicates the digital zoom ratio when the image was shot.
-                                                                                   If the numerator of the recorded value is 0, this indicates that digital zoom was not used.*/
-    ISP_DCF_INFO_S  stIspDCFInfo;
-
-} JPEG_DCF_S;
-
-
-typedef struct hiISP_FRAME_INFO_S
-{
-    HI_U32      u32ISO;                    /* ISP internal ISO : Again*Dgain*ISPgain */
-    HI_U32      u32ExposureTime;           /* Exposure time (reciprocal of shutter speed),unit is us */
-    HI_U32      u32IspDgain;
-    HI_U32      u32Again;
-    HI_U32      u32Dgain;
-    HI_U32      au32Ratio[3];
-    HI_U32      u32IspNrStrength;
-    HI_U32      u32FNumber;                /* The actual F-number (F-stop) of lens when the image was taken */
-    HI_U32      u32SensorID;               /* which sensor is used */
-    HI_U32      u32SensorMode;
-    HI_U32      u32HmaxTimes;              /* Sensor HmaxTimes,unit is ns */
-    HI_U32      u32Vmax;                   /* Sensor Vmax,unit is line */
-    HI_U32      u32VcNum;                  /* when dump wdr frame, which is long or short  exposure frame. */
-} ISP_FRAME_INFO_S;
-
-
-#define CFACOLORPLANE     (3)
-#define DNG_NP_SIZE       (6)
-
-
-typedef struct hiDNG_RATIONAL_S
-{
-    HI_U32 u32Numerator;/*represents the numerator of a fraction,*/
-    HI_U32 u32Denominator;/* the denominator. */
-} DNG_RATIONAL_S;
-
-/*
-Defines the structure of DNG image dynamic infomation
-*/
-typedef struct hiDNG_IMAGE_DYNAMIC_INFO_S
-{
-    HI_U32 au32BlackLevel[ISP_BAYER_CHN];           /* RO;Range: [0x0, 0xFFFF]; black level*/
-    DNG_RATIONAL_S astAsShotNeutral[CFACOLORPLANE]; /* specifies the selected white balance at time of capture, encoded as the coordinates of a perfectly neutral color in linear reference space values.*/
-    HI_DOUBLE adNoiseProfile[DNG_NP_SIZE];          /* RO;describes the amount of noise in a raw image*/
-} DNG_IMAGE_DYNAMIC_INFO_S;
-
-
-typedef struct hiISP_HDR_INFO_S
-{
-    HI_U32 u32ColorTemp;
-    HI_U16 au16CCM[9];
-    HI_U8  u8Saturation;
-} ISP_HDR_INFO_S;
-
-typedef struct hiISP_ATTACH_INFO_S
-{
-    ISP_HDR_INFO_S     stIspHdr;
-    HI_U32 u32ISO;
-    HI_U32 u32InitISO;
-    HI_U8 u8SnsWDRMode;
-} ISP_ATTACH_INFO_S;
-
-typedef enum hiFRAME_FLAG_E
-{
-    FRAME_FLAG_SNAP_FLASH  = 0x1 << 0,
-    FRAME_FLAG_SNAP_CUR      = 0x1 << 1,
-    FRAME_FLAG_SNAP_REF       = 0x1 << 2,
-    FRAME_FLAG_SNAP_END      = 0x1 << 31,
-    FRAME_FLAG_BUTT
-} FRAME_FLAG_E;
-
-
-/* RGGB=4 */
-#define ISP_WB_GAIN_NUM  4
-/* 3*3=9 matrix */
-#define ISP_CAP_CCM_NUM   9
-typedef struct hiISP_CONFIG_INFO_S
-{
-    HI_U32  u32ISO;
-    HI_U32  u32IspDgain;
-    HI_U32  u32ExposureTime;
-    HI_U32  au32WhiteBalanceGain[ISP_WB_GAIN_NUM];
-    HI_U32  u32ColorTemperature;
-    HI_U16  au16CapCCM[ISP_CAP_CCM_NUM];
-} ISP_CONFIG_INFO_S;
-
-typedef struct hiVIDEO_SUPPLEMENT_S
-{
-    HI_U64   u64JpegDCFPhyAddr;
-    HI_U64   u64IspInfoPhyAddr;
-    HI_U64   u64LowDelayPhyAddr;
-    HI_U64   u64MotionDataPhyAddr;
-    HI_U64   u64FrameDNGPhyAddr;
-
-    HI_VOID* ATTRIBUTE pJpegDCFVirAddr;        /* JPEG_DCF_S, used in JPEG DCF */
-    HI_VOID* ATTRIBUTE pIspInfoVirAddr;        /* ISP_FRAME_INFO_S, used in ISP debug, when get raw and send raw */
-    HI_VOID* ATTRIBUTE pLowDelayVirAddr;       /* used in low delay */
-    HI_VOID* ATTRIBUTE pMotionDataVirAddr;     /* vpss 3dnr use: gme motion data, Filter motion data, gyro data.*/
-    HI_VOID* ATTRIBUTE pFrameDNGVirAddr;
-} VIDEO_SUPPLEMENT_S;
-
-typedef enum hiCOLOR_GAMUT_E
-{
-    COLOR_GAMUT_BT601 = 0,
-    COLOR_GAMUT_BT709,
-    COLOR_GAMUT_BT2020, /* Only used for Hi3559AV100 */
-    COLOR_GAMUT_USER,
-    COLOR_GAMUT_BUTT
-} COLOR_GAMUT_E;
-
-typedef struct hiISP_COLORGAMMUT_INFO_S
-{
-        COLOR_GAMUT_E enColorGamut;
-} ISP_COLORGAMMUT_INFO_S;
-
-typedef enum hiDYNAMIC_RANGE_E
-{
-    DYNAMIC_RANGE_SDR8 = 0,
-    DYNAMIC_RANGE_SDR10,
-    DYNAMIC_RANGE_HDR10,
-    DYNAMIC_RANGE_HLG,
-    DYNAMIC_RANGE_SLF,
-    DYNAMIC_RANGE_XDR,
-    DYNAMIC_RANGE_BUTT
-} DYNAMIC_RANGE_E;
-
-
-typedef enum hiDATA_BITWIDTH_E
-{
-    DATA_BITWIDTH_8 = 0,
-    DATA_BITWIDTH_10,
-    DATA_BITWIDTH_12,
-    DATA_BITWIDTH_14,
-    DATA_BITWIDTH_16,
-    DATA_BITWIDTH_BUTT
-} DATA_BITWIDTH_E;
-
-typedef struct hiVIDEO_FRAME_S
-{
-    HI_U32              u32Width;
-    HI_U32              u32Height;
-    VIDEO_FIELD_E       enField;
-    PIXEL_FORMAT_E      enPixelFormat;
-    VIDEO_FORMAT_E      enVideoFormat;
-    COMPRESS_MODE_E     enCompressMode;
-    DYNAMIC_RANGE_E     enDynamicRange;
-    COLOR_GAMUT_E       enColorGamut;
-    HI_U32              u32HeaderStride[3];
-    HI_U32              u32Stride[3];
-    HI_U32              u32ExtStride[3];
-
-    HI_U64              u64HeaderPhyAddr[3];
-    HI_U64              u64HeaderVirAddr[3];
-    HI_U64              u64PhyAddr[3];
-    HI_U64              u64VirAddr[3];
-    HI_U64              u64ExtPhyAddr[3];
-    HI_U64              u64ExtVirAddr[3];
-
-    HI_S16              s16OffsetTop;        /* top offset of show area */
-    HI_S16              s16OffsetBottom;    /* bottom offset of show area */
-    HI_S16              s16OffsetLeft;        /* left offset of show area */
-    HI_S16              s16OffsetRight;        /* right offset of show area */
-
-    HI_U32              u32MaxLuminance;
-    HI_U32              u32MinLuminance;
-
-    HI_U32              u32TimeRef;
-    HI_U64              u64PTS;
-
-    HI_U64              u64PrivateData;
-    HI_U32              u32FrameFlag;     /* FRAME_FLAG_E, can be OR operation. */
-    VIDEO_SUPPLEMENT_S  stSupplement;
-} VIDEO_FRAME_S;
-
-typedef struct hiVIDEO_FRAME_INFO_S
-{
-    VIDEO_FRAME_S stVFrame;
-    HI_U32        u32PoolId;
-    MOD_ID_E      enModId;
-} VIDEO_FRAME_INFO_S;
-
-
-
-typedef struct hiVB_CAL_CONFIG_S
-{
-    HI_U32 u32VBSize;
-
-    HI_U32 u32HeadStride;
-    HI_U32 u32HeadSize;
-    HI_U32 u32HeadYSize;
-
-    HI_U32 u32MainStride;
-    HI_U32 u32MainSize;
-    HI_U32 u32MainYSize;
-
-    HI_U32 u32ExtStride;
-    HI_U32 u32ExtYSize;
-}VB_CAL_CONFIG_S;
-
-
-typedef struct hiBITMAP_S
-{
-    PIXEL_FORMAT_E enPixelFormat;  /* Bitmap's pixel format */
-    HI_U32 u32Width;               /* Bitmap's width */
-    HI_U32 u32Height;              /* Bitmap's height */
-    HI_VOID* ATTRIBUTE pData;      /* Address of Bitmap's data */
-} BITMAP_S;
-
-typedef struct hiLDC_ATTR_S
-{
-    HI_BOOL    bAspect;             /* RW;Range: [0, 1];Whether aspect ration  is keep */
-    HI_S32     s32XRatio;           /* RW; Range: [0, 100]; field angle ration of  horizontal,valid when bAspect=0.*/
-    HI_S32     s32YRatio;           /* RW; Range: [0, 100]; field angle ration of  vertical,valid when bAspect=0.*/
-    HI_S32     s32XYRatio;          /* RW; Range: [0, 100]; field angle ration of  all,valid when bAspect=1.*/
-    HI_S32 s32CenterXOffset;        /* RW; Range: [-511, 511]; horizontal offset of the image distortion center relative to image center.*/
-    HI_S32 s32CenterYOffset;        /* RW; Range: [-511, 511]; vertical offset of the image distortion center relative to image center.*/
-    HI_S32 s32DistortionRatio;      /* RW; Range: [-300, 500]; LDC Distortion ratio.When spread on,s32DistortionRatio range should be [0, 500]*/
-} LDC_ATTR_S;
-
-
-typedef struct hiLDCV2_ATTR_S
-{
-    HI_S32 s32FocalLenX;                                            /* RW; focal length in horizontal direction, with 2 decimal numbers */
-    HI_S32 s32FocalLenY;                                            /* RW; focal length in vertical direction, with 2 decimal numbers */
-    HI_S32 s32CoorShiftX;                                           /* RW; coordinate of image center, with 2 decimal numbers */
-    HI_S32 s32CoorShiftY;                                           /* RW; Y coordinate of image center, with 2 decimal numbers */
-    HI_S32 as32SrcCaliRatio[SRC_LENS_COEF_SEG][SRC_LENS_COEF_NUM];  /* RW; lens distortion coefficients of the source image, with 5 decimal numbers */
-    HI_S32 s32SrcJunPt;                                             /* RW; Junction Point of the two segments */
-    HI_S32 as32DstCaliRatio[DST_LENS_COEF_SEG][DST_LENS_COEF_NUM];  /* RW; lens distortion coefficients, with 5 decimal numbers */
-    HI_S32 as32DstJunPt[DST_LENS_COEF_SEG_POINT];                   /* RW; Junction Point of the three segments */
-    HI_S32 s32MaxDu;                                                /* RW; max undistorted distance before 3rd polynomial drop, with 16bits decimal */
-} LDCV2_ATTR_S;
-
-typedef enum hiLDC_VIEW_TYPE_E
-{
-    LDC_VIEW_TYPE_ALL  = 0,  /* View scale all but x and y independtly, this will keep both x and y axis ,but corner maybe lost*/
-    LDC_VIEW_TYPE_CROP = 1,  /* Not use view scale, this will lost some side and corner */
-
-    LDC_VIEW_TYPE_BUTT,
-} LDC_VIEW_TYPE_E;
-
-typedef struct hiLDCV3_ATTR_S
-{
-    LDC_VIEW_TYPE_E enViewType; /* RW; Range: [0, 1], 0: all mode, 1: crop mode.*/
-    HI_S32 s32CenterXOffset;    /* RW; Range: ABS(s32CenterXOffset)->[0, min(128, width*0.08)], horizontal offset of the image distortion center relative to image center.*/
-    HI_S32 s32CenterYOffset;    /* RW; Range: ABS(s32CenterXOffset)->[0, min(128, height*0.08)], vertical offset of the image distortion center relative to image center.*/
-    HI_S32 s32DistortionRatio;  /* RW; Range: [-300, 300], LDC Distortion ratio.*/
-    HI_S32 s32MinRatio;         /* RW; Range: [-300, 300], to remove the black region around when performing pinchusion distortion correction with crop mode.*/
-} LDCV3_ATTR_S;
-
-typedef enum hiROTATION_VIEW_TYPE_E
-{
-    ROTATION_VIEW_TYPE_ALL      = 0, /* View all source Image,no lose*/
-    ROTATION_VIEW_TYPE_TYPICAL  = 1, /* View from rotation Image with source size,same lose*/
-    ROTATION_VIEW_TYPE_INSIDE   = 2, /* View with no black section,all  in dest Image*/
-    ROTATION_VIEW_TYPE_BUTT,
-} ROTATION_VIEW_TYPE_E;
-
-typedef struct hiROTATION_EX_S
-{
-    ROTATION_VIEW_TYPE_E enViewType;       /*RW;Range: [0, 2];Rotation mode*/
-    HI_U32               u32Angle;         /*RW;Range: [0,360];Rotation Angle:[0,360]*/
-    HI_S32               s32CenterXOffset; /*RW;Range: [-511, 511];Horizontal offset of the image distortion center relative to image center.*/
-    HI_S32               s32CenterYOffset; /*RW;Range: [-511, 511];Vertical offset of the image distortion center relative to image center.*/
-    SIZE_S               stDestSize;       /*RW;Dest size of any angle rotation*/
-} ROTATION_EX_S;
-
-
-typedef enum hiWDR_MODE_E
-{
-    WDR_MODE_NONE = 0,
-    WDR_MODE_BUILT_IN,
-    WDR_MODE_QUDRA,
-
-    WDR_MODE_2To1_LINE,
-    WDR_MODE_2To1_FRAME,
-    WDR_MODE_2To1_FRAME_FULL_RATE,
-
-    WDR_MODE_3To1_LINE,
-    WDR_MODE_3To1_FRAME,
-    WDR_MODE_3To1_FRAME_FULL_RATE,
-
-    WDR_MODE_4To1_LINE,
-    WDR_MODE_4To1_FRAME,
-    WDR_MODE_4To1_FRAME_FULL_RATE,
-
-    WDR_MODE_BUTT,
-} WDR_MODE_E;
-
-typedef enum hiFRAME_INTERRUPT_TYPE_E
-{
-    FRAME_INTERRUPT_START,
-    FRAME_INTERRUPT_EARLY,
-    FRAME_INTERRUPT_EARLY_END,
-    FRAME_INTERRUPT_EARLY_ONE_BUF,
-    FRAME_INTERRUPT_EARLY_END_ONE_BUF,
-    FRAME_INTERRUPT_BUTT,
-} FRAME_INTERRUPT_TYPE_E;
-
-typedef struct hiFRAME_INTERRUPT_ATTR_S
-{
-    FRAME_INTERRUPT_TYPE_E enIntType;
-    HI_U32 u32EarlyLine;
-} FRAME_INTERRUPT_ATTR_S;
-
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* _HI_COMM_VIDEO_H_ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vo.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vo.h
deleted file mode 100644
index be0c3132..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vo.h
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
-* Copyright (c) Hisilicon Technologies Co., Ltd. 2012-2019. All rights reserved.
-* Description: Common defination of video output
-* Author: Hisilicon multimedia software group
-* Create: 2016/11/09
-*/
-#ifndef __HI_COMM_VO_H__
-#define __HI_COMM_VO_H__
-
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_comm_video.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-typedef enum hiEN_VOU_ERR_CODE_E {
-    EN_ERR_VO_DEV_NOT_CONFIG = 0x40,
-    EN_ERR_VO_DEV_NOT_ENABLE = 0x41,
-    EN_ERR_VO_DEV_HAS_ENABLED = 0x42,
-    EN_ERR_VO_DEV_HAS_BINDED = 0x43,
-    EN_ERR_VO_DEV_NOT_BINDED = 0x44,
-
-    ERR_VO_NOT_ENABLE = 0x45,
-    ERR_VO_NOT_DISABLE = 0x46,
-    ERR_VO_NOT_CONFIG = 0x47,
-
-    ERR_VO_CHN_NOT_DISABLE = 0x48,
-    ERR_VO_CHN_NOT_ENABLE = 0x49,
-    ERR_VO_CHN_NOT_CONFIG = 0x4a,
-    ERR_VO_CHN_NOT_ALLOC = 0x4b,
-
-    ERR_VO_CCD_INVALID_PAT = 0x4c,
-    ERR_VO_CCD_INVALID_POS = 0x4d,
-
-    ERR_VO_WAIT_TIMEOUT = 0x4e,
-    ERR_VO_INVALID_VFRAME = 0x4f,
-    ERR_VO_INVALID_RECT_PARA = 0x50,
-    ERR_VO_SETBEGIN_ALREADY = 0x51,
-    ERR_VO_SETBEGIN_NOTYET = 0x52,
-    ERR_VO_SETEND_ALREADY = 0x53,
-    ERR_VO_SETEND_NOTYET = 0x54,
-
-    ERR_VO_GRP_INVALID_ID = 0x55,
-    ERR_VO_GRP_NOT_CREATE = 0x56,
-    ERR_VO_GRP_HAS_CREATED = 0x57,
-    ERR_VO_GRP_NOT_DESTROY = 0x58,
-    ERR_VO_GRP_CHN_FULL = 0x59,
-    ERR_VO_GRP_CHN_EMPTY = 0x5a,
-    ERR_VO_GRP_CHN_NOT_EMPTY = 0x5b,
-    ERR_VO_GRP_INVALID_SYN_MODE = 0x5c,
-    ERR_VO_GRP_INVALID_BASE_PTS = 0x5d,
-    ERR_VO_GRP_NOT_START = 0x5e,
-    ERR_VO_GRP_NOT_STOP = 0x5f,
-    ERR_VO_GRP_INVALID_FRMRATE = 0x60,
-    ERR_VO_GRP_CHN_HAS_REG = 0x61,
-    ERR_VO_GRP_CHN_NOT_REG = 0x62,
-    ERR_VO_GRP_CHN_NOT_UNREG = 0x63,
-    ERR_VO_GRP_BASE_NOT_CFG = 0x64,
-
-    ERR_GFX_NOT_DISABLE = 0x65,
-    ERR_GFX_NOT_BIND = 0x66,
-    ERR_GFX_NOT_UNBIND = 0x67,
-    ERR_GFX_INVALID_ID = 0x68,
-
-    ERR_VO_WBC_NOT_DISABLE = 0x69,
-    ERR_VO_WBC_NOT_CONFIG = 0x6a,
-
-    ERR_VO_CHN_AREA_OVERLAP = 0x6b,
-
-    EN_ERR_INVALID_WBCID = 0x6c,
-    EN_ERR_INVALID_LAYERID = 0x6d,
-    EN_ERR_VO_VIDEO_HAS_BINDED = 0x6e,
-    EN_ERR_VO_VIDEO_NOT_BINDED = 0x6f,
-    ERR_VO_WBC_HAS_BIND = 0x70,
-    ERR_VO_WBC_HAS_CONFIG = 0x71,
-    ERR_VO_WBC_NOT_BIND = 0x72,
-
-    /* new added */
-    ERR_VO_BUTT
-} EN_VOU_ERR_CODE_E;
-
-/* System define error code */
-#define HI_ERR_VO_BUSY                 HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-#define HI_ERR_VO_NO_MEM               HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-#define HI_ERR_VO_NULL_PTR             HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-#define HI_ERR_VO_SYS_NOTREADY         HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-#define HI_ERR_VO_INVALID_DEVID        HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_DEVID)
-#define HI_ERR_VO_INVALID_CHNID        HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-#define HI_ERR_VO_ILLEGAL_PARAM        HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-#define HI_ERR_VO_NOT_SUPPORT          HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-#define HI_ERR_VO_NOT_PERMIT           HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-#define HI_ERR_VO_INVALID_WBCID        HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_WBCID)
-#define HI_ERR_VO_INVALID_LAYERID      HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_LAYERID)
-
-/* Device relative error code */
-#define HI_ERR_VO_DEV_NOT_CONFIG       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_VO_DEV_NOT_CONFIG)
-#define HI_ERR_VO_DEV_NOT_ENABLE       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_VO_DEV_NOT_ENABLE)
-#define HI_ERR_VO_DEV_HAS_ENABLED      HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_VO_DEV_HAS_ENABLED)
-#define HI_ERR_VO_DEV_HAS_BINDED       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_VO_DEV_HAS_BINDED)
-#define HI_ERR_VO_DEV_NOT_BINDED       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_VO_DEV_NOT_BINDED)
-
-/* Video layer relative error code */
-#define HI_ERR_VO_VIDEO_NOT_ENABLE     HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_NOT_ENABLE)
-#define HI_ERR_VO_VIDEO_NOT_DISABLE    HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_NOT_DISABLE)
-#define HI_ERR_VO_VIDEO_NOT_CONFIG     HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_NOT_CONFIG)
-#define HI_ERR_VO_VIDEO_HAS_BINDED     HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_VO_VIDEO_HAS_BINDED)
-#define HI_ERR_VO_VIDEO_NOT_BINDED     HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, EN_ERR_VO_VIDEO_NOT_BINDED)
-
-/* WBC Relative error code */
-#define HI_ERR_VO_WBC_NOT_DISABLE      HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_WBC_NOT_DISABLE)
-#define HI_ERR_VO_WBC_NOT_CONFIG       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_WBC_NOT_CONFIG)
-#define HI_ERR_VO_WBC_HAS_CONFIG       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_WBC_HAS_CONFIG)
-#define HI_ERR_VO_WBC_NOT_BIND         HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_WBC_NOT_BIND)
-#define HI_ERR_VO_WBC_HAS_BIND         HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_WBC_HAS_BIND)
-
-/* Channel Relative error code */
-#define HI_ERR_VO_CHN_NOT_DISABLE      HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_CHN_NOT_DISABLE)
-#define HI_ERR_VO_CHN_NOT_ENABLE       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_CHN_NOT_ENABLE)
-#define HI_ERR_VO_CHN_NOT_CONFIG       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_CHN_NOT_CONFIG)
-#define HI_ERR_VO_CHN_NOT_ALLOC        HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_CHN_NOT_ALLOC)
-#define HI_ERR_VO_CHN_AREA_OVERLAP     HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_CHN_AREA_OVERLAP)
-
-/* Cascade Relatvie error code */
-#define HI_ERR_VO_INVALID_PATTERN      HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_CCD_INVALID_PAT)
-#define HI_ERR_VO_INVALID_POSITION     HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_CCD_INVALID_POS)
-
-/* MISCellaneous error code */
-#define HI_ERR_VO_WAIT_TIMEOUT         HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_WAIT_TIMEOUT)
-#define HI_ERR_VO_INVALID_VFRAME       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_INVALID_VFRAME)
-#define HI_ERR_VO_INVALID_RECT_PARA    HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_INVALID_RECT_PARA)
-#define HI_ERR_VO_SETBEGIN_ALREADY     HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_SETBEGIN_ALREADY)
-#define HI_ERR_VO_SETBEGIN_NOTYET      HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_SETBEGIN_NOTYET)
-#define HI_ERR_VO_SETEND_ALREADY       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_SETEND_ALREADY)
-#define HI_ERR_VO_SETEND_NOTYET        HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_SETEND_NOTYET)
-
-/* Synchronization group relative error code */
-#define HI_ERR_VO_GRP_INVALID_ID       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_INVALID_ID)
-#define HI_ERR_VO_GRP_NOT_CREATE       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_NOT_CREATE)
-#define HI_ERR_VO_GRP_HAS_CREATED      HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_HAS_CREATED)
-#define HI_ERR_VO_GRP_NOT_DESTROY      HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_NOT_DESTROY)
-#define HI_ERR_VO_GRP_CHN_FULL         HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_CHN_FULL)
-#define HI_ERR_VO_GRP_CHN_EMPTY        HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_CHN_EMPTY)
-#define HI_ERR_VO_GRP_CHN_NOT_EMPTY    HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_CHN_NOT_EMPTY)
-#define HI_ERR_VO_GRP_INVALID_SYN_MODE HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_INVALID_SYN_MODE)
-#define HI_ERR_VO_GRP_INVALID_BASE_PTS HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_INVALID_BASE_PTS)
-#define HI_ERR_VO_GRP_NOT_START        HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_NOT_START)
-#define HI_ERR_VO_GRP_NOT_STOP         HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_NOT_STOP)
-#define HI_ERR_VO_GRP_INVALID_FRMRATE  HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_INVALID_FRMRATE)
-#define HI_ERR_VO_GRP_CHN_HAS_REG      HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_CHN_HAS_REG)
-#define HI_ERR_VO_GRP_CHN_NOT_REG      HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_CHN_NOT_REG)
-#define HI_ERR_VO_GRP_CHN_NOT_UNREG    HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_CHN_NOT_UNREG)
-#define HI_ERR_VO_GRP_BASE_NOT_CFG     HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_VO_GRP_BASE_NOT_CFG)
-
-/* Graphics layer relative error code */
-#define HI_ERR_VO_GFX_NOT_DISABLE      HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_GFX_NOT_DISABLE)
-#define HI_ERR_VO_GFX_NOT_BIND         HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_GFX_NOT_BIND)
-#define HI_ERR_VO_GFX_NOT_UNBIND       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_GFX_NOT_UNBIND)
-#define HI_ERR_VO_GFX_INVALID_ID       HI_DEF_ERR(HI_ID_VO, EN_ERR_LEVEL_ERROR, ERR_GFX_INVALID_ID)
-
-/* VO video output interface type */
-#define VO_INTF_CVBS                   (0x01L << 0)
-#define VO_INTF_YPBPR                  (0x01L << 1)
-#define VO_INTF_VGA                    (0x01L << 2)
-#define VO_INTF_BT656                  (0x01L << 3)
-#define VO_INTF_BT1120                 (0x01L << 4)
-#define VO_INTF_HDMI                   (0x01L << 5)
-#define VO_INTF_LCD                    (0x01L << 6)
-#define VO_INTF_BT656_H                (0x01L << 7)
-#define VO_INTF_BT656_L                (0x01L << 8)
-#define VO_INTF_LCD_6BIT               (0x01L << 9)
-#define VO_INTF_LCD_8BIT               (0x01L << 10)
-#define VO_INTF_LCD_16BIT              (0x01L << 11)
-#define VO_INTF_LCD_18BIT              (0x01L << 12)
-#define VO_INTF_LCD_24BIT              (0x01L << 13)
-#define VO_INTF_MIPI                   (0x01L << 14)
-#define VO_INTF_MIPI_SLAVE             (0x01L << 15)
-
-typedef HI_U32 VO_INTF_TYPE_E;
-
-typedef enum hiVO_INTF_SYNC_E {
-    VO_OUTPUT_PAL = 0, /* PAL standard */
-    VO_OUTPUT_NTSC, /* NTSC standard */
-
-    VO_OUTPUT_1080P24, /* 1920 x 1080 at 24 Hz. */
-    VO_OUTPUT_1080P25, /* 1920 x 1080 at 25 Hz. */
-    VO_OUTPUT_1080P30, /* 1920 x 1080 at 30 Hz. */
-
-    VO_OUTPUT_720P50, /* 1280 x  720 at 50 Hz. */
-    VO_OUTPUT_720P60, /* 1280 x  720 at 60 Hz. */
-    VO_OUTPUT_1080I50, /* 1920 x 1080 at 50 Hz, interlace. */
-    VO_OUTPUT_1080I60, /* 1920 x 1080 at 60 Hz, interlace. */
-    VO_OUTPUT_1080P50, /* 1920 x 1080 at 50 Hz. */
-    VO_OUTPUT_1080P60, /* 1920 x 1080 at 60 Hz. */
-
-    VO_OUTPUT_576P50, /* 720  x  576 at 50 Hz. */
-    VO_OUTPUT_480P60, /* 720  x  480 at 60 Hz. */
-
-    VO_OUTPUT_800x600_60, /* VESA 800 x 600 at 60 Hz (non-interlaced) */
-    VO_OUTPUT_1024x768_60, /* VESA 1024 x 768 at 60 Hz (non-interlaced) */
-    VO_OUTPUT_1280x1024_60, /* VESA 1280 x 1024 at 60 Hz (non-interlaced) */
-    VO_OUTPUT_1366x768_60, /* VESA 1366 x 768 at 60 Hz (non-interlaced) */
-    VO_OUTPUT_1440x900_60, /* VESA 1440 x 900 at 60 Hz (non-interlaced) CVT Compliant */
-    VO_OUTPUT_1280x800_60, /* 1280*800@60Hz VGA@60Hz */
-    VO_OUTPUT_1600x1200_60, /* VESA 1600 x 1200 at 60 Hz (non-interlaced) */
-    VO_OUTPUT_1680x1050_60, /* VESA 1680 x 1050 at 60 Hz (non-interlaced) */
-    VO_OUTPUT_1920x1200_60, /* VESA 1920 x 1600 at 60 Hz (non-interlaced) CVT (Reduced Blanking) */
-    VO_OUTPUT_640x480_60, /* VESA 640 x 480 at 60 Hz (non-interlaced) CVT */
-    VO_OUTPUT_960H_PAL, /* ITU-R BT.1302 960 x 576 at 50 Hz (interlaced) */
-    VO_OUTPUT_960H_NTSC, /* ITU-R BT.1302 960 x 480 at 60 Hz (interlaced) */
-    VO_OUTPUT_1920x2160_30, /* 1920x2160_30 */
-    VO_OUTPUT_2560x1440_30, /* 2560x1440_30 */
-    VO_OUTPUT_2560x1440_60, /* 2560x1440_60 */
-    VO_OUTPUT_2560x1600_60, /* 2560x1600_60 */
-    VO_OUTPUT_3840x2160_24, /* 3840x2160_24 */
-    VO_OUTPUT_3840x2160_25, /* 3840x2160_25 */
-    VO_OUTPUT_3840x2160_30, /* 3840x2160_30 */
-    VO_OUTPUT_3840x2160_50, /* 3840x2160_50 */
-    VO_OUTPUT_3840x2160_60, /* 3840x2160_60 */
-    VO_OUTPUT_4096x2160_24, /* 4096x2160_24 */
-    VO_OUTPUT_4096x2160_25, /* 4096x2160_25 */
-    VO_OUTPUT_4096x2160_30, /* 4096x2160_30 */
-    VO_OUTPUT_4096x2160_50, /* 4096x2160_50 */
-    VO_OUTPUT_4096x2160_60, /* 4096x2160_60 */
-    VO_OUTPUT_320x240_60, /* For ota5182 at 60 Hz (8bit)  */
-    VO_OUTPUT_320x240_50, /* For ili9342 at 50 Hz (6bit)  */
-    VO_OUTPUT_240x320_50, /* Hi3559AV100: For ili9341 at 50 Hz (6bit) */
-                            /* Hi3556AV100/Hi3519AV100: For st7789 at 50Hz(6bit) */
-    VO_OUTPUT_240x320_60, /* For ili9341 at 60 Hz (16bit) */
-    VO_OUTPUT_800x600_50, /* For LCD     at 50 Hz (24bit) */
-    VO_OUTPUT_720x1280_60, /* For MIPI DSI Tx 720 x1280 at 60 Hz */
-    VO_OUTPUT_1080x1920_60, /* For MIPI DSI Tx 1080x1920 at 60 Hz */
-    VO_OUTPUT_7680x4320_30, /* For HDMI2.1 at 30 Hz         */
-    VO_OUTPUT_USER, /* User timing. */
-
-    VO_OUTPUT_BUTT
-} VO_INTF_SYNC_E;
-
-typedef enum hiVO_ZOOM_IN_E {
-    VO_ZOOM_IN_RECT = 0, /* Zoom in by rect */
-    VO_ZOOM_IN_RATIO, /* Zoom in by ratio */
-    VO_ZOOM_IN_BUTT
-} VO_ZOOM_IN_E;
-
-typedef enum hiVO_CSC_MATRIX_E {
-    VO_CSC_MATRIX_IDENTITY = 0, /* Identity CSC matrix. */
-
-    VO_CSC_MATRIX_BT601_TO_BT709, /* BT601 to BT709 */
-    VO_CSC_MATRIX_BT709_TO_BT601, /* BT709 to BT601 */
-
-    VO_CSC_MATRIX_BT601_TO_RGB_PC, /* BT601 to RGB */
-    VO_CSC_MATRIX_BT709_TO_RGB_PC, /* BT709 to RGB */
-
-    VO_CSC_MATRIX_RGB_TO_BT601_PC, /* RGB to BT601 FULL */
-    VO_CSC_MATRIX_RGB_TO_BT709_PC, /* RGB to BT709 FULL */
-
-    VO_CSC_MATRIX_RGB_TO_BT2020_PC, /* RGB to BT.2020 */
-    VO_CSC_MATRIX_BT2020_TO_RGB_PC, /* BT.2020 to RGB */
-
-    VO_CSC_MATRIX_RGB_TO_BT601_TV, /* RGB to BT601 LIMIT */
-    VO_CSC_MATRIX_RGB_TO_BT709_TV, /* RGB to BT709 LIMIT */
-
-    VO_CSC_MATRIX_BUTT
-} VO_CSC_MATRIX_E;
-
-typedef struct hiVO_CHN_ATTR_S {
-    HI_U32 u32Priority; /* Video out overlay pri sd */
-    RECT_S stRect; /* Rectangle of video output channel */
-    HI_BOOL bDeflicker; /* Deflicker or not sd */
-} VO_CHN_ATTR_S;
-
-typedef struct hiVO_CHN_PARAM_S {
-    ASPECT_RATIO_S stAspectRatio; /* RW; aspect ratio */
-} VO_CHN_PARAM_S;
-
-typedef struct hiVO_BORDER_S {
-    HI_BOOL bBorderEn; /* RW; Do frame or not */
-    BORDER_S stBorder; /* RW; frame's top, bottom, left, right width and color */
-} VO_BORDER_S;
-
-typedef struct hiVO_QUERY_STATUS_S {
-    HI_U32 u32ChnBufUsed; /* Channel buffer that been occupied */
-} VO_QUERY_STATUS_S;
-
-typedef struct hiVO_SYNC_INFO_S {
-    HI_BOOL bSynm; /* RW; sync mode(0:timing,as BT.656; 1:signal,as LCD) */
-    HI_BOOL bIop; /* RW; interlaced or progressive display(0:i; 1:p) */
-    HI_U8 u8Intfb; /* RW; interlace bit width while output */
-
-    HI_U16 u16Vact; /* RW; vertical active area */
-    HI_U16 u16Vbb; /* RW; vertical back blank porch */
-    HI_U16 u16Vfb; /* RW; vertical front blank porch */
-
-    HI_U16 u16Hact; /* RW; horizontal active area */
-    HI_U16 u16Hbb; /* RW; horizontal back blank porch */
-    HI_U16 u16Hfb; /* RW; horizontal front blank porch */
-    HI_U16 u16Hmid; /* RW; bottom horizontal active area */
-
-    HI_U16 u16Bvact; /* RW; bottom vertical active area */
-    HI_U16 u16Bvbb; /* RW; bottom vertical back blank porch */
-    HI_U16 u16Bvfb; /* RW; bottom vertical front blank porch */
-
-    HI_U16 u16Hpw; /* RW; horizontal pulse width */
-    HI_U16 u16Vpw; /* RW; vertical pulse width */
-
-    HI_BOOL bIdv; /* RW; inverse data valid of output */
-    HI_BOOL bIhs; /* RW; inverse horizontal synch signal */
-    HI_BOOL bIvs; /* RW; inverse vertical synch signal */
-} VO_SYNC_INFO_S;
-
-typedef struct hiVO_PUB_ATTR_S {
-    HI_U32 u32BgColor; /* RW; Background color of a device, in RGB format. */
-    VO_INTF_TYPE_E enIntfType; /* RW; Type of a VO interface */
-    VO_INTF_SYNC_E enIntfSync; /* RW; Type of a VO interface timing */
-    VO_SYNC_INFO_S stSyncInfo; /* RW; Information about VO interface timings */
-} VO_PUB_ATTR_S;
-
-typedef struct hiVO_WBC_ATTR_S {
-    SIZE_S stTargetSize; /* RW; WBC Zoom target size */
-    PIXEL_FORMAT_E enPixelFormat; /* RW; the pixel format of WBC output */
-    HI_U32 u32FrameRate; /* RW; frame rate control */
-    DYNAMIC_RANGE_E enDynamicRange; /* RW; Write back dynamic range type */
-    COMPRESS_MODE_E enCompressMode; /* RW; Write back Compressing mode   */
-} VO_WBC_ATTR_S;
-
-typedef enum hiVO_WBC_MODE_E {
-    VO_WBC_MODE_NORMAL = 0, /* In this mode, wbc will capture frames according to dev frame rate
-                                and wbc frame rate */
-    VO_WBC_MODE_DROP_REPEAT, /* In this mode, wbc will drop dev repeat frame, and capture the real frame
-                                according to video layer's display rate and wbc frame rate */
-    VO_WBC_MODE_PROG_TO_INTL, /* In this mode, wbc will drop dev repeat frame which repeats more than 3 times,
-                                and change two progressive frames to one interlace frame */
-    VO_WBC_MODE_BUTT,
-} VO_WBC_MODE_E;
-
-typedef enum hiVO_WBC_SOURCE_TYPE_E {
-    VO_WBC_SOURCE_DEV = 0x0, /* WBC source is device */
-    VO_WBC_SOURCE_VIDEO = 0x1, /* WBC source is video layer */
-    VO_WBC_SOURCE_GRAPHIC = 0x2, /* WBC source is graphic layer. Warning: not supported */
-    VO_WBC_SOURCE_BUTT
-} VO_WBC_SOURCE_TYPE_E;
-
-typedef struct hiVO_WBC_SOURCE_S {
-    VO_WBC_SOURCE_TYPE_E enSourceType; /* RW; WBC source's type */
-    HI_U32 u32SourceId; /* RW; WBC source's ID */
-} VO_WBC_SOURCE_S;
-
-typedef enum hiVO_PART_MODE_E {
-    VO_PART_MODE_SINGLE = 0, /* single partition, which use software to make multi-picture in one hardware cell */
-    VO_PART_MODE_MULTI = 1, /* muliti partition, each partition is a hardware cell */
-    VO_PART_MODE_BUTT
-} VO_PART_MODE_E;
-
-typedef struct hiVO_VIDEO_LAYER_ATTR_S {
-    RECT_S stDispRect; /* RW; Display resolution */
-    SIZE_S stImageSize; /* RW; Canvas size of the video layer */
-    HI_U32 u32DispFrmRt; /* RW; Display frame rate */
-    PIXEL_FORMAT_E enPixFormat; /* RW; Pixel format of the video layer */
-    HI_BOOL bDoubleFrame; /* RW; Whether to double frames */
-    HI_BOOL bClusterMode; /* RW; Whether to take Cluster way to use memory */
-    DYNAMIC_RANGE_E enDstDynamicRange; /* RW; Video Layer output dynamic range type */
-} VO_VIDEO_LAYER_ATTR_S;
-
-typedef struct hiVO_LAYER_PARAM_S {
-    ASPECT_RATIO_S stAspectRatio; /* RW; aspect ratio */
-} VO_LAYER_PARAM_S;
-
-typedef struct hiVO_ZOOM_RATIO_S {
-    HI_U32 u32XRatio; /* RW; Range: [0, 1000]; XRatio = x * 1000 / W,
-                              x means the start point to be zoomed, W means displaying channel's width. */
-    HI_U32 u32YRatio; /* RW; Range: [0, 1000]; YRatio = y * 1000 / H,
-                              y means the start point to be zoomed, H means displaying channel's height. */
-    HI_U32 u32WRatio; /* RW; Range: [0, 1000]; WRatio = w * 1000 / W,
-                              w means the width to be zoomed, W means displaying channel's width. */
-    HI_U32 u32HRatio; /* RW; Range: [0, 1000]; HRatio = h * 1000 / H,
-                              h means the height to be zoomed, H means displaying channel's height. */
-} VO_ZOOM_RATIO_S;
-
-typedef struct hiVO_ZOOM_ATTR_S {
-    VO_ZOOM_IN_E enZoomType; /* choose the type of zoom in */
-    union {
-        RECT_S stZoomRect; /* zoom in by rect */
-        VO_ZOOM_RATIO_S stZoomRatio; /* zoom in by ratio */
-    };
-} VO_ZOOM_ATTR_S;
-
-typedef struct hiVO_CSC_S {
-    VO_CSC_MATRIX_E enCscMatrix; /* CSC matrix */
-    HI_U32 u32Luma; /* RW; Range:    [0, 100]; luminance, default: 50 */
-    HI_U32 u32Contrast; /* RW; Range:    [0, 100]; contrast, default: 50 */
-    HI_U32 u32Hue; /* RW; Range:    [0, 100]; hue, default: 50 */
-    HI_U32 u32Satuature; /* RW; Range:    [0, 100]; satuature, default: 50 */
-} VO_CSC_S;
-
-typedef struct hiVO_REGION_INFO_S {
-    HI_U32 u32RegionNum; /* count of the region */
-    RECT_S *ATTRIBUTE pstRegion; /* region attribute */
-} VO_REGION_INFO_S;
-
-typedef struct hiVO_LAYER_BOUNDARY_S {
-    HI_U32 u32Width;
-    HI_U32 u32Color[2];
-} VO_LAYER_BOUNDARY_S;
-
-typedef struct hiVO_CHN_BOUNDARY_S {
-    HI_BOOL bBoundaryEn; /* do Frame or not */
-    HI_U32 u32ColorIndex; /* the index of Frame color,[0,1] */
-} VO_CHN_BOUNDARY_S;
-
-typedef struct hiVO_MOD_PARAM_S {
-    HI_BOOL bTransparentTransmit; /* RW, Range: [0, 1];  YC(Luminance and Chrominance) changes or not
-                                            when passing through VO */
-    HI_BOOL bExitDev;
-    HI_BOOL bWbcBgBlackEn;
-    HI_BOOL bDevClkExtEn;
-    HI_BOOL bSaveBufMode[VO_MAX_PHY_DEV_NUM]; /* save buff mode */
-} VO_MOD_PARAM_S;
-
-typedef enum hiVO_CLK_SOURCE_E {
-    VO_CLK_SOURCE_PLL,
-    VO_CLK_SOURCE_LCDMCLK,
-
-    VO_CLK_SOURCE_BUTT
-} VO_CLK_SOURCE_E;
-
-typedef struct hiVO_USER_INTFSYNC_PLL_S {
-    HI_U32 u32Fbdiv;
-    HI_U32 u32Frac;
-    HI_U32 u32Refdiv;
-    HI_U32 u32Postdiv1;
-    HI_U32 u32Postdiv2;
-} VO_USER_INTFSYNC_PLL_S;
-
-typedef struct hiVO_USER_INTFSYNC_ATTR_S {
-    VO_CLK_SOURCE_E enClkSource;
-
-    union {
-        VO_USER_INTFSYNC_PLL_S stUserSyncPll;
-        HI_U32 u32LcdMClkDiv;
-    };
-} VO_USER_INTFSYNC_ATTR_S;
-
-typedef struct hiVO_USER_INTFSYNC_INFO_S {
-    VO_USER_INTFSYNC_ATTR_S stUserIntfSyncAttr;
-    HI_U32 u32PreDiv;
-    HI_U32 u32DevDiv;
-    HI_BOOL bClkReverse;
-} VO_USER_INTFSYNC_INFO_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* End of #ifndef __HI_COMM_VO_H__ */
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vpss.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vpss.h
deleted file mode 100644
index 7874ed0f..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_comm_vpss.h
+++ /dev/null
@@ -1,680 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2016-2019. All rights reserved.
- * Description: Vpss common interface
- * Author: Hisilicon multimedia software group
- * Create: 2016/09/27
- */
-
-#ifndef __HI_COMM_VPSS_H__
-#define __HI_COMM_VPSS_H__
-
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_errno.h"
-#include "hi_comm_video.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-#define VPSS_SHARPEN_GAIN_NUM        (32)
-#define VPSS_AUTO_ISO_STRENGTH_NUM   (16)
-#define VPSS_YUV_SHPLUMA_NUM         (32)
-#define VPSS_3DNR_MAX_AUTO_PARAM_NUM (16)
-
-#define HI_ERR_VPSS_NULL_PTR         HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-#define HI_ERR_VPSS_NOTREADY         HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-#define HI_ERR_VPSS_INVALID_DEVID    HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_DEVID)
-#define HI_ERR_VPSS_INVALID_CHNID    HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_INVALID_CHNID)
-#define HI_ERR_VPSS_EXIST            HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_EXIST)
-#define HI_ERR_VPSS_UNEXIST          HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-#define HI_ERR_VPSS_NOT_SUPPORT      HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-#define HI_ERR_VPSS_NOT_PERM         HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_PERM)
-#define HI_ERR_VPSS_NOMEM            HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-#define HI_ERR_VPSS_NOBUF            HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_NOBUF)
-#define HI_ERR_VPSS_SIZE_NOT_ENOUGH  HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_SIZE_NOT_ENOUGH)
-#define HI_ERR_VPSS_ILLEGAL_PARAM    HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-#define HI_ERR_VPSS_BUSY             HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-#define HI_ERR_VPSS_BUF_EMPTY        HI_DEF_ERR(HI_ID_VPSS, EN_ERR_LEVEL_ERROR, EN_ERR_BUF_EMPTY)
-
-#define VPSS_INVALID_FRMRATE         -1
-#define VPSS_CHN0                    0
-#define VPSS_CHN1                    1
-#define VPSS_CHN2                    2
-#define VPSS_CHN3                    3
-#define VPSS_INVALID_CHN             -1
-
-typedef enum hiVPSS_NR_TYPE_E {
-    VPSS_NR_TYPE_VIDEO         = 0,
-    VPSS_NR_TYPE_SNAP          = 1,
-    VPSS_NR_TYPE_VIDEO_SPATIAL = 2,
-    VPSS_NR_TYPE_VIDEO_ENHANCE = 3,
-    VPSS_NR_TYPE_BUTT
-} VPSS_NR_TYPE_E;
-
-typedef enum hiNR_MOTION_MODE_E {
-    NR_MOTION_MODE_NORMAL          = 0,        /* normal */
-    NR_MOTION_MODE_COMPENSATE      = 1,        /* motion compensate */
-    NR_MOTION_MODE_BUTT
-} NR_MOTION_MODE_E;
-
-typedef struct hiVPSS_NR_ATTR_S {
-    VPSS_NR_TYPE_E      enNrType;
-    COMPRESS_MODE_E     enCompressMode;   /* RW; Reference frame compress mode */
-    NR_MOTION_MODE_E    enNrMotionMode;   /* RW; NR motion compensate mode. */
-} VPSS_NR_ATTR_S;
-
-typedef struct hiVPSS_GRP_ATTR_S {
-    /* RW; Range: Hi3559AV100 = [64, 16384] | Hi3519AV100 = [64, 8192] | Hi3516CV500 = [64, 2304] |
-        Hi3516AV300 = [64, 3840] | Hi3516DV300 = [64, 2688] | Hi3556V200 = [64, 4608] | Hi3559V200 = [64, 4608] |
-        Hi3516EV200 = [64, 4096]; Width of source image. */
-    HI_U32                     u32MaxW;
-    /* RW; Range: Hi3559AV100 = [64, 16384] | Hi3519AV100 = [64, 8192] | Hi3516CV500 = [64, 2304] |
-        Hi3516AV300 = [64, 3840] | Hi3516DV300 = [64, 2688] | Hi3556V200 = [64, 4608] | Hi3559V200 = [64, 4608] |
-        Hi3516EV200 = [64, 4096]; Height of source image. */
-    HI_U32                     u32MaxH;
-    PIXEL_FORMAT_E             enPixelFormat;     /* RW; Pixel format of source image. */
-    DYNAMIC_RANGE_E            enDynamicRange;    /* RW; DynamicRange of source image. */
-    FRAME_RATE_CTRL_S          stFrameRate;       /* Grp frame rate contrl. */
-    HI_BOOL                    bNrEn;             /* RW;Range: [0, 1];  NR enable. */
-    VPSS_NR_ATTR_S             stNrAttr;          /* RW; NR attr. */
-} VPSS_GRP_ATTR_S;
-
-typedef enum hiVPSS_CHN_MODE_E {
-    VPSS_CHN_MODE_USER  = 0,       /* User mode. */
-    VPSS_CHN_MODE_AUTO  = 1        /* Auto mode. */
-
-} VPSS_CHN_MODE_E;
-
-typedef struct hiVPSS_CHN_ATTR_S {
-    VPSS_CHN_MODE_E     enChnMode;          /* RW; Vpss channel's work mode. */
-    /* RW; Range: Hi3559AV100 = [64, 16384] | Hi3519AV100 = [64, 8192] | Hi3516CV500 = [64, 8192] |
-        Hi3516AV300 = [64, 8192] | Hi3516DV300 = [64, 8192] | Hi3556V200 = [64, 8192] | Hi3559V200 = [64, 8192] |
-        Hi3516EV200 = [64, 4096]; Width of target image. */
-    HI_U32              u32Width;
-    /* RW; Range: Hi3559AV100 = [64, 16384] | Hi3519AV100 = [64, 8192] | Hi3516CV500 = [64, 8192] |
-        Hi3516AV300 = [64, 8192] | Hi3516DV300 = [64, 8192] | Hi3556V200 = [64, 8192] | Hi3559V200 = [64, 8192] |
-        Hi3516EV200 = [64, 4096]; Height of target image. */
-    HI_U32              u32Height;
-    VIDEO_FORMAT_E      enVideoFormat;      /* RW; Video format of target image. */
-    PIXEL_FORMAT_E      enPixelFormat;      /* RW; Pixel format of target image. */
-    DYNAMIC_RANGE_E     enDynamicRange;     /* RW; DynamicRange of target image. */
-    COMPRESS_MODE_E     enCompressMode;     /* RW; Compression mode of the output. */
-    FRAME_RATE_CTRL_S   stFrameRate;        /* Frame rate control info */
-    HI_BOOL             bMirror;            /* RW; Mirror enable. */
-    HI_BOOL             bFlip;              /* RW; Flip enable. */
-    HI_U32              u32Depth;           /* RW; Range: [0, 8]; User get list depth. */
-    ASPECT_RATIO_S      stAspectRatio;      /* Aspect Ratio info. */
-} VPSS_CHN_ATTR_S;
-
-typedef enum hiVPSS_CROP_COORDINATE_E {
-    VPSS_CROP_RATIO_COOR = 0,   /* Ratio coordinate. */
-    VPSS_CROP_ABS_COOR          /* Absolute coordinate. */
-} VPSS_CROP_COORDINATE_E;
-
-typedef struct hiVPSS_CROP_INFO_S {
-    HI_BOOL                 bEnable;            /* RW; Range: [0, 1];  CROP enable. */
-    VPSS_CROP_COORDINATE_E  enCropCoordinate;   /* RW;  Range: [0, 1]; Coordinate mode of the crop start point. */
-    RECT_S                  stCropRect;         /* CROP rectangular. */
-} VPSS_CROP_INFO_S;
-
-/* Only used for Hi3519AV100/Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct hiVPSS_LDC_ATTR_S {
-    HI_BOOL     bEnable;                        /* RW; Range: [0, 1]; Whether LDC is enbale */
-    LDC_ATTR_S  stAttr;
-} VPSS_LDC_ATTR_S;
-
-/* Only used for Hi3516EV200 */
-typedef struct hiVPSS_LDCV3_ATTR_S {
-    HI_BOOL     bEnable;                        /* RW;Whether LDC is enbale */
-    LDCV3_ATTR_S  stAttr;
-} VPSS_LDCV3_ATTR_S;
-
-typedef struct hiVPSS_ROTATION_EX_ATTR_S {
-    HI_BOOL       bEnable;                      /* Whether ROTATE_EX_S is enbale */
-    ROTATION_EX_S stRotationEx;                 /* Rotate Attribute */
-} VPSS_ROTATION_EX_ATTR_S;
-
-typedef struct hiVPSS_LOW_DELAY_INFO_S {
-    HI_BOOL bEnable;          /* RW; Low delay enable. */
-    HI_U32 u32LineCnt;        /* RW; Range: [16, 16384]; Low delay shoreline. */
-} VPSS_LOW_DELAY_INFO_S;
-
-typedef struct hiVPSS_EXT_CHN_ATTR_S {
-    /* RW; Range: [0, 3]; Channel bind to. */
-    VPSS_CHN           s32BindChn;
-    /* RW; Range: Hi3559AV100 = [64, 16384] | Hi3519AV100 = [64, 8192] | Hi3516CV500 = [64, 8192] |
-        Hi3516AV300 = [64, 8192] | Hi3516DV300 = [64, 8192] | Hi3556V200 = [64, 8192] | Hi3559V200 = [64, 8192] |
-        Hi3516EV200 = [64, 4096]; Width of target image. */
-    HI_U32             u32Width;
-    /* RW; Range: Hi3559AV100 = [64, 16384] | Hi3519AV100 = [64, 8192] | Hi3516CV500 = [64, 8192] |
-        Hi3516AV300 = [64, 8192] | Hi3516DV300 = [64, 8192] | Hi3556V200 = [64, 8192] | Hi3559V200 = [64, 8192] |
-        Hi3516EV200 = [64, 4096]; Height of target image. */
-    HI_U32             u32Height;
-    /* RW; Video format of target image. */
-    VIDEO_FORMAT_E     enVideoFormat;
-    /* RW; Pixel format of target image. */
-    PIXEL_FORMAT_E     enPixelFormat;
-    /* RW; Dynamic range. */
-    DYNAMIC_RANGE_E    enDynamicRange;
-    /* RW; Compression mode of the output. */
-    COMPRESS_MODE_E    enCompressMode;
-    /* RW; Range: [0, 8]; User get list depth. */
-    HI_U32             u32Depth;
-    /* Frame rate control info */
-    FRAME_RATE_CTRL_S  stFrameRate;
-} VPSS_EXT_CHN_ATTR_S;
-
-/* Only used for Hi3559AV100/Hi3519AV100 */
-typedef struct hiVPSS_GRP_SHARPEN_MANUAL_ATTR_S {
-    /* RW; Range: [0, 4095]; Undirectional sharpen strength for texture and detail enhancement */
-    HI_U16 au16TextureStr[VPSS_SHARPEN_GAIN_NUM];
-    /* RW; Range: [0, 4095]; Directional sharpen strength for edge enhancement */
-    HI_U16 au16EdgeStr[VPSS_SHARPEN_GAIN_NUM];
-    /* RW; Range: [0, 4095]; Texture frequency adjustment. Texture and detail will be finer when it increase */
-    HI_U16 u16TextureFreq;
-    /* RW; Range: [0, 4095]; Edge frequency adjustment. Edge will be narrower and thiner when it increase */
-    HI_U16 u16EdgeFreq;
-    /* RW; Range: [0, 127]; u8OvershootAmt */
-    HI_U8  u8OverShoot;
-    /* RW; Range: [0, 127]; u8UndershootAmt */
-    HI_U8  u8UnderShoot;
-    /* RW; Range: [0, 255]; overshoot and undershoot suppression strength,
-        the amplitude and width of shoot will be decrease when shootSupSt increase */
-    HI_U8  u8ShootSupStr;
-    /* RW; Range: [0, 255]; Different sharpen strength for detail and edge.
-        When it is bigger than 128, detail sharpen strength will be stronger than edge. */
-    HI_U8  u8DetailCtrl;
-} VPSS_GRP_SHARPEN_MANUAL_ATTR_S;
-
-/* Only used for Hi3559AV100/Hi3519AV100 */
-typedef struct hiVPSS_GRP_SHARPEN_AUTO_ATTR_S {
-    /* RW; Range: [0, 4095]; Undirectional sharpen strength for texture and detail enhancement */
-    HI_U16 au16TextureStr[VPSS_SHARPEN_GAIN_NUM][VPSS_AUTO_ISO_STRENGTH_NUM];
-    /* RW; Range: [0, 4095]; Directional sharpen strength for edge enhancement */
-    HI_U16 au16EdgeStr[VPSS_SHARPEN_GAIN_NUM][VPSS_AUTO_ISO_STRENGTH_NUM];
-    /* RW; Range: [0, 4095]; Texture frequency adjustment. Texture and detail will be finer when it increase */
-    HI_U16 au16TextureFreq[VPSS_AUTO_ISO_STRENGTH_NUM];
-    /* RW; Range: [0, 4095]; Edge frequency adjustment. Edge will be narrower and thiner when it increase */
-    HI_U16 au16EdgeFreq[VPSS_AUTO_ISO_STRENGTH_NUM];
-    /* RW; Range: [0, 127]; u8OvershootAmt */
-    HI_U8  au8OverShoot[VPSS_AUTO_ISO_STRENGTH_NUM];
-    /* RW; Range: [0, 127]; u8UndershootAmt */
-    HI_U8  au8UnderShoot[VPSS_AUTO_ISO_STRENGTH_NUM];
-    /* RW; Range: [0, 255]; overshoot and undershoot suppression strength,
-        the amplitude and width of shoot will be decrease when shootSupSt increase */
-    HI_U8  au8ShootSupStr[VPSS_AUTO_ISO_STRENGTH_NUM];
-    /* RW; Range: [0, 255]; Different sharpen strength for detail and edge.
-        When it is bigger than 128, detail sharpen strength will be stronger than edge. */
-    HI_U8  au8DetailCtrl[VPSS_AUTO_ISO_STRENGTH_NUM];
-} VPSS_GRP_SHARPEN_AUTO_ATTR_S;
-
-/* Only used for Hi3559AV100/Hi3519AV100 */
-typedef struct hiVPSS_GRP_SHARPEN_ATTR_S {
-    /* RW;  Range: [0, 1];Sharpen enable. */
-    HI_BOOL                         bEnable;
-    /* RW; Sharpen Operation mode. */
-    OPERATION_MODE_E                enOpType;
-    /* RW; Range: [0, 127]; sharpen weight based on loacal luma */
-    HI_U8                           au8LumaWgt[VPSS_YUV_SHPLUMA_NUM];
-    /* RW; Sharpen manual attribute */
-    VPSS_GRP_SHARPEN_MANUAL_ATTR_S  stSharpenManualAttr;
-    /* RW; Sharpen auto attribute */
-    VPSS_GRP_SHARPEN_AUTO_ATTR_S    stSharpenAutoAttr;
-} VPSS_GRP_SHARPEN_ATTR_S;
-
-/* Only used for Hi3519AV100 */
-typedef struct {
-    /* IES0~4 ; Range: [0, 255]; The gains of edge and texture enhancement. 0~3 for different frequency response. */
-    HI_U8  IES0, IES1, IES2, IES3;
-    /* IEDZ   ; Range: [0, 999]; The threshold to control the generated artifacts. */
-    HI_U16 IEDZ : 10, _rb_ : 6;
-} tV56aIEy;
-
-/* Only used for Hi3519AV100 */
-typedef struct {
-    /* SPN6; Range: [0,   4];  The selection of filters to be mixed for NO.6 filter. */
-    /* SFR ; Range: [0,  31];  The relative NR strength to the SFi and SFk filter. */
-    HI_U8  SPN6 : 3, SFR  : 5;
-    /* SBN6; Range: [0,   4];  The selection of filters to be mixed for NO.6 filter. */
-    /* PBR6; Range: [0,  16];  The mix ratio between SPN6 and SBN6. */
-    HI_U8  SBN6 : 3, PBR6 : 5;
-    /* SFS2, SFT2, SBR2; Range: [0, 255];  The NR strength parameters for NO.1 and NO.2 filters. */
-    HI_U8  SFS2, SFT2, SBR2;
-    /* SFS4, SFT4, SBR4; Range: [0, 255];  The NR strength parameters for NO.3 and NO.4 filters. */
-    HI_U8  SFS4, SFT4, SBR4;
-
-    /* STH1~3; Range: [0, 511]; The thresholds for protection of edges from blurring */
-    /* SFN0~3; Range: [0,   6]; Filter selection for different image areas based on STH1~3. */
-    /* NRyEn ; Range: [0,   1]; The NR switches */
-    HI_U16 STH1 : 9,  SFN1 : 3, SFN0  : 3, NRyEn : 1;
-    /* BWSF4 ; Range: [0,   1]; The NR window size for the NO.3 and NO.4 filters.  */
-    /* KMode ; Range: [0,   3]; a. Selection of SFi and SFk type filter. b.
-        The denoise mode based on image brightness. */
-    HI_U16 STH2 : 9,  SFN2 : 3, BWSF4 : 1, kMode : 3;
-    /* tEdge ; Range: [0,   3]; NR strength control mode for the image background */
-    /* Trith ; Range: [0,   1]; The switch to choose 3 STH threshold or 2 STH threshold */
-    HI_U16 STH3 : 9,  SFN3 : 3, tEdge : 2, TriTh : 1, _rb_  : 1;
-} tV56aSFy;
-
-/* Only used for Hi3519AV100 */
-typedef struct {
-    /* MADZ;   Range: [0, 999]; The blending ratio between MAI2 and MAI1 based on image statistics. */
-    /* MAI0~2; Range: [0,   3]; The three blending results between spatial and temporal filtering. */
-    HI_U16 MADZ : 10, MAI0 : 2, MAI1 : 2,  MAI2 : 2;
-    /* MADK;   Range: [0, 255]; The blending ratio between MAI2 and MAI1 based on brightness. (low limit). */
-    /* MABR;   Range: [0, 255]; The blending ratio between MAI2 and MAI1 based on brightness. (high limit). */
-    HI_U8  MADK,      MABR;
-    /* MATH;   Range: [0, 999]; The theshold for motion detection. */
-    /* MATE;   Range: [0,   8]; The motion index for smooth image area. */
-    /* MATW;   Range: [0,   3]; The motion index for prevention of motion ghost. */
-    HI_U16 MATH : 10, MATE : 4, MATW : 2;
-    /* MASW;   Range: [0,  15]; The motion index for low-frequency noises. */
-    /* MABW;   Range: [0,   4]; The window size for motion detection. */
-    /* MAXN;   Range: [0,   1]; Not for tunning. */
-    HI_U8  MASW :  4, MABW : 3, MAXN : 1, _rB_;
-} tV56aMDy;
-
-/* Only used for Hi3519AV100 */
-typedef struct {
-    /* TFS;    Range: [0,  15]; The NR strength for temporal filtering. */
-    /* TDZ;    Range: [0, 999]; Protection of the weak texture area from temporal filtering.  */
-    /* TDX;    Range: [0,   3]; Not for tuning. */
-    HI_U16 TFS : 4,  TDZ : 10, TDX : 2;
-    /* TFR[5]; Range: [0,  31]; The temoproal NR strength control for background (static) area. */
-    /* TSS;    Range: [0,  15]; The ratio for blending spatial NR with the temproal NR results. */
-    /* TSI;    Range: [0,   1]; The selection of blending filter for TSS. */
-    HI_U8  TFR[5],   TSS : 4,  TSI : 1, _rb_ : 2;
-    /* SDZ;    Range: [0, 999]; The threshold of NR control for result MAI1. */
-    /* STR;    Range: [0,  31]; The strength of NR control for result MAI1.  */
-    /* bRef;   Range: [0,   1]; The switch for temproal filtering.  */
-    HI_U16 SDZ : 10, STR : 5,  bRef : 1;
-} tV56aTFy;
-
-/* Only used for Hi3519AV100 */
-typedef struct {
-    /* SFC;    Range: [0, 255]; Spatial NR strength for the first level. */
-    /* TFC;    Range: [0,  63]; Temporal NR strength. */
-    HI_U8  SFC, _rb_ : 2, TFC : 6;
-    /* CSFS;   Range: [0, 999]; Spatial NR strength for the second level. */
-    /* CSFR;   Range: [0,  32]; Spatial NR strength control. */
-    HI_U16 CSFS : 10,    CSFR : 6;
-    /* CTFR;   Range: [0, 999]; Temporal NR strength control. */
-    /* CTFS;   Range: [0,  15]; Temporal NR filtering strength */
-    /* CIIR;   Range: [0,   1]; Spatial NR mode for the first level. */
-    HI_U16 CTFR : 11,    CTFS : 4,    CIIR : 1;
-} tV56aNRc;
-
-/* Only used for Hi3519AV100 */
-typedef struct {
-    tV56aIEy IEy[2];
-    tV56aSFy SFy[4];
-    tV56aMDy MDy[2];
-    tV56aTFy TFy[2];
-    tV56aNRc NRc;
-
-    /* SBSk2[32], SDSk2[32]; Range [0, 8192];  Spatial NR strength based on brightness. */
-    HI_U16 SBSk2[32], SDSk2[32];
-    /* SBSk3[32], SDSk3[32]; Range [0, 8192];  Spatial NR strength based on brightness. */
-    HI_U16 SBSk3[32], SDSk3[32];
-} VPSS_NRX_V1_S;
-
-/* Only used for Hi3519AV100 */
-typedef struct hiVPSS_NRX_PARAM_MANUAL_V1_S {
-    VPSS_NRX_V1_S stNRXParam;
-} VPSS_NRX_PARAM_MANUAL_V1_S;
-
-/* Only used for Hi3519AV100 */
-typedef struct hiVPSS_NRX_PARAM_AUTO_V1_S {
-    HI_U32 u32ParamNum;
-    HI_U32 *pau32ISO;
-    VPSS_NRX_V1_S *pastNRXParam;
-} VPSS_NRX_PARAM_AUTO_V1_S;
-
-/* Only used for Hi3519AV100 */
-typedef struct hiVPSS_NRX_PARAM_V1_S {
-    OPERATION_MODE_E           enOptMode;           /* RW;Adaptive NR */
-    VPSS_NRX_PARAM_MANUAL_V1_S stNRXManual;         /* RW;NRX V1 param for manual video */
-    VPSS_NRX_PARAM_AUTO_V1_S   stNRXAuto;           /* RW;NRX V1 param for auto video */
-} VPSS_NRX_PARAM_V1_S;
-
-/* Only used for Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct {
-    /* IES0~4 ; Range: [0, 255]; The gains of edge and texture enhancement. 0~3 for different frequency response. */
-    HI_U8  IES0, IES1, IES2, IES3;
-    HI_U16 IEDZ : 10, _rb_ : 6;     /* IEDZ   ; Range: [0, 999]; The threshold to control the generated artifacts. */
-} tV500_VPSS_IEy;
-
-/* Only used for Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct {
-    /* SPN6; Range: [0,   5];  The selection of filters to be mixed for NO.6 filter. */
-    /* SFR ; Range: [0,  31];  The relative NR strength in the SFi and SFk filter. */
-    /* SBN6; Range: [0,   5];  The selection of filters to be mixed for NO.6 filter. */
-    /* PBR6; Range: [0,  16];  The mix ratio between SPN6 and SBN6. */
-    HI_U8  SPN6 : 3, SFR  : 5;
-    HI_U8  SBN6 : 3, PBR6 : 5;
-
-    /* JMODE;      Range: [0,   4]; The selection modes for the blending of spatial filters */
-    /* STR0, STR1; Range: [0,  16]; The blending ratio of different filters. (Used in serial filtering mode (SFM).) */
-    /* DeIdx;      Range: [3,   6]; The selection number of filters that textures and details will be added to. */
-    HI_U16 SRT0 : 5, SRT1 : 5, JMODE : 3,  DeIdx : 3;
-    /* DeRate;     Range: [0, 255]; The enhancement strength for the SFM (When DeRate > 0, the SFM will be activated) */
-    /* SFR6;       Range: [0,  31]; The relative NR strength for NO.6 filter. (Effective when JMODE = 4) */
-    HI_U8  DeRate, SFR6[3];
-
-    /* SFS1, SFT1, SBR1; Range: [0, 255];  The NR strength parameters for NO.1 filter. */
-    /* SFS2, SFT2, SBR2; Range: [0, 255];  The NR strength parameters for NO.2 filter. */
-    /* SFS4, SFT4, SBR4; Range: [0, 255];  The NR strength parameters for NO.3 and NO.4 filters. */
-    HI_U8  SFS1,  SFT1,  SBR1;
-    HI_U8  SFS2,  SFT2,  SBR2;
-    HI_U8  SFS4,  SFT4,  SBR4;
-
-    /* STH1~3; Range: [0, 511]; The thresholds for protection of edges from blurring */
-    /* NRyEn ; Range: [0,   1]; The NR switches */
-    /* SFN0~3; Range: [0,   6]; Filter selection for different image areas based on STH1~3. */
-    /* BWSF4 ; Range: [0,   1]; The NR window size for the NO.3 and NO.4 filters.  */
-    /* KMode ; Range: [0,   3]; The denoise mode based on image brightness. */
-    /* Trith ; Range: [0,   1]; The switch to choose 3 STH threshold or 2 STH threshold */
-    HI_U16 STH1 : 9, SFN1 : 3, SFN0  : 3, NRyEn : 1;
-    HI_U16 STH2 : 9, SFN2 : 3, BWSF4 : 1, kMode : 3;
-    HI_U16 STH3 : 9, SFN3 : 3, TriTh : 1, _rb0_ : 3;
-
-    /* SBSk[32], SDSk[32]; Range [0, 8191];  Spatial NR strength based on brightness. */
-    HI_U16 SBSk[32], SDSk[32];
-} tV500_VPSS_SFy;
-
-/* Only used for Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct {
-    /* MADZ0, MADZ1;     Range: [0, 511]; The blending ratio between MAI2 and MAI1 based on image statistics. */
-    /* MAI00~02,MAI10~12 Range: [0,   3]; The three blending results between spatial and temporal filtering. */
-    /* MABR0, MABR1;  Range: [0, 255]; The blending ratio between MAI2 and MAI1 based on brightness.  */
-    /* biPath;           Range: [0,   1]; The switch for single path or dual path. 0: single path; 1: dual path. */
-    HI_U16 MADZ0   : 9,  MAI00    : 2,  MAI01  : 2,  MAI02    : 2,  biPath  : 1;
-    HI_U16 MADZ1   : 9,  MAI10    : 2,  MAI11  : 2,  MAI12    : 2,  _rb0_ : 1;
-    HI_U8  MABR0, MABR1;
-
-    /* MATH0,MATH1;   Range: [0, 999]; The theshold for motion detection. */
-    /* MATE0,MATE1;   Range: [0,   8]; The motion index for smooth image area. */
-    /* MATW;   Range: [0,   3]; The motion index for prevention of motion ghost. */
-    HI_U16 MATH0   : 10,  MATE0   : 4,  MATW   : 2;
-    HI_U16 MATH1   : 10,  MATE1   : 4,  _rb1_  : 2;
-
-
-    /* MASW;   Range: [0,  15]; The motion index for low-frequency noises. */
-    /* MABW0,MABW1;   Range: [0,   9]; The window size for motion detection. */
-    HI_U8  MASW    :  4,  _rb2_   : 4;
-    HI_U8  MABW0   :  4,  MABW1   : 4;
-} tV500_VPSS_MDy;
-
-/* Only used for Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct {
-    /* TFS0,TFS1;        Range: [0,  15]; The NR strength for temporal filtering. */
-    /* TDZ0,TDZ1;        Range: [0, 999]; Protection of the weak texture area from temporal filtering.  */
-    /* TDX0,TDX1;        Range: [0,   3]; Not for tuning. */
-    HI_U16 TFS0  :  4, TDZ0   : 10, TDX0    : 2;
-    HI_U16 TFS1  :  4, TDZ1   : 10, TDX1    : 2;
-
-    /* SDZ0,SDZ1;        Range: [0, 999]; The threshold of NR control for result MAI1. */
-    /* STR0,STR1;        Range: [0,  31]; The strength of NR control for result MAI1.  */
-    /* DZMode0, DZMode1; Range: [0,   1]; The selection mode for TDZ0 and TDZ1, respectively.  */
-    HI_U16 SDZ0  : 10, STR0   : 5,  DZMode0 : 1;
-    HI_U16 SDZ1  : 10, STR1   : 5,  DZMode1 : 1;
-
-    /* TFR0,TFR1;        Range: [0,  31]; The temoproal NR strength control for background (static) area. */
-    /* TSS0,TSS1;        Range: [0,  15]; The ratio for blending spatial NR with the temproal NR results. */
-    /* TSI0,TSI1;        Range: [0,   1]; The selection of blending filter for TSS. */
-    HI_U8  TFR0[6],    TSS0   : 4,  TSI0    : 4;
-    HI_U8  TFR1[6],    TSS1   : 4,  TSI1    : 4;
-
-    /* tEdge;            Range: [0,   3]; NR strength control mode for the updating background. */
-    /* RFI;              Range: [0,   4]; Reference mode. (used in when NR_MOTION_MODE_COMPENSATE are selected). */
-    /* bRef;             Range: [0,   1]; The Switch for temproal filtering. */
-    HI_U8  RFI   : 3,  tEdge  : 2,  bRef    : 1,  _rb_ : 2;
-} tV500_VPSS_TFy;
-
-/* Only used for Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct {
-    /* advMATH;        Range: [0,   1]; The Switch for advanced motion dection.  */
-    /* RFUI;           Range: [0,   4]; The modes for updating reference for NRy leve 2,
-        (used in when NR_MOTION_MODE_COMPENSATE are selected). */
-    HI_U16 advMATH : 1, RFDZ  : 9,    _rb_ : 6;
-    /* RFDZ;           Rnage: [0, 511]; The threshold for RFI0 and RFI1 mode 3 and 4. */
-    /* RFSLP;          Rnage: [0,  31]; The Strength for RFI0 and RFI1 mode 3 and 4. */
-    HI_U8  RFUI    : 3, RFSLP : 5;
-} tV500_VPSS_RFs;
-
-/* Only used for Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct {
-    tV500_VPSS_IEy  IEy;
-    tV500_VPSS_SFy  SFy;
-    HI_U8 NRcEn : 1, _rb_ : 7;
-} tV500_VPSS_NRc;
-
-/* Only used for Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct {
-    /* SFC;    Range: [0, 255]; Spatial NR strength. */
-    HI_U8  SFC;
-    /* TFC;    Range: [0,  63]; Temporal NR strength relative to Spatial NR. */
-    /* CTFS;   Range: [0,  15]; Absolute temporal NR strength. */
-    HI_U16 CTFS : 4, TFC : 6, _rb_ : 6;
-
-} tV500_VPSS_pNRc;
-
-/* Only used for Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct {
-    tV500_VPSS_IEy  IEy[3];
-    tV500_VPSS_SFy  SFy[3];
-    tV500_VPSS_MDy  MDy[2];
-    tV500_VPSS_RFs  RFs;
-    tV500_VPSS_TFy  TFy[2];
-    tV500_VPSS_pNRc pNRc;
-    tV500_VPSS_NRc  NRc;
-} VPSS_NRX_V2_S;
-
-/* Only used for Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct hiVPSS_NRX_PARAM_MANUAL_V2_S {
-    VPSS_NRX_V2_S stNRXParam;
-} VPSS_NRX_PARAM_MANUAL_V2_S;
-
-/* Only used for Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct hiVPSS_NRX_PARAM_AUTO_V2_S {
-    HI_U32 u32ParamNum;
-    HI_U32 *pau32ISO;
-    VPSS_NRX_V2_S *pastNRXParam;
-} VPSS_NRX_PARAM_AUTO_V2_S;
-
-/* Only used for Hi3516CV500/Hi3516AV300/Hi3516DV300/Hi3556V200/Hi3559V200 */
-typedef struct hiVPSS_NRX_PARAM_V2_S {
-    OPERATION_MODE_E           enOptMode;           /* RW;Adaptive NR */
-    VPSS_NRX_PARAM_MANUAL_V2_S stNRXManual;         /* RW;NRX V2 param for manual video */
-    VPSS_NRX_PARAM_AUTO_V2_S   stNRXAuto;           /* RW;NRX V2 param for auto video */
-} VPSS_NRX_PARAM_V2_S;
-
-/* Only used for Hi3516EV200 */
-typedef struct {
-    /* IES0~4 ; Range: [0, 255]; The gains of edge and texture enhancement. 0~3 for different frequency response. */
-    HI_U8  IES0, IES1, IES2, IES3;
-    /* IEDZ   ; Range: [0, 999]; The threshold to control the generated artifacts. */
-    HI_U16  IEDZ : 10, IEEn : 1, _rb_ : 5;
-} tV200_VPSS_IEy;
-
-/* Only used for Hi3516EV200 */
-typedef struct {
-    HI_U8  SPN6 : 3, SFR  : 5;                                      /* SPN6, SBN6:  [0, 5]; */
-
-    HI_U8  SBN6 : 3, PBR6 : 5;                                    /* SFR: [0,31];  PBR6: [0,15]; */
-
-    /* JMODE;      Range: [0,   4]; The selection modes for the blending of spatial filters */
-    /* STR0, STR1; Range: [0,  16]; The blending ratio of different filters. (Used in serial filtering mode (SFM).) */
-    /* DeIdx;      Range: [3,   6]; The selection number of filters that textures and details will be added to. */
-    HI_U16  SRT0 : 5, SRT1 : 5, JMODE : 3, DeIdx : 3;
-
-    /* DeRate;     Range: [0, 255]; The enhancement strength for the SFM (When DeRate > 0, the SFM will be activated) */
-    /* SFR6[4];    Range: [0,  31]; The relative NR strength for NO.6 filter. (Effective when JMODE = 4) */
-    /* SBR6[2];    Range: [0,  15]; The control of overshoot and undershoot. */
-    HI_U8  SFR6[4], SBR6[2], DeRate;
-
-    /* SFS1, SFT1, SBR1; Range: [0, 255];  The NR strength parameters for NO.1 filter. */
-    HI_U8  SFS1,  SFT1,  SBR1;
-    /* SFS2, SFT2, SBR2; Range: [0, 255];  The NR strength parameters for NO.2 filter. */
-    HI_U8  SFS2,  SFT2,  SBR2;
-    /* SFS4, SFT4, SBR4; Range: [0, 255];  The NR strength parameters for NO.3 and NO.4 filters. */
-    HI_U8  SFS4,  SFT4,  SBR4;
-
-    /* STH1, STH2, STHd1, STHd2; Range: [0, 511]; The thresholds for protection of edges from blurring */
-    /* NRyEn;      Range: [0,   1]; The NR switches */
-    /* SFN0~2;     Range: [0,   6]; Filter selection for different image areas based on STH1~3. */
-    /* KMode ;     Range: [0,   3]; The denoise mode based on image brightness. */
-    /* SBSk[32], SDSk[32]; Range [0, 8191];  Spatial NR strength based on brightness. */
-    HI_U16  STH1 : 9,  SFN1 : 3, SFN0  : 3, NRyEn   : 1;
-    HI_U16  STHd1 : 9, _rb0_ : 7;
-    HI_U16  STH2 : 9,  SFN2 : 3, kMode : 3, _rb1_   : 1;
-    HI_U16  STHd2 : 9, _rb2_ : 7;
-    HI_U16  SBSk[32], SDSk[32];
-} tV200_VPSS_SFy;
-
-/* Only used for Hi3516EV200 */
-typedef struct {
-    /* TFS0,TFS1;          Range: [0,  15]; The NR strength for temporal filtering. */
-    /* TDZ0,TDZ1;          Range: [0, 999]; Protection of the weak texture area from temporal filtering.  */
-    /* TDX0,TDX1;          Range: [0,   3]; Not for tuning. */
-    HI_U16  TFS0 : 4,   TDZ0 : 10,  TDX0    : 2;
-    HI_U16  TFS1 : 4,   TDZ1 : 10,  TDX1    : 2;
-
-    /* SDZ0,SDZ1;          Range: [0, 999]; The threshold of NR control for result MAI1. */
-    /* STR0,STR1;          Range: [0,  31]; The strength of NR control for result MAI1.  */
-    /* DZMode0, DZMode1;   Range: [0,   1]; The selection mode for TDZ0 and TDZ1, respectively.  */
-    HI_U16  SDZ0 : 10,  STR0 : 5,   DZMode0 : 1;
-    HI_U16  SDZ1 : 10,  STR1 : 5,   DZMode1 : 1;
-
-    /* TFR0,TFR1;          Range: [0,  31]; The temoproal NR strength control for background (static) area. */
-    /* TSS0,TSS1;          Range: [0,  15]; The ratio for blending spatial NR with the temproal NR results. */
-    /* TSI0,TSI1;          Range: [0,   1]; The selection of blending filter for TSS. */
-    HI_U8  TSS0 : 4,   TSI0 : 4,  TFR0[6];
-    HI_U8  TSS1 : 4,   TSI1 : 4,  TFR1[6];
-
-    /* TED;  Range: [0,   3]; NR strength control mode for the updating background. */
-    /* bRef;   Range: [0,   1]; The Switch for temproal filtering.  */
-    /* TFRS;   Range: [0,  15]; Spatial filtering strength for static area. */
-    HI_U8  TFRS : 4,   TED  : 2,   bRef    : 1,  _rb_ : 1;
-} tV200_VPSS_TFy;
-
-/* Only used for Hi3516EV200 */
-typedef struct {
-    /* PATH0 */
-    /* MADZ0, MADZ1;     Range: [0, 511]; The blending ratio between MAI2 and MAI1 based on image statistics. */
-    /* MAI00~02,MAI10~12 Range: [0,   3]; The three blending results between spatial and temporal filtering. */
-    HI_U16  MADZ0   : 9,   MAI00 : 2,  MAI01  : 2, MAI02 : 2, _rb0_ : 1;
-    HI_U16  MADZ1   : 9,   MAI10 : 2,  MAI11  : 2, MAI12 : 2, _rb1_ : 1;
-    /* MABR0, MABR1;     Range: [0, 255]; The blending ratio between MAI2 and MAI1 based on brightness.  */
-    HI_U8  MABR0, MABR1;
-
-    /* MATH0,MATH1, MATHd0, MATHd1;     Range: [0, 999]; The theshold for motion detection. */
-    /* MATE0,MATE1;   Range: [0,   8]; The motion index for smooth image area. */
-    /* MATW;          Range: [0,   3]; The motion index for prevention of motion ghost. */
-    /* MASW;          Range: [0,  15]; The motion index for low-frequency noises. */
-    /* MABW0,MABW1;   Range: [0,   9]; The window size for motion detection. */
-    HI_U16  MATH0   : 10,  MATE0 : 4,  MATW   : 2;
-    HI_U16  MATHd0  : 10,  _rb2_ : 6;
-    HI_U16  MATH1   : 10,  _rb3_ : 6;
-    HI_U16  MATHd1  : 10,  _rb4_ : 6;
-    HI_U8  MASW    :  4,  MATE1 : 4;
-    HI_U8  MABW0   :  4,  MABW1 : 4;
-
-    /* AdvMATH:  Range: [0, 1]; The switch to active the advanced mode. */
-    /* AdvTH:    Range: [0, 999]; The threshold to control the effects of the AdvMATH. */
-    HI_U16  AdvMATH : 1,   AdvTH : 12, _rb5_  : 3;
-} tV200_VPSS_MDy;
-
-/* Only used for Hi3516EV200 */
-typedef struct {
-    /* SFC;    Range: [0, 255]; Spatial NR strength. */
-    /* TFC;    Range: [0,  32]; Temporal NR strength relative to Spatial NR. */
-    HI_U8  SFC, TFC : 6, _rb0_ : 2;
-    /* TRC;    Range: [0, 255]; Control of color bleeding in */
-    /* TPC;    Range: [0,  32]; Type of temporal NR. */
-    HI_U8  TRC, TPC : 6, _rb1_ : 2;
-
-    HI_BOOL MODE;
-    /* PRESFC;    Range: [0,  32]; The strength for chroma pre spatial filter. */
-    HI_U8  PRESFC : 6, _rb2_ : 2;
-} tV200_VPSS_NRc;
-
-/* Only used for Hi3516EV200 */
-typedef struct {
-    tV200_VPSS_IEy  IEy[5];
-    tV200_VPSS_SFy  SFy[5];
-    tV200_VPSS_MDy  MDy[2];
-    tV200_VPSS_TFy  TFy[3];
-    tV200_VPSS_NRc  NRc;
-} VPSS_NRX_V3_S;
-
-/* Only used for Hi3516EV200 */
-typedef struct hiVPSS_NRX_PARAM_MANUAL_V3_S {
-    VPSS_NRX_V3_S stNRXParam;
-} VPSS_NRX_PARAM_MANUAL_V3_S;
-
-/* Only used for Hi3516EV200 */
-typedef struct hiVPSS_NRX_PARAM_AUTO_V3_S {
-    HI_U32 u32ParamNum;
-    HI_U32 *pau32ISO;
-    VPSS_NRX_V3_S *pastNRXParam;
-} VPSS_NRX_PARAM_AUTO_V3_S;
-
-/* Only used for Hi3516EV200 */
-typedef struct hiVPSS_NRX_PARAM_V3_S {
-    OPERATION_MODE_E           enOptMode;           /* RW;Adaptive NR */
-    VPSS_NRX_PARAM_MANUAL_V3_S stNRXManual;         /* RW;NRX V3 param for manual video */
-    VPSS_NRX_PARAM_AUTO_V3_S   stNRXAuto;           /* RW;NRX V3 param for auto video */
-} VPSS_NRX_PARAM_V3_S;
-
-/* Not support for Hi3559AV100 */
-typedef enum hiVPSS_NR_VER_E {
-    VPSS_NR_V1 = 1,
-    VPSS_NR_V2 = 2,
-    VPSS_NR_V3 = 3,
-    VPSS_NR_V4 = 4,
-    VPSS_NR_BUTT
-} VPSS_NR_VER_E;
-
-/* Not support for Hi3559AV100 */
-typedef struct hiVPSS_GRP_NRX_PARAM_S {
-    VPSS_NR_VER_E enNRVer;
-    union {
-        VPSS_NRX_PARAM_V1_S stNRXParam_V1;   /* interface X V1 for Hi3519AV100 */
-        VPSS_NRX_PARAM_V2_S stNRXParam_V2;   /* interface X V2 for Hi3516CV500 */
-        VPSS_NRX_PARAM_V3_S stNRXParam_V3;   /* interface X V3 for Hi3516EV200 */
-    };
-
-} VPSS_GRP_NRX_PARAM_S;
-
-typedef struct hiVPSS_CHN_BUF_WRAP_S {
-    HI_BOOL bEnable;
-    HI_U32  u32BufLine;             /* RW; Range: [128, H]; Chn buffer allocated by line. */
-    HI_U32  u32WrapBufferSize; /* RW; Whether to allocate buffer according to compression. */
-} VPSS_CHN_BUF_WRAP_S;
-
-typedef struct hiVPSS_PARAM_MOD_S {
-    HI_BOOL bOneBufForLowDelay;
-    HI_U32  u32VpssVbSource;
-    HI_U32  u32VpssSplitNodeNum;
-    HI_BOOL bHdrSupport;
-    HI_BOOL bNrQuickStart;
-} VPSS_MOD_PARAM_S;
-
-typedef enum hiVPSS_CHN_PROC_MODE_E {
-    VPSS_CHN_PROC_MODE_VIDEO = 0,
-    VPSS_CHN_PROC_MODE_SNAP = 1,
-    VPSS_CHN_PROC_MODE_BUTT
-} VPSS_CHN_PROC_MODE_E;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-#endif /* __HI_COMM_VPSS_H__ */
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_common.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_common.h
deleted file mode 100644
index 14fc60af..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_common.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/******************************************************************************
-Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-******************************************************************************
-File Name     : hi_common.h
-Version       : Initial Draft
-Author        : Hisilicon multimedia software group
-Created       : 2016/07/15
-Last Modified :
-Description   : The common defination
-Function List :
-******************************************************************************/
-#ifndef __HI_COMMON_H__
-#define __HI_COMMON_H__
-
-#include "autoconf.h"
-#include "hi_type.h"
-
-#include "hi_defines.h"
-
-
-#ifndef __IGNORE_HWSEC__
-
-#ifndef __KERNEL__
-#include "hi_securec.h"
-#endif
-
-#ifdef __LITEOS__
-#include "hi_securec.h"
-#endif
-
-#endif
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#ifndef VER_X
-#define VER_X 1
-#endif
-
-#ifndef VER_Y
-#define VER_Y 0
-#endif
-
-#ifndef VER_Z
-#define VER_Z 0
-#endif
-
-#ifndef VER_P
-#define VER_P 0
-#endif
-
-#ifndef VER_B
-#define VER_B 0
-#endif
-
-#ifdef HI_DEBUG
-#define VER_D " Debug"
-#else
-#define VER_D " Release"
-#endif
-
-#ifdef CONFIG_HI_LOG_TRACE_SUPPORT
-#define VER_E ""
-#else
-#define VER_E " NoLog"
-#endif
-
-
-#define ATTRIBUTE __attribute__((aligned (ALIGN_NUM)))
-
-
-#define COMPAT_POINTER(ptr, type)\
-    do {\
-        HI_UL ulAddr   =  (HI_UL)ptr;\
-        HI_U32 u32Addr =  (HI_U32)ulAddr;\
-        ptr = (type)(HI_UL)u32Addr;\
-    } while(0)
-
-
-
-
-
-#define __MK_VERSION(x,y,z,p,b) #x"."#y"."#z"."#p" B0"#b
-#define MK_VERSION(x,y,z,p,b) __MK_VERSION(x,y,z,p,b)
-#define MPP_VERSION  CHIP_NAME MPP_VER_PRIX MK_VERSION(VER_X,VER_Y,VER_Z,VER_P,VER_B) VER_D VER_E
-
-#define VERSION_NAME_MAXLEN 64
-typedef struct hiMPP_VERSION_S
-{
-    HI_CHAR aVersion[VERSION_NAME_MAXLEN];
-} MPP_VERSION_S;
-
-
-typedef HI_S32 AI_CHN;
-typedef HI_S32 AO_CHN;
-typedef HI_S32 AENC_CHN;
-typedef HI_S32 ADEC_CHN;
-typedef HI_S32 AUDIO_DEV;
-typedef HI_S32 VI_DEV;
-typedef HI_S32 VI_PIPE;
-typedef HI_S32 VI_CHN;
-typedef HI_S32 VI_STITCH_GRP;
-typedef HI_S32 VO_DEV;
-typedef HI_S32 VO_LAYER;
-typedef HI_S32 VO_CHN;
-typedef HI_S32 VO_WBC;
-typedef HI_S32 GRAPHIC_LAYER;
-typedef HI_S32 VENC_CHN;
-typedef HI_S32 VDEC_CHN;
-typedef HI_S32 IVE_HANDLE;
-typedef HI_S32 CLS_HANDLE;
-typedef HI_S32 FD_CHN;
-typedef HI_S32 MD_CHN;
-typedef HI_S32 ISP_DEV;
-typedef HI_S32 BLK_DEV;
-typedef HI_S32 SENSOR_ID;
-typedef HI_S32 MIPI_DEV;
-typedef HI_S32 SLAVE_DEV;
-typedef HI_S32 SVP_NNIE_HANDLE;
-typedef HI_S32 SVP_DSP_HANDLE;
-typedef HI_S32 SVP_ALG_CHN;
-typedef HI_S32 VPSS_GRP;
-typedef HI_S32 VPSS_GRP_PIPE;
-typedef HI_S32 VPSS_CHN;
-typedef HI_S32 AVS_GRP;
-typedef HI_S32 AVS_PIPE;
-typedef HI_S32 AVS_CHN;
-typedef HI_S32 MCF_GRP;
-typedef HI_S32 MCF_PIPE;
-typedef HI_S32 MCF_CHN;
-
-#define HI_INVALID_CHN (-1)
-#define HI_INVALID_WAY (-1)
-#define HI_INVALID_LAYER (-1)
-#define HI_INVALID_DEV (-1)
-#define HI_INVALID_HANDLE (-1)
-#define HI_INVALID_VALUE (-1)
-#define HI_INVALID_TYPE (-1)
-
-
-#define CCM_MATRIX_SIZE             (9)
-#define CCM_MATRIX_NUM              (7)
-
-#define CLUT_R_NUM            (17)
-#define CLUT_B_NUM            (17)
-#define CLUT_G_NUM            (17)
-#define HI_ISP_CLUT_COEFACMCNT (4850)
-#define CUBIC_POINT_MAX  (5)
-
-
-typedef enum hiMOD_ID_E
-{
-    HI_ID_CMPI    = 0,
-    HI_ID_VB      = 1,
-    HI_ID_SYS     = 2,
-    HI_ID_RGN      = 3,
-    HI_ID_CHNL    = 4,
-    HI_ID_VDEC    = 5,
-    HI_ID_AVS     = 6,
-    HI_ID_VPSS    = 7,
-    HI_ID_VENC    = 8,
-    HI_ID_SVP     = 9,
-    HI_ID_H264E   = 10,
-    HI_ID_JPEGE   = 11,
-    HI_ID_MPEG4E  = 12,
-    HI_ID_H265E   = 13,
-    HI_ID_JPEGD   = 14,
-    HI_ID_VO      = 15,
-    HI_ID_VI      = 16,
-    HI_ID_DIS     = 17,
-    HI_ID_VALG    = 18,
-    HI_ID_RC      = 19,
-    HI_ID_AIO     = 20,
-    HI_ID_AI      = 21,
-    HI_ID_AO      = 22,
-    HI_ID_AENC    = 23,
-    HI_ID_ADEC    = 24,
-    HI_ID_VPU    = 25,
-    HI_ID_PCIV    = 26,
-    HI_ID_PCIVFMW = 27,
-    HI_ID_ISP      = 28,
-    HI_ID_IVE      = 29,
-    HI_ID_USER    = 30,
-    HI_ID_DCCM    = 31,
-    HI_ID_DCCS    = 32,
-    HI_ID_PROC    = 33,
-    HI_ID_LOG     = 34,
-    HI_ID_VFMW    = 35,
-    HI_ID_H264D   = 36,
-    HI_ID_GDC     = 37,
-    HI_ID_PHOTO   = 38,
-    HI_ID_FB      = 39,
-    HI_ID_HDMI    = 40,
-    HI_ID_VOIE    = 41,
-    HI_ID_TDE     = 42,
-    HI_ID_HDR      = 43,
-    HI_ID_PRORES  = 44,
-    HI_ID_VGS     = 45,
-
-    HI_ID_FD      = 47,
-    HI_ID_ODT      = 48, //Object detection trace
-    HI_ID_VQA      = 49, //Video quality  analysis
-    HI_ID_LPR      = 50, //Object detection trace
-    HI_ID_SVP_NNIE     = 51,
-    HI_ID_SVP_DSP      = 52,
-    HI_ID_DPU_RECT     = 53,
-    HI_ID_DPU_MATCH    = 54,
-
-    HI_ID_MOTIONSENSOR = 55,
-    HI_ID_MOTIONFUSION = 56,
-
-    HI_ID_GYRODIS      = 57,
-    HI_ID_PM           = 58,
-    HI_ID_SVP_ALG      = 59,
-    HI_ID_IVP          = 60,
-    HI_ID_MCF          = 61,
-    HI_ID_QR           = 62,
-
-    HI_ID_BUTT,
-} MOD_ID_E;
-
-typedef struct hiMPP_CHN_S
-{
-    MOD_ID_E    enModId;
-    HI_S32      s32DevId;
-    HI_S32      s32ChnId;
-} MPP_CHN_S;
-
-
-
-
-#define MPP_MOD_VI       "vi"
-#define MPP_MOD_VO       "vo"
-#define MPP_MOD_AVS       "avs"
-#define MPP_MOD_HDMI      "hdmi"
-#define MPP_MOD_VGS       "vgs"
-#define MPP_MOD_GDC       "gdc"
-#define MPP_MOD_DIS       "dis"
-#define MPP_MOD_GYRODIS   "gyrodis"
-
-#define MPP_MOD_CHNL      "chnl"
-#define MPP_MOD_VENC      "venc"
-#define MPP_MOD_VPSS      "vpss"
-#define MPP_MOD_RGN       "rgn"
-#define MPP_MOD_IVE       "ive"
-#define MPP_MOD_FD        "fd"
-#define MPP_MOD_MD          "md"
-#define MPP_MOD_IVP       "ivp"
-#define MPP_MOD_SVP       "svp"
-#define MPP_MOD_SVP_NNIE  "nnie"
-#define MPP_MOD_SVP_DSP   "dsp"
-#define MPP_MOD_SVP_ALG   "svp_alg"
-#define MPP_MOD_DPU_RECT  "rect"
-#define MPP_MOD_DPU_MATCH "match"
-
-
-#define MPP_MOD_H264E     "h264e"
-#define MPP_MOD_H265E     "h265e"
-#define MPP_MOD_JPEGE     "jpege"
-#define MPP_MOD_MPEG4E    "mpeg4e"
-#define MPP_MOD_VEDU      "vedu"
-#define MPP_MOD_PRORES    "prores"
-
-#define MPP_MOD_VDEC      "vdec"
-#define MPP_MOD_H264D     "h264d"
-#define MPP_MOD_JPEGD     "jpegd"
-
-#define MPP_MOD_AI        "ai"
-#define MPP_MOD_AO        "ao"
-#define MPP_MOD_AENC      "aenc"
-#define MPP_MOD_ADEC      "adec"
-#define MPP_MOD_AIO       "aio"
-#define MPP_MOD_ACODEC      "acodec"
-
-#define MPP_MOD_VB        "vb"
-#define MPP_MOD_SYS       "sys"
-#define MPP_MOD_CMPI      "cmpi"
-
-#define MPP_MOD_PCIV      "pciv"
-#define MPP_MOD_PCIVFMW   "pcivfmw"
-
-#define MPP_MOD_PROC      "proc"
-#define MPP_MOD_LOG       "logmpp"
-
-#define MPP_MOD_DCCM      "dccm"
-#define MPP_MOD_DCCS      "dccs"
-
-#define MPP_MOD_FB        "fb"
-
-#define MPP_MOD_RC        "rc"
-
-#define MPP_MOD_VOIE      "voie"
-
-#define MPP_MOD_TDE       "tde"
-#define MPP_MOD_ISP       "isp"
-#define MPP_MOD_USR       "usr"
-#define MPP_MOD_MCF       "mcf"
-#define MPP_MOD_PM        "pm"
-#define MPP_MOD_MFUSION   "motionfusion"
-
-/* We just coyp this value of payload type from RTP/RTSP definition */
-typedef enum
-{
-    PT_PCMU          = 0,
-    PT_1016          = 1,
-    PT_G721          = 2,
-    PT_GSM           = 3,
-    PT_G723          = 4,
-    PT_DVI4_8K       = 5,
-    PT_DVI4_16K      = 6,
-    PT_LPC           = 7,
-    PT_PCMA          = 8,
-    PT_G722          = 9,
-    PT_S16BE_STEREO  = 10,
-    PT_S16BE_MONO    = 11,
-    PT_QCELP         = 12,
-    PT_CN            = 13,
-    PT_MPEGAUDIO     = 14,
-    PT_G728          = 15,
-    PT_DVI4_3        = 16,
-    PT_DVI4_4        = 17,
-    PT_G729          = 18,
-    PT_G711A         = 19,
-    PT_G711U         = 20,
-    PT_G726          = 21,
-    PT_G729A         = 22,
-    PT_LPCM          = 23,
-    PT_CelB          = 25,
-    PT_JPEG          = 26,
-    PT_CUSM          = 27,
-    PT_NV            = 28,
-    PT_PICW          = 29,
-    PT_CPV           = 30,
-    PT_H261          = 31,
-    PT_MPEGVIDEO     = 32,
-    PT_MPEG2TS       = 33,
-    PT_H263          = 34,
-    PT_SPEG          = 35,
-    PT_MPEG2VIDEO    = 36,
-    PT_AAC           = 37,
-    PT_WMA9STD       = 38,
-    PT_HEAAC         = 39,
-    PT_PCM_VOICE     = 40,
-    PT_PCM_AUDIO     = 41,
-    PT_MP3           = 43,
-    PT_ADPCMA        = 49,
-    PT_AEC           = 50,
-    PT_X_LD          = 95,
-    PT_H264          = 96,
-    PT_D_GSM_HR      = 200,
-    PT_D_GSM_EFR     = 201,
-    PT_D_L8          = 202,
-    PT_D_RED         = 203,
-    PT_D_VDVI        = 204,
-    PT_D_BT656       = 220,
-    PT_D_H263_1998   = 221,
-    PT_D_MP1S        = 222,
-    PT_D_MP2P        = 223,
-    PT_D_BMPEG       = 224,
-    PT_MP4VIDEO      = 230,
-    PT_MP4AUDIO      = 237,
-    PT_VC1           = 238,
-    PT_JVC_ASF       = 255,
-    PT_D_AVI         = 256,
-    PT_DIVX3         = 257,
-    PT_AVS             = 258,
-    PT_REAL8         = 259,
-    PT_REAL9         = 260,
-    PT_VP6             = 261,
-    PT_VP6F             = 262,
-    PT_VP6A             = 263,
-    PT_SORENSON          = 264,
-    PT_H265          = 265,
-    PT_VP8             = 266,
-    PT_MVC             = 267,
-    PT_PNG           = 268,
-    /* add by hisilicon */
-    PT_AMR           = 1001,
-    PT_MJPEG         = 1002,
-    PT_AMRWB         = 1003,
-    PT_PRORES        = 1006,
-    PT_OPUS          = 1007,
-    PT_BUTT
-} PAYLOAD_TYPE_E;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif  /* _HI_COMMON_H_ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_common_cipher.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_common_cipher.h
deleted file mode 100644
index 64de3edc..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_common_cipher.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef __HI_COMMON_CIPHER__
-#define __HI_COMMON_CIPHER__
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-#define  HI_ERR_CIPHER_NOT_INIT                     (HI_S32)(0x804D0001)
-#define  HI_ERR_CIPHER_INVALID_HANDLE               (HI_S32)(0x804D0002)
-#define  HI_ERR_CIPHER_INVALID_POINT                (HI_S32)(0x804D0003)
-#define  HI_ERR_CIPHER_INVALID_PARA                 (HI_S32)(0x804D0004)
-#define  HI_ERR_CIPHER_FAILED_INIT                  (HI_S32)(0x804D0005)
-#define  HI_ERR_CIPHER_FAILED_GETHANDLE             (HI_S32)(0x804D0006)
-#define  HI_ERR_CIPHER_FAILED_RELEASEHANDLE         (HI_S32)(0x804D0007)
-#define  HI_ERR_CIPHER_FAILED_CONFIGAES             (HI_S32)(0x804D0008)
-#define  HI_ERR_CIPHER_FAILED_CONFIGDES             (HI_S32)(0x804D0009)
-#define  HI_ERR_CIPHER_FAILED_ENCRYPT               (HI_S32)(0x804D000A)
-#define  HI_ERR_CIPHER_FAILED_DECRYPT               (HI_S32)(0x804D000B)
-#define  HI_ERR_CIPHER_BUSY                         (HI_S32)(0x804D000C)
-#define  HI_ERR_CIPHER_NO_AVAILABLE_RNG             (HI_S32)(0x804D000D)
-#define  HI_ERR_CIPHER_FAILED_MEM                   (HI_S32)(0x804D000E)
-#define  HI_ERR_CIPHER_UNAVAILABLE                  (HI_S32)(0x804D000F)
-#define  HI_ERR_CIPHER_OVERFLOW                     (HI_S32)(0x804D0010)
-#define  HI_ERR_CIPHER_HARD_STATUS                  (HI_S32)(0x804D0011)
-#define  HI_ERR_CIPHER_TIMEOUT                      (HI_S32)(0x804D0012)
-#define  HI_ERR_CIPHER_UNSUPPORTED                  (HI_S32)(0x804D0013)
-#define  HI_ERR_CIPHER_REGISTER_IRQ                 (HI_S32)(0x804D0014)
-#define  HI_ERR_CIPHER_ILLEGAL_UUID                 (HI_S32)(0x804D0015)
-#define  HI_ERR_CIPHER_ILLEGAL_KEY                  (HI_S32)(0x804D0016)
-#define  HI_ERR_CIPHER_INVALID_ADDR                 (HI_S32)(0x804D0017)
-#define  HI_ERR_CIPHER_INVALID_LENGTH               (HI_S32)(0x804D0018)
-#define  HI_ERR_CIPHER_ILLEGAL_DATA                 (HI_S32)(0x804D0019)
-#define  HI_ERR_CIPHER_RSA_SIGN                     (HI_S32)(0x804D001A)
-#define  HI_ERR_CIPHER_RSA_VERIFY                   (HI_S32)(0x804D001B)
-#define  HI_ERR_CIPHER_MEMSET_S_FAILED              (HI_S32)(0x804D001C)
-#define  HI_ERR_CIPHER_MEMCPY_S_FAILED              (HI_S32)(0x804D001D)
-#define  HI_ERR_CIPHER_RSA_CRYPT_FAILED             (HI_S32)(0x804D001E)
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __CRYP_CIPHER_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_common_qr.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_common_qr.h
deleted file mode 100644
index 806342a1..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_common_qr.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2019. All rights reserved.
- * Description: definition of hi_common_qr.h
- * Author: Hisilicon multimedia software (SVP) group
- * Create: 2019-09-02
- */
-#ifndef _HI_COMMOM_QR_H_
-#define _HI_COMMOM_QR_H_
-
-#include "hi_type.h"
-#include "hi_errno.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"{
-#endif
-#endif
-
-#define HI_QR_MAX_PAYLOAD_LEN 256
-
-typedef enum {
-    HI_QR_STATE_DECODE_SUCCESS   = 0x00,
-    HI_QR_STATE_NON_EXISTENT     = 0x01,
-    HI_QR_STATE_DECODE_FAIL      = 0x02,
-    HI_QR_STATE_DATA_OVERFLOW    = 0x03,
-    HI_QR_STATE_BUTT
-} hi_qr_decode_state;
-
-#define HI_ERR_QR_ILLEGAL_PARAM     HI_DEF_ERR(HI_ID_QR, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-#define HI_ERR_QR_EXIST             HI_DEF_ERR(HI_ID_QR, EN_ERR_LEVEL_ERROR, EN_ERR_EXIST)
-#define HI_ERR_QR_NULL_PTR          HI_DEF_ERR(HI_ID_QR, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-#define HI_ERR_QR_NO_MEM            HI_DEF_ERR(HI_ID_QR, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-#define HI_ERR_QR_NOT_READY         HI_DEF_ERR(HI_ID_QR, EN_ERR_LEVEL_ERROR, EN_ERR_SYS_NOTREADY)
-
-typedef struct {
-    hi_qr_decode_state state;
-    hi_s32  version;
-    hi_s32  ecc_level;
-    hi_s32  mask;
-    hi_s32  data_type;
-    hi_s32  payload_len;
-    hi_u32  eci;
-    hi_u8   payload[HI_QR_MAX_PAYLOAD_LEN];
-} hi_qr_info;
-
-typedef struct {
-    hi_u64 phys_addr;
-    hi_u64 virt_addr;
-    hi_u32 mem_size;
-} hi_qr_mem_info;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-#endif /* _HI_COMMON_QR_H_ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_debug.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_debug.h
deleted file mode 100644
index 477618b4..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_debug.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/******************************************************************************
-Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-******************************************************************************
-File Name     : hi_debug.h
-Version       : Initial Draft
-Author        : Hisilicon multimedia software group
-Created       : 2016/07/15
-Last Modified :
-Description   : all struct and maro definition for debug
-Function List :
-******************************************************************************/
-#ifndef __HI_DEBUG_H__
-#define __HI_DEBUG_H__
-
-#ifndef __KERNEL__
-#include <stdio.h>
-#include <stdarg.h>
-#endif
-
-#include "hi_type.h"
-#include "hi_common.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"{
-#endif
-#endif /* __cplusplus */
-
-#define _EX__FILE_LINE(fxx,lxx) "[File]:"fxx"\n[Line]:"#lxx"\n[Info]:"
-#define EX__FILE_LINE(fxx,lxx) _EX__FILE_LINE(fxx,lxx)
-#define __FILE_LINE__ EX__FILE_LINE(__FILE__, __LINE__)
-
-#define HI_DBG_EMERG      0   /* system is unusable                   */
-#define HI_DBG_ALERT      1   /* action must be taken immediately     */
-#define HI_DBG_CRIT       2   /* critical conditions                  */
-#define HI_DBG_ERR        3   /* error conditions                     */
-#define HI_DBG_WARN       4   /* warning conditions                   */
-#define HI_DBG_NOTICE     5   /* normal but significant condition     */
-#define HI_DBG_INFO       6   /* informational                        */
-#define HI_DBG_DEBUG      7   /* debug-level messages                 */
-
-typedef struct hiLOG_LEVEL_CONF_S
-{
-    MOD_ID_E  enModId;
-    HI_S32    s32Level;
-    HI_CHAR   cModName[16];
-} LOG_LEVEL_CONF_S;
-
-#ifndef __KERNEL__
-/******************************************************************************
-** For User Mode : HI_PRINT, HI_ASSERT, HI_TRACE
-******************************************************************************/
-
-#define HI_PRINT printf
-
-/* #ifdef HI_DEBUG */
-#ifdef CONFIG_HI_LOG_TRACE_SUPPORT
-    /* Using samples:   HI_ASSERT(x>y); */
-    #define HI_ASSERT(expr)               \
-    do{                                   \
-        if (!(expr)) {                    \
-            printf("\nASSERT at:\n"       \
-                   "  >Function : %s\n"   \
-                   "  >Line No. : %d\n"   \
-                   "  >Condition: %s\n",  \
-                   __FUNCTION__, __LINE__, #expr);\
-            _exit(-1);\
-        } \
-    }while(0)
-
-    /* Using samples:
-    ** HI_TRACE(HI_DBG_DEBUG, HI_ID_CMPI, "Test %d, %s\n", 12, "Test");
-    **/
-    #define HI_TRACE(level, enModId, fmt...) fprintf(stderr,##fmt)
-#else
-    #define HI_ASSERT(expr)
-    #define HI_TRACE(level, enModId, fmt...)
-#endif
-
-#else
-/******************************************************************************
-** For Linux Kernel : HI_PRINT, HI_ASSERT, HI_TRACE
-******************************************************************************/
-//#include "hi_osal.h"
-#define HI_PRINT osal_printk
-
-extern HI_S32 HI_ChkLogLevel(HI_S32 s32Levle, MOD_ID_E enModId);
-
-int HI_LOG(HI_S32 level, MOD_ID_E enModId,const char *fmt, ...) __attribute__((format(printf,3,4)));
-
-/* #ifdef HI_DEBUG */
-#ifdef CONFIG_HI_LOG_TRACE_SUPPORT
-    /* Using samples:   HI_ASSERT(x>y); */
-    #define HI_ASSERT(expr)               \
-    do{                                   \
-        if (!(expr)) {                    \
-            osal_panic("\nASSERT at:\n"   \
-                  "  >Function : %s\n"    \
-                  "  >Line No. : %d\n"    \
-                  "  >Condition: %s\n",   \
-                  __FUNCTION__, __LINE__, #expr);\
-        } \
-    }while(0)
-
-    /* Using samples:
-    ** HI_TRACE(HI_DBG_DEBUG, HI_ID_CMPI, "Test %d, %s\n", 12, "Test");
-    **/
-    #define HI_TRACE HI_LOG
-#else
-    #define HI_ASSERT(expr)
-    #define HI_TRACE(level, enModId, fmt...)
-#endif
-
-
-#endif  /* end of __KERNEL__ */
-
-
-#define HI_PRINT_BLOCK(pu8Datablock, u32Length)  \
-{  \
-    HI_U32 u32ii = 0;  \
-    HI_U8* pu8VirAddr = (HI_U8*)(pu8Datablock);  \
-    if(HI_NULL != pu8VirAddr)\
-    {\
-        HI_PRINT("\n[Func]:%s [Line]:%d [Info]:%s\n", __FUNCTION__, __LINE__, #pu8Datablock);  \
-        for (u32ii = 0; u32ii < (u32Length);)  \
-        {  \
-            HI_PRINT(" %02X", *pu8VirAddr);\
-            pu8VirAddr++;\
-            u32ii++;\
-            if(0 == (u32ii % 16))HI_PRINT("\n");\
-        }  \
-        HI_PRINT("\n\n");\
-    }\
-    else\
-    {\
-        HI_PRINT("\n[Func]:%s [Line]:%d [Info]:pointer(%s) is null!\n", __FUNCTION__, __LINE__, #pu8Datablock);  \
-    }\
-}
-
-
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_DEBUG_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_defines.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_defines.h
deleted file mode 100644
index b2a33e70..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_defines.h
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
-* Copyright (c) Hisilicon Technologies Co., Ltd. 2012-2019. All rights reserved.
-* Description:
-* Author: Hisilicon multimedia software group
-* Create: 2011/06/28
-*/
-
-#ifndef __HI_DEFINES_H__
-#define __HI_DEFINES_H__
-
-#include "autoconf.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-#ifndef HICHIP
-#define HICHIP                         CONFIG_HI_CHIP_TYPE
-#endif
-
-/* "0x3559AEF" for Hi3559AV100ES */
-#define HI3559A_V100ES                 0x3559AEF
-#define HI3559A_V100                   0x3559A100
-#define HI3519A_V100                   0x3519A100
-#define HI3516C_V500                   0x3516C500
-#define HI3516E_V200                   0x3516E200
-#define HI3516E_V300                   0x3516E300
-#define HI3518E_V300                   0x3518E300
-#define HI3516D_V200                   0x3516D200
-#define HI_CHIP_TEST                   0x0
-
-#define HI35xx_Vxxx                    0x35000000
-
-#if HICHIP == HI3559A_V100ES
-#define CHIP_NAME                      "Hi3559AV100ES"
-#elif HICHIP == HI3559A_V100
-#define CHIP_NAME                      "Hi3559AV100"
-#elif HICHIP == HI3519A_V100
-#define CHIP_NAME                      "Hi3519AV100"
-#elif HICHIP == HI3516C_V500
-#define CHIP_NAME                      "Hi3516CV500"
-#elif HICHIP == HI3516E_V200
-#define CHIP_NAME                      "Hi3516EV200"
-#elif HICHIP == HI35xx_Vxxx
-#error HuHu, I am an dummy chip
-#else
-#error HICHIP define may be error
-#endif
-
-#define MPP_VER_PRIX                   "_MPP_V"
-
-#define ALIGN_NUM                      4
-
-#define LUMA_PHY_ALIGN                 16
-
-#define DEFAULT_ALIGN                  8
-#define MAX_ALIGN                      1024
-#define SEG_CMP_LENGTH                 128
-
-#define MAX_MMZ_NAME_LEN               16
-
-#define VO_MAX_NODE_NUM                16
-
-/* For VB */
-#define VB_MAX_POOLS                   512
-
-/* For VENC */
-#define VENC_MAX_NAME_LEN              16
-#define VENC_MAX_CHN_NUM               16
-#define VEDU_IP_NUM                    1
-#define H264E_MAX_WIDTH                3072
-#define H264E_MAX_HEIGHT               3072
-#define H264E_MIN_WIDTH                114
-#define H264E_MIN_HEIGHT               114
-#define H265E_MAX_WIDTH                3072
-#define H265E_MAX_HEIGHT               3072
-#define H265E_MIN_WIDTH                114
-#define H265E_MIN_HEIGHT               114
-#define JPEGE_MAX_WIDTH                8192
-#define JPEGE_MAX_HEIGHT               8192
-#define JPEGE_MIN_WIDTH                32
-#define JPEGE_MIN_HEIGHT               32
-#define JPGE_MAX_NUM                   1
-#define VENC_MAX_ROI_NUM               8
-#define H264E_MIN_HW_INDEX             0
-#define H264E_MAX_HW_INDEX             11
-#define H264E_MIN_VW_INDEX             0
-#define H264E_MAX_VW_INDEX             3
-#define VENC_QP_HISGRM_NUM             52
-#define MAX_TILE_NUM                   1
-#define H265E_ADAPTIVE_FRAME_TYPE      4
-#define H265E_ADAPTIVE_QP_TYPE         5
-#define H265E_LCU_SIZE                 32
-
-#define VENC_MIN_INPUT_FRAME_RATE      1
-#define VENC_MAX_INPUT_FRAME_RATE      240
-
-#define VENC_MAX_RECEIVE_SOURCE        4
-
-#define VENC_PIC_RECEIVE_SOURCE0       0
-#define VENC_PIC_RECEIVE_SOURCE1       1
-#define VENC_PIC_RECEIVE_SOURCE2       2
-#define VENC_PIC_RECEIVE_SOURCE3       3
-
-/* For RC */
-#define RC_TEXTURE_THR_SIZE            16
-#define MIN_BITRATE                    2
-#define MAX_BITRATE                    60 * 1024
-#define MAX_EXTRA_BITRATE              1000 * 1024
-
-/* For Region */
-#define RGN_MIN_WIDTH                  2
-#define RGN_MIN_HEIGHT                 2
-
-#define RGN_COVER_MIN_X                0
-#define RGN_COVER_MIN_Y                0
-#define RGN_COVER_MAX_X                4094
-#define RGN_COVER_MAX_Y                4094
-#define RGN_COVER_MAX_WIDTH            4096
-#define RGN_COVER_MAX_HEIGHT           4096
-#define RGN_COVER_MIN_THICK            2
-#define RGN_COVER_MAX_THICK            8
-
-#define RGN_COVEREX_MIN_X              -4096
-#define RGN_COVEREX_MIN_Y              -4096
-#define RGN_COVEREX_MAX_X              4094
-#define RGN_COVEREX_MAX_Y              4094
-#define RGN_COVEREX_MAX_WIDTH          4096
-#define RGN_COVEREX_MAX_HEIGHT         4096
-#define RGN_COVEREX_MIN_THICK          2
-#define RGN_COVEREX_MAX_THICK          14
-
-#define RGN_OVERLAY_MIN_X              0
-#define RGN_OVERLAY_MIN_Y              0
-#define RGN_OVERLAY_MAX_X              4094
-#define RGN_OVERLAY_MAX_Y              4094
-#define RGN_OVERLAY_MAX_WIDTH          4096
-#define RGN_OVERLAY_MAX_HEIGHT         4096
-
-#define RGN_OVERLAYEX_MIN_X            0
-#define RGN_OVERLAYEX_MIN_Y            0
-#define RGN_OVERLAYEX_MAX_X            4094
-#define RGN_OVERLAYEX_MAX_Y            4094
-#define RGN_OVERLAYEX_MAX_WIDTH        4096
-#define RGN_OVERLAYEX_MAX_HEIGHT       4096
-
-#define RGN_MOSAIC_X_ALIGN             4
-#define RGN_MOSAIC_Y_ALIGN             2
-#define RGN_MOSAIC_WIDTH_ALIGN         4
-#define RGN_MOSAIC_HEIGHT_ALIGN        2
-
-#define RGN_MOSAIC_MIN_X               0
-#define RGN_MOSAIC_MIN_Y               0
-#define RGN_MOSAIC_MAX_X               4092
-#define RGN_MOSAIC_MAX_Y               4094
-#define RGN_MOSAIC_MIN_WIDTH           8
-#define RGN_MOSAIC_MIN_HEIGHT          8
-#define RGN_MOSAIC_MAX_WIDTH           4096
-#define RGN_MOSAIC_MAX_HEIGHT          4096
-
-#define RGN_ALIGN                      2
-
-#define RGN_HANDLE_MAX                 128
-#define RGN_MAX_BUF_NUM                6
-
-#define COVER_MAX_NUM_VI               0
-#define COVEREX_MAX_NUM_VI             16
-#define OVERLAY_MAX_NUM_VI             0
-#define OVERLAYEX_MAX_NUM_VI           16
-#define MOSAIC_MAX_NUM_VI              0
-
-#define OVERLAY_MAX_NUM_VENC           8
-#define OVERLAYEX_MAX_NUM_VENC         8
-
-#define COVER_MAX_NUM_VPSS             8
-#define COVEREX_MAX_NUM_VPSS           8
-#define OVERLAY_MAX_NUM_VPSS           0
-#define OVERLAYEX_MAX_NUM_VPSS         8
-#define MOSAIC_MAX_NUM_VPSS            4
-
-#define OVERLAYEX_MAX_NUM_AVS          0
-
-#define COVEREX_MAX_NUM_VO             1
-#define OVERLAYEX_MAX_NUM_VO           1
-
-#define OVERLAYEX_MAX_NUM_PCIV         0
-
-#define RGN_VGS_TASK_WIDTH_MAX         4096
-
-/*************************************/
-#define VENC_MAX_SSE_NUM               8
-#define HISI_MAX_SENSOR_NUM            2
-
-/* For VI */
-/* number of channle and device on video input unit of chip
- * Note! VI_MAX_CHN_NUM is NOT equal to VI_MAX_DEV_NUM
- * multiplied by VI_MAX_CHN_NUM, because all VI devices
- * can't work at mode of 4 channles at the same time.
- */
-#define VI_MAX_DEV_NUM                 1
-#define VI_MAX_PHY_PIPE_NUM            2
-#define VI_MAX_VIR_PIPE_NUM            0
-#define VI_MAX_PIPE_NUM                (VI_MAX_PHY_PIPE_NUM + VI_MAX_VIR_PIPE_NUM)
-#define VI_MAX_STITCH_GRP_NUM          1
-#define VI_MAX_WDR_NUM                 2
-
-#define VI_MAX_PHY_CHN_NUM             1
-
-#ifdef CONFIG_HI_VI_EXTCHN_SUPPORT
-#define VI_MAX_EXT_CHN_NUM             8
-#else
-#define VI_MAX_EXT_CHN_NUM             0
-#endif
-#define VI_EXT_CHN_START               VI_MAX_PHY_CHN_NUM
-#define VI_MAX_CHN_NUM                 (VI_MAX_PHY_CHN_NUM + VI_MAX_EXT_CHN_NUM)
-#define VI_MAX_EXTCHN_BIND_PER_CHN     8
-
-#define VIPROC_IRQ_NUM                 1
-#define VI_MAX_WDR_FRAME_NUM           2
-#define VI_MAX_NODE_NUM                2
-#define VIPROC_IP_NUM                  1
-#define VICAP_IP_NUM                   1
-
-#define VI_MAX_SPLIT_NODE_NUM          2
-
-#define VI_DEV_MIN_WIDTH               120
-#define VI_DEV_MIN_HEIGHT              120
-#define VI_DEV_MAX_WIDTH               3072
-#define VI_DEV_MAX_HEIGHT              3072
-#define VI_FPN_MAX_WIDTH               3072
-#define VI_FPN_MAX_HEIGHT              VI_DEV_MAX_HEIGHT
-
-#define VI_PIPE_OFFLINE_MIN_WIDTH      120
-#define VI_PIPE_OFFLINE_MIN_HEIGHT     120
-#define VI_PIPE_OFFLINE_MAX_WIDTH      3072
-#define VI_PIPE_OFFLINE_MAX_HEIGHT     3072
-
-#define VI_PIPE_ONLINE_MIN_WIDTH       120
-#define VI_PIPE_ONLINE_MIN_HEIGHT      120
-#define VI_PIPE_ONLINE_MAX_WIDTH       2304
-#define VI_PIPE_ONLINE_MAX_HEIGHT      3072
-
-#define VI_PHYCHN_OFFLINE_MIN_WIDTH    120
-#define VI_PHYCHN_OFFLINE_MIN_HEIGHT   120
-#define VI_PHYCHN_OFFLINE_MAX_WIDTH    3072
-#define VI_PHYCHN_OFFLINE_MAX_HEIGHT   3072
-
-#define VI_PHYCHN_ONLINE_MIN_WIDTH     120
-#define VI_PHYCHN_ONLINE_MIN_HEIGHT    120
-#define VI_PHYCHN_ONLINE_MAX_WIDTH     2304
-#define VI_PHYCHN_ONLINE_MAX_HEIGHT    3072
-
-#define VI_EXTCHN_MIN_WIDTH            32
-#define VI_EXTCHN_MIN_HEIGHT           32
-#define VI_EXTCHN_MAX_WIDTH            4096
-#define VI_EXTCHN_MAX_HEIGHT           4096
-
-#define VI_PHY_CHN1_MAX_ZOOMIN         1
-#define VI_PHY_CHN1_MAX_ZOOMOUT        30
-#define VI_EXT_CHN_MAX_ZOOMIN          16
-#define VI_EXT_CHN_MAX_ZOOMOUT         30
-
-#define VI_CMP_PARAM_SIZE              144
-
-#define VI_VPSS_DEFAULT_EARLINE        128
-
-/* For DIS */
-#define DIS_PYRAMID_LAYER_NUM          5
-#define DIS_MAX_CHN_NUM                2
-#define DIS_MAX_IMAGE_WIDTH            (3840)
-#define DIS_MIN_IMAGE_WIDTH            (1280)
-#define DIS_MAX_IMAGE_HEIGHT           (2160)
-#define DIS_MIN_IMAGE_HEIGHT           (720)
-
-/* For VO */
-
-#define VO_MAX_VIRT_DEV_NUM            0 /* max virtual dev num */
-#define VO_MAX_PHY_DEV_NUM             1 /* max physical dev num */
-
-#define VO_MIN_CHN_WIDTH               32 /* channel minimal width */
-#define VO_MIN_CHN_HEIGHT              32 /* channel minimal height */
-#define VO_MAX_ZOOM_RATIO              1000 /* max zoom ratio, 1000 means 100% scale */
-#define VO_MAX_DEV_NUM                 1 /* max dev num */
-#define VO_MAX_LAYER_NUM               1 /* max layer num */
-#define VO_MAX_PRIORITY                1 /* max layer priority */
-#define VO_MAX_CHN_NUM                 1 /* max chn num */
-#define VO_MAX_LAYER_IN_DEV            1 /* max layer num of each dev */
-#define VO_MAX_GRAPHICS_LAYER_NUM      1
-#define VO_MAX_WBC_NUM                 1
-#define VO_MIN_TOLERATE                1 /* min play toleration 1ms */
-#define VO_MAX_TOLERATE                100000 /* max play toleration 100s */
-
-/* For AVS */
-#define AVS_MAX_GRP_NUM                32 /* max grp num */
-#define AVS_PIPE_NUM                   4 /* max pipe num */
-#define AVS_MAX_CHN_NUM                2 /* max chn num */
-#define AVS_SPLIT_NUM                  2
-#define AVS_SPLIT_PIPE_NUM             6
-#define AVS_CUBE_MAP_SURFACE_NUM       6
-
-#define AVS_MAX_IN_WIDTH               8192
-#define AVS_MAX_IN_HEIGHT              8192
-#define AVS_MIN_IN_WIDTH               1280
-#define AVS_MIN_IN_HEIGHT              720
-
-#define AVS_MAX_OUT_WIDTH              8192
-#define AVS_MAX_OUT_HEIGHT             8192
-#define AVS_MIN_OUT_WIDTH              256
-#define AVS_MIN_OUT_HEIGHT             256
-
-/* For AUDIO */
-#define AI_DEV_MAX_NUM                 1
-#define AO_DEV_MIN_NUM                 0
-#define AO_DEV_MAX_NUM                 1
-#define AIO_MAX_NUM                    1
-#define AENC_MAX_CHN_NUM               32
-#define ADEC_MAX_CHN_NUM               32
-
-#define AI_MAX_CHN_NUM                 2
-#define AO_MAX_CHN_NUM                 3
-#define AO_SYSCHN_CHNID                (AO_MAX_CHN_NUM - 1)
-
-#define AIO_MAX_CHN_NUM                ((AO_MAX_CHN_NUM > AI_MAX_CHN_NUM) ? AO_MAX_CHN_NUM : AI_MAX_CHN_NUM)
-
-/* For VPSS */
-#define VPSS_IP_NUM                    1
-#define VPSS0                          0
-#define VPSS_MAX_GRP_NUM               8
-#define VPSS_MAX_GRP_PIPE_NUM          1
-#define VPSS_PARALLEL_PIC_NUM          1
-#define VPSS_MAX_PHY_CHN_NUM           3
-#define VPSS_LOWDELAY_CHN_NUM          2
-#define VPSS_MAX_EXT_CHN_NUM           4
-#define VPSS_MAX_CHN_NUM               (VPSS_MAX_PHY_CHN_NUM + VPSS_MAX_EXT_CHN_NUM)
-#define VPSS_MIN_IMAGE_WIDTH_SBS       512
-#define VPSS_MIN_IMAGE_WIDTH           64
-#define VPSS_MIN_IMAGE_HEIGHT          64
-#define VPSS_MAX_IMAGE_WIDTH_SLAVE     4096
-#define VPSS_MAX_IN_IMAGE_WIDTH        4096
-#define VPSS_MAX_IMAGE_WIDTH           4096
-#define VPSS_MAX_IMAGE_HEIGHT          4096
-#define VPSS_MAX_CMP_IMAGE_WIDTH       3072
-#define VPSS_MAX_CMP_IMAGE_HEIGHT      3072
-#define VPSS_EXTCHN_MAX_IMAGE_WIDTH    4096
-#define VPSS_EXTCHN_MAX_IMAGE_HEIGHT   4096
-#define VPSS_MAX_ZOOMIN                16
-#define VPSS_MAX_ZOOMOUT               15
-#define VPSS_EXT_CHN_MAX_ZOOMIN        16
-#define VPSS_EXT_CHN_MAX_ZOOMOUT       30
-#define VPSS_LINE_BUFFER               2304
-
-/* For PCIV */
-#define PCIV_MAX_CHN_NUM               16 /* max pciv channel number in each pciv device */
-
-/* For IVS_MD */
-#define MD_MAX_CHN                     64
-#define MD_MAX_WIDTH                   1920
-#define MD_MAX_HEIGHT                  1080
-#define MD_MIN_WIDTH                   64
-#define MD_MIN_HEIGHT                  64
-
-/* For RECT */
-#define DPU_RECT_MAX_GRP_NUM           8
-#define DPU_RECT_MAX_PIPE_NUM          2
-#define DPU_RECT_MAX_CHN_NUM           2
-
-#define DPU_RECT_IN_IMAGE_MAX_WIDTH    2048
-#define DPU_RECT_IN_IMAGE_MAX_HEIGHT   2048
-#define DPU_RECT_IN_IMAGE_MIN_WIDTH    128
-#define DPU_RECT_IN_IMAGE_MIN_HEIGHT   64
-#define DPU_RECT_OUT_IMAGE_MAX_WIDTH   1920
-#define DPU_RECT_OUT_IMAGE_MAX_HEIGHT  1080
-#define DPU_RECT_OUT_IMAGE_MIN_WIDTH   128
-#define DPU_RECT_OUT_IMAGE_MIN_HEIGHT  64
-
-/* For MATCH */
-#define DPU_MATCH_MAX_GRP_NUM          8
-#define DPU_MATCH_MAX_PIPE_NUM         2
-#define DPU_MATCH_MAX_CHN_NUM          1
-
-#define DPU_MATCH_IN_IMAGE_MAX_WIDTH   1920
-#define DPU_MATCH_IN_IMAGE_MAX_HEIGHT  1080
-#define DPU_MATCH_IN_IMAGE_MIN_WIDTH   128
-#define DPU_MATCH_IN_IMAGE_MIN_HEIGHT  64
-#define DPU_MATCH_OUT_IMAGE_MAX_WIDTH  1920
-#define DPU_MATCH_OUT_IMAGE_MAX_HEIGHT 1080
-#define DPU_MATCH_OUT_IMAGE_MIN_WIDTH  128
-#define DPU_MATCH_OUT_IMAGE_MIN_HEIGHT 64
-
-/* For Gdc */
-#define FISHEYE_MIN_IN_IMAGE_WIDTH     1920
-#define FISHEYE_MIN_IN_IMAGE_HEIGHT    1080
-#define FISHEYE_MIN_OUT_IMAGE_WIDTH    640
-#define FISHEYE_MIN_OUT_IMAGE_HEIGHT   360
-
-#define LDC_MIN_IMAGE_WIDTH            640
-#define LDC_MIN_IMAGE_HEIGHT           480
-
-#define SPREAD_MIN_IMAGE_WIDTH         640
-#define SPREAD_MIN_IMAGE_HEIGHT        480
-
-#define PMF_MIN_IMAGE_WIDTH            480
-#define PMF_MIN_IMAGE_HEIGHT           360
-
-#define ROTATION_EX_MIN_IMAGE_WIDTH    640
-#define ROTATION_EX_MIN_IMAGE_HEIGHT   480
-
-/* For GDC */
-#define GDC_MAX_IMAGE_WIDTH            4608
-#define GDC_MAX_IMAGE_HEIGHT           4608
-#define GDC_IP_NUM                     1
-#define GDC_FUSION_NUM                 9
-
-/* For VGS */
-#define VGS_IP_NUM                     1
-#define VGS0                           0
-#define VGS1                           1
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_DEFINES_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_errno.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_errno.h
deleted file mode 100644
index 9f5401de..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_errno.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/******************************************************************************
-Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-******************************************************************************
-File Name     : hi_errno.h
-Version       : Initial Draft
-Author        : Hisilicon multimedia software group
-Created       : 2016/07/15
-Last Modified :
-Description   : define the format of error code
-Function List :
-******************************************************************************/
-#ifndef __HI_ERRNO_H__
-#define __HI_ERRNO_H__
-
-#include "hi_debug.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"{
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-
-/* 1010 0000b
- * VTOP use APPID from 0~31
- * so, hisilicon use APPID based on 32
- */
-#define HI_ERR_APPID  (0x80000000L + 0x20000000L)
-
-typedef enum hiERR_LEVEL_E
-{
-    EN_ERR_LEVEL_DEBUG = 0,  /* debug-level                                  */
-    EN_ERR_LEVEL_INFO,       /* informational                                */
-    EN_ERR_LEVEL_NOTICE,     /* normal but significant condition             */
-    EN_ERR_LEVEL_WARNING,    /* warning conditions                           */
-    EN_ERR_LEVEL_ERROR,      /* error conditions                             */
-    EN_ERR_LEVEL_CRIT,       /* critical conditions                          */
-    EN_ERR_LEVEL_ALERT,      /* action must be taken immediately             */
-    EN_ERR_LEVEL_FATAL,      /* just for compatibility with previous version */
-    EN_ERR_LEVEL_BUTT
-}ERR_LEVEL_E;
-
-
-/******************************************************************************
-|----------------------------------------------------------------|
-| 1 |   APP_ID   |   MOD_ID    | ERR_LEVEL |   ERR_ID            |
-|----------------------------------------------------------------|
-|<--><--7bits----><----8bits---><--3bits---><------13bits------->|
-******************************************************************************/
-
-#define HI_DEF_ERR( module, level, errid) \
-    ((HI_S32)( (HI_ERR_APPID) | ((module) << 16 ) | ((level)<<13) | (errid) ))
-
-/* NOTE! the following defined all common error code,
-** all module must reserved 0~63 for their common error code
-*/
-typedef enum hiEN_ERR_CODE_E
-{
-    EN_ERR_INVALID_DEVID = 1, /* invlalid device ID                           */
-    EN_ERR_INVALID_CHNID = 2, /* invlalid channel ID                          */
-    EN_ERR_ILLEGAL_PARAM = 3, /* at lease one parameter is illagal
-                               * eg, an illegal enumeration value             */
-    EN_ERR_EXIST         = 4, /* resource exists                              */
-    EN_ERR_UNEXIST       = 5, /* resource unexists                            */
-
-    EN_ERR_NULL_PTR      = 6, /* using a NULL point                           */
-
-    EN_ERR_NOT_CONFIG    = 7, /* try to enable or initialize system, device
-                              ** or channel, before configing attribute       */
-
-    EN_ERR_NOT_SUPPORT   = 8, /* operation or type is not supported by NOW    */
-    EN_ERR_NOT_PERM      = 9, /* operation is not permitted
-                              ** eg, try to change static attribute           */
-    EN_ERR_INVALID_PIPEID = 10, /* invlalid pipe ID                           */
-    EN_ERR_INVALID_STITCHGRPID  = 11, /* invlalid stitch group ID                           */
-
-    EN_ERR_NOMEM         = 12,/* failure caused by malloc memory              */
-    EN_ERR_NOBUF         = 13,/* failure caused by malloc buffer              */
-
-    EN_ERR_BUF_EMPTY     = 14,/* no data in buffer                            */
-    EN_ERR_BUF_FULL      = 15,/* no buffer for new data                       */
-
-    EN_ERR_SYS_NOTREADY  = 16,/* System is not ready,maybe not initialed or
-                              ** loaded. Returning the error code when opening
-                              ** a device file failed.                        */
-
-    EN_ERR_BADADDR       = 17,/* bad address,
-                              ** eg. used for copy_from_user & copy_to_user   */
-
-    EN_ERR_BUSY          = 18,/* resource is busy,
-                              ** eg. destroy a venc chn without unregister it */
-    EN_ERR_SIZE_NOT_ENOUGH = 19, /* buffer size is smaller than the actual size required */
-
-    EN_ERR_BUTT          = 63,/* maxium code, private error code of all modules
-                              ** must be greater than it                      */
-}EN_ERR_CODE_E;
-
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif  /* __HI_ERRNO_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_i2c.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_i2c.h
deleted file mode 100644
index b1bfbbeb..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_i2c.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _HI_I2C_H
-#define _HI_I2C_H
-
-
-
-/* /dev/i2c-X ioctl commands.  The ioctl's parameter is always an
- * unsigned long, except for:
- *      - I2C_FUNCS, takes pointer to an unsigned long
- *      - I2C_RDWR, takes pointer to struct i2c_rdwr_ioctl_data
- *      - I2C_SMBUS, takes pointer to struct i2c_smbus_ioctl_data
- */
-#define I2C_RETRIES     0x0701  /* number of times a device address should
-                   be polled when not acknowledging */
-#define I2C_TIMEOUT     0x0702  /* set timeout in units of 10 ms */
-
-/* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses
- * are NOT supported! (due to code brokenness)
- */
-#define I2C_SLAVE       0x0703  /* Use this slave address */
-#define I2C_SLAVE_FORCE 0x0706  /* Use this slave address, even if it
-                   is already in use by a driver! */
-#define I2C_TENBIT      0x0704  /* 0 for 7 bit addrs, != 0 for 10 bit */
-
-#define I2C_FUNCS       0x0705  /* Get the adapter functionality mask */
-
-#define I2C_RDWR        0x0707  /* Combined R/W transfer (one STOP only) */
-
-#define I2C_PEC         0x0708  /* != 0 to use PEC with SMBus */
-#define I2C_SMBUS       0x0720  /* SMBus transfer */
-#define I2C_16BIT_REG   0x0709  /* 16BIT REG WIDTH */
-#define I2C_16BIT_DATA  0x070a  /* 16BIT DATA WIDTH */
-
-typedef struct hiI2C_DATA_S
-{
-    unsigned char    dev_addr;
-    unsigned int     reg_addr;
-    unsigned int     addr_byte_num;
-    unsigned int     data;
-      unsigned int     data_byte_num;
-}I2C_DATA_S;
-
-#endif
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_isp_bin.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_isp_bin.h
deleted file mode 100644
index a10f85e4..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_isp_bin.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_isp_bin.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2015/01/14
-  Description   :
-  History       :
-  1.Date        : 2015/01/14
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-
-#ifndef __HI_ISP_BIN_H__
-#define __HI_ISP_BIN_H__
-
-#include "hi_type.h"
-#include "hi_comm_isp.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-/****************************************************************************
- * MACRO DEFINITION                                                         *
- ****************************************************************************/
-#define MAX_BIN_REG_NUM 5
-
-/****************************************************************************
- * GENERAL STRUCTURES                                                       *
- ****************************************************************************/
-typedef struct hiISP_BIN_REG_ATTR_S {
-    HI_U32  u32Addr;    /* register addr */
-    HI_U8   u8StartBit; /* start bit of register addr */
-    HI_U8   u8EndBit;   /* end bit of register addr */
-} ISP_BIN_REG_ATTR_S;
-
-/* -------------------------------------------*
- The base addr of ISP logic register
- The base addr of ISP ext register
- The base addr of Hisi AE ext register
- The base addr of Hisi AWB ext register
-* ------------------------------------------- */
-
-ISP_BIN_REG_ATTR_S g_astIspBinRegAttr[ISP_MAX_PIPE_NUM][MAX_BIN_REG_NUM] = {
-    [0 ...(ISP_MAX_PIPE_NUM - 1)] = {0}
-};
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* __HI_ISP_BIN_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_isp_debug.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_isp_debug.h
deleted file mode 100644
index 473fd393..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_isp_debug.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_isp_debug.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2010/08/30
-  Description   :
-  History       :
-  1.Date        : 2010/08/30
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-
-#ifndef __HI_ISP_DEBUG_H__
-#define __HI_ISP_DEBUG_H__
-
-#include "hi_debug.h"
-#define ISP_TRACE(level, fmt, ...)\
-    do{ \
-        HI_TRACE(level, HI_ID_ISP,"[Func]:%s [Line]:%d [Info]:"fmt,__FUNCTION__, __LINE__,##__VA_ARGS__);\
-    }while(0)
-
-/* To avoid divide-0 exception in code. */
-#define DIV_0_TO_1(a)   ( ((a) == 0) ? 1 : (a) )
-#define DIV_0_TO_1_FLOAT(a) ((((a) < 1E-10) && ((a) > -1E-10)) ? 1 : (a))
-
-#endif     /* __HI_ISP_DEBUG_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_isp_defines.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_isp_defines.h
deleted file mode 100644
index 101132be..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_isp_defines.h
+++ /dev/null
@@ -1,184 +0,0 @@
-
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_isp_defines.h
-
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2013/11/07
-  Description   :
-  History       :
-  1.Date        : 2013/11/07
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-#ifndef __HI_ISP_DEFINES_H__
-#define __HI_ISP_DEFINES_H__
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-/* isp sys part */
-#define ISP_STRIPING_MAX_NUM                      (2)
-#define ISP_NORMAL_BLOCK_NUM                      (1)
-#define ISP_DEFAULT_BLOCK_NUM                     (2)
-#define ISP_SBS_BLOCK_NUM                         (2)
-
-#define ISP_BE0_PIPE_ID                           (0)
-#define ISP_BE1_PIPE_ID                           (8)
-#define ISP_MAX_BE_NUM                            (1)
-#define ISP_MAX_STITCH_NUM                        (1)
-
-#define ISP_MAX_PHY_PIPE_NUM                      (2)
-#define ISP_MAX_VIR_PIPE_NUM                      (0)
-#define ISP_MAX_PIPE_NUM                          (ISP_MAX_PHY_PIPE_NUM + ISP_MAX_VIR_PIPE_NUM)
-
-#define ISP_STRIPING_OVERLAP_DEFAULT              (256)
-
-#define ISP_WDR_CHN_MAX                           (2)
-#define ISP_SUPPORT_DE_MODULE                     (1)
-
-#define SENSOR_RES_WIDTH_MAX                      3072
-#define SENSOR_RES_HEIGHT_MAX                     3072
-#define ISP_RES_WIDTH_MAX                         3072,3072 // need change when pipe num is change
-#define ISP_RES_HEIGHT_MAX                        3072,3072 // need change when pipe num is change
-
-extern HI_U16 g_au16ResWMax[ISP_MAX_PIPE_NUM];
-extern HI_U16 g_au16ResHMax[ISP_MAX_PIPE_NUM];
-
-/* isp alg part */
-#define HI_ISP_CLUT_LUT_LENGTH                    (5508)
-#define HI_ISP_CA_YRATIO_LUT_LENGTH               (128)
-
-
-#define STATIC_DP_COUNT_NORMAL                    (2048)
-#define STATIC_DP_COUNT_MAX                       (STATIC_DP_COUNT_NORMAL * ISP_STRIPING_MAX_NUM)
-#define ISP_SUPPORT_OFFLINE_DPC_CALIBRATION       (1)
-
-#define HI_ISP_SPECAWB_FACT_ELEMENT_LUT0          (4096)
-#define HI_ISP_SPECAWB_FACT_ELEMENT_LUT1          (4096)
-#define HI_ISP_SPECAWB_FACT_ELEMENT_LUT2          (4096)
-#define HI_ISP_SPECAWB_FACT_ELEMENT_LUT3          (4096)
-#define HI_ISP_SPECAWB_FACT_ELEMENT_LUT4          (4096)
-#define HI_ISP_SPECAWB_FACT_ELEMENT_LUT5          (4096)
-#define HI_ISP_SPECAWB_FACT_ELEMENT_LUT6          (4096)
-#define HI_ISP_SPECAWB_WB_CNVTBL_LUT              (16384)
-#define HI_ISP_SPECAWB_KELDBB_LUT                 (16384)
-#define HI_ISP_SPECAWB_BBL_LUT                    (240)
-#define HI_ISP_SPECAWB_CAA_LUT1                   (16384)
-#define HI_ISP_SPECAWB_CAA_LUT2                   (16384)
-#define HI_ISP_SPECAWB_CAA_LUT3                   (16384)
-#define ISP_SPECAWB_BUF_SIZE                      (110832)
-
-#define AWB_ZONE_BIN                              (1)
-#define AWB_LIB_NUM                               (ISP_MAX_PHY_PIPE_NUM)
-#define AE_LIB_NUM                                (ISP_MAX_PHY_PIPE_NUM)
-
-
-#define HI_ISP_SHARPEN_RGAIN                      (31)
-#define HI_ISP_SHARPEN_RGAIN_MAX                  (31)
-#define HI_ISP_SHARPEN_RGAIN_BIT                  (31)
-#define HI_ISP_SHARPEN_GGAIN                      (32)
-#define HI_ISP_SHARPEN_GGAIN_MAX                  (255)
-#define HI_ISP_SHARPEN_GGAIN_BIT                  (255)
-#define HI_ISP_SHARPEN_BGAIN                      (31)
-#define HI_ISP_SHARPEN_BGAIN_MAX                  (31)
-#define HI_ISP_SHARPEN_BGAIN_BIT                  (31)
-#define HI_ISP_SHARPEN_LUMAWGT                    (31)
-#define HI_ISP_SHARPEN_LUMAWGT_MAX                (31)
-#define HI_ISP_SHARPEN_LUMAWGT_BIT                (31)
-#define HI_ISP_SHARPEN_EdgeFiltMaxCap             (18)
-#define HI_ISP_SHARPEN_EdgeFiltMaxCap_MAX         (47)
-#define HI_ISP_SHARPEN_EdgeFiltMaxCap_BIT         (63)
-
-#define GAMMA_REG_NODE_NUM                        (257)
-#define GAMMA_OUTSEG_NUM                          (8)
-
-#define HI_ISP_DRC_STRENGTH_MAX                   (1023)
-#define HI_ISP_DRC_SPA_FLT_COEF_MAX               (5)
-
-#define HI_ISP_DEMOSAIC_DETAIL_SMOOTH_RANGE_MAX   (7)
-#define HI_ISP_DEMOSAIC_DETAIL_SMOOTH_RANGE_MIN   (1)
-#define HI_ISP_DEMOSAIC_NONDIR_MFDETALEHC_STR_MAX (127)
-
-#define HI_ISP_LDCI_HEPOSWGT_MAX                  (255)
-#define HI_ISP_LDCI_HENEGWGT_MAX                  (255)
-#define HI_ISP_PREGAMMA_LUT_MAX                   (0xFFFFF)
-
-#define EXPANDER_NODE_NUM                         (129)
-
-#define HI_ISP_CR_SLOPE_MAX                       (16)
-#define HI_ISP_CR_THR_MAX                         (65535)
-#define HI_ISP_CR_NPOFFSET_MAX                    (65535)
-#define HI_ISP_CR_NPOFFSET_MIN                    (8192)
-#define HI_ISP_LSC_MESHSTR_MAX                    (1023)
-#define HI_ISP_LSC_DEFAULT_MESH_STRENGTH          (256)
-#define HI_ISP_LSC_DEFAULT_WEIGHT                 (256)
-#define HI_ISP_LSC_GRID_COL                       (17)
-#define HI_ISP_LSC_GRID_ROW                       (17)
-#define HI_ISP_LSC_GRID_POINTS                    (HI_ISP_LSC_GRID_COL * HI_ISP_LSC_GRID_ROW)
-#define HI_ISP_LSC_DEFAULT_MESH_SCALE             (4)    // 0.10bit
-#define HI_ISP_LSC_XGRID_WIDTH_MAX(x)        (255)
-#define HI_ISP_LSC_YGRID_WIDTH_MAX(x)        (255)
-
-#define DEFOG_ZONE_ROW                            (24)
-#define DEFOG_ZONE_COLUMN                         (16)
-#define DEFOG_ZONE_NUM                            (384)
-#define DEFOG_MAX_ZONE_NUM                        (384)
-
-#define HI_ISP_CCM_RECOVER_EN_DEFAULT             (1)
-#define HI_ISP_CCM_LUMA_COEFR_DEFAULT             (8)
-#define HI_ISP_CCM_LUMA_COEFB_DEFAULT             (4)
-#define HI_ISP_CCM_DARKPREV_DEFAULT               (14)
-#define HI_ISP_CCM_LUMA_COEFR_UP_DEFAULT          (10)
-#define HI_ISP_CCM_LUMA_COEFB_UP_DEFAULT          (10)
-#define HI_ISP_CCM_SOFT_CLIP0_STEP_DEFAULT        (10)
-#define HI_ISP_CCM_SOFT_CLIP1_STEP_DEFAULT        (14)
-#define HI_ISP_CCM_PEAKSUPP_SAT_DEFAULT           (110)
-#define HI_ISP_CCM_PEAKSUPP_MAX_DEFAULT           (255)
-#define HI_ISP_CCM_DARK_RANGE_MAX                 (15)
-
-
-#define HI_ISP_BAYERNR_LUT_EVEN_LENGTH            (17)
-#define HI_ISP_BAYERNR_LUT_ODD_LENGTH             (16)
-#define HI_ISP_BAYERNR_LMTLUT_EVEN_NUM            (65)
-#define HI_ISP_BAYERNR_LMTLUT_ODD_NUM             (64)
-
-
-#define  HI_ISP_BAYERNR_WINDOW_SIZE_SEL_DEFAULT (4)
-#define  HI_ISP_BAYERNR_PATTERN_NOISE_REDUCTION_DEFAULT (1)
-#define  HI_ISP_BAYERNR_GAIN_SAD_DEFAULT (0x40)
-#define  HI_ISP_BAYERNR_IMPLS_NR_ENABLE1_DEFAULT (1 )
-#define  HI_ISP_BAYERNR_IMPLS_NR_ENABLE2_DEFAULT (1 )
-#define  HI_ISP_BAYERNR_IMPLS_NR_ENABLE3_DEFAULT (1 )
-#define  HI_ISP_BAYERNR_IMPLS_NR_STRENGTH_DEFAULT (0x20)
-#define  HI_ISP_BAYERNR_SYMMSAD_DEFAULT  (1)
-#define  HI_ISP_BAYERNR_ENABLE_POST_PROC_DEFAULT (3)
-#define  HI_ISP_BAYERNR_BILATERAL_ENABLE_DEFAULT (2)
-#define  HI_ISP_BAYERNR_NLIMIT_GAIN_BLT_DEFAULT (200)
-
-#define  AF_GAMMA_VALUE_MAX  (1)
-#define  HI_EXT_SYSTEM_MANUAL_DEHAZE_HBLK_DEFAULT (24)
-#define  HI_EXT_SYSTEM_MANUAL_DEHAZE_VBLK_DEFAULT (16)
-
-#define HI_ISP_FE_AF_SUPPORT                      0
-#define HI_ISP_BE_AF_SUPPORT                      1
-#define HI_ISP_AF_ENABLE_MASK                     ((HI_ISP_BE_AF_SUPPORT << 1) + HI_ISP_FE_AF_SUPPORT)
-
-
-// #define HI_ISP_CCM_RECOVER_EN_DEFAULT             (0x1)
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* __HI_ISP_DEFINES_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ive.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ive.h
deleted file mode 100644
index 0e8183a3..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ive.h
+++ /dev/null
@@ -1,1053 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2001-2014, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_comm_ive.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software (IVE) group
-  Created       : 2014/08/05
-  Description   :
-  1.Date        : 2013/07/01~2014/08/05
-    Modification: Created file
-******************************************************************************/
-#ifndef _HI_IVE_H_
-#define _HI_IVE_H_
-
-#include "hi_comm_ive.h"
-// if sdk environment,include hi_common.h,else typedef HI_S32 IVE_HANDLE
-#include "hi_common.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"{
-#endif
-#endif
-
-#define IVE_HIST_NUM          256
-#define IVE_MAP_NUM           256
-#define IVE_MAX_REGION_NUM    254
-#define IVE_ST_MAX_CORNER_NUM 500
-
-/*
-* DMA mode ,created by Chen Quanfu 2013-07-19
-*/
-typedef enum hiIVE_DMA_MODE_E {
-    IVE_DMA_MODE_DIRECT_COPY = 0x0,
-    IVE_DMA_MODE_INTERVAL_COPY = 0x1,
-    IVE_DMA_MODE_SET_3BYTE = 0x2,
-    IVE_DMA_MODE_SET_8BYTE = 0x3,
-    IVE_DMA_MODE_BUTT
-} IVE_DMA_MODE_E;
-
-/*
-* DMA control parameter ,created by Chen Quanfu 2013-07-19
-*/
-typedef struct hiIVE_DMA_CTRL_S {
-    IVE_DMA_MODE_E enMode;
-    HI_U64 u64Val;      /* Used in memset mode */
-    HI_U8 u8HorSegSize; /* Used in interval-copy mode, every row was segmented by u8HorSegSize bytes, 
-                         restricted in values of 2,3,4,8,16 */
-    HI_U8 u8ElemSize;   /* Used in interval-copy mode, the valid bytes copied in front of every segment 
-                        in a valid row, which 0<u8ElemSize<u8HorSegSize */
-    HI_U8 u8VerSegRows; /* Used in interval-copy mode, copy one row in every u8VerSegRows */
-} IVE_DMA_CTRL_S;
-
-/*
-* Filter control parameters
-* You need to set these parameters when using the filter operator.
-* Modify template filter from 3x3 to 5x5 by Chen Quanfu 2013-07-11
-*/
-typedef struct hiIVE_FILTER_CTRL_S {
-    HI_S8 as8Mask[25]; /* Template parameter filter coefficient */
-    HI_U8 u8Norm;      /* Normalization parameter, by right shift */
-} IVE_FILTER_CTRL_S;
-
-/*
-* CSC working mode.
-* Modified by Tan Bing, 2013-7-22.
-*/
-typedef enum hiIVE_CSC_MODE_E {
-    IVE_CSC_MODE_VIDEO_BT601_YUV2RGB = 0x0, /* CSC: YUV2RGB, video transfer mode, RGB value range [16, 235] */
-    IVE_CSC_MODE_VIDEO_BT709_YUV2RGB = 0x1, /* CSC: YUV2RGB, video transfer mode, RGB value range [16, 235] */
-    IVE_CSC_MODE_PIC_BT601_YUV2RGB = 0x2,   /* CSC: YUV2RGB, picture transfer mode, RGB value range [0, 255] */
-    IVE_CSC_MODE_PIC_BT709_YUV2RGB = 0x3,   /* CSC: YUV2RGB, picture transfer mode, RGB value range [0, 255] */
-
-    IVE_CSC_MODE_PIC_BT601_YUV2HSV = 0x4, /* CSC: YUV2HSV, picture transfer mode, HSV value range [0, 255] */
-    IVE_CSC_MODE_PIC_BT709_YUV2HSV = 0x5, /* CSC: YUV2HSV, picture transfer mode, HSV value range [0, 255] */
-
-    IVE_CSC_MODE_PIC_BT601_YUV2LAB = 0x6, /* CSC: YUV2LAB, picture transfer mode, Lab value range [0, 255] */
-    IVE_CSC_MODE_PIC_BT709_YUV2LAB = 0x7, /* CSC: YUV2LAB, picture transfer mode, Lab value range [0, 255] */
-
-    IVE_CSC_MODE_VIDEO_BT601_RGB2YUV = 0x8, /* CSC: RGB2YUV, video transfer mode, YUV value range [0, 255] */
-    IVE_CSC_MODE_VIDEO_BT709_RGB2YUV = 0x9, /* CSC: RGB2YUV, video transfer mode, YUV value range [0, 255] */
-    IVE_CSC_MODE_PIC_BT601_RGB2YUV = 0xa,   /* CSC: RGB2YUV, picture transfer mode, Y:[16, 235],U\V:[16, 240] */
-    IVE_CSC_MODE_PIC_BT709_RGB2YUV = 0xb,   /* CSC: RGB2YUV, picture transfer mode, Y:[16, 235],U\V:[16, 240] */
-
-    IVE_CSC_MODE_BUTT
-} IVE_CSC_MODE_E;
-
-/*
-* CSC control parameters
-* You need to set these parameters when using the CSC operator.
-* Removed the CSC output format, replaced by setting the output image type.
-* Modified by tanbing 2013-7-22.
-*/
-typedef struct hiIVE_CSC_CTRL_S {
-    IVE_CSC_MODE_E enMode; /* Working mode */
-} IVE_CSC_CTRL_S;
-
-/*
-* Filter+CSC control parameters
-* You need to set these parameters when using the filter+CSC operator.
-* The control information about both the filter and CSC needs to be configured.
-* Modify template filter from 3x3 to 5x5 by Tan Bing 2013-07-11
-*/
-typedef struct hiIVE_FILTER_AND_CSC_CTRL_S {
-    IVE_CSC_MODE_E enMode; /* CSC working mode */
-    HI_S8 as8Mask[25];     /* Template parameter filter coefficient */
-    HI_U8 u8Norm;          /* Normalization parameter, by right shift */
-} IVE_FILTER_AND_CSC_CTRL_S;
-
-/*
-* SOBEL output ctrl
-*/
-typedef enum hiIVE_SOBEL_OUT_CTRL_E {
-    IVE_SOBEL_OUT_CTRL_BOTH = 0x0, /* Output horizontal and vertical */
-    IVE_SOBEL_OUT_CTRL_HOR = 0x1,  /* Output horizontal */
-    IVE_SOBEL_OUT_CTRL_VER = 0x2,  /* Output vertical */
-    IVE_SOBEL_OUT_CTRL_BUTT
-} IVE_SOBEL_OUT_CTRL_E;
-
-/*
-* SOBEL control parameter
-* Add IVE_SOBEL_OUT_CTRL_E by Chen Quanfu 2013-07-11
-*/
-typedef struct hiIVE_SOBEL_CTRL_S {
-    IVE_SOBEL_OUT_CTRL_E enOutCtrl; /* Output format */
-    HI_S8 as8Mask[25];              /* Template parameter */
-} IVE_SOBEL_CTRL_S;
-
-/*
-* Type of the magnitude and angle output results
-* Modified by Chen Quanfu 2013-07-23
-*/
-typedef enum hiIVE_MAG_AND_ANG_OUT_CTRL_E {
-    IVE_MAG_AND_ANG_OUT_CTRL_MAG = 0x0,         /* Only the magnitude is output. */
-    IVE_MAG_AND_ANG_OUT_CTRL_MAG_AND_ANG = 0x1, /* The magnitude and angle are output. */
-    IVE_MAG_AND_ANG_OUT_CTRL_BUTT
-} IVE_MAG_AND_ANG_OUT_CTRL_E;
-
-/*
-* Magnitude and angle control parameter
-*/
-typedef struct hiIVE_MAG_AND_ANG_CTRL_S {
-    IVE_MAG_AND_ANG_OUT_CTRL_E enOutCtrl;
-    HI_U16 u16Thr;
-    HI_S8 as8Mask[25]; /* Template parameter. */
-} IVE_MAG_AND_ANG_CTRL_S;
-
-/*
-* Dilate control parameters
-*/
-typedef struct hiIVE_DILATE_CTRL_S {
-    HI_U8 au8Mask[25]; /* The template parameter value must be 0 or 255. */
-} IVE_DILATE_CTRL_S;
-
-/*
-* Erode control parameter
-*/
-typedef struct hiIVE_ERODE_CTRL_S {
-    HI_U8 au8Mask[25]; /* The template parameter value must be 0 or 255. */
-} IVE_ERODE_CTRL_S;
-
-/*
-* Type of the Thresh mode.
-* Modified by Tan Bing, 2013-7-22
-*/
-typedef enum hiIVE_THRESH_MODE_E {
-    IVE_THRESH_MODE_BINARY = 0x0,    /* srcVal <= lowThr, dstVal = minVal; srcVal > lowThr, dstVal = maxVal. */
-    IVE_THRESH_MODE_TRUNC = 0x1,     /* srcVal <= lowThr, dstVal = srcVal; srcVal > lowThr, dstVal = maxVal. */
-    IVE_THRESH_MODE_TO_MINVAL = 0x2, /* srcVal <= lowThr, dstVal = minVal; srcVal > lowThr, dstVal = srcVal. */
-
-    IVE_THRESH_MODE_MIN_MID_MAX = 0x3, /* srcVal <= lowThr, dstVal = minVal;  lowThr < srcVal <= highThr, 
-                                       dstVal = midVal; srcVal > highThr, dstVal = maxVal. */
-    IVE_THRESH_MODE_ORI_MID_MAX = 0x4, /* srcVal <= lowThr, dstVal = srcVal;  lowThr < srcVal <= highThr, 
-                                       dstVal = midVal; srcVal > highThr, dstVal = maxVal. */
-    IVE_THRESH_MODE_MIN_MID_ORI = 0x5, /* srcVal <= lowThr, dstVal = minVal;  lowThr < srcVal <= highThr, 
-                                       dstVal = midVal; srcVal > highThr, dstVal = srcVal. */
-    IVE_THRESH_MODE_MIN_ORI_MAX = 0x6, /* srcVal <= lowThr, dstVal = minVal;  lowThr < srcVal <= highThr, 
-                                       dstVal = srcVal; srcVal > highThr, dstVal = maxVal. */
-    IVE_THRESH_MODE_ORI_MID_ORI = 0x7, /* srcVal <= lowThr, dstVal = srcVal;  lowThr < srcVal <= highThr, 
-                                        dstVal = midVal; srcVal > highThr, dstVal = srcVal. */
-
-    IVE_THRESH_MODE_BUTT
-} IVE_THRESH_MODE_E;
-
-/*
-* Thresh control parameters.
-* Modified by Tan Bing, 2013-7-22
-*/
-typedef struct hiIVE_THRESH_CTRL_S {
-    IVE_THRESH_MODE_E enMode;
-    HI_U8 u8LowThr;  /* user-defined threshold,  0<=u8LowThr<=255 */
-    HI_U8 u8HighThr; /* user-defined threshold, if enMode<IVE_THRESH_MODE_MIN_MID_MAX, u8HighThr is not used, 
-                      else 0<=u8LowThr<=u8HighThr<=255; */
-    HI_U8 u8MinVal;  /* Minimum value when tri-level thresholding */
-    HI_U8 u8MidVal;  /* Middle value when tri-level thresholding, if enMode<2, u32MidVal is not used; */
-    HI_U8 u8MaxVal;  /* Maxmum value when tri-level thresholding */
-} IVE_THRESH_CTRL_S;
-
-/*
-* Type of the Sub output results
-*/
-typedef enum hiIVE_SUB_MODE_E {
-    IVE_SUB_MODE_ABS = 0x0,   /* Absolute value of the difference */
-    IVE_SUB_MODE_SHIFT = 0x1, /* The output result is obtained by shifting the result one digit right 
-                                to reserve the signed bit. */
-    IVE_SUB_MODE_BUTT
-} IVE_SUB_MODE_E;
-
-/*
-* Sub control parameters
-*/
-typedef struct hiIVE_SUB_CTRL_S {
-    IVE_SUB_MODE_E enMode;
-} IVE_SUB_CTRL_S;
-
-/*
-* Type of the Integ output results, created by Tan Bing, 2013-03-18
-* Modify by Chen Quanfu 2013-07-15
-* Spec: add IVE_INTEG_OUT_CTRL_SQSUM output format
-*/
-typedef enum hiIVE_INTEG_OUT_CTRL_E {
-    IVE_INTEG_OUT_CTRL_COMBINE = 0x0,
-    IVE_INTEG_OUT_CTRL_SUM = 0x1,
-    IVE_INTEG_OUT_CTRL_SQSUM = 0x2,
-    IVE_INTEG_OUT_CTRL_BUTT
-} IVE_INTEG_OUT_CTRL_E;
-
-/*
-* Integ control parameters,Create by Chen Quanfu 2013-07-15
-*/
-typedef struct hiIVE_INTEG_CTRL_S {
-    IVE_INTEG_OUT_CTRL_E enOutCtrl;
-} IVE_INTEG_CTRL_S;
-
-/*
-* Type of the Thresh_S16 mode
-*/
-typedef enum hiIVE_THRESH_S16_MODE_E {
-    IVE_THRESH_S16_MODE_S16_TO_S8_MIN_MID_MAX = 0x0,
-    IVE_THRESH_S16_MODE_S16_TO_S8_MIN_ORI_MAX = 0x1,
-    IVE_THRESH_S16_MODE_S16_TO_U8_MIN_MID_MAX = 0x2,
-    IVE_THRESH_S16_MODE_S16_TO_U8_MIN_ORI_MAX = 0x3,
-
-    IVE_THRESH_S16_MODE_BUTT
-} IVE_THRESH_S16_MODE_E;
-
-/*
-* Thresh_S16 control parameters
-*/
-typedef struct hiIVE_THRESH_S16_CTRL_S {
-    IVE_THRESH_S16_MODE_E enMode;
-    HI_S16 s16LowThr;     /* User-defined threshold */
-    HI_S16 s16HighThr;    /* User-defined threshold */
-    IVE_8BIT_U un8MinVal; /* Minimum value when tri-level thresholding */
-    IVE_8BIT_U un8MidVal; /* Middle value when tri-level thresholding */
-    IVE_8BIT_U un8MaxVal; /* Maxmum value when tri-level thresholding */
-} IVE_THRESH_S16_CTRL_S;
-
-/*
-* Type of the Thresh_U16 mode
-*/
-typedef enum hiIVE_THRESH_U16_MODE_E {
-    IVE_THRESH_U16_MODE_U16_TO_U8_MIN_MID_MAX = 0x0,
-    IVE_THRESH_U16_MODE_U16_TO_U8_MIN_ORI_MAX = 0x1,
-
-    IVE_THRESH_U16_MODE_BUTT
-} IVE_THRESH_U16_MODE_E;
-
-/*
-* Thresh_U16 control parameters
-*/
-typedef struct hiIVE_THRESH_U16_CTRL_S {
-    IVE_THRESH_U16_MODE_E enMode;
-    HI_U16 u16LowThr;
-    HI_U16 u16HighThr;
-    HI_U8 u8MinVal;
-    HI_U8 u8MidVal;
-    HI_U8 u8MaxVal;
-} IVE_THRESH_U16_CTRL_S;
-
-/*
-* Mode of 16BitTo8Bit
-*/
-typedef enum hiIVE_16BIT_TO_8BIT_MODE_E {
-    IVE_16BIT_TO_8BIT_MODE_S16_TO_S8 = 0x0,
-    IVE_16BIT_TO_8BIT_MODE_S16_TO_U8_ABS = 0x1,
-    IVE_16BIT_TO_8BIT_MODE_S16_TO_U8_BIAS = 0x2,
-    IVE_16BIT_TO_8BIT_MODE_U16_TO_U8 = 0x3,
-
-    IVE_16BIT_TO_8BIT_MODE_BUTT
-} IVE_16BIT_TO_8BIT_MODE_E;
-
-/*
-* 16BitTo8Bit control parameters
-*/
-typedef struct hiIVE_16BIT_TO_8BIT_CTRL_S {
-    IVE_16BIT_TO_8BIT_MODE_E enMode;
-    HI_U16 u16Denominator;
-    HI_U8 u8Numerator;
-    HI_S8 s8Bias;
-} IVE_16BIT_TO_8BIT_CTRL_S;
-
-/*
-* Type of the OrdStaFilter
-*/
-typedef enum hiIVE_ORD_STAT_FILTER_MODE_E {
-    IVE_ORD_STAT_FILTER_MODE_MEDIAN = 0x0,
-    IVE_ORD_STAT_FILTER_MODE_MAX = 0x1,
-    IVE_ORD_STAT_FILTER_MODE_MIN = 0x2,
-
-    IVE_ORD_STAT_FILTER_MODE_BUTT
-} IVE_ORD_STAT_FILTER_MODE_E;
-
-/*
-* OrdStaFilter control parameters
-*/
-typedef struct hiIVE_ORD_STAT_FILTER_CTRL_S {
-    IVE_ORD_STAT_FILTER_MODE_E enMode;
-
-} IVE_ORD_STAT_FILTER_CTRL_S;
-
-/*
-* Type of the Map
-*/
-typedef enum hiIVE_MAP_MODE_E {
-    IVE_MAP_MODE_U8 = 0x0,
-    IVE_MAP_MODE_S16 = 0x1,
-    IVE_MAP_MODE_U16 = 0x2,
-
-    IVE_MAP_MODE_BUTT
-} IVE_MAP_MODE_E;
-/*
-* Map control struct
-*/
-typedef struct hiIVE_MAP_CTRL_S {
-    IVE_MAP_MODE_E enMode;
-} IVE_MAP_CTRL_S;
-/*
-* Map unsigned 8 bit LUT memory struct
-*/
-typedef struct hiIVE_MAP_U8BIT_LUT_MEM_S {
-    HI_U8 au8Map[IVE_MAP_NUM];
-} IVE_MAP_U8BIT_LUT_MEM_S;
-/*
-* Map unsigned 16 bit LUT memory struct
-*/
-typedef struct hiIVE_MAP_U16BIT_LUT_MEM_S {
-    HI_U16 au16Map[IVE_MAP_NUM];
-} IVE_MAP_U16BIT_LUT_MEM_S;
-/*
-* Map signed 16 bit LUT memory struct
-*/
-typedef struct hiIVE_MAP_S16BIT_LUT_MEM_S {
-    HI_S16 as16Map[IVE_MAP_NUM];
-} IVE_MAP_S16BIT_LUT_MEM_S;
-/*
-* Equalizehist control member struct
-*/
-typedef struct hiIVE_EQUALIZE_HIST_CTRL_MEM_S {
-    HI_U32 au32Hist[IVE_HIST_NUM];
-    HI_U8 au8Map[IVE_MAP_NUM];
-} IVE_EQUALIZE_HIST_CTRL_MEM_S;
-
-/*
-* Equalizehist control parameters,created by Chen Quanfu 2013-07-17
-*/
-typedef struct hiIVE_EQUALIZE_HIST_CTRL_S {
-    IVE_MEM_INFO_S stMem;
-} IVE_EQUALIZE_HIST_CTRL_S;
-
-/*
-* Add control parameters,created by Chen Quanfu 2013-07-17
-*/
-typedef struct hiIVE_ADD_CTRL_S {
-    HI_U0Q16 u0q16X; /* x of "xA+yB" */
-    HI_U0Q16 u0q16Y; /* y of "xA+yB" */
-} IVE_ADD_CTRL_S;
-
-/*
-* NCC dst memory struct
-*/
-typedef struct hiIVE_NCC_DST_MEM_S {
-    HI_U64 u64Numerator;
-    HI_U64 u64QuadSum1;
-    HI_U64 u64QuadSum2;
-    HI_U8 u8Reserved[8];
-} IVE_NCC_DST_MEM_S;
-
-/*
-* Region struct
-*/
-typedef struct hiIVE_REGION_S {
-    HI_U32 u32Area;   /* Represented by the pixel number */
-    HI_U16 u16Left;   /* Circumscribed rectangle left border */
-    HI_U16 u16Right;  /* Circumscribed rectangle right border */
-    HI_U16 u16Top;    /* Circumscribed rectangle top border */
-    HI_U16 u16Bottom; /* Circumscribed rectangle bottom border */
-} IVE_REGION_S;
-
-/*
-* CCBLOB struct
-*/
-typedef struct hiIVE_CCBLOB_S {
-    HI_U16 u16CurAreaThr;                       /* Threshold of the result regions' area */
-    HI_S8 s8LabelStatus;                        /* -1: Labeled failed ; 0: Labeled successfully */
-    HI_U8 u8RegionNum;                          /* Number of valid region, non-continuous stored */
-    IVE_REGION_S astRegion[IVE_MAX_REGION_NUM]; /* Valid regions with 'u32Area>0' and 'label = ArrayIndex+1' */
-} IVE_CCBLOB_S;
-
-/*
-* Type of the CCL
-*/
-typedef enum hiIVE_CCL_MODE_E {
-    IVE_CCL_MODE_4C = 0x0, /* 4-connected */
-    IVE_CCL_MODE_8C = 0x1, /* 8-connected */
-
-    IVE_CCL_MODE_BUTT
-} IVE_CCL_MODE_E;
-/*
-* CCL control struct
-*/
-typedef struct hiIVE_CCL_CTRL_S {
-    IVE_CCL_MODE_E enMode; /* Mode */
-    HI_U16 u16InitAreaThr; /* Init threshold of region area */
-    HI_U16 u16Step;        /* Increase area step for once */
-} IVE_CCL_CTRL_S;
-
-/*
-* GMM control struct
-*/
-typedef struct hiIVE_GMM_CTRL_S {
-    HI_U22Q10 u22q10NoiseVar; /* Initial noise Variance */
-    HI_U22Q10 u22q10MaxVar;   /* Max  Variance */
-    HI_U22Q10 u22q10MinVar;   /* Min  Variance */
-    HI_U0Q16 u0q16LearnRate;  /* Learning rate */
-    HI_U0Q16 u0q16BgRatio;    /* Background ratio */
-    HI_U8Q8 u8q8VarThr;       /* Variance Threshold */
-    HI_U0Q16 u0q16InitWeight; /* Initial Weight */
-    HI_U8 u8ModelNum;         /* Model number: 3 or 5 */
-} IVE_GMM_CTRL_S;
-
-/*
-* Type of the GMM2 sensitivity factor mode
-*/
-typedef enum hiIVE_GMM2_SNS_FACTOR_MODE_E {
-    IVE_GMM2_SNS_FACTOR_MODE_GLB = 0x0, /* Global sensitivity factor mode */
-    IVE_GMM2_SNS_FACTOR_MODE_PIX = 0x1, /* Pixel sensitivity factor mode */
-
-    IVE_GMM2_SNS_FACTOR_MODE_BUTT
-} IVE_GMM2_SNS_FACTOR_MODE_E;
-
-/*
-* Type of the GMM2 life update factor mode
-*/
-typedef enum hiIVE_GMM2_LIFE_UPDATE_FACTOR_MODE_E {
-    IVE_GMM2_LIFE_UPDATE_FACTOR_MODE_GLB = 0x0, /* Global life update factor mode */
-    IVE_GMM2_LIFE_UPDATE_FACTOR_MODE_PIX = 0x1, /* Pixel life update factor mode */
-
-    IVE_GMM2_LIFE_UPDATE_FACTOR_MODE_BUTT
-} IVE_GMM2_LIFE_UPDATE_FACTOR_MODE_E;
-
-/*
-* GMM2 control struct
-*/
-typedef struct hiIVE_GMM2_CTRL_S {
-    IVE_GMM2_SNS_FACTOR_MODE_E enSnsFactorMode;                /* Sensitivity factor mode */
-    IVE_GMM2_LIFE_UPDATE_FACTOR_MODE_E enLifeUpdateFactorMode; /* Life update factor mode */
-    HI_U16 u16GlbLifeUpdateFactor;                             /* Global life update factor (default: 4) */
-    HI_U16 u16LifeThr;                                         /* Life threshold (default: 5000) */
-    HI_U16 u16FreqInitVal;                                     /* Initial frequency (default: 20000) */
-    HI_U16 u16FreqReduFactor;                                  /* Frequency reduction factor (default: 0xFF00) */
-    HI_U16 u16FreqAddFactor;                                   /* Frequency adding factor (default: 0xEF) */
-    HI_U16 u16FreqThr;                                         /* Frequency threshold (default: 12000) */
-    HI_U16 u16VarRate;                                         /* Variation update rate (default: 1) */
-    HI_U9Q7 u9q7MaxVar;                                        /* Max variation (default: (16 * 16)<<7) */
-    HI_U9Q7 u9q7MinVar;                                        /* Min variation (default: ( 8 *  8)<<7) */
-    HI_U8 u8GlbSnsFactor;                                      /* Global sensitivity factor (default: 8) */
-    HI_U8 u8ModelNum;                                          /* Model number (range: 1~5, default: 3) */
-} IVE_GMM2_CTRL_S;
-
-/*
-* CannyHysEdge control struct
-*/
-typedef struct hiIVE_CANNY_HYS_EDGE_CTRL_S {
-    IVE_MEM_INFO_S stMem;
-    HI_U16 u16LowThr;
-    HI_U16 u16HighThr;
-    HI_S8 as8Mask[25];
-} IVE_CANNY_HYS_EDGE_CTRL_S;
-
-/*
-* Canny stack size struct
-*/
-typedef struct hiIVE_CANNY_STACK_SIZE_S {
-    HI_U32 u32StackSize;  /* Stack size for output */
-    HI_U8 u8Reserved[12]; /* For 16 byte align */
-} IVE_CANNY_STACK_SIZE_S;
-
-/*
-* LBP compare mode
-*/
-typedef enum hiIVE_LBP_CMP_MODE_E {
-    IVE_LBP_CMP_MODE_NORMAL = 0x0, /* P(x)-P(center)>= un8BitThr.s8Val, s(x)=1; else s(x)=0; */
-    IVE_LBP_CMP_MODE_ABS = 0x1,    /* Abs(P(x)-P(center))>=un8BitThr.u8Val, s(x)=1; else s(x)=0; */
-
-    IVE_LBP_CMP_MODE_BUTT
-} IVE_LBP_CMP_MODE_E;
-
-/*
-* LBP control struct
-*/
-typedef struct hiIVE_LBP_CTRL_S {
-    IVE_LBP_CMP_MODE_E enMode;
-    IVE_8BIT_U un8BitThr;
-} IVE_LBP_CTRL_S;
-
-/*
-* Type of the GradientFilter output format
-*/
-typedef enum hiIVE_NORM_GRAD_OUT_CTRL_E {
-    IVE_NORM_GRAD_OUT_CTRL_HOR_AND_VER = 0x0,
-    IVE_NORM_GRAD_OUT_CTRL_HOR = 0x1,
-    IVE_NORM_GRAD_OUT_CTRL_VER = 0x2,
-    IVE_NORM_GRAD_OUT_CTRL_COMBINE = 0x3,
-
-    IVE_NORM_GRAD_OUT_CTRL_BUTT
-} IVE_NORM_GRAD_OUT_CTRL_E;
-
-/*
-* GradientFilter control parameters
-*/
-typedef struct hiIVE_NORM_GRAD_CTRL_S {
-    IVE_NORM_GRAD_OUT_CTRL_E enOutCtrl;
-    HI_S8 as8Mask[25];
-    HI_U8 u8Norm;
-} IVE_NORM_GRAD_CTRL_S;
-
-/*
-* LKOpticalFlowPyr output mode
-*/
-typedef enum hiIVE_LK_OPTICAL_FLOW_PYR_OUT_MODE_E {
-    IVE_LK_OPTICAL_FLOW_PYR_OUT_MODE_NONE = 0,   /* Output none */
-    IVE_LK_OPTICAL_FLOW_PYR_OUT_MODE_STATUS = 1, /* Output status */
-    IVE_LK_OPTICAL_FLOW_PYR_OUT_MODE_BOTH = 2,   /* Output status and err */
-
-    IVE_LK_OPTICAL_FLOW_PYR_OUT_MODE_BUTT
-} IVE_LK_OPTICAL_FLOW_PYR_OUT_MODE_E;
-
-/*
-* LKOpticalFlowPyr control parameters
-*/
-typedef struct hiIVE_LK_OPTICAL_FLOW_PYR_CTRL_S {
-    IVE_LK_OPTICAL_FLOW_PYR_OUT_MODE_E enOutMode;
-    HI_BOOL bUseInitFlow;  /* where to use initial flow */
-    HI_U16 u16PtsNum;      /* Number of the feature points,<=500 */
-    HI_U8 u8MaxLevel;      /* 0<=u8MaxLevel<=3 */
-    HI_U0Q8 u0q8MinEigThr; /* Minimum eigenvalue threshold */
-    HI_U8 u8IterCnt;       /* Maximum iteration times, <=20 */
-    HI_U0Q8 u0q8Eps;       /* Used for exit criteria: dx^2 + dy^2 < u0q8Eps */
-} IVE_LK_OPTICAL_FLOW_PYR_CTRL_S;
-
-/*
-* Shi-Tomasi maximum eigenvalue
-*/
-typedef struct hiIVE_ST_MAX_EIG_S {
-    HI_U16 u16MaxEig;     /* Shi-Tomasi second step output MaxEig */
-    HI_U8 u8Reserved[14]; /* For 16 byte align */
-} IVE_ST_MAX_EIG_S;
-
-/*
-* ShiTomasi control parameters
-*/
-typedef struct hiIVE_ST_CANDI_CORNER_CTRL_S {
-    IVE_MEM_INFO_S stMem;
-    HI_U0Q8 u0q8QualityLevel;
-} IVE_ST_CANDI_CORNER_CTRL_S;
-
-typedef struct hiIVE_ST_CORNER_INFO_S {
-    HI_U16 u16CornerNum;
-    IVE_POINT_U16_S astCorner[IVE_ST_MAX_CORNER_NUM];
-} IVE_ST_CORNER_INFO_S;
-
-typedef struct hiIVE_ST_CORNER_CTRL_S {
-    HI_U16 u16MaxCornerNum;
-    HI_U16 u16MinDist;
-} IVE_ST_CORNER_CTRL_S;
-
-/*
-* GradFg mode enum
-*/
-typedef enum hiIVE_GRAD_FG_MODE_E {
-    IVE_GRAD_FG_MODE_USE_CUR_GRAD = 0x0,
-    IVE_GRAD_FG_MODE_FIND_MIN_GRAD = 0x1,
-
-    IVE_GRAD_FG_MODE_BUTT
-} IVE_GRAD_FG_MODE_E;
-
-/*
-* GradFg ctrl struct
-*/
-typedef struct hiIVE_GRAD_FG_CTRL_S {
-    IVE_GRAD_FG_MODE_E enMode; /* Calculation mode */
-    HI_U16 u16EdwFactor;       /* Edge width adjustment factor (range: 500 to 2000; default: 1000) */
-    HI_U8 u8CrlCoefThr;        /* Gradient vector correlation coefficient threshold 
-                                (ranges: 50 to 100; default: 80) */
-    HI_U8 u8MagCrlThr;         /* Gradient amplitude threshold (range: 0 to 20; default: 4) */
-    HI_U8 u8MinMagDiff;        /* Gradient magnitude difference threshold (range: 2 to 8; default: 2) */
-    HI_U8 u8NoiseVal;          /* Gradient amplitude noise threshold (range: 1 to 8; default: 1) */
-    HI_U8 u8EdwDark;           /* Black pixels enable flag (range: 0 (no), 1 (yes); default: 1) */
-} IVE_GRAD_FG_CTRL_S;
-
-typedef struct hiIVE_CANDI_BG_PIX_S {
-    HI_U8Q4F4 u8q4f4Mean;    /* Candidate background grays value */
-    HI_U16 u16StartTime;     /* Candidate Background start time */
-    HI_U16 u16SumAccessTime; /* Candidate Background cumulative access time */
-    HI_U16 u16ShortKeepTime; /* Candidate background short hold time */
-    HI_U8 u8ChgCond;         /* Time condition for candidate background into the changing state */
-    HI_U8 u8PotenBgLife;     /* Potential background cumulative access time */
-} IVE_CANDI_BG_PIX_S;
-
-typedef struct hiIVE_WORK_BG_PIX_S {
-    HI_U8Q4F4 u8q4f4Mean; /* 0# background grays value */
-    HI_U16 u16AccTime;    /* Background cumulative access time */
-    HI_U8 u8PreGray;      /* Gray value of last pixel */
-    HI_U5Q3 u5q3DiffThr;  /* Differential threshold */
-    HI_U8 u8AccFlag;      /* Background access flag */
-    HI_U8 u8BgGray[3];    /* 1# ~ 3# background grays value */
-} IVE_WORK_BG_PIX_S;
-
-typedef struct hiIVE_BG_LIFE_S {
-    HI_U8 u8WorkBgLife[3]; /* 1# ~ 3# background vitality */
-    HI_U8 u8CandiBgLife;   /* Candidate background vitality */
-} IVE_BG_LIFE_S;
-
-typedef struct hiIVE_BG_MODEL_PIX_S {
-    IVE_WORK_BG_PIX_S stWorkBgPixel; /* Working background */
-    IVE_CANDI_BG_PIX_S stCandiPixel; /* Candidate background */
-    IVE_BG_LIFE_S stBgLife;          /* Background vitality */
-} IVE_BG_MODEL_PIX_S;
-
-typedef struct hiIVE_FG_STAT_DATA_S {
-    HI_U32 u32PixNum;
-    HI_U32 u32SumLum;
-    HI_U8 u8Reserved[8];
-} IVE_FG_STAT_DATA_S;
-
-typedef struct hiIVE_BG_STAT_DATA_S {
-    HI_U32 u32PixNum;
-    HI_U32 u32SumLum;
-    HI_U8 u8Reserved[8];
-} IVE_BG_STAT_DATA_S;
-
-typedef struct hiIVE_MATCH_BG_MODEL_CTRL_S {
-    HI_U32 u32CurFrmNum; /* Current frame timestamp, in frame units */
-    HI_U32 u32PreFrmNum; /* Previous frame timestamp, in frame units */
-    HI_U16 u16TimeThr;   /* Potential background replacement time threshold 
-                            (range: 2 to 100 frames; default: 20) */
-
-    HI_U8 u8DiffThrCrlCoef; /* Correlation coefficients between differential threshold and gray value 
-                            (range: 0 to 5; default: 0) */
-    HI_U8 u8DiffMaxThr;     /* Maximum of background differential threshold (range: 3 to 15; default: 6) */
-    HI_U8 u8DiffMinThr;     /* Minimum of background differential threshold (range: 3 to 15; default: 4) */
-    HI_U8 u8DiffThrInc;     /* Dynamic Background differential threshold increment 
-                            (range: 0 to 6; default: 0) */
-    HI_U8 u8FastLearnRate;  /* Quick background learning rate (range: 0 to 4; default: 2) */
-    HI_U8 u8DetChgRegion;   /* Whether to detect change region (range: 0 (no), 1 (yes); default: 0) */
-} IVE_MATCH_BG_MODEL_CTRL_S;
-
-typedef struct hiIVE_UPDATE_BG_MODEL_CTRL_S {
-    HI_U32 u32CurFrmNum;    /* Current frame timestamp, in frame units */
-    HI_U32 u32PreChkTime;   /* The last time when background status is checked */
-    HI_U32 u32FrmChkPeriod; /* Background status checking period (range: 0 to 2000 frames; default: 50) */
-
-    HI_U32 u32InitMinTime;       /* Background initialization shortest time 
-                                (range: 20 to 6000 frames; default: 100) */
-    HI_U32 u32StyBgMinBlendTime; /* Steady background integration shortest time 
-                                (range: 20 to 6000 frames; default: 200) */
-    HI_U32 u32StyBgMaxBlendTime; /* Steady background integration longest time 
-                                (range: 20 to 40000 frames; default: 1500) */
-    HI_U32 u32DynBgMinBlendTime; /* Dynamic background integration shortest time 
-                                (range: 0 to 6000 frames; default: 0) */
-    HI_U32 u32StaticDetMinTime;  /* Still detection shortest time (range: 20 to 6000 frames; default: 80) */
-    HI_U16 u16FgMaxFadeTime;     /* Foreground disappearing longest time 
-                                (range: 1 to 255 seconds; default: 15) */
-    HI_U16 u16BgMaxFadeTime;     /* Background disappearing longest time 
-                                (range: 1 to 255  seconds ; default: 60) */
-
-    HI_U8 u8StyBgAccTimeRateThr; /* Steady background access time ratio threshold 
-                                (range: 10 to 100; default: 80) */
-    HI_U8 u8ChgBgAccTimeRateThr; /* Change background access time ratio threshold 
-                                (range: 10 to 100; default: 60) */
-    HI_U8 u8DynBgAccTimeThr;     /* Dynamic background access time ratio threshold 
-                                (range: 0 to 50; default: 0) */
-    HI_U8 u8DynBgDepth;          /* Dynamic background depth (range: 0 to 3; default: 3) */
-    HI_U8 u8BgEffStaRateThr;     /* Background state time ratio threshold when initializing 
-                                (range: 90 to 100; default: 90) */
-
-    HI_U8 u8AcceBgLearn;  /* Whether to accelerate background learning (range: 0 (no), 1 (yes); default: 0) */
-    HI_U8 u8DetChgRegion; /* Whether to detect change region (range: 0 (no), 1 (yes); default: 0) */
-} IVE_UPDATE_BG_MODEL_CTRL_S;
-
-typedef enum hiIVE_ANN_MLP_ACTIV_FUNC_E {
-    IVE_ANN_MLP_ACTIV_FUNC_IDENTITY = 0x0,
-    IVE_ANN_MLP_ACTIV_FUNC_SIGMOID_SYM = 0x1,
-    IVE_ANN_MLP_ACTIV_FUNC_GAUSSIAN = 0x2,
-
-    IVE_ANN_MLP_ACTIV_FUNC_BUTT
-} IVE_ANN_MLP_ACTIV_FUNC_E;
-typedef enum hiIVE_ANN_MLP_ACCURATE_E {
-    IVE_ANN_MLP_ACCURATE_SRC16_WGT16 = 0x0, /* input decimals' accurate 16 bit, weight 16bit */
-    IVE_ANN_MLP_ACCURATE_SRC14_WGT20 = 0x1, /* input decimals' accurate 14 bit, weight 20bit */
-
-    IVE_ANN_MLP_ACCURATE_BUTT
-} IVE_ANN_MLP_ACCURATE_E;
-
-typedef struct hiIVE_ANN_MLP_MODEL_S {
-    IVE_ANN_MLP_ACTIV_FUNC_E enActivFunc;
-    IVE_ANN_MLP_ACCURATE_E enAccurate;
-    IVE_MEM_INFO_S stWeight;
-    HI_U32 u32TotalWeightSize;
-
-    HI_U16 au16LayerCount[8]; /* 8 layers, including input and output layer */
-    HI_U16 u16MaxCount;       /* MaxCount<=1024 */
-    HI_U8 u8LayerNum;         /* 2<layerNum<=8 */
-    HI_U8 u8Reserved;
-} IVE_ANN_MLP_MODEL_S;
-
-typedef enum hiIVE_SVM_TYPE_E {
-    IVE_SVM_TYPE_C_SVC = 0x0,
-    IVE_SVM_TYPE_NU_SVC = 0x1,
-
-    IVE_SVM_TYPE_BUTT
-} IVE_SVM_TYPE_E;
-
-typedef enum hiIVE_SVM_KERNEL_TYPE_E {
-    IVE_SVM_KERNEL_TYPE_LINEAR = 0x0,
-    IVE_SVM_KERNEL_TYPE_POLY = 0x1,
-    IVE_SVM_KERNEL_TYPE_RBF = 0x2,
-    IVE_SVM_KERNEL_TYPE_SIGMOID = 0x3,
-
-    IVE_SVM_KERNEL_TYPE_BUTT
-} IVE_SVM_KERNEL_TYPE_E;
-
-typedef struct hiIVE_SVM_MODEL_S {
-    IVE_SVM_TYPE_E enType;
-    IVE_SVM_KERNEL_TYPE_E enKernelType;
-
-    IVE_MEM_INFO_S stSv;   /* SV memory */
-    IVE_MEM_INFO_S stDf;   /* Decision functions memory */
-    HI_U32 u32TotalDfSize; /* All decision functions coef size in byte */
-
-    HI_U16 u16FeatureDim;
-    HI_U16 u16SvTotal;
-    HI_U8 u8ClassCount;
-} IVE_SVM_MODEL_S;
-
-/*
-* Sad mode
-*/
-typedef enum hiIVE_SAD_MODE_E {
-    IVE_SAD_MODE_MB_4X4 = 0x0,   /* 4x4 */
-    IVE_SAD_MODE_MB_8X8 = 0x1,   /* 8x8 */
-    IVE_SAD_MODE_MB_16X16 = 0x2, /* 16x16 */
-
-    IVE_SAD_MODE_BUTT
-} IVE_SAD_MODE_E;
-/*
-* Sad output ctrl
-*/
-typedef enum hiIVE_SAD_OUT_CTRL_E {
-    IVE_SAD_OUT_CTRL_16BIT_BOTH = 0x0, /* Output 16 bit sad and thresh */
-    IVE_SAD_OUT_CTRL_8BIT_BOTH = 0x1,  /* Output 8 bit sad and thresh */
-    IVE_SAD_OUT_CTRL_16BIT_SAD = 0x2,  /* Output 16 bit sad */
-    IVE_SAD_OUT_CTRL_8BIT_SAD = 0x3,   /* Output 8 bit sad */
-    IVE_SAD_OUT_CTRL_THRESH = 0x4,     /* Output thresh,16 bits sad */
-
-    IVE_SAD_OUT_CTRL_BUTT
-} IVE_SAD_OUT_CTRL_E;
-/*
-* Sad ctrl param
-*/
-typedef struct hiIVE_SAD_CTRL_S {
-    IVE_SAD_MODE_E enMode;
-    IVE_SAD_OUT_CTRL_E enOutCtrl;
-    HI_U16 u16Thr;  /* srcVal <= u16Thr, dstVal = minVal; srcVal > u16Thr, dstVal = maxVal. */
-    HI_U8 u8MinVal; /* Min value */
-    HI_U8 u8MaxVal; /* Max value */
-} IVE_SAD_CTRL_S;
-
-/*
-* Resize zoom mode
-*/
-typedef enum hiIVE_RESIZE_MODE_E {
-    IVE_RESIZE_MODE_LINEAR = 0x0, /* Bilinear interpolation */
-    IVE_RESIZE_MODE_AREA = 0x1, /* Area-based (or super) interpolation */
-
-    IVE_RESIZE_MODE_BUTT
-} IVE_RESIZE_MODE_E;
-
-/*
-* Resize ctrl param
-*/
-typedef struct hiIVE_RESIZE_CTRL_S {
-    IVE_RESIZE_MODE_E enMode;
-    IVE_MEM_INFO_S stMem;
-    HI_U16 u16Num;
-} IVE_RESIZE_CTRL_S;
-
-/*
-* CNN active function mode
-*/
-typedef enum hiIVE_CNN_ACTIV_FUNC_E {
-    IVE_CNN_ACTIV_FUNC_NONE = 0x0,    /* Do not taking a activation, equivalent f(x)=x */
-    IVE_CNN_ACTIV_FUNC_RELU = 0x1,    /* f(x)=max(0, x) */
-    IVE_CNN_ACTIV_FUNC_SIGMOID = 0x2, /* f(x)=1/(1+exp(-x)), not support */
-
-    IVE_CNN_ACTIV_FUNC_BUTT
-} IVE_CNN_ACTIV_FUNC_E;
-
-/*
-* CNN pooling mode
-*/
-typedef enum hiIVE_CNN_POOLING_E {
-    IVE_CNN_POOLING_NONE = 0x0, /* Do not taking a pooling action */
-    IVE_CNN_POOLING_MAX = 0x1,  /* Using max value of every pooling area */
-    IVE_CNN_POOLING_AVG = 0x2,  /* Using average value of every pooling area */
-
-    IVE_CNN_POOLING_BUTT
-} IVE_CNN_POOLING_E;
-
-/*
-* CNN Conv-ReLU-Pooling layer control parameters
-*/
-typedef struct hiIVE_CNN_CONV_POOLING_S {
-    IVE_CNN_ACTIV_FUNC_E enActivFunc; /* Type of activation function */
-    IVE_CNN_POOLING_E enPooling;      /* Mode of pooling method */
-
-    HI_U8 u8FeatureMapNum; /* Number of feature maps */
-    HI_U8 u8KernelSize;    /* Kernel size, only support 3 currently */
-    HI_U8 u8ConvStep;      /* Convolution step, only support 1 currently */
-
-    HI_U8 u8PoolSize; /* Pooling size, only support 2 currently */
-    HI_U8 u8PoolStep; /* Pooling step, only support 2 currently */
-    HI_U8 u8Reserved[3];
-
-} IVE_CNN_CONV_POOLING_S;
-
-/*
-* CNN fully connected layer control parameters
-*/
-typedef struct hiIVE_CNN_FULL_CONNECT_S {
-    HI_U16 au16LayerCnt[8]; /* Neuron number of every fully connected layers */
-    HI_U16 u16MaxCnt;       /* Max neuron number in all fully connected layers */
-    HI_U8 u8LayerNum;       /* Number of fully connected layer */
-    HI_U8 u8Reserved;
-} IVE_CNN_FULL_CONNECT_S;
-
-/*
-* CNN model info
-*/
-typedef struct hiIVE_CNN_MODEL_S {
-    IVE_CNN_CONV_POOLING_S astConvPool[8]; /* Conv-ReLU-Pooling layers info */
-    IVE_CNN_FULL_CONNECT_S stFullConnect;  /* Fully connected layers info */
-
-    IVE_MEM_INFO_S stConvKernelBias; /* Conv-ReLU-Pooling layers' kernels and bias */
-    HI_U32 u32ConvKernelBiasSize;    /* Size of Conv-ReLU-Pooling layer' kernels and bias */
-
-    IVE_MEM_INFO_S stFCLWgtBias; /* Fully Connection Layers' weights and bias */
-    HI_U32 u32FCLWgtBiasSize;    /* Size of fully connection layers weights and bias */
-
-    HI_U32 u32TotalMemSize; /* Total memory size of all kernels, weights, bias */
-
-    IVE_IMAGE_TYPE_E enType; /* Image type used for the CNN model */
-    HI_U32 u32Width;         /* Image width used for the model */
-    HI_U32 u32Height;        /* Image height used for the model */
-
-    HI_U16 u16ClassCount;     /* Number of classes */
-    HI_U8 u8ConvPoolLayerNum; /* Number of Conv-ReLU-Pooling layers */
-    HI_U8 u8Reserved;
-} IVE_CNN_MODEL_S;
-
-/*
-* CNN ctrl param
-*/
-typedef struct hiIVE_CNN_CTRL_S {
-    IVE_MEM_INFO_S stMem; /* Assist memory */
-    HI_U32 u32Num;        /* Input image number */
-} IVE_CNN_CTRL_S;
-
-/*
-* CNN result struct
-*/
-typedef struct hiIVE_CNN_RESULT_S {
-    HI_S32 s32ClassIdx;   /* The most possible index of the classification */
-    HI_S32 s32Confidence; /* The confidence of the classification */
-} IVE_CNN_RESULT_S;
-
-/*
-* Perspective transform algorithm mode
-*/
-typedef enum hiIVE_PERSP_TRANS_ALG_MODE_E {
-    IVE_PERSP_TRANS_ALG_MODE_NR_SIM = 0x0, /* Non-reflective similarity transform mode */
-    IVE_PERSP_TRANS_ALG_MODE_SIM = 0x1,    /* Reflective similarity transform mode */
-    IVE_PERSP_TRANS_ALG_MODE_AFFINE = 0x2, /* Affine transform mode */
-
-    IVE_PERSP_TRANS_ALG_MODE_BUTT
-} IVE_PERSP_TRANS_ALG_MODE_E;
-
-/*
-* Point pair
-*/
-typedef struct hiIVE_PERSP_TRANS_POINT_PAIR_S {
-    IVE_POINT_U14Q2_S stSrcPoint; /* Source point */
-    IVE_POINT_U14Q2_S stDstPoint; /* Destination point */
-} IVE_PERSP_TRANS_POINT_PAIR_S;
-
-/*
-* Perspective transform csc mode
-*/
-typedef enum hiIVE_PERSP_TRANS_CSC_MODE_E {
-    IVE_PERSP_TRANS_CSC_MODE_NONE = 0x0,                /* No do csc */
-    IVE_PERSP_TRANS_CSC_MODE_VIDEO_BT601_YUV2RGB = 0x1, /* CSC: YUV2RGB, video transfer mode, 
-                                                      RGB value range [16, 235] */
-    IVE_PERSP_TRANS_CSC_MODE_VIDEO_BT709_YUV2RGB = 0x2, /* CSC: YUV2RGB, video transfer mode, 
-                                                      RGB value range [16, 235] */
-    IVE_PERSP_TRANS_CSC_MODE_PIC_BT601_YUV2RGB = 0x3,   /* CSC: YUV2RGB, picture transfer mode, 
-                                                      RGB value range [0, 255] */
-    IVE_PERSP_TRANS_CSC_MODE_PIC_BT709_YUV2RGB = 0x4,   /* CSC: YUV2RGB, picture transfer mode, 
-                                                      RGB value range [0, 255] */
-
-    IVE_PERSP_TRANS_CSC_MODE_BUTT
-} IVE_PERSP_TRANS_CSC_MODE_E;
-
-/*
-* Perspective transform ctrl
-*/
-typedef struct hiIVE_PERSP_TRANS_CTRL_S {
-    IVE_PERSP_TRANS_ALG_MODE_E enAlgMode; /* Alg mode */
-    IVE_PERSP_TRANS_CSC_MODE_E enCscMode; /* CSC mode */
-    HI_U16 u16RoiNum;                     /* Roi number */
-    HI_U16 u16PointPairNum;               /* Point pair number  */
-} IVE_PERSP_TRANS_CTRL_S;
-
-typedef struct hiIVE_ROI_INFO_S {
-    IVE_RECT_S24Q8_S stRoi;
-    HI_U32 u32RoiId;
-} IVE_ROI_INFO_S;
-
-/* Kcf ctrl param */
-typedef struct hiIVE_KCF_PRO_CTRL_S {
-    IVE_CSC_MODE_E enCscMode; /* Only support:
-                                IVE_CSC_MODE_VIDEO_BT601_YUV2RGB  CSC: YUV2RGB, video transfer mode, 
-                                RGB value range [16, 235]
-                                IVE_CSC_MODE_VIDEO_BT709_YUV2RGB  CSC: YUV2RGB, video transfer mode, 
-                                RGB value range [16, 235]
-                                IVE_CSC_MODE_PIC_BT601_YUV2RGB  CSC: YUV2RGB, picture transfer mode, 
-                                RGB value range [0, 255]
-                                IVE_CSC_MODE_PIC_BT709_YUV2RGB  CSC: YUV2RGB, picture transfer mode, 
-                                RGB value range [0, 255]
-                            */
-    IVE_MEM_INFO_S stTmpBuf;
-    HI_U1Q15 u1q15InterFactor; /* Blend coefficient. [0, 32768] */
-    HI_U0Q16 u0q16Lamda;       /* The regularization coefficient. [0, 65535] */
-    HI_U4Q12 u4q12TrancAlfa;   /* The normalization thresh. [0, 4095] */
-    HI_U0Q8 u0q8Sigma;         /* The gaussian kernel bandwidth. [0, 255]  */
-    HI_U8 u8RespThr;
-} IVE_KCF_PRO_CTRL_S;
-
-typedef struct hiIVE_KCF_OBJ_S {
-    IVE_ROI_INFO_S stRoiInfo;
-    IVE_MEM_INFO_S stCosWinX;
-    IVE_MEM_INFO_S stCosWinY;
-    IVE_MEM_INFO_S stGaussPeak;
-    IVE_MEM_INFO_S stHogFeature;
-    IVE_MEM_INFO_S stAlpha;
-    IVE_MEM_INFO_S stDst;
-    HI_U3Q5 u3q5Padding; /* [48, 160]  */
-    HI_U8 au8Reserved[3];
-} IVE_KCF_OBJ_S;
-
-typedef struct hiIVE_LIST_HEAD_S {
-    struct hiIVE_LIST_HEAD_S *pstNext, *pstPrev;
-} IVE_LIST_HEAD_S;
-
-typedef struct hiIVE_KCF_OBJ_NODE_S {
-    IVE_LIST_HEAD_S stList;
-    IVE_KCF_OBJ_S stKcfObj;
-} IVE_KCF_OBJ_NODE_S;
-
-typedef enum hiIVE_KCF_LIST_STATE_E {
-    IVE_KCF_LIST_STATE_CREATE = 0x1,
-    IVE_KCF_LIST_STATE_DESTORY = 0x2,
-    IVE_KCF_LIST_STATE_BUTT
-} IVE_KCF_LIST_STATE_E;
-
-typedef struct hiIVE_KCF_OBJ_LIST_S {
-    IVE_KCF_OBJ_NODE_S *pstObjNodeBuf; /* The object list node address */
-    IVE_LIST_HEAD_S stFreeObjList;     /* The free list of object list */
-    IVE_LIST_HEAD_S stTrainObjList;    /* The training list of object list */
-    IVE_LIST_HEAD_S stTrackObjList;    /* The tracking list of object list */
-
-    HI_U32 u32FreeObjNum;             /* The numbers of free list */
-    HI_U32 u32TrainObjNum;            /* The numbers of training list */
-    HI_U32 u32TrackObjNum;            /* The numbers of tracking list */
-    HI_U32 u32MaxObjNum;              /* The maximum numbers of object list */
-    IVE_KCF_LIST_STATE_E enListState; /* The object list state */
-    HI_U8 *pu8TmpBuf;                 /* Assist buffer */
-} IVE_KCF_OBJ_LIST_S;
-
-typedef struct hiIVE_KCF_BBOX_S {
-    IVE_KCF_OBJ_NODE_S *pstNode;
-    HI_S32 s32Response; /* Bbox Response value. */
-
-    IVE_ROI_INFO_S stRoiInfo;
-    HI_BOOL bTrackOk;
-    HI_BOOL bRoiRefresh;
-} IVE_KCF_BBOX_S;
-
-typedef struct hiIVE_KCF_BBOX_CTRL_S {
-    HI_U32 u32MaxBboxNum; /* The member numbers of Bbox Array. */
-    HI_S32 s32RespThr;    /* Select Bbox when Bbox'Response value is greater than or equal to RespThr. */
-} IVE_KCF_BBOX_CTRL_S;
-
-typedef enum hiIVE_HOG_MODE_E {
-    IVE_HOG_MODE_VERTICAL_TANGENT_PLANE = 0x1,
-    IVE_HOG_MODE_HORIZONTAL_TANGENT_PLANE = 0x2,
-    IVE_HOG_MODE_BUTT
-} IVE_HOG_MODE_E;
-
-typedef struct hiIVE_HOG_CTRL_S {
-    IVE_CSC_MODE_E enCscMode; /* Only support:
-                                IVE_CSC_MODE_VIDEO_BT601_YUV2RGB  CSC: YUV2RGB, video transfer mode, 
-                                RGB value range [16, 235]
-                                IVE_CSC_MODE_VIDEO_BT709_YUV2RGB  CSC: YUV2RGB, video transfer mode, 
-                                RGB value range [16, 235]
-                                IVE_CSC_MODE_PIC_BT601_YUV2RGB  CSC: YUV2RGB, picture transfer mode, 
-                                RGB value range [0, 255]
-                                IVE_CSC_MODE_PIC_BT709_YUV2RGB  CSC: YUV2RGB, picture transfer mode, 
-                                RGB value range [0, 255] */
-    IVE_HOG_MODE_E enHogMode; /* Hog mode */
-    HI_U32 u32RoiNum;         /* Roi number. [1, 64] */
-    HI_U4Q12 u4q12TrancAlfa;  /* The normalization thresh. [0, 4095] */
-    HI_U8 au8Rsv[2];
-} IVE_HOG_CTRL_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-#endif/*_HI_IVE_H_*/
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ivp.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ivp.h
deleted file mode 100644
index 88f65f32..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ivp.h
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2018-2019. All rights reserved.
- * Description: defination of hi_ivp.h
- * Author: Hisilicon multimedia software (SVP) group
- * Create: 2018/10/26
- */
-#ifndef _HI_IVP_H_
-#define _HI_IVP_H_
-
-#include "hi_type.h"
-#include "hi_errno.h"
-#include "hi_common.h"
-#include "hi_comm_video.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"{
-#endif
-#endif
-
-#define HI_IVP_MAX_VENC_CHN_NUM 16
-#define HI_IVP_MAX_VIPIPE_NUM 2
-#define HI_IVP_MAX_CLASS 2
-#define HI_IVP_CLASS_NAME_LEN 32
-
-typedef struct{
-    hi_u64  physical_addr; /* RW;The physical address of the memory */
-    hi_u64  virtual_addr; /* RW;The virtual address of the memory */
-    hi_u32  memory_size;    /* RW;The size of memory */
-}hi_ivp_mem_info;
-
-typedef struct{
-    hi_float threshold;
-}hi_ivp_ctrl_attr;
-
-typedef struct{
-    hi_s32 x;
-    hi_s32 y;
-    hi_u32 width;
-    hi_u32 height;
-}hi_ivp_rect;
-
-typedef struct{
-	hi_ivp_rect rect;
-	hi_float quality;
-}hi_ivp_obj;
-
-typedef struct{
-    hi_char class_name[HI_IVP_CLASS_NAME_LEN];
-    hi_u32 rect_num;
-    hi_u32 rect_capcity;
-    hi_ivp_obj *objs;
-}hi_ivp_obj_of_one_class;
-
-typedef struct{
-    hi_s32 class_num;
-    hi_ivp_obj_of_one_class obj_class[HI_IVP_MAX_CLASS];
-}hi_ivp_obj_array;
-
-typedef struct{
-    hi_bool enable;
-    hi_u32 threshold; /* RW;Range: [1,1024] */
-}hi_ivp_roi_attr;
-
-typedef enum{
-    HI_IVP_ROI_MB_MODE_4X4,
-    HI_IVP_ROI_MB_MODE_8X8,
-    HI_IVP_ROI_MB_MODE_16X16,
-    HI_IVP_ROI_MB_MODE_BUTT
-}hi_ivp_roi_mb_mode;
-
-typedef struct{
-    hi_ivp_roi_mb_mode roi_mb_mode;
-    hi_u32 img_width; /* equal to the width of processing frame */
-    hi_u32 img_height; /* equal to the height of processing frame */
-    hi_u8 *mb_map; /* for 4x4 mb mode, alloc (DIV_UP(img_width,4))*(DIV_UP(img_height,4)) bytes */
-}hi_ivp_roi_map;
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_init
-*   Description  : Intelligent Video Process(IVP) initialization.
-*   Parameters   : HI_VOID
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_init(hi_void);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_deinit
-*   Description  : Intelligent Video Process(IVP) exit.
-*   Parameters   : HI_VOID.
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_deinit(hi_void);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_load_resource_from_memory
-*   Description  : Load resource from memory.
-*   Parameters   : const hi_ivp_mem_info *ivp_file_mem_info:Input
-                   hi_s32 *ivp_handle:Output
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_load_resource_from_memory(const hi_ivp_mem_info *ivp_file_mem_info, hi_s32 *ivp_handle);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_unload_resource
-*   Description  : Unload resource.
-*   Parameters   : hi_s32 ivp_handle:Input
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_unload_resource(hi_s32 ivp_handle);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_set_ctrl_attr
-*   Description  : Set ctrl param,include SMD threshold.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   const hi_ivp_ctrl_attr *ivp_ctrl_attr:input
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_set_ctrl_attr(hi_s32 ivp_handle, const hi_ivp_ctrl_attr *ivp_ctrl_attr);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_get_ctrl_attr
-*   Description  : Get ctrl param,include SMD threshold.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   hi_ivp_ctrl_attr *ivp_ctrl_attr:Output
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_get_ctrl_attr(hi_s32 ivp_handle, hi_ivp_ctrl_attr *ivp_ctrl_attr);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_set_fd_ctrl_attr
-*   Description  : Set FD ctrl param,include FD threshold. Only Hi3518EV300 support.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   const hi_ivp_ctrl_attr *ivp_ctrl_attr:input
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2019/05/22
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_set_fd_ctrl_attr(hi_s32 ivp_handle, const hi_ivp_ctrl_attr *ivp_ctrl_attr);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_get_fd_ctrl_attr
-*   Description  : Get FD ctrl param,include FD threshold. Only Hi3518EV300 support.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   hi_ivp_ctrl_attr *ivp_ctrl_attr:Output
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2019/05/22
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_get_fd_ctrl_attr(hi_s32 ivp_handle, hi_ivp_ctrl_attr *ivp_ctrl_attr);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_set_venc_low_bitrate
-*   Description  : Enable or disable venc low bitrate.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   hi_s32 venc_chn:Input
-                   hi_bool enable:Input
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_set_venc_low_bitrate(hi_s32 ivp_handle, hi_s32 venc_chn, hi_bool enable);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_get_venc_low_bitrate
-*   Description  : Get status of venc low bitrate.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   hi_s32 venc_chn:Input
-                   hi_bool *enable:Output
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_get_venc_low_bitrate(hi_s32 ivp_handle, hi_s32 venc_chn, hi_bool *enable);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_set_advance_isp
-*   Description  : Enable or disable advance Isp Attr.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   hi_s32 vi_pipe:Input
-                   hi_bool enable:Input
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_set_advance_isp(hi_s32 ivp_handle, hi_s32 vi_pipe, hi_bool enable);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_get_advance_isp
-*   Description  : Get status of advance ISP attr.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   hi_s32 vi_pipe:Input
-                   hi_bool *enable:Output
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_get_advance_isp(hi_s32 ivp_handle, hi_s32 vi_pipe, hi_bool *enable);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_set_roi_attr
-*   Description  : Set ROI Attr.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   const hi_ivp_roi_attr *roi_attr:Input
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2019/3/6
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_set_roi_attr(hi_s32 ivp_handle, const hi_ivp_roi_attr *roi_attr);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_get_roi_attr
-*   Description  : Get ROI Attr.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   hi_ivp_roi_attr *roi_attr:Output
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2019/3/6
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_get_roi_attr(hi_s32 ivp_handle, hi_ivp_roi_attr *roi_attr);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_set_roi_map
-*   Description  : Set ROI Map.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   const hi_ivp_roi_map *roi_map:Input
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2019/3/6
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_set_roi_map(hi_s32 ivp_handle, const hi_ivp_roi_map *roi_map);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_process
-*   Description  : Process.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   const VIDEO_FRAME_INFO_S *src_frame:Input
-                   hi_bool *obj_alarm:Output,alarm info.
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_process(hi_s32 ivp_handle, const VIDEO_FRAME_INFO_S *src_frame, hi_bool *obj_alarm);
-
-/*****************************************************************************
-*   Prototype    : hi_ivp_process_ex
-*   Description  : Process.
-*   Parameters   : hi_s32 ivp_handle:Input
-                   const VIDEO_FRAME_INFO_S *src_frame:Input
-                   hi_ivp_obj_array *obj_array:Output
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018/10/26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-hi_s32 hi_ivp_process_ex(hi_s32 ivp_handle, const VIDEO_FRAME_INFO_S *src_frame, hi_ivp_obj_array *obj_array);
-
-/* Error Code */
-typedef enum hiEN_IVP_ERR_CODE_E {
-    ERR_IVP_READ_FILE      = 0x41,   /* IVP read file error */
-    ERR_IVP_OPERATE_FILE   = 0x42,   /* IVP operate file error */
-    ERR_IVP_PROCESS_ERR    = 0x43,
-    ERR_IVP_INIT_FAIL      = 0x44,   /* IVP init fail */
-    ERR_IVP_EXIT_FAIL      = 0x45,   /* IVP exit fail */
-    ERR_IVP_LOAD_RESOURCE_FAIL = 0x46,
-
-    ERR_IVP_BUTT
-}EN_IVP_ERR_CODE_E;
-
-/************************************************IVP error code ***********************************/
-#define HI_ERR_IVP_NULL_PTR          HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, EN_ERR_NULL_PTR)
-#define HI_ERR_IVP_ILLEGAL_PARAM     HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, EN_ERR_ILLEGAL_PARAM)
-#define HI_ERR_IVP_NOT_SURPPORT      HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, EN_ERR_NOT_SUPPORT)
-#define HI_ERR_IVP_INIT_FAIL         HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, ERR_IVP_INIT_FAIL)
-#define HI_ERR_IVP_EXIT_FAIL         HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, ERR_IVP_EXIT_FAIL)
-#define HI_ERR_IVP_NOMEM             HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, EN_ERR_NOMEM)
-#define HI_ERR_IVP_EXIST             HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, EN_ERR_EXIST)
-#define HI_ERR_IVP_UNEXIST           HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, EN_ERR_UNEXIST)
-#define HI_ERR_IVP_READ_FILE         HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, ERR_IVP_READ_FILE)
-#define HI_ERR_IVP_OPERATE_FILE      HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, ERR_IVP_OPERATE_FILE)
-#define HI_ERR_IVP_PROCESS_ERR       HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, ERR_IVP_PROCESS_ERR)
-#define HI_ERR_IVP_LOAD_RESOURCE_FAIL       HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, ERR_IVP_LOAD_RESOURCE_FAIL)
-#define HI_ERR_IVP_BUSY              HI_DEF_ERR(HI_ID_IVP, EN_ERR_LEVEL_ERROR, EN_ERR_BUSY)
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-
-#endif/*_HI_IVP_H_*/
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ivs_qr.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ivs_qr.h
deleted file mode 100644
index 6873c9ba..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ivs_qr.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2019. All rights reserved.
- * Description: definition of hi_ivs_qr.h
- * Author: Hisilicon multimedia software (SVP) group
- * Create: 2019-09-02
- */
-#ifndef _HI_IVS_QR_H_
-#define _HI_IVS_QR_H_
-
-#include "hi_common_qr.h"
-#include "hi_comm_video.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"{
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-/*
- *   Prototype    : hi_ivs_qr_init
- *   Description  : qr init context.
- *   Parameters   : void
- *   Return Value : HI_SUCCESS: Success;Error codes: Failure.
- *   Spec         :
- *   History:
- *       1.  Date         : 2019/09/02
- *           Author       :
- *           Modification : Created function
- */
-hi_s32 hi_ivs_qr_init(hi_void);
-
-/*
- *   Prototype    : hi_ivs_qr_get_buf_size
- *   Description  : get qr buf size.
- *   Parameters   : hi_u32    max_img_width       Max input image width
- *                  hi_u32    max_img_height      Max input image height
- *                  hi_u32    *size               output buffer size
- *   Return Value : HI_SUCCESS: Success;Error codes: Failure.
- *   Spec         :
- *   History:
- *       1.  Date         : 2019/09/02
- *           Author       :
- *           Modification : Created function
- */
-hi_s32 hi_ivs_qr_get_buf_size(hi_u32 max_img_width, hi_u32 max_img_height, hi_u32 *size);
-
-/*
- *   Prototype    : hi_ivs_qr_proc
- *   Description  : qr process.
- *   Parameters   : VIDEO_FRAME_INFO_S          *src_frame        input frame
- *                  hi_qr_mem_info               *buf              buffer
- *                  hi_qr_info                   *qr_info          output QR info
- *   Return Value : HI_SUCCESS: Success;Error codes: Failure.
- *   Spec         :
- *   History:
- *       1.  Date         : 2019/09/02
- *           Author       :
- *           Modification : Created function
- */
-hi_s32 hi_ivs_qr_proc(VIDEO_FRAME_INFO_S *src_frame, hi_qr_mem_info *buf, hi_qr_info *qr_info);
-
-/*
- *   Prototype    : hi_ivs_qr_deinit
- *   Description  : qr deinit.
- *   Parameters   : void
- *   Return Value : HI_SUCCESS: Success;Error codes: Failure.
- *   Spec         :
- *   History:
- *       1.  Date         : 2019/09/02
- *           Author       :
- *           Modification : Created function
- */
-hi_s32 hi_ivs_qr_deinit(hi_void);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-#endif /* _HI_IVS_QR_H_ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_math.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_math.h
deleted file mode 100644
index 6148ba6c..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_math.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Huawei Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_math.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2016/07/15
-  Last Modified :
-  Description   : mathematical functions.
-  Function List :
-******************************************************************************/
-#ifndef __HI_MATH_H__
-#define __HI_MATH_H__
-
-#include "hi_type.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"{
-#endif
-#endif /* __cplusplus */
-
-/******************************************************************************
-** ABS(x)                 absolute value of x
-** SIGN(x)                sign of x
-** CMP(x,y)               0 if x==y; 1 if x>y; -1 if x<y
-******************************************************************************/
-#define ABS(x)          ( (x) >= 0 ? (x) : (-(x)) )
-#define _SIGN(x)         ( (x) >= 0 ? 1 : -1 )
-#define CMP(x,y)        (((x) == (y)) ? 0 : (((x) > (y)) ? 1 : -1))
-
-/******************************************************************************
-** MAX2(x,y)              maximum of x and y
-** MIN2(x,y)              minimum of x and y
-** MAX3(x,y,z)            maximum of x, y and z
-** MIN3(x,y,z)            minimun of x, y and z
-** MEDIAN(x,y,z)          median of x,y,z
-** MEAN2(x,y)             mean of x,y
-******************************************************************************/
-#define MAX2(x,y)       ( (x)>(y) ? (x):(y) )
-#define MIN2(x,y)       ( (x)<(y) ? (x):(y) )
-#define MAX3(x,y,z)     ( (x)>(y) ? MAX2(x,z) : MAX2(y,z) )
-#define MIN3(x,y,z)     ( (x)<(y) ? MIN2(x,z) : MIN2(y,z) )
-#define MEDIAN(x,y,z)   (((x)+(y)+(z) - MAX3(x,y,z)) - MIN3(x,y,z) )
-#define MEAN2(x,y)      (((x)+(y)) >> 1 )
-
-/******************************************************************************
-** CLIP3(x,min,max)       clip x within [min,max]
-** WRAP_MAX(x,max,min)    wrap to min if x equal max
-** WRAP_MIN(x,min,max)    wrap to max if x equal min
-** VALUE_BETWEEN(x,min.max)   True if x is between [min,max] inclusively.
-******************************************************************************/
-#define CLIP_MIN(x,min)          (((x) >= min) ? (x) : min)
-#define CLIP3(x,min,max)         ( (x)< (min) ? (min) : ((x)>(max)?(max):(x)) )
-#define CLIP_MAX(x,max)          ((x)>(max)?(max):(x))
-#define WRAP_MAX(x,max,min)      ( (x)>=(max) ? (min) : (x) )
-#define WRAP_MIN(x,min,max)      ( (x)<=(min) ? (max) : (x) )
-#define VALUE_BETWEEN(x,min,max) (((x)>=(min)) && ((x) <= (max)))
-
-/******************************************************************************
-** MULTI_OF_2_POWER(x,a)  whether x is multiple of a(a must be power of 2)
-** ALIGN_DOWN(x,a)     floor x to multiple of a(a must be power of 2)
-** ALIGN_UP(x, a)            align x to multiple of a
-**
-** Example:
-** ALIGN_UP(5,4) = 8
-** ALIGN_DOWN(5,4)   = 4
-******************************************************************************/
-#define MULTI_OF_2_POWER(x,a)    (!((x) & ((a) - 1) ) )
-#define HICEILING(x, a)           (((x)+(a)-1)/(a))
-
-#define ALIGN_UP(x, a)           ( ( ((x) + ((a) - 1) ) / a ) * a )
-#define ALIGN_DOWN(x, a)         ( ( (x) / (a)) * (a) )
-
-#define DIV_UP(x, a)             ( ((x) + ((a) - 1) ) / a )
-
-/******************************************************************************
-** Get the span between two unsinged number, such as
-** SPAN(HI_U32, 100, 200) is 200 - 100 = 100
-** SPAN(HI_U32, 200, 100) is 0xFFFFFFFF - 200 + 100
-** SPAN(HI_U64, 200, 100) is 0xFFFFFFFFFFFFFFFF - 200 + 100
-******************************************************************************/
-#define SPAN(type, begin, end)\
-({                            \
-   type b = (begin);          \
-   type e = (end);            \
-   (type)((b >= e) ? (b - e) : (b + ((~((type)0))-e))); \
-})
-
-/******************************************************************************
-** ENDIAN32(x,y)              little endian <---> big endian
-** IS_LITTLE_END()            whether the system is little end mode
-******************************************************************************/
-#define  ENDIAN32( x )                        \
-    (   ( (x) << 24 ) |                        \
-        ( ( (x) & 0x0000ff00 ) << 8 ) |        \
-        ( ( (x) & 0x00ff0000 ) >> 8 ) |        \
-        ( ( (x) >> 24 ) & 0x000000ff )  )
-
-
-
-/******************************************************************************
-** ENDIAN16(x,y)              little endian <---> big endian
-** IS_LITTLE_END()            whether the system is little end mode
-******************************************************************************/
-#define  ENDIAN16( x )    ( (((x) << 8) & 0xff00) | (((x) >> 8) & 255) )
-
-
-
-__inline static HI_BOOL IS_LITTLE_END(void)
-{
-    union unEND_TEST_U
-    {
-        HI_CHAR cTest[4];
-        HI_U32  u32Test;
-    } unEndTest;
-
-    unEndTest.cTest[0] = 0x01;
-    unEndTest.cTest[1] = 0x02;
-    unEndTest.cTest[2] = 0x03;
-    unEndTest.cTest[3] = 0x04;
-
-    return (unEndTest.u32Test > 0x01020304) ? (HI_TRUE) : (HI_FALSE);
-}
-
-
-/******************************************************************************
-** FRACTION32(de,nu)          fraction: nu(minator) / de(nominator).
-** NUMERATOR32(x)              of x(x is fraction)
-** DENOMINATOR32(x)           Denominator of x(x is fraction)
-
-** represent fraction in 32 bit. LSB 16 is numerator, MSB 16 is denominator
-** It is integer if denominator is 0.
-******************************************************************************/
-#define FRACTION32(de,nu)       ( ((de) << 16) | (nu) )
-#define NUMERATOR32(x)          ( (x) & 0xffff)
-#define DENOMINATOR32(x)        ( (x) >> 16 )
-
-/******************************************************************************
-** RGB(r,g,b)    assemble the r,g,b to 24bit color
-** RGB_R(c)      get RED   from 24bit color
-** RGB_G(c)      get GREEN from 24bit color
-** RGB_B(c)      get BLUE  from 24bit color
-******************************************************************************/
-#define RGB(r,g,b) ((((r) & 0xff) << 16) | (((g) & 0xff) << 8) | ((b) & 0xff))
-#define RGB_R(c)   ( ((c) & 0xff0000) >> 16)
-#define RGB_G(c)   ( ((c) & 0xff00) >> 8)
-#define RGB_B(c)   (  (c) & 0xff)
-
-/******************************************************************************
-** YUV(y,u,v)    assemble the y,u,v to 30bit color
-** YUV_Y(c)      get Y from 30bit color
-** YUV_U(c)      get U from 30bit color
-** YUV_V(c)      get V from 30bit color
-******************************************************************************/
-#define YUV(y,u,v) ((((y) & 0x03ff) << 20) | (((u) & 0x03ff) << 10) | ((v) & 0x03ff))
-#define YUV_Y(c)   ( ((c) & 0x3ff00000) >> 20)
-#define YUV_U(c)   ( ((c) & 0x000ffc00) >> 10)
-#define YUV_V(c)   (  (c) & 0x000003ff)
-
-/******************************************************************************
-** YUV_8BIT(y,u,v)    assemble the y,u,v to 24bit color
-** YUV_8BIT_Y(c)      get Y from 24bit color
-** YUV_8BIT_U(c)      get U from 24bit color
-** YUV_8BIT_V(c)      get V from 24bit color
-******************************************************************************/
-#define YUV_8BIT(y,u,v) ((((y) & 0xff) << 16) | (((u) & 0xff) << 8) | ((v) & 0xff))
-#define YUV_8BIT_Y(c)   ( ((c) & 0xff0000) >> 16)
-#define YUV_8BIT_U(c)   ( ((c) & 0xff00) >> 8)
-#define YUV_8BIT_V(c)   (  (c) & 0xff)
-
-/******************************************************************************
-** Rgb2Yc(r, g, b, *y, *u, *u)    convert r,g,b to y,u,v
-** Rgb2Yuv(rgb)             convert rgb to yuv
-******************************************************************************/
-__inline static HI_VOID Rgb2Yc(HI_U16 r, HI_U16 g, HI_U16 b, HI_U16 * py, HI_U16 * pcb, HI_U16 * pcr)
-{
-    /* Y */
-    *py = (HI_U16)((((r*66+g*129+b*25) >> 8) + 16) << 2);
-
-    /* Cb */
-    *pcb = (HI_U16)(((((b*112-r*38)-g*74) >> 8) + 128) << 2);
-
-    /* Cr */
-    *pcr = (HI_U16)(((((r*112-g*94)-b*18) >> 8) + 128) << 2);
-}
-
-__inline static HI_U32 Rgb2Yuv(HI_U32 u32Rgb)
-{
-    HI_U16 y,u,v;
-
-    Rgb2Yc(RGB_R(u32Rgb), RGB_G(u32Rgb), RGB_B(u32Rgb), &y, &u, &v);
-
-    return YUV(y,u,v);
-}
-
-
-__inline static HI_VOID Rgb2Yc_full(HI_U16 r, HI_U16 g, HI_U16 b, HI_U16 *py, HI_U16 *pcb, HI_U16 *pcr)
-{
-    HI_U16 py_temp, pcb_temp, pcr_temp;
-
-    py_temp  = (HI_U16)(((r*76 + g*150 + b*29)>>8) * 4);
-    pcb_temp = (HI_U16)(CLIP_MIN(((((b*130 - r*44 ) - g*86) >> 8)+128),0) * 4);
-    pcr_temp = (HI_U16)(CLIP_MIN(((((r*130 - g*109) - b*21) >> 8)+128),0) * 4);
-
-    *py = MAX2(MIN2(py_temp, 1023), 0);
-    *pcb = MAX2(MIN2(pcb_temp, 1023), 0);
-    *pcr = MAX2(MIN2(pcr_temp, 1023), 0);
-}
-
-__inline static HI_U32 Rgb2Yuv_full(HI_U32 u32Rgb)
-{
-    HI_U16 y,u,v;
-
-    Rgb2Yc_full(RGB_R(u32Rgb), RGB_G(u32Rgb), RGB_B(u32Rgb), &y, &u, &v);
-
-    return YUV(y,u,v);
-}
-
-/******************************************************************************
-** Rgb2Yc_8BIT(r, g, b, *y, *u, *u)    convert r,g,b to y,u,v
-** Rgb2Yuv_8BIT(rgb)                   convert rgb to yuv
-******************************************************************************/
-__inline static HI_VOID Rgb2Yc_8BIT(HI_U8 r, HI_U8 g, HI_U8 b, HI_U8 *py, HI_U8 *pcb, HI_U8 *pcr)
-{
-    /* Y */
-    *py = (HI_U8)(((r*66+g*129+b*25) >> 8) + 16);
-
-    /* Cb */
-    *pcb = (HI_U8)((((b*112-r*38)-g*74) >> 8) + 128);
-
-    /* Cr */
-    *pcr = (HI_U8)((((r*112-g*94)-b*18) >> 8) + 128);
-}
-
-__inline static HI_U32 Rgb2Yuv_8BIT(HI_U32 u32Rgb)
-{
-    HI_U8 y,u,v;
-
-    Rgb2Yc_8BIT(RGB_R(u32Rgb), RGB_G(u32Rgb), RGB_B(u32Rgb), &y, &u, &v);
-
-    return YUV_8BIT(y,u,v);
-}
-
-__inline static HI_VOID Rgb2Yc_full_8BIT(HI_U8 r, HI_U8 g, HI_U8 b, HI_U8 *py, HI_U8 *pcb, HI_U8 *pcr)
-{
-    HI_S16 py_temp, pcb_temp, pcr_temp;
-
-    py_temp = (r*76 + g*150 + b*29)>>8;
-    pcb_temp = (((b*130 - r*44) - g*86) >> 8)+128;
-    pcr_temp = (((r*130 - g*109) - b*21) >> 8)+128;
-
-    *py = MAX2(MIN2(py_temp, 255), 0);
-    *pcb = MAX2(MIN2(pcb_temp, 255), 0);
-    *pcr = MAX2(MIN2(pcr_temp, 255), 0);
-}
-
-__inline static HI_U32 Rgb2Yuv_full_8BIT(HI_U32 u32Rgb)
-{
-    HI_U8 y,u,v;
-
-    Rgb2Yc_full_8BIT(RGB_R(u32Rgb), RGB_G(u32Rgb), RGB_B(u32Rgb), &y, &u, &v);
-
-    return YUV_8BIT(y,u,v);
-}
-
-/*******************************************************************************
-** FpsControl Useing Sample:
-**  FPS_CTRL_S g_stFpsCtrl;
-**
-**  Take 12 frame uniform in 25.
-**  InitFps(&g_stFpsCtrl, 25, 12);
-**
-**  {
-**       if(FpsControl(&g_stFpsCtrl)) printf("Yes, this frmae should be token");
-**  }
-**
-*******************************************************************************/
-typedef struct hiFPS_CTRL_S
-{
-    HI_U32 u32Ffps;    /* Full frame rate    */
-    HI_U32 u32Tfps;    /* Target frame rate  */
-    HI_U32 u32FrmKey;  /* update key frame   */
-} FPS_CTRL_S;
-
-__inline static HI_VOID InitFps(FPS_CTRL_S *pFrmCtrl, HI_U32 u32FullFps,
-                                HI_U32 u32TagFps)
-{
-    pFrmCtrl->u32Ffps   = u32FullFps;
-    pFrmCtrl->u32Tfps   = u32TagFps;
-    pFrmCtrl->u32FrmKey = 0;
-}
-
-__inline static HI_BOOL FpsControl(FPS_CTRL_S *pFrmCtrl)
-{
-    HI_BOOL   bReturn       = HI_FALSE;
-
-    pFrmCtrl->u32FrmKey += pFrmCtrl->u32Tfps;
-    if (pFrmCtrl->u32FrmKey >= pFrmCtrl->u32Ffps)
-    {
-        pFrmCtrl->u32FrmKey -= pFrmCtrl->u32Ffps;
-        bReturn = HI_TRUE;
-    }
-
-    return bReturn;
-}
-
-
-__inline static HI_U32 GetLowAddr(HI_U64  u64Phyaddr)
-{
-    return (HI_U32)u64Phyaddr;
-}
-
-
-__inline static HI_U32 GetHighAddr(HI_U64  u64Phyaddr)
-{
-    return (HI_U32)(u64Phyaddr>>32);
-}
-
-
-
-
-#define hi_usleep(usec) \
-do { \
-    usleep(usec); \
-} while (0)
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-
-#endif /* __HI_MATH_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_md.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_md.h
deleted file mode 100644
index 93a393cb..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_md.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2001-2015, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_md.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software (IVE) group
-  Created       : 2014/11/10
-  Description   :
-  History       :
-  1.Date        : 2014/11/10
-    Author      :
-    Modification: Created file
-  2.Date        : 2015/11/24
-	Author      :
-	Modification: Modify MD_ATTR_S
-******************************************************************************/
-#ifndef _HI_MD_H_
-#define _HI_MD_H_
-
-#include "hi_ive.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif
-/*
-* Definition md algorithm mode
-*/
-typedef enum hiMD_ALG_MODE_E {
-    MD_ALG_MODE_BG = 0x0,  /* Base on background image */
-    MD_ALG_MODE_REF = 0x1, /* Base on reference image */
-
-    MD_ALG_MODE_BUTT
-} MD_ALG_MODE_E;
-/*
-* Definition of md attribute
-*/
-typedef struct hiMD_ATTR_S {
-    MD_ALG_MODE_E enAlgMode;         /* Md algorithm mode */
-    IVE_SAD_MODE_E enSadMode;        /* Sad mode */
-    IVE_SAD_OUT_CTRL_E enSadOutCtrl; /* Sad output ctrl */
-    HI_U32 u32Width;                 /* Image width */
-    HI_U32 u32Height;                /* Image height */
-    HI_U16 u16SadThr;                /* Sad thresh */
-    IVE_CCL_CTRL_S stCclCtrl;        /* Ccl ctrl */
-    IVE_ADD_CTRL_S stAddCtrl;        /* Add ctrl */
-} MD_ATTR_S;
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-
-#endif /* _HI_MD_H_ */
\ No newline at end of file
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_mipi.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_mipi.h
deleted file mode 100644
index 76c71653..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_mipi.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2016-2019. All rights reserved.
- * Description: hi_mipi.h
- * Author:
- * Create: 2016-10-07
- */
-
-#ifndef __HI_MIPI_RX_H__
-#define __HI_MIPI_RX_H__
-
-typedef unsigned int combo_dev_t;
-typedef unsigned int sns_rst_source_t;
-typedef unsigned int sns_clk_source_t;
-
-
-#define MIPI_LANE_NUM           4
-#define LVDS_LANE_NUM           4
-
-#define WDR_VC_NUM              2
-#define SYNC_CODE_NUM           4
-
-#define MIPI_RX_MAX_DEV_NUM     1
-#define CMOS_MAX_DEV_NUM        1
-
-#define SNS_MAX_CLK_SOURCE_NUM  1
-#define SNS_MAX_RST_SOURCE_NUM  1
-
-
-#ifdef HI_MIPI_DEBUG
-#define HI_MSG(x...) \
-    do { \
-        osal_printk("%s->%d: ", __FUNCTION__, __LINE__); \
-        osal_printk(x); \
-        osal_printk("\n"); \
-    } while (0)
-#else
-#define HI_MSG(args...) do { } while (0)
-#endif
-
-#define HI_ERR(x...) \
-    do { \
-        osal_printk("%s(%d): ", __FUNCTION__, __LINE__); \
-        osal_printk(x); \
-    } while (0)
-
-#define MIPIRX_CHECK_NULL_PTR(ptr)\
-    do{\
-        if((ptr) == NULL)\
-        {\
-            HI_ERR("NULL point \r\n");\
-            return HI_FAILURE;\
-        }\
-    } while (0)
-
-
-typedef enum {
-    LANE_DIVIDE_MODE_0    = 0,
-    LANE_DIVIDE_MODE_BUTT
-} lane_divide_mode_t;
-
-typedef enum {
-    WORK_MODE_LVDS          = 0x0,
-    WORK_MODE_MIPI          = 0x1,
-    WORK_MODE_CMOS          = 0x2,
-    WORK_MODE_BT1120        = 0x3,
-    WORK_MODE_SLVS          = 0x4,
-    WORK_MODE_BUTT
-} work_mode_t;
-
-typedef enum {
-    INPUT_MODE_MIPI         = 0x0,              /* mipi */
-    INPUT_MODE_SUBLVDS      = 0x1,              /* SUB_LVDS */
-    INPUT_MODE_LVDS         = 0x2,              /* LVDS */
-    INPUT_MODE_HISPI        = 0x3,              /* HISPI */
-    INPUT_MODE_CMOS         = 0x4,              /* CMOS */
-    INPUT_MODE_BT601        = 0x5,              /* BT601 */
-    INPUT_MODE_BT656        = 0x6,              /* BT656 */
-    INPUT_MODE_BT1120       = 0x7,              /* BT1120 */
-    INPUT_MODE_BYPASS       = 0x8,              /* MIPI Bypass */
-    INPUT_MODE_BUTT
-} input_mode_t;
-
-typedef enum {
-    MIPI_DATA_RATE_X1 = 0,         /* output 1 pixel per clock */
-    MIPI_DATA_RATE_X2 = 1,         /* output 2 pixel per clock */
-
-    MIPI_DATA_RATE_BUTT
-} mipi_data_rate_t;
-
-typedef struct {
-    int x;
-    int y;
-    unsigned int width;
-    unsigned int height;
-} img_rect_t;
-
-typedef struct {
-    unsigned int width;
-    unsigned int height;
-} img_size_t;
-
-typedef enum {
-    DATA_TYPE_RAW_8BIT = 0,
-    DATA_TYPE_RAW_10BIT,
-    DATA_TYPE_RAW_12BIT,
-    DATA_TYPE_RAW_14BIT,
-    DATA_TYPE_RAW_16BIT,
-    DATA_TYPE_YUV420_8BIT_NORMAL,
-    DATA_TYPE_YUV420_8BIT_LEGACY,
-    DATA_TYPE_YUV422_8BIT,
-    DATA_TYPE_BUTT
-} data_type_t;
-
-/* MIPI D_PHY WDR MODE defines */
-typedef enum {
-    HI_MIPI_WDR_MODE_NONE = 0x0,
-    HI_MIPI_WDR_MODE_VC   = 0x1,    /* Virtual Channel */
-    HI_MIPI_WDR_MODE_DT   = 0x2,    /* Data Type */
-    HI_MIPI_WDR_MODE_DOL  = 0x3,    /* DOL Mode */
-    HI_MIPI_WDR_MODE_BUTT
-} mipi_wdr_mode_t;
-
-
-
-typedef struct {
-    data_type_t           input_data_type;          /* data type: 8/10/12/14/16 bit */
-    mipi_wdr_mode_t       wdr_mode;                 /* MIPI WDR mode */
-    short                 lane_id[MIPI_LANE_NUM];   /* lane_id: -1 - disable */
-
-    union {
-        short data_type[WDR_VC_NUM];                /* used by the HI_MIPI_WDR_MODE_DT */
-    };
-} mipi_dev_attr_t;
-
-typedef enum {
-    HI_WDR_MODE_NONE    = 0x0,
-    HI_WDR_MODE_2F      = 0x1,
-    HI_WDR_MODE_3F      = 0x2,
-    HI_WDR_MODE_4F      = 0x3,
-    HI_WDR_MODE_DOL_2F  = 0x4,
-    HI_WDR_MODE_DOL_3F  = 0x5,
-    HI_WDR_MODE_DOL_4F  = 0x6,
-    HI_WDR_MODE_BUTT
-} wdr_mode_t;
-
-typedef enum {
-    LVDS_SYNC_MODE_SOF = 0,         /* sensor SOL, EOL, SOF, EOF */
-    LVDS_SYNC_MODE_SAV,             /* SAV, EAV */
-    LVDS_SYNC_MODE_BUTT
-} lvds_sync_mode_t;
-
-typedef enum {
-    LVDS_VSYNC_NORMAL   = 0x00,
-    LVDS_VSYNC_SHARE    = 0x01,
-    LVDS_VSYNC_HCONNECT = 0x02,
-    LVDS_VSYNC_BUTT
-} lvds_vsync_type_t;
-
-typedef struct {
-    lvds_vsync_type_t sync_type;
-
-    /* hconnect vsync blanking len, valid when the sync_type is LVDS_VSYNC_HCONNECT */
-    unsigned short hblank1;
-    unsigned short hblank2;
-} lvds_vsync_attr_t;
-
-typedef enum {
-    LVDS_FID_NONE    = 0x00,
-    LVDS_FID_IN_SAV  = 0x01,    /* frame identification id in SAV 4th */
-    LVDS_FID_IN_DATA = 0x02,    /* frame identification id in first data */
-    LVDS_FID_BUTT
-} lvds_fid_type_t;
-
-typedef struct {
-    lvds_fid_type_t fid_type;
-
-    /* Sony DOL has the Frame Information Line, in DOL H-Connection mode,
-       should configure this flag as false to disable output the Frame Information Line */
-    unsigned char output_fil;
-} lvds_fid_attr_t;
-
-typedef enum {
-    LVDS_ENDIAN_LITTLE  = 0x0,
-    LVDS_ENDIAN_BIG     = 0x1,
-    LVDS_ENDIAN_BUTT
-} lvds_bit_endian_t;
-
-
-typedef struct {
-    data_type_t         input_data_type;            /* data type: 8/10/12/14 bit */
-    wdr_mode_t          wdr_mode;                   /* WDR mode */
-
-    lvds_sync_mode_t    sync_mode;                  /* sync mode: SOF, SAV */
-    lvds_vsync_attr_t   vsync_attr;                 /* normal, share, hconnect */
-    lvds_fid_attr_t     fid_attr;                   /* frame identification code */
-
-    lvds_bit_endian_t   data_endian;                /* data endian: little/big */
-    lvds_bit_endian_t   sync_code_endian;           /* sync code endian: little/big */
-    short               lane_id[LVDS_LANE_NUM];     /* lane_id: -1 - disable */
-
-    /* each vc has 4 params, sync_code[i]:
-       sync_mode is SYNC_MODE_SOF: SOF, EOF, SOL, EOL
-       sync_mode is SYNC_MODE_SAV: invalid sav, invalid eav, valid sav, valid eav  */
-    unsigned short      sync_code[LVDS_LANE_NUM][WDR_VC_NUM][SYNC_CODE_NUM];
-} lvds_dev_attr_t;
-
-typedef struct {
-    combo_dev_t         devno;              /* device number */
-    input_mode_t        input_mode;         /* input mode: MIPI/LVDS/SUBLVDS/HISPI/DC */
-    mipi_data_rate_t    data_rate;
-    /* MIPI Rx device crop area (corresponding to the oringnal sensor input image size) */
-    img_rect_t          img_rect;
-
-    union {
-        mipi_dev_attr_t     mipi_attr;
-        lvds_dev_attr_t     lvds_attr;
-    };
-} combo_dev_attr_t;
-
-typedef enum {
-    PHY_CMV_GE1200MV    = 0x00,
-    PHY_CMV_LT1200MV    = 0x01,
-    PHY_CMV_BUTT
-} phy_cmv_mode_t;
-
-typedef struct {
-    combo_dev_t       devno;
-    phy_cmv_mode_t    cmv_mode;
-} phy_cmv_t;
-
-
-#define HI_MIPI_IOC_MAGIC   'm'
-
-/* init data lane, input mode, data type */
-#define HI_MIPI_SET_DEV_ATTR                _IOW(HI_MIPI_IOC_MAGIC, 0x01, combo_dev_attr_t)
-
-/* set phy common mode voltage mode */
-#define HI_MIPI_SET_PHY_CMVMODE             _IOW(HI_MIPI_IOC_MAGIC, 0x04, phy_cmv_t)
-
-/* reset sensor */
-#define HI_MIPI_RESET_SENSOR                _IOW(HI_MIPI_IOC_MAGIC, 0x05, sns_rst_source_t)
-
-/* unreset sensor */
-#define HI_MIPI_UNRESET_SENSOR              _IOW(HI_MIPI_IOC_MAGIC, 0x06, sns_rst_source_t)
-
-/* reset mipi */
-#define HI_MIPI_RESET_MIPI                  _IOW(HI_MIPI_IOC_MAGIC, 0x07, combo_dev_t)
-
-/* unreset mipi */
-#define HI_MIPI_UNRESET_MIPI                _IOW(HI_MIPI_IOC_MAGIC, 0x08, combo_dev_t)
-
-/* reset slvs */
-#define HI_MIPI_RESET_SLVS                  _IOW(HI_MIPI_IOC_MAGIC, 0x09, combo_dev_t)
-
-/* unreset slvs */
-#define HI_MIPI_UNRESET_SLVS                _IOW(HI_MIPI_IOC_MAGIC, 0x0a, combo_dev_t)
-
-/* set mipi hs_mode */
-#define HI_MIPI_SET_HS_MODE                 _IOW(HI_MIPI_IOC_MAGIC, 0x0b, lane_divide_mode_t)
-
-/* enable mipi clock */
-#define HI_MIPI_ENABLE_MIPI_CLOCK           _IOW(HI_MIPI_IOC_MAGIC, 0x0c, combo_dev_t)
-
-/* disable mipi clock */
-#define HI_MIPI_DISABLE_MIPI_CLOCK          _IOW(HI_MIPI_IOC_MAGIC, 0x0d, combo_dev_t)
-
-/* enable slvs clock */
-#define HI_MIPI_ENABLE_SLVS_CLOCK           _IOW(HI_MIPI_IOC_MAGIC, 0x0e, combo_dev_t)
-
-/* disable slvs clock */
-#define HI_MIPI_DISABLE_SLVS_CLOCK          _IOW(HI_MIPI_IOC_MAGIC, 0x0f, combo_dev_t)
-
-/* enable sensor clock */
-#define HI_MIPI_ENABLE_SENSOR_CLOCK         _IOW(HI_MIPI_IOC_MAGIC, 0x10, sns_clk_source_t)
-
-/* disable sensor clock */
-#define HI_MIPI_DISABLE_SENSOR_CLOCK        _IOW(HI_MIPI_IOC_MAGIC, 0x11, sns_clk_source_t)
-
-#endif /* __HI_MIPI_RX_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_resampler_api.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_resampler_api.h
deleted file mode 100644
index 0ad2bfa1..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_resampler_api.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef _HI_RESAMPLER_API_H_
-#define _HI_RESAMPLER_API_H_
-
-#include "hi_type.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MAXFRAMESIZE 2048
-
-#ifndef HI_ERR_RESAMPLE_PREFIX
- #define HI_ERR_RESAMPLE_PREFIX 0x80000000
-#endif
-
-/* input handle is invalid */
-#define HI_ERR_RESAMPLE_HANDLE (HI_ERR_RESAMPLE_PREFIX | 0x0001)
-
-/* pcm circ buffer state is invalid */
-#define HI_ERR_RESAMPLE_PCMBUF (HI_ERR_RESAMPLE_PREFIX | 0x0002)
-
-/* input sample number is more than MAXFRAMESIZE or input buffer size
-   , or input sample number is not invalid (eg. even)*/
-#define HI_ERR_RESAMPLE_SAMPLE_NUMBER (HI_ERR_RESAMPLE_PREFIX | 0x0003)
-
-/* output pcm buffer space is not enough */
-#define HI_ERR_RESAMPLE_OUTPCM_SPACE (HI_ERR_RESAMPLE_PREFIX | 0x0004)
-
-/* the channels of input pcm is invalid */
-#define HI_ERR_PCM_CHANNEL (HI_ERR_RESAMPLE_PREFIX | 0x0005)
-
-/* the bit width of input pcm is invalid */
-#define HI_ERR_PCM_FORMAT (HI_ERR_RESAMPLE_PREFIX | 0x0006)
-
-/* invalid bypass flag */
-#define HI_ERR_INVALID_BYPASSFLAG (HI_ERR_RESAMPLE_PREFIX | 0x0007)
-
-/* error unknown */
-#define HI_ERR_UNKNOWN (HI_ERR_RESAMPLE_PREFIX | 0x0008)
-
-/* input Empty pointer*/
-#define HI_ERR_INPUT_EMPTY_POINTER (HI_ERR_RESAMPLE_PREFIX | 0x0009)
-
-/**************************************************************************************
- * Function:    HI_Resampler_Create
- *
- * Description: allocate memory for platform-specific data
- *              clear all the user-accessible fields
- *
- * Inputs:      inrate:  8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000
- *              outrate: 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000
- *              chans:   1 or 2
- * Outputs:     none
- *
- * Return:      handle to Resampler instance, 0 if malloc fails
- **************************************************************************************/
-HI_VOID* HI_Resampler_Create(HI_S32 s32Inrate, HI_S32 s32Outrate, HI_S32 s32Chans);
-
-
-/**************************************************************************************
- * Function:    HI_Resampler_Process
- *
- * Description: Resample pcm data to specific samplerate, only for interlaced format
- *
- * Inputs:      inst: valid Resampler instance pointer (HResampler)
- *              inbuf:   pointer to inputbuf
- *              insamps: input number of sample pointers
- * Outputs:     outbuf:  pointer to outputbuf
- *
- * Return:      output sample number per-channel
- * Notes:       sure insamps < MAXFRAMESIZE
-
-
- **************************************************************************************/
-HI_S32 HI_Resampler_Process(HI_VOID* inst, HI_S16* s16Inbuf, HI_S32 s32Insamps, HI_S16* s16Outbuf);
-
-
-/**************************************************************************************
- * Function:    HI_Resampler_Destroy
- *
- * Description: free platform-specific data allocated by ResamplerCreate
- *
- * Inputs:      valid Resampler instance pointer (HResampler)
- * Outputs:     none
- *
- * Return:      none
- **************************************************************************************/
-HI_VOID HI_Resampler_Destroy(HI_VOID* inst);
-
-
-/*******************************************************************************
- * Function:	HI_Resampler_GetMaxOutputNum
- *
- * Description: Caculate max output number at specific input number
- *
- * Inputs:		inst:	  valid Resampler instance pointer (HI_HANDLE)
- *				insamps:  input data number per-channel, insamps must be even
- * Outputs: 	none
- * Return:		>=0:	  Success, return the max output number per-channel
- *				other:	  Fail, return error code
- * Notes:
- * 1  if stereo(chans==2), sure insamps%2 == 0
- ******************************************************************************/
-HI_S32 HI_Resampler_GetMaxOutputNum(HI_VOID* inst, HI_S32 s32Insamps);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_securec.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_securec.h
deleted file mode 100644
index 1977c161..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_securec.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
-* Copyright @ Huawei Technologies Co., Ltd. 1998-2014. All rights reserved.  
-* File name: securec.h
-* Decription: 
-*             the user of this secure c library should include this header file
-*             in you source code. This header file declare all supported API
-*             prototype of the library, such as memcpy_s, strcpy_s, wcscpy_s,
-*             strcat_s, strncat_s, sprintf_s, scanf_s, and so on.
-* History:   
-*     1. Date: 
-*         Author:  
-*         Modification: 
-********************************************************************************
-*/
-
-#ifndef __HI_SECUREC_H__5D13A042_DC3F_4ED9_A8D1_882811274C27
-#define __HI_SECUREC_H__5D13A042_DC3F_4ED9_A8D1_882811274C27
-
-/* If you need high performance, enable the WITH_PERFORMANCE_ADDONS macro! */
-//#define WITH_PERFORMANCE_ADDONS
-
-#include "securectype.h"    /*lint !e537*/
-#include "securec.h"
-
-#include <stdarg.h>
-
-/*if you need export the function of this library in Win32 dll, use __declspec(dllexport) */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-    /**
-    * @Description:The wmemcpy_s function copies n successive wide characters from the object pointed to by src into the object pointed to by dest.
-    * @param dest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param src -source  address
-    * @param count -copies count wide characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_wmemcpy(wchar_t* dest, size_t destMax, const wchar_t* src, size_t count)
-    {
-        return wmemcpy_s(dest, destMax, src, count);
-    }
-    
-    /**
-    * @Description:The memmove_s function copies n characters from the object pointed to by src into the object pointed to by dest.
-    * @param dest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param src -source  address
-    * @param count -copies count wide characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_memmove(void* dest, size_t destMax, const void* src, size_t count)
-    {
-        return memmove_s(dest, destMax, src, count);
-    }
-    
-    /**
-    * @Description:The wmemmove_s function copies n successive wide characters from the object pointed to by src into the object pointed to by dest.
-    * @param dest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param src -source  address
-    * @param count -copies count wide characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_wmemmove(wchar_t* dest, size_t destMax, const wchar_t* src, size_t count)
-    {
-        return wmemmove_s(dest, destMax, src, count);
-    }
-
-    /**
-    * @Description:The wcscpy_s function copies the wide string pointed to by strSrc (including theterminating null wide character) into the array pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param strSrc -source  address
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_wcscpy(wchar_t* strDest, size_t destMax, const wchar_t* strSrc)
-    {
-        return wcscpy_s(strDest, destMax, strSrc);
-    }
-
-    /**
-    * @Description:The wcsncpy_s function copies not more than n successive wide characters (not including the terminating null wide character) 
-    *                       from the array pointed to by strSrc to the array pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating wide character) 
-    * @param strSrc -source  address
-    * @param count -copies count wide characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_wcsncpy(wchar_t* strDest, size_t destMax, const wchar_t* strSrc, size_t count)
-    {
-        return wcsncpy_s(strDest, destMax, strSrc, count);
-    }
-
-    /**
-    * @Description:The wcscat_s function appends a copy of the wide string pointed to by strSrc (including the terminating null wide character) 
-    *                     to the end of the wide string pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating wide character) 
-    * @param strSrc -source  address
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_wcscat(wchar_t* strDest, size_t destMax, const wchar_t* strSrc)
-    {
-        return wcscat_s(strDest, destMax, strSrc);
-    }
-
-    /**
-    * @Description:The wcsncat_s function appends not more than n successive wide characters (not including the terminating null wide character) 
-    *                       from the array pointed to by strSrc to the end of the wide string pointed to by strDest.
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating wide character) 
-    * @param strSrc -source  address
-    * @param count -copies count wide characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_wcsncat(wchar_t* strDest, size_t destMax, const wchar_t* strSrc, size_t count)
-    {
-        return wcsncat_s(strDest, destMax, strSrc, count);
-    }
-
-    /**
-    * @Description: The  strtok_s  function parses a string into a sequence of tokens,On the first call to strtok_s the string to be parsed should be specified in strToken.  
-    *                       In each subsequent call that should parse the same string, strToken should be NULL
-    * @param strToken - the string to be delimited
-    * @param strDelimit -specifies a set of characters that delimit the tokens in the parsed string
-    * @param context -is a pointer to a char * variable that is used internally by strtok_s function
-    * @return:returns a pointer to the first character of a token, or a null pointer if there is no token or there is a runtime-constraint violation.
-    */
-    static inline char* hi_strtok(char* strToken, const char* strDelimit, char** context)
-    {
-        return strtok_s(strToken, strDelimit, context);
-    }
-
-     /**
-    * @Description: The  wcstok_s  function  is  the  wide-character  equivalent  of the strtok_s function
-    * @param strToken - the string to be delimited
-    * @param strDelimit -specifies a set of characters that delimit the tokens in the parsed string
-    * @param context -is a pointer to a char * variable that is used internally by strtok_s function
-    * @return:returns a pointer to the first character of a token, or a null pointer if there is no token or there is a runtime-constraint violation.
-    */
-    #define hi_wcstok(strToken, strDelimit, context) \
-        wcstok_s(strToken, strDelimit, context)
-
-    /**
-    * @Description: The sprintf_s function is equivalent to the sprintf function except for the parameter destMax and the explicit runtime-constraints violation
-    * @param strDest -  produce output according to a format ,write to the character string strDest
-    * @param destMax - The maximum length of destination buffer(including the terminating null byte ('\0'))
-    * @param format - fromat string
-    * @return:success the number of characters printed(not including the terminating null byte ('\0')), If an error occurred return -1.
-    */
-    #define hi_sprintf(strDest, destMax, format, ...) \
-        sprintf_s(strDest, destMax, format, ##__VA_ARGS__)
-
-    /**
-    * @Description: The  swprintf_s  function  is  the  wide-character  equivalent  of the sprintf_s function
-    * @param strDest -  produce output according to a format ,write to the character string strDest
-    * @param destMax - The maximum length of destination buffer(including the terminating null )
-    * @param format - fromat string
-    * @return:success the number of characters printed(not including the terminating null wide characte), If an error occurred return -1.
-    */
-    #define hi_swprintf(strDest, destMax, format, ...) \
-        swprintf_s(strDest, destMax, format, ##__VA_ARGS__)
-
-
-    /**
-    * @Description: The snprintf_s function is equivalent to the snprintf function except for the parameter destMax/count and the explicit runtime-constraints violation
-    * @param strDest -  produce output according to a format ,write to the character string strDest
-    * @param destMax - The maximum length of destination buffer(including the terminating null  byte ('\0'))
-    * @param count - do not write more than count bytes to strDest(not including the terminating null  byte ('\0'))
-    * @param format - fromat string
-    * @param argptr - instead of  a variable  number of arguments
-    * @return:return the number of characters printed(not including the terminating null byte ('\0')), If an error occurred return -1.
-    */
-    #define hi_snprintf(strDest, destMax, count, format, ...) \
-        snprintf_s(strDest, destMax, count, format, ##__VA_ARGS__)
-
-    /**
-    * @Description: The scanf_s function is equivalent to fscanf_s with the argument stdin interposed before the arguments to scanf_s
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    #define hi_scanf(format, ...) scanf_s(format, ##__VA_ARGS__)
-
-    /**
-    * @Description: The  wscanf_s  function  is  the  wide-character  equivalent  of the scanf_s function
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    #define hi_wscanf(format, ...) wscanf_s(format, ##__VA_ARGS__)
-
-
-    /**
-    * @Description: The fscanf_s function is equivalent to fscanf except that the c, s, and [ conversion specifiers apply to a pair of arguments (unless assignment suppression is indicated by a*)
-    * @param stream - stdio file stream
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    #define hi_fscanf(stream, format, ...) fscanf_s(stream, format, ##__VA_ARGS__)
-
-    /**
-    * @Description: The  fwscanf_s  function  is  the  wide-character  equivalent  of the fscanf_s function
-    * @param stream - stdio file stream
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    #define hi_fwscanf(stream, format, ...) fwscanf_s(stream, format, ##__VA_ARGS__)
-
-    /**
-    * @Description: The sscanf_s function is equivalent to fscanf_s, except that input is obtained from a string (specified by the argument buffer) rather than from a stream
-    * @param buffer -  read character from  buffer
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    #define hi_sscanf(buffer, format, ...) sscanf_s(buffer, format, ##__VA_ARGS__)
-
-    /**
-    * @Description: The  swscanf_s  function  is  the  wide-character  equivalent  of the sscanf_s function
-    * @param buffer -  read character from  buffer
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    #define hi_swscanf(buffer, format, ...) swscanf_s(buffer, format, ##__VA_ARGS__)
-
-    /**
-    * @Description:The gets_s function reads at most one less than the number of characters specified by destMax from the stream pointed to by stdin, into the array pointed to by buffer
-    * @param buffer - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating null character) 
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline char* hi_gets(char* buffer, size_t destMax)
-    {
-        return gets_s(buffer, destMax);
-    }
-    
-     /**
-    * @Description:The memset_s function copies the value of c (converted to an unsigned char) into each of the first count characters of the object pointed to by dest.
-    * @param dest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param c - the value to be copied
-    * @param count -copies fisrt count characters of  dest
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_memset(void* dest, size_t destMax, int c, size_t count)
-    {
-        return memset_s(dest, destMax, c, count);
-    }
-
-    /**
-    * @Description:The memcpy_s function copies n characters from the object pointed to by src into the object pointed to by dest.
-    * @param dest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param src -source  address
-    * @param count -copies count  characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_memcpy(void* dest, size_t destMax, const void* src, size_t count)
-    {
-        return memcpy_s(dest, destMax, src, count);
-    }
-
-    /**
-    * @Description:The strcpy_s function copies the string pointed to by strSrc (including the terminating null character) into the array pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating null character) 
-    * @param strSrc -source  address
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_strcpy(char* strDest, size_t destMax, const char* strSrc)
-    {
-        return strcpy_s(strDest, destMax, strSrc);
-    }
-    
-    /**
-    * @Description:The strncpy_s function copies not more than n successive characters (not including the terminating null character) 
-    *                     from the array pointed to by strSrc to the array pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating null character) 
-    * @param strSrc -source  address
-    * @param count -copies count  characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_strncpy(char* strDest, size_t destMax, const char* strSrc, size_t count)
-    {
-        return strncpy_s(strDest, destMax, strSrc, count);
-    }
-
-    /**
-    * @Description:The strcat_s function appends a copy of the  string pointed to by strSrc (including the terminating null  character) 
-    *                     to the end of the  string pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating null wide character) 
-    * @param strSrc -source  address
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_strcat(char* strDest, size_t destMax, const char* strSrc)
-    {
-        return strcat_s(strDest, destMax, strSrc);
-    }
-
-    
-    /**
-    * @Description:The strncat_s function appends not more than n successive  characters (not including the terminating null  character) 
-    *                       from the array pointed to by strSrc to the end of the  string pointed to by strDest.
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating null character) 
-    * @param strSrc -source  address
-    * @param count -copies count  characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    static inline int hi_strncat(char* strDest, size_t destMax, const char* strSrc, size_t count)
-    {
-        return strncat_s(strDest, destMax, strSrc, count);
-    }
-
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif/* __HI_SECUREC_H__5D13A042_DC3F_4ED9_A8D1_882811274C27 */
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_sns_ctrl.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_sns_ctrl.h
deleted file mode 100644
index 83193872..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_sns_ctrl.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_sns_ctrl.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2011/01/10
-  Description   :
-  History       :
-  1.Date        : 2011/01/10
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-
-#ifndef __HI_SNS_CTRL_H__
-#define __HI_SNS_CTRL_H__
-
-#include "hi_type.h"
-#include "hi_comm_3a.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-
-typedef struct hiISP_SNS_STATE_S {
-    HI_BOOL     bInit;                  /* HI_TRUE: Sensor init */
-    HI_BOOL     bSyncInit;              /* HI_TRUE: Sync Reg init */
-    HI_U8       u8ImgMode;
-    HI_U8       u8Hdr;               /* HI_TRUE: HDR enbale */
-    WDR_MODE_E  enWDRMode;
-
-    ISP_SNS_REGS_INFO_S astRegsInfo[2]; /* [0]: Sensor reg info of cur-frame; [1]: Sensor reg info of pre-frame ; */
-
-    HI_U32      au32FL[2];              /* [0]: FullLines of cur-frame; [1]: Pre FullLines of pre-frame */
-    HI_U32      u32FLStd;               /* FullLines std */
-    HI_U32      au32WDRIntTime[4];
-} ISP_SNS_STATE_S;
-
-typedef enum hiISP_SNS_MIRRORFLIP_TYPE_E {
-    ISP_SNS_NORMAL      = 0,
-    ISP_SNS_MIRROR      = 1,
-    ISP_SNS_FLIP        = 2,
-    ISP_SNS_MIRROR_FLIP = 3,
-    ISP_SNS_BUTT
-} ISP_SNS_MIRRORFLIP_TYPE_E;
-
-typedef struct hiISP_SNS_OBJ_S {
-    HI_S32 (*pfnRegisterCallback)(VI_PIPE ViPipe, ALG_LIB_S *pstAeLib, ALG_LIB_S *pstAwbLib);
-    HI_S32 (*pfnUnRegisterCallback)(VI_PIPE ViPipe, ALG_LIB_S *pstAeLib, ALG_LIB_S *pstAwbLib);
-    HI_S32 (*pfnSetBusInfo)(VI_PIPE ViPipe, ISP_SNS_COMMBUS_U unSNSBusInfo);
-    HI_VOID (*pfnStandby)(VI_PIPE ViPipe);
-    HI_VOID (*pfnRestart)(VI_PIPE ViPipe);
-    HI_VOID (*pfnMirrorFlip)(VI_PIPE ViPipe, ISP_SNS_MIRRORFLIP_TYPE_E eSnsMirrorFlip);
-    HI_S32 (*pfnWriteReg)(VI_PIPE ViPipe, HI_S32 s32Addr, HI_S32 s32Data);
-    HI_S32 (*pfnReadReg)(VI_PIPE ViPipe, HI_S32 s32Addr);
-    HI_S32 (*pfnSetInit)(VI_PIPE ViPipe, ISP_INIT_ATTR_S *pstInitAttr);
-} ISP_SNS_OBJ_S;
-
-extern ISP_SNS_OBJ_S stSnsMn34220Obj;
-extern ISP_SNS_OBJ_S stSnsImx377Obj;
-extern ISP_SNS_OBJ_S stSnsImx299Obj;
-extern ISP_SNS_OBJ_S stSnsImx477Obj;
-extern ISP_SNS_OBJ_S stSnsImx299SlvsObj;
-extern ISP_SNS_OBJ_S stSnsImx290Obj;
-extern ISP_SNS_OBJ_S stSnsImx327Obj;
-extern ISP_SNS_OBJ_S stSnsImx327_2l_Obj;
-extern ISP_SNS_OBJ_S stSnsImx334Obj;
-extern ISP_SNS_OBJ_S stSnsOV2718Obj;
-extern ISP_SNS_OBJ_S stSnsAr0237Obj;
-
-extern ISP_SNS_OBJ_S stSnsCmv50000Obj;
-extern ISP_SNS_OBJ_S stSnsImx277SlvsObj;
-extern ISP_SNS_OBJ_S stSnsImx117Obj;
-extern ISP_SNS_OBJ_S stSnsImx290SlaveObj;
-extern ISP_SNS_OBJ_S stSnsImx334SlaveObj;
-extern ISP_SNS_OBJ_S stSnsImx226Obj;
-extern ISP_SNS_OBJ_S stSnsImx335Obj;
-extern ISP_SNS_OBJ_S stSnsImx307Obj;
-extern ISP_SNS_OBJ_S stSnsImx307_2l_Obj;
-extern ISP_SNS_OBJ_S stSnsImx458Obj;
-extern ISP_SNS_OBJ_S stSnsSc4236Obj;
-extern ISP_SNS_OBJ_S stSnsSc4210Obj;
-extern ISP_SNS_OBJ_S stSnsSc2231Obj;
-extern ISP_SNS_OBJ_S stSnsSc2235Obj;
-extern ISP_SNS_OBJ_S stSnsSc3235Obj;
-extern ISP_SNS_OBJ_S stSnsSoiF37Obj;
-extern ISP_SNS_OBJ_S stSnsOs05aObj;
-extern ISP_SNS_OBJ_S stSnsOS08A10Obj;
-extern ISP_SNS_OBJ_S stSnsOs05a_2lObj;
-extern ISP_SNS_OBJ_S stSnsGc2053Obj;
-extern ISP_SNS_OBJ_S stSnsSharp8kObj;
-extern ISP_SNS_OBJ_S stSnsOv12870Obj;
-extern ISP_SNS_OBJ_S stSnsGc2053ForCarObj;
-
-#define CMOS_CHECK_POINTER(ptr)\
-    do {\
-        if (ptr == HI_NULL)\
-        {\
-            ISP_TRACE(HI_DBG_ERR, "Null Pointer!\n");\
-            return HI_ERR_ISP_NULL_PTR;\
-        }\
-    }while(0)
-
-#define CMOS_CHECK_POINTER_VOID(ptr)\
-    do {\
-        if (ptr == HI_NULL)\
-        {\
-            ISP_TRACE(HI_DBG_ERR, "Null Pointer!\n");\
-            return;\
-        }\
-    }while(0)
-
-#define SENSOR_FREE(ptr)\
-    do{\
-        if (ptr != HI_NULL)\
-        {\
-            free(ptr);\
-            ptr = HI_NULL;\
-        }\
-    } while (0)
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* __HI_SNS_CTRL_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_spi.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_spi.h
deleted file mode 100644
index e3ba60ef..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_spi.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef __HI_SPI_H__
-#define __HI_SPI_H__
-
-typedef unsigned long long  __u64;
-typedef unsigned int        __u32;
-typedef unsigned short      __u16;
-typedef unsigned char       __u8;
-
-#ifdef __HuaweiLite__
-#include <spi.h>
-#else
-
-
-/* User space versions of kernel symbols for SPI clocking modes,
- * matching <linux/spi/spi.h>
- */
-
-#define SPI_CPHA        0x01
-#define SPI_CPOL        0x02
-
-#define SPI_MODE_0        (0|0)
-#define SPI_MODE_1        (0|SPI_CPHA)
-#define SPI_MODE_2        (SPI_CPOL|0)
-#define SPI_MODE_3        (SPI_CPOL|SPI_CPHA)
-
-#define SPI_CS_HIGH        0x04
-#define SPI_LSB_FIRST    0x08
-#define SPI_3WIRE        0x10
-#define SPI_LOOP        0x20
-#define SPI_NO_CS        0x40
-#define SPI_READY        0x80
-
-/*---------------------------------------------------------------------------*/
-
-/* IOCTL commands */
-
-#define SPI_IOC_MAGIC            'k'
-
-/**
- * struct spi_ioc_transfer - describes a single SPI transfer
- * @tx_buf: Holds pointer to userspace buffer with transmit data, or null.
- *    If no data is provided, zeroes are shifted out.
- * @rx_buf: Holds pointer to userspace buffer for receive data, or null.
- * @len: Length of tx and rx buffers, in bytes.
- * @speed_hz: Temporary override of the device's bitrate.
- * @bits_per_word: Temporary override of the device's wordsize.
- * @delay_usecs: If nonzero, how long to delay after the last bit transfer
- *    before optionally deselecting the device before the next transfer.
- * @cs_change: True to deselect device before starting the next transfer.
- *
- * This structure is mapped directly to the kernel spi_transfer structure;
- * the fields have the same meanings, except of course that the pointers
- * are in a different address space (and may be of different sizes in some
- * cases, such as 32-bit i386 userspace over a 64-bit x86_64 kernel).
- * Zero-initialize the structure, including currently unused fields, to
- * accommodate potential future updates.
- *
- * SPI_IOC_MESSAGE gives userspace the equivalent of kernel spi_sync().
- * Pass it an array of related transfers, they'll execute together.
- * Each transfer may be half duplex (either direction) or full duplex.
- *
- *    struct spi_ioc_transfer mesg[4];
- *    ...
- *    status = ioctl(fd, SPI_IOC_MESSAGE(4), mesg);
- *
- * So for example one transfer might send a nine bit command (right aligned
- * in a 16-bit word), the next could read a block of 8-bit data before
- * terminating that command by temporarily deselecting the chip; the next
- * could send a different nine bit command (re-selecting the chip), and the
- * last transfer might write some register values.
- */
-struct spi_ioc_transfer {
-    __u64        tx_buf;
-    __u64        rx_buf;
-
-    __u32        len;
-    __u32        speed_hz;
-
-    __u16        delay_usecs;
-    __u8        bits_per_word;
-    __u8        cs_change;
-    __u32        pad;
-
-    /* If the contents of 'struct spi_ioc_transfer' ever change
-     * incompatibly, then the ioctl number (currently 0) must change;
-     * ioctls with constant size fields get a bit more in the way of
-     * error checking than ones (like this) where that field varies.
-     *
-     * NOTE: struct layout is the same in 64bit and 32bit userspace.
-     */
-};
-
-/* not all platforms use <asm-generic/ioctl.h> or _IOC_TYPECHECK() ... */
-#define SPI_MSGSIZE(N) \
-    ((((N)*(sizeof (struct spi_ioc_transfer))) < (1 << _IOC_SIZEBITS)) \
-        ? ((N)*(sizeof (struct spi_ioc_transfer))) : 0)
-#define SPI_IOC_MESSAGE(N) _IOW(SPI_IOC_MAGIC, 0, char[SPI_MSGSIZE(N)])
-
-
-/* Read / Write of SPI mode (SPI_MODE_0..SPI_MODE_3) */
-#define SPI_IOC_RD_MODE            _IOR(SPI_IOC_MAGIC, 1, __u8)
-#define SPI_IOC_WR_MODE            _IOW(SPI_IOC_MAGIC, 1, __u8)
-
-/* Read / Write SPI bit justification */
-#define SPI_IOC_RD_LSB_FIRST        _IOR(SPI_IOC_MAGIC, 2, __u8)
-#define SPI_IOC_WR_LSB_FIRST        _IOW(SPI_IOC_MAGIC, 2, __u8)
-
-/* Read / Write SPI device word length (1..N) */
-#define SPI_IOC_RD_BITS_PER_WORD    _IOR(SPI_IOC_MAGIC, 3, __u8)
-#define SPI_IOC_WR_BITS_PER_WORD    _IOW(SPI_IOC_MAGIC, 3, __u8)
-
-/* Read / Write SPI device default max speed hz */
-#define SPI_IOC_RD_MAX_SPEED_HZ        _IOR(SPI_IOC_MAGIC, 4, __u32)
-#define SPI_IOC_WR_MAX_SPEED_HZ        _IOW(SPI_IOC_MAGIC, 4, __u32)
-
-#endif
-#endif /* __HI_SPI_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ssp.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ssp.h
deleted file mode 100644
index 528ce0d2..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_ssp.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * extdrv/include/hi_ssp.h for Linux .
- *
- * History:
- *      2006-4-11 create this file
- */
-
-#ifndef __HI_SSP_H__
-#define __HI_SSP_H__
-
-#define SSP_READ_ALT    0x1
-#define SSP_WRITE_ALT    0X3
-
-typedef struct hiSPI_DATA_S
-{
-    unsigned int     spi_no;
-    unsigned char    dev_addr;
-    unsigned int     dev_byte_num;
-    unsigned int     reg_addr;
-    unsigned int     addr_byte_num;
-    unsigned int     data;
-      unsigned int     data_byte_num;
-}SPI_DATA_S;
-
-
-#endif
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_tde_api.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_tde_api.h
deleted file mode 100644
index 4c92c15c..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_tde_api.h
+++ /dev/null
@@ -1,610 +0,0 @@
-/*****************************************************************************
-*Copyright (C), 2016-2018, Hisilicon Tech. Co., Ltd.
-*
-* FileName: hi_api_tde.h
-* Description:TDE2 API define
-*
-* History:
-* Version   Date          Author        DefectNum       Description
-*
-*****************************************************************************/
-
-#ifndef _HI_API_TDE2_H_
-#define _HI_API_TDE2_H_
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif  /* __cplusplus */
-
-#include "hi_type.h"
-#include "hi_tde_type.h"
-
-#define HI_TDE_Open HI_TDE2_Open
-#define HI_TDE_Close HI_TDE2_Close
-#define HI_TDE_BeginJob HI_TDE2_BeginJob
-
-/****************************************************************************/
-/*                             TDE2 API define                               */
-/****************************************************************************/
-
-/******************************* API Declaration *****************************/
-/** \addtogroup      TDE */
-
-/**
-\brief Starts a two-dimensional engine 2 (TDE2) device.
-\attention \n
-Before using the TDE, you must call this API to ensure that a TDE device is started.\n
-A TDE device can be started repeatedly by using multiple processes.\n.
-
-
-\param  N/A
-\retval ::HI_SUCCESS Success.
-\retval ::HI_ERR_TDE_DEV_OPEN_FAILED Starting a TDE device fails.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_Open(HI_VOID);
-
-
-/**
-\brief Stops a TDE2 device.
-\attention \n
-HI_TDE2_Open must work with HI_TDE2_Close.\n
-\param  N/A
-\retval N/A
-\see \n
-N/A
-*/
-HI_VOID     HI_TDE2_Close(HI_VOID);
-
-
-/**
-\brief Creates a TDE task.
-\attention N/A
-\param  N/A
-\retval If the return value is greater than 0, it indicates that the TDE task handle is valid.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_INVALID_HANDLE The handle of a TDE task is invalid.
-\see \n
-N/A
-*/
-TDE_HANDLE  HI_TDE2_BeginJob(HI_VOID);
-
-
-/**
-\brief Submits an existing TDE task.
-\attention \n
-Before calling this API, you must call HI_TDE2_Open to start a TDE device and call HI_TDE2_BeginJob to obtain a valid task handle.\n
-If the calling mode is set to block mode, and the API is returned due to timeout or interruption, the operation continues till it is complete even though the API called by the TDE is returned in advance.\n
-The synchronization mode is not supported currently.\n
-After a task is submitted, its handle becomes invalid. If the task is submitted again, the error code HI_ERR_TDE_INVALID_HANDLE is returned. \n.
-
-\param[in] s32Handle  Handle of a TDE task.
-\param[in] bSync  Whether to submit a TDE task in synchronization mode.
-\param[in] bBlock  Block flag.
-\param[in] u32TimeOut  Timeout period 10 ms.
-\retval ::HI_SUCCESS  A task is submitted successfully in non-block mode.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The input task handle is invalid.
-\retval ::HI_ERR_TDE_JOB_TIMEOUT  A task is not completed due to timeout.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_EndJob(TDE_HANDLE s32Handle, HI_BOOL bSync, HI_BOOL bBlock, HI_U32 u32TimeOut);
-
-
-/**
-\brief Cancels an operation added in a TDE task.
-\attention \n
-Before calling this API, you must call HI_TDE2_Open to start a TDE device and call HI_TDE2_BeginJob to obtain a valid task handle.\n
-A submitted task cannot be cancelled.\n
-No operations can be added to cancelled tasks, because the cancelled tasks are invalid.\n
-This API is called when an error occurs during TDE operation configuration.\n
-\param[in] s32Handle Handle of a TDE task.
-\retval 0 success.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_FAILURE  The specified task cannot be cancelled because it has been submitted.
-
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_CancelJob(TDE_HANDLE s32Handle);
-
-
-
-/**
-\brief Waits for the completion of a specified TDE task.
-\attention \n
- As a block interface, this API is blocked until the specified task is complete.\n
-
-\param[in] s32Handle Handle of a TDE task.
-\retval 0  The specified TDE task is not completed.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The handle of a TDE task is invalid.
-\retval ::HI_ERR_TDE_QUERY_TIMEOUT  The specified task is not completed due to timeout.
-\retval ::HI_ERR_TDE_UNSUPPORTED_OPERATION  The operation is not supported.
-\retval ::HI_ERR_TDE_INTERRUPT Blocked job was interrupted.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_WaitForDone(TDE_HANDLE s32Handle);
-
-
-/**
-\brief Waits for the completion of all TDE tasks.
-\attention \n
-As a block interface, this API is blocked until all TDE tasks are complete.\n
-
-\param  N/A
-\retval 0  The specified TDE task is not completed.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_UNSUPPORTED_OPERATION  The operation is not supported.
-\retval ::HI_ERR_TDE_INTERRUPT Blocked job was interrupted.
-N/A
-*/
-HI_S32 HI_TDE2_WaitAllDone(HI_VOID);
-
-
-/**
-\brief Resets all statuses of the TDE.
-\attention \n
-This API is used to reset software and hardware if a timeout error occurs due to the inconsistency of the software and hardware for standby wakeup.\n
-\param  N/A
-\retval 0  TDE reset successfully.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\see \n
-N/A
-*/
-HI_S32 HI_TDE2_Reset(HI_VOID);
-
-
-/**
-\brief Adds the fast copy operation to a TDE task.
-\attention \n
-HI_TDE2_QuickCopy adopts the direct memory access (DMA) transfer technology; therefore, HI_TDE2_QuickCopy is superior to HI_TDE2_Bitblit in transfer.
-Because the format conversion is not supported during fast copying, the formats of the source bitmap and the target bitmap must be the same.\n
-In addition, scaling is not supported during fast copying. If the operating area size of the source bitmap is different from that of the target bitmap, the copy and transfer operations are performed based on the minimum width and height.\n
-The specified operating area and the specified bitmap must have a public area; otherwise, an error is returned. This requirement is applicable to other operations.\n
-If the pixel format of a bitmap is greater than or equal to a byte, the base address and stride of the bitmap format must be aligned based on the pixel format. If the pixel format of a bitmap is smaller than a byte, the base address and stride of the bitmap must be aligned based on byte. This requirement is applicable to other operations.\n
-If the pixel format of a bitmap is smaller than a byte, the horizontal start point and width of the bitmap must be aligned based on pixel.\n
-The horizontal start point and width of the YCbCr422 bitmap must be even numbers. This requirement is applicable to other operations.\n
-
-\param[in] s32Handle  Handle of a TDE task.
-\param[in] pstSrc  Source bitmap.
-\param[in] pstSrcRect  Operating area of the source bitmap.
-\param[in] pstDst  Target bitmap.
-\param[in] pstDstRect  Operating area of the target bitmap.
-\retval 0 success.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_NULL_PTR  The parameter contains a null pointer.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The handle of a TDE task is invalid.
-\retval ::HI_ERR_TDE_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_TDE_NO_MEM  Adding an operation fails due to insufficient memory.
-\retval ::HI_FAILURE  A system error or an unknown error occurs.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_QuickCopy(TDE_HANDLE s32Handle, const TDE2_SURFACE_S *pstSrc, const TDE2_RECT_S  *pstSrcRect,
-                              const TDE2_SURFACE_S *pstDst, const TDE2_RECT_S *pstDstRect);
-
-
-/**
-\brief Rapidly fills in the target bitmap with a fixed value.
-\attention \n
-The data to be filled in must be specified based on the format of the target bitmap.\n
-
-\param[in] s32Handle  Handle of a TDE task.
-\param[in] pstDst  Target bitmap.
-\param[in] pstDstRect  Operating area of the target bitmap.
-\param[in] u32FillData  Data to be filled in.
-\retval 0 success.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_NULL_PTR  The parameter contains a null pointer.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The handle of a TDE task is invalid.
-\retval ::HI_ERR_TDE_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_TDE_NO_MEM  Adding an operation fails due to insufficient memory.
-\retval ::HI_FAILURE  A system error or an unknown error occurs.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_QuickFill(TDE_HANDLE s32Handle, const TDE2_SURFACE_S *pstDst, const TDE2_RECT_S *pstDstRect,
-                              HI_U32 u32FillData);
-
-
-/**
-\brief Scales the source bitmap based on a specified size of the target bitmap. The source bitmap and target bitmap can be the same.
-\attention \n
-The maximum minification is smaller than 256, there is no limit on magnification,but the max size of the bitmap is 4095*4095\n
-You can scale a bitmap that serves as both source bitmap and target bitmap. If the memories for storing the source bitmap and target bitmap overlap, the bitmaps cannot be scaled.\n
-
-\param[in] s32Handle  Handle of a TDE task.
-\param[in] pstSrc  Source bitmap.
-\param[in] pstSrcRect  Operating area of the source bitmap.
-\param[in] pstDst  Target bitmap.
-\param[in] pstDstRect  Operating area of the target bitmap.
-\retval 0 success.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_NULL_PTR  The parameter contains a null pointer.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The handle of a TDE task is invalid.
-\retval ::HI_ERR_TDE_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_TDE_NO_MEM  Adding an operation fails due to insufficient memory.
-\retval ::HI_ERR_TDE_NOT_ALIGNED  The start address or stride of the bitmap is not aligned based on pixel.
-\retval ::HI_ERR_TDE_MINIFICATION  The start address or stride of the bitmap is not aligned based on pixel.
-\retval ::HI_ERR_TDE_NOT_ALIGNED  The start address of the color look-up table (CLUT) is not 4-byte aligned.
-\retval ::HI_ERR_TDE_UNSUPPORTED_OPERATION  The operation is not supported.
-\retval ::HI_FAILURE  A system error or an unknown error occurs.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_QuickResize(TDE_HANDLE s32Handle, const TDE2_SURFACE_S *pstSrc, const TDE2_RECT_S  *pstSrcRect,
-                                const TDE2_SURFACE_S *pstDst, const TDE2_RECT_S  *pstDstRect);
-
-
-/**
-\brief Adds the anti-flicker operation to a TDE task.
-\attention \n
-The anti-flicker operation supports vertical filtering only.\n
-The anti-flicker operation can be performed on the source bitmap and target bitmap that are stored in the same memory.\n
-If the sizes of the specified input area and output area are different, scaling is performed.\n
-
-\param[in] s32Handle  Handle of a TDE task.
-\param[in] pstSrc  Source bitmap.
-\param[in] pstSrcRect  Operating area of the source bitmap.
-\param[in] pstDst  Target bitmap.
-\param[in] pstDstRect  Operating area of the target bitmap.
-\retval 0 success.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_NULL_PTR  The parameter contains a null pointer.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The handle of a TDE task is invalid.
-\retval ::HI_ERR_TDE_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_TDE_NO_MEM  Adding an operation fails due to insufficient memory.
-\retval ::HI_ERR_TDE_NOT_ALIGNED  The start address or stride of the bitmap is not aligned based on pixel.
-\retval ::HI_ERR_TDE_UNSUPPORTED_OPERATION  The operation is not supported.
-\retval ::HI_ERR_TDE_MINIFICATION  The minification is too large.
-\retval ::HI_FAILURE  A system error or an unknown error occurs.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_QuickDeflicker(TDE_HANDLE s32Handle, const TDE2_SURFACE_S *pstSrc, const TDE2_RECT_S  *pstSrcRect,
-                                   const TDE2_SURFACE_S *pstDst, const TDE2_RECT_S  *pstDstRect);
-
-
-
-/**
-\brief Adds the transfer operation (with additional functions available for the raster or macroblock bitmap) to a TDE task.
-\attention \n
-Before calling this API, you must call HI_TDE2_Open to start a TDE device and call HI_TDE2_BeginJob to obtain a valid task handle.\n
-If the sizes of the foreground bitmap and target bitmap are different, scaling is performed based on the preset scaling area. If no scaling area is set, the clip and transfer operations are performed based on the minimum value of the public area.\n
-The value of the global alpha, Alpha0, or Alpha1 ranges from 0 to 255.\n
-The background bitmap and the target bitmap can be the same.\n
-If only the single-source transfer operation with additional functions,you can set the structure information and the pointer of the operating area of the background or the background bitmap to null,but the pointer to the operation option type can't be null,and it doesn't support ColorKey and Blend.\n
-Scaling is not supported if the mirror function is enabled.\n
-If only the single-source transfer operation (for example, performing the ROP and reverse operations on the source bitmap only) is required, you can set the structure information and the pointer of the operating area of the background or the background bitmap to null.\n
-Scaling is not supported if the mirror function is enabled.\n
-The clip operation can be performed only when the clipping area overlaps the operating area; otherwise, an error occurs.\n
-When the color extension (from CLUT to ARGB/AYCbCr) is performed for the first time, the CLUT Reload flag function must be enabled.\n
-During a simple transfer operation (the operation does not contain additional functions and the pixel format of source and target bitmaps are the same), you can set the pointer to the operation option type to null. Then fast transfer is implemented.\n
-The pixel format of the target bitmap cannot be the macroblock format.\n
-
-\param[in] s32Handle  Handle of a TDE task.
-\param[in] pstBackGround  Background bitmap.
-\param[in] pstBackGroundRect  Operating area of the background bitmap.
-\param[in] pstForeGround  Foreground bitmap.
-\param[in] pstForeGroundRect  Operating area of the foreground bitmap.
-\param[in] pstDst  Target bitmap.
-\param[in] pstDstRect  Operating area of the target bitmap.
-\param[in] pstOpt  Structure for setting operation parameters.
-\retval 0 success.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_NULL_PTR  The parameter contains a null pointer.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The handle of a TDE task is invalid.
-\retval ::HI_ERR_TDE_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_TDE_NO_MEM  Adding an operation fails due to insufficient memory.
-\retval ::HI_ERR_TDE_NOT_ALIGNED  The start address of the CLUT is not 4-byte aligned.
-\retval ::HI_ERR_TDE_MINIFICATION  The minification is too large.
-\retval ::HI_ERR_TDE_UNSUPPORTED_OPERATION  The bitmap does not support this operation.
-\retval ::HI_ERR_TDE_CLIP_AREA  The operating area does not overlap the clipping area, and the displayed information is not updated.
-\retval ::HI_FAILURE  A system error or an unknown error occurs.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_Bitblit(TDE_HANDLE s32Handle, const TDE2_SURFACE_S *pstBackGround, const TDE2_RECT_S  *pstBackGroundRect,
-                            const TDE2_SURFACE_S *pstForeGround, const TDE2_RECT_S  *pstForeGroundRect, const TDE2_SURFACE_S *pstDst,
-                            const TDE2_RECT_S  *pstDstRect, const TDE2_OPT_S *pstOpt);
-
-
-/**
-\brief Adds the fill and transfer operations (with additional functions available for the raster bitmap) to a TDE task. After addition, the functions of drawing a point, drawing a line, filling in a color block on the surface, and filling in a memory can be implemented.
-\attention \n
-Before calling this API, you must call HI_TDE2_Open to start a TDE device and call HI_TDE2_BeginJob to obtain a valid task handle.\n
-When the foreground bitmap is null, the functions of this API are the same as those of HI_TDE2_QuickFil.\n
-During solid drawing, the foreground bitmap supports the colorkey operation only.\n
-To draw a rectangle, a vertical line, or a horizontal line by calling HI_TDE2_SolidDraw, you need to set the width and height of the filled rectangle. For example, drawing a vertical line is to draw a rectangle with the width of one pixel.
-
-\param[in] s32Handle  Handle of a TDE task.
-\param[in] pstForeGround  Foreground bitmap.
-\param[in] pstForeGroundRect  Operating area of the foreground bitmap.
-\param[in] pstDst  Target bitmap.
-\param[in] pstDstRect  Operating area of the target bitmap.
-\param[in] pstFillColor  Structure of fill colors.
-\param[in] pstOpt  Structure of operation attributes.
-\retval 0 success.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_NULL_PTR  The parameter contains a null pointer.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The handle of a TDE task is invalid.
-\retval ::HI_ERR_TDE_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_TDE_NO_MEM  Adding an operation fails due to insufficient memory.
-\retval ::HI_ERR_TDE_NOT_ALIGNED  The start address of the CLUT is not 4-byte aligned.
-\retval ::HI_ERR_TDE_MINIFICATION  The minification is too large.
-\retval ::HI_ERR_TDE_UNSUPPORTED_OPERATION  The bitmap does not support this operation.
-\retval ::HI_ERR_TDE_CLIP_AREA  The operating area does not overlap the clipping area, and the displayed information is not updated.
-\retval ::HI_FAILURE  A system error or an unknown error occurs.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_SolidDraw(TDE_HANDLE s32Handle, const TDE2_SURFACE_S *pstForeGround, const TDE2_RECT_S  *pstForeGroundRect,
-                              const TDE2_SURFACE_S *pstDst,
-                              const TDE2_RECT_S  *pstDstRect, const TDE2_FILLCOLOR_S *pstFillColor,
-                              const TDE2_OPT_S *pstOpt);
-
-
-/**
-\brief Adds the transfer operation (with additional functions available for the macroblock bitmap) to a TDE task. That is, the luminance macroblock data and the chrominance macroblock data are combined into raster data. During the combination, the scaling, anti-flicker, and clip operations can be performed concurrently.
-\attention \n
-Before calling this API, you must call HI_TDE2_Open to start a TDE device and call HI_TDE2_BeginJob to obtain a valid task handle.\n
-For the YCbCr422 macroblock, the horizontal coordination of the start point and the width of the operating area must be an even number.\n
-The pixel format of the target bitmap cannot be the macroblock format.\n
-
-\param[in] s32Handle  Handle of a TDE task.
-\param[in] pstMB  Surface of a macroblock.
-\param[in] pstMbRect  Operating area of a macroblock.
-\param[in] pstDst  Target bitmap.
-\param[in] pstDstRect  Operating area of the target bitmap.
-\param[in] pstMbOpt  Operation attributes of a macroblock.
-\retval 0 success.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_NULL_PTR  The parameter contains a null pointer.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The handle of a TDE task is invalid.
-\retval ::HI_ERR_TDE_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_TDE_NO_MEM  Adding an operation fails due to insufficient memory.
-\retval ::HI_ERR_TDE_MINIFICATION  The minification is too large because its maximum value is 255.
-\retval ::HI_ERR_TDE_UNSUPPORTED_OPERATION  The bitmap does not support this operation.
-\retval ::HI_ERR_TDE_CLIP_AREA  The operating area does not overlap the clipping area, and the displayed information is not updated.
-\retval ::HI_FAILURE  A system error or an unknown error occurs.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_MbBlit(TDE_HANDLE s32Handle, const TDE2_MB_S *pstMB, const TDE2_RECT_S  *pstMbRect, const TDE2_SURFACE_S *pstDst, const TDE2_RECT_S  *pstDstRect,
-                           const TDE2_MBOPT_S *pstMbOpt);
-
-
-/**
-\brief Adds the mask raster of operation (ROP) (available for the raster bitmap) to a TDE task. That is, the ROP operation is performed on the foreground bitmap and the background bitmap based on the mask bitmap.
-\attention \n
-Before calling this API, you must call HI_TDE2_Open to start a TDE device and call HI_TDE2_BeginJob to obtain a valid task handle.\n
-The sizes of the operating areas of the mask bitmap, foreground bitmap, and background bitmap must be the same.\n
-The mask bitmap must be in A1 format.\n
-The target bitmap and foreground bitmap must be in the same color space.\n
-\param[in] s32Handle  Handle of a TDE task.
-\param[in] pstBackGround  Background bitmap.
-\param[in] pstBackGroundRect  Operating area of the background bitmap.
-\param[in] pstForeGround  Foreground bitmap.
-\param[in] pstForeGroundRect  Operating area of the foreground bitmap.
-\param[in] pstMask  Mask bitmap.
-\param[in] pstMaskRect  Operating area of the mask bitmap.
-\param[in] pstDst  Target bitmap.
-\param[in] pstDstRect  Operating area of the target bitmap.
-\param[in] enRopCode_Color  ROP code of a color component.
-\param[in] enRopCode_Alpha  ROP code of the alpha component.
-\retval 0 success.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_NULL_PTR  The parameter contains a null pointer.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The handle of a TDE task is invalid.
-\retval ::HI_ERR_TDE_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_TDE_NO_MEM  Adding an operation fails due to insufficient memory.
-\retval ::HI_FAILURE  A system error or an unknown error occurs.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_BitmapMaskRop(TDE_HANDLE s32Handle,
-                                  const TDE2_SURFACE_S *pstBackGround, const TDE2_RECT_S  *pstBackGroundRect,
-                                  const TDE2_SURFACE_S *pstForeGround, const TDE2_RECT_S  *pstForeGroundRect,
-                                  const TDE2_SURFACE_S *pstMask, const TDE2_RECT_S  *pstMaskRect,
-                                  const TDE2_SURFACE_S *pstDst, const TDE2_RECT_S  *pstDstRect,
-                                  TDE2_ROP_CODE_E enRopCode_Color, TDE2_ROP_CODE_E enRopCode_Alpha);
-
-
-/**
-\brief Adds the mask blend operation (available for the raster bitmap) to a TDE task. That is, the foreground bitmap and the background bitmap are blending with the mask bitmap based on the mask bitmap.
-\attention \n
-Before calling this API, you must call HI_TDE2_Open to start a TDE device and call HI_TDE2_BeginJob to obtain a valid task handle.\n
-The target bitmap and background bitmap must be in the same color space.\n
-If the foreground bitmap contains the premultiplied data, the premultiplied mode must be selected during alpha blending; otherwise, the non-premultiplied mode is selected.
-The parameter enBlendMode cannot be set to TDE2_ALUCMD_ROP.\n
-
-\param[in] s32Handle   Handle of a TDE task.
-\param[in] pstBackGround  Background bitmap.
-\param[in] pstBackGroundRect  Operating area of the background bitmap.
-\param[in] pstForeGround  Foreground bitmap.
-\param[in] pstForeGroundRect  Operating area of the foreground bitmap.
-\param[in] pstMask  Mask bitmap.
-\param[in] pstMaskRect  Operating area of the mask bitmap.
-\param[in] pstDst  Target bitmap.
-\param[in] pstDstRect  Operating area of the target bitmap.
-\param[in] u8Alpha  Global alpha value during alpha blending.
-\param[in] enBlendMode  Alpha blending mode.
-\retval 0 success.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_NULL_PTR  The parameter contains a null pointer.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The handle of a TDE task is invalid.
-\retval ::HI_ERR_TDE_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_TDE_NO_MEM  Adding an operation fails due to insufficient memory.
-\retval ::HI_FAILURE  A system error or an unknown error occurs.
-\see \n
-N/A
-*/
-HI_S32      HI_TDE2_BitmapMaskBlend(TDE_HANDLE s32Handle,
-                                    const TDE2_SURFACE_S *pstBackGround, const TDE2_RECT_S  *pstBackGroundRect,
-                                    const TDE2_SURFACE_S *pstForeGround, const TDE2_RECT_S  *pstForeGroundRect,
-                                    const TDE2_SURFACE_S *pstMask, const TDE2_RECT_S  *pstMaskRect,
-                                    const TDE2_SURFACE_S *pstDst, const TDE2_RECT_S  *pstDstRect,
-                                    HI_U8 u8Alpha, TDE2_ALUCMD_E enBlendMode);
-
-
-/**
-\brief  Adds the rotation operation to a TDE task.
-\attention \n
-The pixel formats of the source bitmap and target bitmap must be the same, and the format cannot be YUV, CLUT1, or CLUT4.\n
-The parameters s32DstPointX and s32DstPointY are set to 0 by default. Because the two parameters are not used at present, they can be set to any values.\n
-
-\param[in] s32Handle  Handle of a TDE task.
-\param[in] pstSrc  Source bitmap.
-\param[in] pstSrcRect  Operating area of the source bitmap.
-\param[in] pstDst  Target bitmap.
-\param[in] s32DstPointX  Horizontal coordinate of the start point of the operating area in the target bitmap.
-\param[in] s32DstPointY  Vertical coordinate of the start point of the operating area in the target bitmap.
-\param[in] enRotateAngle  Rotate angle.
-\retval 0 success.
-\retval ::HI_ERR_TDE_DEV_NOT_OPEN  Calling this API fails because no TDE device is started.
-\retval ::HI_ERR_TDE_INVALID_HANDLE  The handle of a TDE task is invalid.
-\retval ::HI_ERR_TDE_NULL_PTR  The parameter contains a null pointer.
-\retval ::HI_ERR_TDE_UNSUPPORTED_OPERATION  The operation is not supported.
-\retval ::HI_ERR_TDE_INVALID_PARA  The parameter is invalid.
-\see \n
-N/A
-*/
-HI_S32 HI_TDE2_Rotate(TDE_HANDLE s32Handle, const TDE2_SURFACE_S* pstSrc, const TDE2_RECT_S  *pstSrcRect, const TDE2_SURFACE_S* pstDst,
-                                                const TDE2_RECT_S  *pstDstRect,TDE_ROTATE_ANGLE_E enRotateAngle);
-
-
-
-/**
-\brief Sets the anti-flicker level.
-\attention \n
-N/A
-\param[in] enDeflickerLevel  Anti-flicker level.
-\retval 0 success.
-\retval ::
-
-\see none
-*/
-HI_S32 HI_TDE2_SetDeflickerLevel(TDE_DEFLICKER_LEVEL_E enDeflickerLevel);
-
-
-/**
-\brief Obtains the anti-flicker level.
-\attention \n
-N/A
-\param[in] pDeflickerLevel  Anti-flicker level.
-\retval 0 success.
-\retval ::
-
-\see \n
-N/A
-*/
-HI_S32 HI_TDE2_GetDeflickerLevel(TDE_DEFLICKER_LEVEL_E *pDeflickerLevel);
-
-
-/**
-\brief Sets the alpha judgment threshold.
-\attention \n
-N/A
-\param[in] u8ThresholdValue  Judgment threshold.
-\retval 0 success.
-\retval ::
-
-\see \n
-N/A
-*/
-HI_S32 HI_TDE2_SetAlphaThresholdValue(HI_U8 u8ThresholdValue);
-
-
-/**
-\brief Obtains the alpha judgment threshold.
-\attention \n
-N/A
-\param[in] pu8ThresholdValue  Judgment threshold.
-\retval 0 success.
-\retval ::
-
-\see \n
-N/A
-*/
-HI_S32 HI_TDE2_GetAlphaThresholdValue(HI_U8 *pu8ThresholdValue);
-
-
-/**
-\brief Enables or disables the alpha judgment.
-\attention  N/A
-\param[in] bEnAlphaThreshold  Whether to enable the alpha judgment.
-\retval 0 success.
-\retval ::
-\see \n
-N/A
-*/
-HI_S32 HI_TDE2_SetAlphaThresholdState(HI_BOOL bEnAlphaThreshold);
-
-
-/**
-\brief Obtains the enable status of the alpha judgment.
-\attention N/A
-\param[in]  p_bEnAlphaThreshold  Whether to enable the alpha judgment.
-\retval 0 success.
-\retval ::
-
-\see \n
-N/A
-*/
-HI_S32 HI_TDE2_GetAlphaThresholdState(HI_BOOL *p_bEnAlphaThreshold);
-
-
-/**
-\brief Fills in the pattern.
-\attention N/A
-\param[in] s32Handle  Handle of a TDE task.
-\param[in] pstBackGround  Background bitmap.
-\param[in] pstBackGroundRect  Operating rectangle of the background bitmap.
-\param[in] pstForeGround  Foreground bitmap.
-\param[in] pstForeGroundRect  Operating rectangle of the foreground bitmap.
-\param[in] pstDst  Target bitmap.
-\param[in] pstDstRect  Operating rectangle of the target bitmap.
-\param[in] pstOpt  Options for pattern filling.
-\retval 0 success.
-\retval ::
-
-\see \n
-N/A
-*/
-HI_S32 HI_TDE2_PatternFill(TDE_HANDLE s32Handle, const TDE2_SURFACE_S *pstBackGround,
-                           const TDE2_RECT_S *pstBackGroundRect, const TDE2_SURFACE_S *pstForeGround,
-                           const TDE2_RECT_S *pstForeGroundRect, const TDE2_SURFACE_S *pstDst,
-                           const TDE2_RECT_S *pstDstRect, const TDE2_PATTERN_FILL_OPT_S *pstOpt);
-
-/**
-\brief Enables or disables the regional anti-flicker function.
-\attention N/A
-\param[in] bRegionDeflicker  Enable/disable flag.
-\retval 0 success.
-\retval ::
-
-\see \n
-N/A
-*/
-HI_S32 HI_TDE2_EnableRegionDeflicker(HI_BOOL bRegionDeflicker);
-
-/**
-\brief: multi blend surface by surface list
-\param[in]: composed surface list
-\retval: 0 success
-**/
-HI_S32 HI_TDE2_MultiBlending(TDE_HANDLE s32Handle, const TDE_SURFACE_LIST_S *pstSurfaceList);
-
-/** @} */  /** <!-- ==== API declaration end ==== */
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif  /* __cplusplus */
-
-#endif  /* _HI_API_TDE2_H_ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_tde_errcode.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_tde_errcode.h
deleted file mode 100644
index 76728dac..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_tde_errcode.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
-  Copyright (C), 2016-2018, Hisilicon Tech. Co., Ltd.
- ******************************************************************************
- File Name     : tde_errcode.h
-Version       : Initial Draft
-Author        : sdk
-Created       :
-Last Modified :
-Description   : err code define
-Function List :
-History       : May modify the code to errcode.h FOR hi3110
- ******************************************************************************/
-#ifndef __TDE_ERRCODE_H__
-#define __TDE_ERRCODE_H__
-
-#include "hi_type.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-/* tde start err no. */
-#define HI_ERR_TDE_BASE  ((HI_S32)( ((0x80UL + 0x20UL)<<24) | (100 << 16 ) | (4 << 13) | 1 ))
-
-enum
-{
-    HI_ERR_TDE_DEV_NOT_OPEN = HI_ERR_TDE_BASE,  /**<  tde device not open yet */
-    HI_ERR_TDE_DEV_OPEN_FAILED,                 /**<  open tde device failed */
-    HI_ERR_TDE_NULL_PTR,                        /**<  input parameters contain null ptr */
-    HI_ERR_TDE_NO_MEM,                          /**<  malloc failed  */
-    HI_ERR_TDE_INVALID_HANDLE,                  /**<  invalid job handle */
-    HI_ERR_TDE_INVALID_PARA,                    /**<  invalid parameter */
-    HI_ERR_TDE_NOT_ALIGNED,                     /**<  aligned error for position, stride, width */
-    HI_ERR_TDE_MINIFICATION,                    /**<  invalid minification */
-    HI_ERR_TDE_CLIP_AREA,                       /**<  clip area and operation area have no intersection */
-    HI_ERR_TDE_JOB_TIMEOUT,                     /**<  blocked job wait timeout */
-    HI_ERR_TDE_UNSUPPORTED_OPERATION,           /**<  unsupported operation */
-    HI_ERR_TDE_QUERY_TIMEOUT,                    /**<  query time out */
-    HI_ERR_TDE_INTERRUPT              /* blocked job was interrupted */
-};
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __TDE_ERRCODE_H__*/
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_tde_type.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_tde_type.h
deleted file mode 100644
index cc14a7dd..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_tde_type.h
+++ /dev/null
@@ -1,502 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016-2018, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
- File Name     : tde_type.h
-Version       : Initial Draft
-Author        :
-Created       : 2016/5/21
-Last Modified :
-Description   : TDE public type
-Function List :
-History       :
-1.Date        : 2016/5/21
-Author      :
-Modification: Created file
-
- ******************************************************************************/
-#ifndef __TDE_TYPE_H__
-#define __TDE_TYPE_H__
-
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#include "hi_tde_errcode.h"
-
-/****************************************************************************/
-/*                             TDE2 types define                             */
-/****************************************************************************/
-
-/*************************** Structure Definition ****************************/
-/** \addtogroup      TDE */
-
-
-/**Definition of the TDE handle*/
-typedef HI_S32 TDE_HANDLE;
-
-
-typedef HI_VOID (* TDE_FUNC_CB) (HI_U32 enCallModId, HI_U32 u32CallDevId, HI_U32 u32CallChnId,
-                            HI_VOID* pJobData);
-
-
-typedef HI_VOID (* TDE_TRIG_SEL)(HI_U32);
-
-/**RGB and packet YUV formats*/
-typedef enum hiTDE2_COLOR_FMT_E
-{
-    TDE2_COLOR_FMT_RGB444 = 0,          /**<For the RGB444 format, red occupies four bits, green occupies four bits, and blue occupies four bits. Other formats may be deduced by analogy.*/
-    TDE2_COLOR_FMT_BGR444,              /**<BGR444 format*/
-    TDE2_COLOR_FMT_RGB555,              /**<RGB555 format*/
-    TDE2_COLOR_FMT_BGR555,              /**<BGR555 format*/
-    TDE2_COLOR_FMT_RGB565,              /**<RGB565 format*/
-    TDE2_COLOR_FMT_BGR565,              /**<BGR565 format*/
-    TDE2_COLOR_FMT_RGB888,              /**<RGB888 format*/
-    TDE2_COLOR_FMT_BGR888,              /**<BGR888 format*/
-    TDE2_COLOR_FMT_ARGB4444,          	/**<ARGB4444 format*/
-    TDE2_COLOR_FMT_ABGR4444,           	/**<ABGR4444 format*/
-    TDE2_COLOR_FMT_RGBA4444,            /**<RGBA4444 format*/
-    TDE2_COLOR_FMT_BGRA4444,            /**<BGRA4444 format*/
-    TDE2_COLOR_FMT_ARGB1555,            /**<ARGB1555 format*/
-    TDE2_COLOR_FMT_ABGR1555,            /**<ABGR1555 format*/
-    TDE2_COLOR_FMT_RGBA1555,            /**<RGBA1555 format*/
-    TDE2_COLOR_FMT_BGRA1555,            /**<BGRA1555 format*/
-    TDE2_COLOR_FMT_ARGB8565,            /**<ARGB8565 format*/
-    TDE2_COLOR_FMT_ABGR8565,            /**<ABGR8565 format*/
-    TDE2_COLOR_FMT_RGBA8565,            /**<RGBA8565 format*/
-    TDE2_COLOR_FMT_BGRA8565,            /**<BGRA8565 format*/
-    TDE2_COLOR_FMT_ARGB8888,            /**<ARGB8888 format*/
-    TDE2_COLOR_FMT_ABGR8888,            /**<ABGR8888 format*/
-    TDE2_COLOR_FMT_RGBA8888,            /**<RGBA8888 format*/
-    TDE2_COLOR_FMT_BGRA8888,            /**<BGRA8888 format*/
-    TDE2_COLOR_FMT_RABG8888,            /**<RABG8888 format*/
-    TDE2_COLOR_FMT_CLUT1,               /**<1-bit palette format without alpha component. Each pixel occupies one bit.*/
-    TDE2_COLOR_FMT_CLUT2,               /**<2-bit palette format without alpha component. Each pixel occupies two bits.*/
-    TDE2_COLOR_FMT_CLUT4,               /**<4-bit palette format without alpha component. Each pixel occupies four bits.*/
-    TDE2_COLOR_FMT_CLUT8,               /**<8-bit palette format without alpha component. Each pixel occupies eight bits.*/
-    TDE2_COLOR_FMT_ACLUT44,             /**<1-bit palette format with alpha component. Each pixel occupies one bit.*/
-    TDE2_COLOR_FMT_ACLUT88,             /**<1-bit palette format with alpha component. Each pixel occupies one bit.*/
-    TDE2_COLOR_FMT_A1,                  /**<Alpha format. Each pixel occupies one bit.*/
-    TDE2_COLOR_FMT_A8,                  /**<Alpha format. Each pixel occupies eight bits.*/
-    TDE2_COLOR_FMT_YCbCr888,            /**<YUV packet format without alpha component*/
-    TDE2_COLOR_FMT_AYCbCr8888,          /**<YUV packet format with alpha component*/
-    TDE2_COLOR_FMT_YCbCr422,            /**<YUV packet422 format*/
-    TDE2_COLOR_FMT_PKGVYUY,             /**<YUV packet422 format, VYUY format*/
-    TDE2_COLOR_FMT_byte,                /**<Only for fast copy*/
-	TDE2_COLOR_FMT_halfword,            /**<Only for fast copy*/
-    TDE2_COLOR_FMT_JPG_YCbCr400MBP,     /**<Semi-planar YUV400 format, for JPG decoding*/
-    TDE2_COLOR_FMT_JPG_YCbCr422MBHP,    /**<Semi-planar YUV422 format, horizontal sampling, for JPG decoding*/
-    TDE2_COLOR_FMT_JPG_YCbCr422MBVP,    /**<Semi-planar YUV422 format, vertical sampling, for JPG decoding*/
-    TDE2_COLOR_FMT_MP1_YCbCr420MBP,     /**<Semi-planar YUV420 format*/
-    TDE2_COLOR_FMT_MP2_YCbCr420MBP,     /**<Semi-planar YUV420 format*/
-    TDE2_COLOR_FMT_MP2_YCbCr420MBI,     /**<Semi-planar YUV400 format*/
-    TDE2_COLOR_FMT_JPG_YCbCr420MBP,     /**<Semi-planar YUV400 format, for JPG decoding*/
-    TDE2_COLOR_FMT_JPG_YCbCr444MBP,     /**<Semi-planar YUV444 format*/
-    TDE2_COLOR_FMT_BUTT                 /**<End of enumeration*/
-} TDE2_COLOR_FMT_E;
-
-/**Definition of the semi-planar YUV format*/
-typedef enum hiTDE2_MB_COLORFMT_E
-{
-    TDE2_MB_COLOR_FMT_JPG_YCbCr400MBP = 0,/**<Semi-planar YUV400 format, for JPG decoding*/
-    TDE2_MB_COLOR_FMT_JPG_YCbCr422MBHP,   /**<Semi-planar YUV422 format, horizontal sampling, for JPG decoding*/
-    TDE2_MB_COLOR_FMT_JPG_YCbCr422MBVP,   /**<Semi-planar YUV422 format, vertical sampling, for JPG decoding*/
-    TDE2_MB_COLOR_FMT_MP1_YCbCr420MBP,    /**<Semi-planar YUV420 format*/
-    TDE2_MB_COLOR_FMT_MP2_YCbCr420MBP,    /**<Semi-planar YUV420 format*/
-    TDE2_MB_COLOR_FMT_MP2_YCbCr420MBI,    /**<Semi-planar YUV400 format*/
-    TDE2_MB_COLOR_FMT_JPG_YCbCr420MBP,    /**<Semi-planar YUV400 format, for JPG pictures*/
-    TDE2_MB_COLOR_FMT_JPG_YCbCr444MBP,    /**<Semi-planar YUV444 format, for JPG pictures*/
-    TDE2_MB_COLOR_FMT_BUTT
-} TDE2_MB_COLOR_FMT_E;
-
-/**Structure of the bitmap information set by customers*/
-typedef struct hiTDE2_SURFACE_S
-{
-    HI_U64 PhyAddr;              /**<Header address of a bitmap or the Y component*/
-
-    TDE2_COLOR_FMT_E enColorFmt;    /**<Color format*/
-
-    HI_U32 u32Height;               /**<Bitmap height*/
-
-    HI_U32 u32Width;                /**<Bitmap width*/
-
-    HI_U32 u32Stride;               /**<Stride of a bitmap or the Y component*/
-
-    HI_BOOL bYCbCrClut;             /**<Whether the CLUT is in the YCbCr space.*/
-
-    HI_BOOL bAlphaMax255;           /**<The maximum alpha value of a bitmap is 255 or 128.*/
-
-    HI_BOOL bAlphaExt1555;          /*<Whether to enable the alpha extension of an ARGB1555 bitmap.*/
-    HI_U8 u8Alpha0;                 /**<Values of alpha0 and alpha1, used as the ARGB1555 format*/
-    HI_U8 u8Alpha1;                 /**<Values of alpha0 and alpha1, used as the ARGB1555 format*/
-    HI_U64 CbCrPhyAddr;          /**<Address of the CbCr component, pilot*/
-    HI_U32 u32CbCrStride;           /**<Stride of the CbCr component, pilot*/
-    HI_U64 ClutPhyAddr;          /**<Address of the color look-up table (CLUT), for color extension or color correction*/
-} TDE2_SURFACE_S;
-
-/**Definition of the semi-planar YUV data*/
-typedef struct hiTDE2_MB_S
-{
-    TDE2_MB_COLOR_FMT_E enMbFmt;        /**<YUV format*/
-    HI_U64              YPhyAddr;    /**<Physical address of the Y component*/
-    HI_U32              u32YWidth;      /**<Width of the Y component*/
-    HI_U32              u32YHeight;     /**<Height of the Y component*/
-    HI_U32              u32YStride;     /**< Stride of the Y component, indicating bytes in each row*/
-    HI_U64              CbCrPhyAddr; /**<Width of the UV component*/
-    HI_U32              u32CbCrStride;  /**<Stride of the UV component, indicating the bytes in each row*/
-} TDE2_MB_S;
-
-/**Definition of the TDE rectangle*/
-typedef struct hiTDE2_RECT_S
-{
-    HI_S32 s32Xpos;     /**<Horizontal coordinate*/
-    HI_S32 s32Ypos;     /**<Vertical coordinate*/
-    HI_U32 u32Width;    /**<Width*/
-    HI_U32 u32Height;   /**<Height*/
-} TDE2_RECT_S;
-
-/**Logical operation type*/
-typedef enum hiTDE2_ALUCMD_E
-{
-    TDE2_ALUCMD_NONE = 0x0,         /**<No alpha and raster of operation (ROP) blending*/
-    TDE2_ALUCMD_BLEND = 0x1,        /**<Alpha blending*/
-    TDE2_ALUCMD_ROP = 0x2,          /**<ROP blending*/
-    TDE2_ALUCMD_COLORIZE = 0x4,     /**<Colorize operation*/
-    TDE2_ALUCMD_BUTT = 0x8          /**<End of enumeration*/
-} TDE2_ALUCMD_E;
-
-/**Definition of ROP codes*/
-typedef enum hiTDE2_ROP_CODE_E
-{
-    TDE2_ROP_BLACK = 0,     /**<Blackness*/
-    TDE2_ROP_NOTMERGEPEN,   /**<~(S2 | S1)*/
-    TDE2_ROP_MASKNOTPEN,    /**<~S2&S1*/
-    TDE2_ROP_NOTCOPYPEN,    /**< ~S2*/
-    TDE2_ROP_MASKPENNOT,    /**< S2&~S1 */
-    TDE2_ROP_NOT,           /**< ~S1 */
-    TDE2_ROP_XORPEN,        /**< S2^S1 */
-    TDE2_ROP_NOTMASKPEN,    /**< ~(S2 & S1) */
-    TDE2_ROP_MASKPEN,       /**< S2&S1 */
-    TDE2_ROP_NOTXORPEN,     /**< ~(S2^S1) */
-    TDE2_ROP_NOP,           /**< S1 */
-    TDE2_ROP_MERGENOTPEN,   /**< ~S2|S1 */
-    TDE2_ROP_COPYPEN,       /**< S2 */
-    TDE2_ROP_MERGEPENNOT,   /**< S2|~S1 */
-    TDE2_ROP_MERGEPEN,      /**< S2|S1 */
-    TDE2_ROP_WHITE,         /**< Whiteness */
-    TDE2_ROP_BUTT
-} TDE2_ROP_CODE_E;
-
-/**Definition of the blit mirror*/
-typedef enum hiTDE2_MIRROR_E
-{
-    TDE2_MIRROR_NONE = 0,       /**<No mirror*/
-    TDE2_MIRROR_HORIZONTAL,     /**<Horizontal mirror*/
-    TDE2_MIRROR_VERTICAL,       /**<Vertical mirror*/
-    TDE2_MIRROR_BOTH,           /**<Horizontal and vertical mirror*/
-    TDE2_MIRROR_BUTT
-} TDE2_MIRROR_E;
-
-/**Clip operation type*/
-typedef enum hiTDE2_CLIPMODE_E
-{
-    TDE2_CLIPMODE_NONE = 0, /**<No clip*/
-    TDE2_CLIPMODE_INSIDE,   /**<Clip the data within the rectangle to output and discard others*/
-    TDE2_CLIPMODE_OUTSIDE,  /**<Clip the data outside the rectangle to output and discard others*/
-    TDE2_CLIPMODE_BUTT
-} TDE2_CLIPMODE_E;
-
-/**Scaling mode for the macroblock*/
-typedef enum hiTDE2_MBRESIZE_E
-{
-    TDE2_MBRESIZE_NONE = 0,         /**<No scaling*/
-    TDE2_MBRESIZE_QUALITY_LOW,      /**<Low-quality scaling*/
-    TDE2_MBRESIZE_QUALITY_MIDDLE,   /**<Medium-quality scaling*/
-    TDE2_MBRESIZE_QUALITY_HIGH,     /**<High-quality scaling*/
-    TDE2_MBRESIZE_BUTT
-} TDE2_MBRESIZE_E;
-
-/**Definition of fill colors*/
-typedef struct hiTDE2_FILLCOLOR_S
-{
-    TDE2_COLOR_FMT_E enColorFmt;    /**<TDE pixel format*/
-    HI_U32           u32FillColor;  /**<Fill colors that vary according to pixel formats*/
-} TDE2_FILLCOLOR_S;
-
-/**Definition of colorkey modes*/
-typedef enum hiTDE2_COLORKEY_MODE_E
-{
-    TDE2_COLORKEY_MODE_NONE = 0,     /**<No colorkey*/
-    TDE2_COLORKEY_MODE_FOREGROUND,   /**<When performing the colorkey operation on the foreground bitmap, you need to perform this operation before the CLUT for color extension and perform this operation after the CLUT for color correction.*/
-    TDE2_COLORKEY_MODE_BACKGROUND,   /**<Perform the colorkey operation on the background bitmap*/
-    TDE2_COLORKEY_MODE_BUTT
-} TDE2_COLORKEY_MODE_E;
-
-/**Definition of colorkey range*/
-typedef struct hiTDE2_COLORKEY_COMP_S
-{
-    HI_U8 u8CompMin;           /**<Minimum value of a component*/
-    HI_U8 u8CompMax;           /**<Maximum value of a component*/
-    HI_U8 bCompOut;            /**<The colorkey of a component is within or beyond the range.*/
-    HI_U8 bCompIgnore;         /**<Whether to ignore a component.*/
-    HI_U8 u8CompMask;          /**<Component mask*/
-    HI_U8 u8Reserved;
-    HI_U8 u8Reserved1;
-    HI_U8 u8Reserved2;
-} TDE2_COLORKEY_COMP_S;
-
-/**Definition of colorkey values*/
-typedef union hiTDE2_COLORKEY_U
-{
-    struct
-    {
-        TDE2_COLORKEY_COMP_S stAlpha;   /**<Alpha component*/
-        TDE2_COLORKEY_COMP_S stRed;     /**<Red component*/
-        TDE2_COLORKEY_COMP_S stGreen;   /**<Green component*/
-        TDE2_COLORKEY_COMP_S stBlue;    /**<Blue component*/
-    } struCkARGB;
-    struct
-    {
-        TDE2_COLORKEY_COMP_S stAlpha;   /**<Alpha component*/
-        TDE2_COLORKEY_COMP_S stY;       /**<Y component*/
-        TDE2_COLORKEY_COMP_S stCb;      /**<Cb component*/
-        TDE2_COLORKEY_COMP_S stCr;      /**<Cr component*/
-    } struCkYCbCr;
-    struct
-    {
-        TDE2_COLORKEY_COMP_S stAlpha;   /**<Alpha component*/
-        TDE2_COLORKEY_COMP_S stClut;    /**<Palette component*/
-    } struCkClut;
-} TDE2_COLORKEY_U;
-
-/*Definition of alpha output sources*/
-typedef enum hiTDE2_OUTALPHA_FROM_E
-{
-    TDE2_OUTALPHA_FROM_NORM = 0,    /**<Output from the result of alpha blending or anti-flicker*/
-    TDE2_OUTALPHA_FROM_BACKGROUND,  /**<Output from the background bitmap*/
-    TDE2_OUTALPHA_FROM_FOREGROUND,  /**<Output from the foreground bitmap*/
-    TDE2_OUTALPHA_FROM_GLOBALALPHA, /**<Output from the global alpha*/
-    TDE2_OUTALPHA_FROM_BUTT
-} TDE2_OUTALPHA_FROM_E;
-
-/**Definition of filtering*/
-typedef enum hiTDE2_FILTER_MODE_E
-{
-    TDE2_FILTER_MODE_COLOR = 0, /**<Filter the color*/
-    TDE2_FILTER_MODE_ALPHA,     /**<Filter the alpha channel*/
-    TDE2_FILTER_MODE_BOTH,      /**<Filter the color and alpha channel*/
-    TDE2_FILTER_MODE_NONE,      /**<No filter */
-    TDE2_FILTER_MODE_BUTT
-} TDE2_FILTER_MODE_E;
-
-/**Configuration of the anti-flicker channel*/
-typedef enum hiTDE2_DEFLICKER_MODE_E
-{
-    TDE2_DEFLICKER_MODE_NONE = 0,   /*<No anti-flicker*/
-    TDE2_DEFLICKER_MODE_RGB,        /**<Perform anti-flicker on the RGB component*/
-    TDE2_DEFLICKER_MODE_BOTH,       /**<Perform anti-flicker on the alpha component*/
-    TDE2_DEFLICKER_MODE_BUTT
-} TDE2_DEFLICKER_MODE_E;
-
-/* blend mode */
-typedef enum hiTDE2_BLEND_MODE_E
-{
-    TDE2_BLEND_ZERO = 0x0,
-    TDE2_BLEND_ONE,
-    TDE2_BLEND_SRC2COLOR,
-    TDE2_BLEND_INVSRC2COLOR,
-    TDE2_BLEND_SRC2ALPHA,
-    TDE2_BLEND_INVSRC2ALPHA,
-    TDE2_BLEND_SRC1COLOR,
-    TDE2_BLEND_INVSRC1COLOR,
-    TDE2_BLEND_SRC1ALPHA,
-    TDE2_BLEND_INVSRC1ALPHA,
-    TDE2_BLEND_SRC2ALPHASAT,
-    TDE2_BLEND_BUTT
-} TDE2_BLEND_MODE_E;
-
-/**Alpha blending command. You can set parameters or select Porter or Duff.*/
-/* pixel = (source * fs + destination * fd),
-   sa = source alpha,
-   da = destination alpha */
-typedef enum hiTDE2_BLENDCMD_E
-{
-    TDE2_BLENDCMD_NONE = 0x0,     /**< fs: sa      fd: 1.0-sa */
-    TDE2_BLENDCMD_CLEAR,    /**< fs: 0.0     fd: 0.0 */
-    TDE2_BLENDCMD_SRC,      /**< fs: 1.0     fd: 0.0 */
-    TDE2_BLENDCMD_SRCOVER,  /**< fs: 1.0     fd: 1.0-sa */
-    TDE2_BLENDCMD_DSTOVER,  /**< fs: 1.0-da  fd: 1.0 */
-    TDE2_BLENDCMD_SRCIN,    /**< fs: da      fd: 0.0 */
-    TDE2_BLENDCMD_DSTIN,    /**< fs: 0.0     fd: sa */
-    TDE2_BLENDCMD_SRCOUT,   /**< fs: 1.0-da  fd: 0.0 */
-    TDE2_BLENDCMD_DSTOUT,   /**< fs: 0.0     fd: 1.0-sa */
-    TDE2_BLENDCMD_SRCATOP,  /**< fs: da      fd: 1.0-sa */
-    TDE2_BLENDCMD_DSTATOP,  /**< fs: 1.0-da  fd: sa */
-    TDE2_BLENDCMD_ADD,      /**< fs: 1.0     fd: 1.0 */
-    TDE2_BLENDCMD_XOR,      /**< fs: 1.0-da  fd: 1.0-sa */
-    TDE2_BLENDCMD_DST,      /**< fs: 0.0     fd: 1.0 */
-    TDE2_BLENDCMD_CONFIG,   /**<You can set the parameteres.*/
-    TDE2_BLENDCMD_BUTT
-} TDE2_BLENDCMD_E;
-
-/**Options for the alpha blending operation*/
-typedef struct hiTDE2_BLEND_OPT_S
-{
-    HI_BOOL  bGlobalAlphaEnable;        /**<Global alpha enable*/
-    HI_BOOL  bPixelAlphaEnable;         /**<Pixel alpha enable*/
-    HI_BOOL bSrc1AlphaPremulti;         /**<Src1 alpha premultiply enable*/
-    HI_BOOL bSrc2AlphaPremulti;         /**<Src2 alpha premultiply enable*/
-    TDE2_BLENDCMD_E eBlendCmd;          /**<Alpha blending command*/
-    TDE2_BLEND_MODE_E eSrc1BlendMode;   /**<Src1 blending mode select. It is valid when eBlendCmd is set to TDE2_BLENDCMD_CONFIG.*/
-    TDE2_BLEND_MODE_E eSrc2BlendMode;   /**<Src2 blending mode select. It is valid when eBlendCmd is set to TDE2_BLENDCMD_CONFIG.*/
-} TDE2_BLEND_OPT_S;
-
-/**CSC parameter option*/
-typedef struct hiTDE2_CSC_OPT_S
-{
-    HI_BOOL bICSCUserEnable;        /**User-defined ICSC parameter enable*/
-    HI_BOOL bICSCParamReload;   /**User-defined ICSC parameter reload enable*/
-    HI_BOOL bOCSCUserEnable;        /**User-defined OCSC parameter enable*/
-    HI_BOOL bOCSCParamReload;   /**User-defined OCSC parameter reload enable*/
-    HI_U64 ICSCParamAddr;        /**ICSC parameter address. The address must be 128-bit aligned.*/
-    HI_U64 OCSCParamAddr;    /**OCSC parameter address. The address must be 128-bit aligned.*/
-} TDE2_CSC_OPT_S;
-
-/**Definition of blit operation options*/
-typedef struct hiTDE2_OPT_S
-{
-    TDE2_ALUCMD_E enAluCmd;                 /**<Logical operation type*/
-
-    TDE2_ROP_CODE_E enRopCode_Color;        /**<ROP type of the color space*/
-
-    TDE2_ROP_CODE_E enRopCode_Alpha;        /**<ROP type of the alpha component*/
-
-    TDE2_COLORKEY_MODE_E enColorKeyMode;    /**<Colorkey mode*/
-
-    TDE2_COLORKEY_U unColorKeyValue;        /**<Colorkey value*/
-
-    TDE2_CLIPMODE_E enClipMode;             /**<Perform the clip operation within or beyond the area*/
-
-    TDE2_RECT_S stClipRect;                 /**<Definition of the clipping area*/
-
-    TDE2_DEFLICKER_MODE_E enDeflickerMode;  /**<Anti-flicker mode*/
-
-    HI_BOOL bResize;                        /**<Whether to scale*/
-
-    TDE2_FILTER_MODE_E enFilterMode;        /**<Filtering mode during scaling*/
-
-    TDE2_MIRROR_E enMirror;                 /**<Mirror type*/
-
-    HI_BOOL bClutReload;                    /**<Whether to reload the CLUT*/
-
-    HI_U8   u8GlobalAlpha;                  /**<Global alpha value*/
-
-    TDE2_OUTALPHA_FROM_E enOutAlphaFrom;    /**<Source of the output alpha*/
-
-    HI_U32 u32Colorize;                     /**<Colorize value*/
-
-    TDE2_BLEND_OPT_S stBlendOpt;
-
-    TDE2_CSC_OPT_S stCscOpt;
-    HI_BOOL bCompress;
-    HI_BOOL bDecompress;
-} TDE2_OPT_S;
-
-/**Definition of macroblock operation options*/
-typedef struct hiTDE2_MBOPT_S
-{
-    TDE2_CLIPMODE_E enClipMode;     /**<Clip mode*/
-
-    TDE2_RECT_S stClipRect;         /**<Definition of the clipping area*/
-
-    HI_BOOL bDeflicker;             /**<Whether to perform anti-flicker*/
-
-    TDE2_MBRESIZE_E enResize;       /**<Scaling information*/
-
-    HI_BOOL bSetOutAlpha;           /**<If the alpha value is not set, the maximum alpha value is output by default.*/
-
-    HI_U8   u8OutAlpha;             /**<Global alpha for operation*/
-} TDE2_MBOPT_S;
-
-/**Definition of the pattern filling operation*/
-typedef struct hiTDE2_PATTERN_FILL_OPT_S
-{
-    TDE2_ALUCMD_E enAluCmd;                 /**<Logical operation type*/
-
-    TDE2_ROP_CODE_E enRopCode_Color;        /**<ROP type of the color space*/
-
-    TDE2_ROP_CODE_E enRopCode_Alpha;        /**<ROP type of the alpha component*/
-
-    TDE2_COLORKEY_MODE_E enColorKeyMode;    /**<Colorkey mode*/
-
-    TDE2_COLORKEY_U unColorKeyValue;        /**<Colorkey value*/
-
-    TDE2_CLIPMODE_E enClipMode;             /**<Clip mode*/
-
-    TDE2_RECT_S stClipRect;                 /**<Clipping area*/
-
-    HI_BOOL bClutReload;                    /**<Whether to reload the CLUT*/
-
-    HI_U8 u8GlobalAlpha;                    /**<Global alpha*/
-
-    TDE2_OUTALPHA_FROM_E enOutAlphaFrom;    /**<Source of the output alpha*/
-
-    HI_U32 u32Colorize;                     /**<Colorize value*/
-
-    TDE2_BLEND_OPT_S stBlendOpt;           /**<Options of the blending operation*/
-
-    TDE2_CSC_OPT_S stCscOpt;        /**<CSC parameter option*/
-
-} TDE2_PATTERN_FILL_OPT_S;
-
-/**Definition of rotation directions*/
-typedef enum hiTDE_ROTATE_ANGLE_E
-{
-    TDE_ROTATE_CLOCKWISE_90 = 0,    /**<Rotate 90 degree clockwise*/
-    TDE_ROTATE_CLOCKWISE_180,       /**<Rotate 180 degree clockwise*/
-    TDE_ROTATE_CLOCKWISE_270,       /**<Rotate 270 degree clockwise*/
-    TDE_ROTATE_BUTT
-} TDE_ROTATE_ANGLE_E;
-
-/**Definition of anti-flicker levels*/
-typedef enum hiTDE_DEFLICKER_LEVEL_E
-{
-    TDE_DEFLICKER_AUTO = 0, /**<Adaptation. The anti-flicker coefficient is selected by the TDE.*/
-    TDE_DEFLICKER_LOW,      /**<Low-level anti-flicker*/
-    TDE_DEFLICKER_MIDDLE,   /**<Medium-level anti-flicker*/
-    TDE_DEFLICKER_HIGH,     /**High-level anti-flicker*/
-    TDE_DEFLICKER_BUTT
-} TDE_DEFLICKER_LEVEL_E;
-
-/* composed surface info */
-typedef struct hiTDE_COMPOSOR_S
-{
-    TDE2_SURFACE_S stSrcSurface;
-    TDE2_RECT_S stInRect;
-    TDE2_RECT_S stOutRect;
-    TDE2_OPT_S stOpt;
-} TDE_COMPOSOR_S;
-
-
-
-/* composed surface list */
-typedef struct hiTDE_SURFACE_LIST_S
-{
-    HI_U32 u32SurfaceNum;
-    TDE2_SURFACE_S *pDstSurface;
-    TDE_COMPOSOR_S *pstComposor;
-} TDE_SURFACE_LIST_S;
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-
-#endif /* End of #ifndef __TDE_TYPE_H__ */
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_type.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_type.h
deleted file mode 100644
index 59a9f688..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_type.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/******************************************************************************
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2005-2019. All rights reserved.
- * Description: Common data types of the system.
- * Author: Hisilicon multimedia software group
- * Create: 2005-4-23
-******************************************************************************/
-
-#ifndef __HI_TYPE_H__
-#define __HI_TYPE_H__
-
-#ifdef __KERNEL__
-
-#include <linux/types.h>
-#else
-
-#include <stdint.h>
-#endif
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"{
-#endif
-#endif /* __cplusplus */
-
-/*--------------------------------------------------------------------------------------------------------------*
- * Defintion of basic data types. The data types are applicable to both the application layer and kernel codes. *
- *--------------------------------------------------------------------------------------------------------------*/
-/*************************** Structure Definition ****************************/
-/** \addtogroup      Common_TYPE */
-/** @{ */  /** <!-- [Common_TYPE] */
-
-typedef unsigned char           HI_UCHAR;
-typedef unsigned char           HI_U8;
-typedef unsigned short          HI_U16;
-typedef unsigned int            HI_U32;
-typedef unsigned long           HI_UL;
-typedef uintptr_t               HI_UINTPTR_T;
-
-typedef char                    HI_CHAR;
-typedef signed char             HI_S8;
-typedef short                   HI_S16;
-typedef int                     HI_S32;
-typedef long                    HI_SL;
-
-typedef float                   HI_FLOAT;
-typedef double                  HI_DOUBLE;
-
-#ifndef _M_IX86
-    typedef unsigned long long  HI_U64;
-    typedef long long           HI_S64;
-#else
-    typedef unsigned __int64    HI_U64;
-    typedef __int64             HI_S64;
-#endif
-
-typedef unsigned long           HI_SIZE_T;
-typedef unsigned long           HI_LENGTH_T;
-typedef long int                HI_PHYS_ADDR_T;
-
-typedef unsigned int            HI_HANDLE;
-
-/*----------------------------------------------*
- * const defination                             *
- *----------------------------------------------*/
-typedef enum {
-    HI_FALSE = 0,
-    HI_TRUE  = 1,
-} HI_BOOL;
-
-#ifndef NULL
-    #define NULL                0L
-#endif
-
-#define HI_NULL                 0L
-#define HI_SUCCESS              0
-#define HI_FAILURE              (-1)
-
-#define HI_VOID                 void
-
-typedef unsigned char           hi_uchar;
-typedef unsigned char           hi_u8;
-typedef unsigned short          hi_u16;
-typedef unsigned int            hi_u32;
-typedef unsigned long long      hi_u64;
-typedef unsigned long           hi_ulong;
-
-typedef char                    hi_char;
-typedef signed char             hi_s8;
-typedef short                   hi_s16;
-typedef int                     hi_s32;
-typedef long long               hi_s64;
-typedef long                    hi_slong;
-
-typedef float                   hi_float;
-typedef double                  hi_double;
-
-typedef void                    hi_void;
-
-typedef unsigned long           hi_size_t;
-typedef unsigned long           hi_length_t;
-
-typedef hi_u32                  hi_handle;
-
-typedef HI_BOOL                 hi_bool;
-typedef HI_UINTPTR_T            hi_uintptr_t;
-
-/** @} */  /** <!-- ==== Structure Definition end ==== */
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_TYPE_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_types.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_types.h
deleted file mode 100644
index 0fc70196..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_types.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/******************************************************************************
- Copyright (C), 2001-2011, Hisilicon Tech. Co., Ltd.
-******************************************************************************
-File Name     : hi_types.h
-Version       : Initial Draft
-Author        : Hisilicon multimedia software group
-Created       : 2005/4/23
-Last Modified :
-Description   : Common data types of the system.
-Function List :
-History       :
-******************************************************************************/
-#ifndef __HI_TYPES_H__
-#define __HI_TYPES_H__
-
-#include "hi_type.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-/*--------------------------------------------------------------------------------------------------------------*
- * Defintion of basic data types. The data types are applicable to both the application layer and kernel codes. *
- *--------------------------------------------------------------------------------------------------------------*/
-/*************************** Structure Definition ****************************/
-/** \addtogroup      Common_TYPE */
-/** @{ */  /** <!-- [Common_TYPE] */
-
-/**
-
-define of HI_HANDLE :
-bit31                                                           bit0
-  |<----   16bit --------->|<---   8bit    --->|<---  8bit   --->|
-  |--------------------------------------------------------------|
-  |      HI_MOD_ID_E       |  mod defined data |     chnID       |
-  |--------------------------------------------------------------|
-
-mod defined data: private data define by each module(for example: sub-mod id), usually, set to 0.
-*/
-
-#define HI_HANDLE_MAKEHANDLE(mod, privatedata, chnid)  (hi_handle)( (((mod)& 0xffff) << 16) | ((((privatedata)& 0xff) << 8) ) | (((chnid) & 0xff)) )
-
-#define HI_HANDLE_GET_MODID(handle)     (((handle) >> 16) & 0xffff)
-#define HI_HANDLE_GET_PriDATA(handle)   (((handle) >> 8) & 0xff)
-#define HI_HANDLE_GET_CHNID(handle)     (((handle)) & 0xff)
-
-
-/** @} */  /** <!-- ==== Structure Definition end ==== */
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_TYPE_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_unf_cipher.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_unf_cipher.h
deleted file mode 100644
index 3132290d..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_unf_cipher.h
+++ /dev/null
@@ -1,855 +0,0 @@
-/******************************************************************************
-
-Copyright (C), 2015-2016, Hisilicon Tech. Co., Ltd.
-
-******************************************************************************
-File Name : hi_tee_cipher.h
-Version : Initial Draft
-Author : Hisilicon multimedia software group
-Created : 2016/06/08
-Description :
-History :
-1.Date : 2016/06/08
-Author : z00268517
-Modification: Created file
-
-*******************************************************************************/
-/**
-* \file
-* \brief Describes the API about the cipher.
-*/
-
-#ifndef __HI_UNF_CIPHER_H__
-#define __HI_UNF_CIPHER_H__
-
-#include "hi_types.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-/*************************** Structure Definition ****************************/
-/** \addtogroup      CIPHER */
-/** @{ */  /** <!-- [CIPHER] */
-
-/** max length of SM2, unit: word */
-#define SM2_LEN_IN_WROD                   (8)
-
-/** max length of SM2, unit: byte */
-#define SM2_LEN_IN_BYTE                   (SM2_LEN_IN_WROD * 4)
-
-/** CIPHER set IV for first package */
-#define CIPHER_IV_CHANGE_ONE_PKG        (1)
-
-/** CIPHER set IV for first package */
-#define CIPHER_IV_CHANGE_ALL_PKG        (2)
-
-/** Cipher work mode */
-typedef enum hiHI_UNF_CIPHER_WORK_MODE_E
-{
-    HI_UNF_CIPHER_WORK_MODE_ECB,        /**<Electronic codebook (ECB) mode*/
-    HI_UNF_CIPHER_WORK_MODE_CBC,        /**<Cipher block chaining (CBC) mode*/
-    HI_UNF_CIPHER_WORK_MODE_CFB,        /**<Cipher feedback (CFB) mode*/
-    HI_UNF_CIPHER_WORK_MODE_OFB,        /**<Output feedback (OFB) mode*/
-    HI_UNF_CIPHER_WORK_MODE_CTR,        /**<Counter (CTR) mode*/
-    HI_UNF_CIPHER_WORK_MODE_CCM,        /**<Counter (CCM) mode*/
-    HI_UNF_CIPHER_WORK_MODE_GCM,        /**<Counter (GCM) mode*/
-    HI_UNF_CIPHER_WORK_MODE_CBC_CTS,    /**<Cipher block chaining CipherStealing mode*/
-    HI_UNF_CIPHER_WORK_MODE_BUTT,
-    HI_UNF_CIPHER_WORK_MODE_INVALID  = 0xffffffff,
-}HI_UNF_CIPHER_WORK_MODE_E;
-
-/** Cipher algorithm */
-typedef enum hiHI_UNF_CIPHER_ALG_E
-{
-    HI_UNF_CIPHER_ALG_DES           = 0x0,  /**< Data encryption standard (DES) algorithm */
-    HI_UNF_CIPHER_ALG_3DES          = 0x1,  /**< 3DES algorithm */
-    HI_UNF_CIPHER_ALG_AES           = 0x2,  /**< Advanced encryption standard (AES) algorithm */
-    HI_UNF_CIPHER_ALG_SM1           = 0x3,  /**<SM1 algorithm*/
-    HI_UNF_CIPHER_ALG_SM4           = 0x4,  /**<SM4 algorithm*/
-    HI_UNF_CIPHER_ALG_DMA           = 0x5,  /**<DMA copy*/
-    HI_UNF_CIPHER_ALG_BUTT          = 0x6,
-    HI_UNF_CIPHER_ALG_INVALID       = 0xffffffff,
-}HI_UNF_CIPHER_ALG_E;
-
-/** Key length */
-typedef enum hiHI_UNF_CIPHER_KEY_LENGTH_E
-{
-    HI_UNF_CIPHER_KEY_AES_128BIT    = 0x0,  /**< 128-bit key for the AES algorithm */
-    HI_UNF_CIPHER_KEY_AES_192BIT    = 0x1,  /**< 192-bit key for the AES algorithm */
-    HI_UNF_CIPHER_KEY_AES_256BIT    = 0x2,  /**< 256-bit key for the AES algorithm */
-    HI_UNF_CIPHER_KEY_DES_3KEY      = 0x2,  /**< Three keys for the DES algorithm */
-    HI_UNF_CIPHER_KEY_DES_2KEY      = 0x3,  /**< Two keys for the DES algorithm */
-    HI_UNF_CIPHER_KEY_DEFAULT       = 0x0,  /**< default key length, DES-8, SM1-48, SM4-16 */
-    HI_UNF_CIPHER_KEY_INVALID       = 0xffffffff,
-}HI_UNF_CIPHER_KEY_LENGTH_E;
-
-/** Cipher bit width */
-typedef enum hiHI_UNF_CIPHER_BIT_WIDTH_E
-{
-    HI_UNF_CIPHER_BIT_WIDTH_64BIT   = 0x0,  /**< 64-bit width */
-    HI_UNF_CIPHER_BIT_WIDTH_8BIT    = 0x1,  /**< 8-bit width */
-    HI_UNF_CIPHER_BIT_WIDTH_1BIT    = 0x2,  /**< 1-bit width */
-    HI_UNF_CIPHER_BIT_WIDTH_128BIT  = 0x3,  /**< 128-bit width */
-    HI_UNF_CIPHER_BIT_WIDTH_INVALID = 0xffffffff,
-}HI_UNF_CIPHER_BIT_WIDTH_E;
-
-/** Cipher control parameters */
-typedef struct hiTEE_CIPHER_CTRL_CHANGE_FLAG_S
-{
-    HI_U32   bit1IV:2;              /**< Initial Vector change flag, 0-don't set, 1-set IV for first package, 2-set IV for each package  */
-    HI_U32   bitsResv:30;           /**< Reserved */
-}HI_UNF_CIPHER_CTRL_CHANGE_FLAG_S;
-
-/** Key ladder selecting parameters */
-typedef enum hiTEE_CIPHER_CA_TYPE_E
-{
-    HI_UNF_CIPHER_KEY_SRC_USER       = 0x0,  /**< User Key*/
-    HI_UNF_CIPHER_KEY_SRC_KLAD_1,           /**< KLAD Key 1*/
-    HI_UNF_CIPHER_KEY_SRC_KLAD_2,           /**< KLAD Key 2*/
-    HI_UNF_CIPHER_KEY_SRC_KLAD_3,           /**< KLAD Key 3*/
-    HI_UNF_CIPHER_KEY_SRC_BUTT,
-    HI_UNF_CIPHER_KEY_SRC_INVALID = 0xffffffff,
-}HI_UNF_CIPHER_CA_TYPE_E;
-
-/** Encryption/Decryption type selecting */
-typedef enum
-{
-    HI_UNF_CIPHER_KLAD_TARGET_AES       = 0x0,  /**< Klad for AES*/
-    HI_UNF_CIPHER_KLAD_TARGET_RSA,              /**< Klad for RSA*/
-    HI_UNF_CIPHER_KLAD_TARGET_BUTT,
-}HI_UNF_CIPHER_KLAD_TARGET_E;
-
-/** Encryption/Decryption type selecting */
-typedef enum
-{
-    HI_UNF_CIPHER_TYPE_NORMAL  = 0x0,
-    HI_UNF_CIPHER_TYPE_COPY_AVOID,
-    HI_UNF_CIPHER_TYPE_BUTT,
-    HI_UNF_CIPHER_TYPE_INVALID = 0xffffffff,
-}HI_UNF_CIPHER_TYPE_E;
-
-/** Structure of the cipher type */
-typedef struct
-{
-    HI_UNF_CIPHER_TYPE_E enCipherType;
-}HI_UNF_CIPHER_ATTS_S;
-
-/** sm1 round config */
-typedef enum hiHI_UNF_CIPHER_SM1_ROUND_E
-{
-    HI_UNF_CIPHER_SM1_ROUND_08 = 0x00,            /**< sm1 round 08 */
-    HI_UNF_CIPHER_SM1_ROUND_10 = 0x01,            /**< sm1 round 10 */
-    HI_UNF_CIPHER_SM1_ROUND_12 = 0x02,            /**< sm1 round 12 */
-    HI_UNF_CIPHER_SM1_ROUND_14 = 0x03,            /**< sm1 round 14 */
-    HI_UNF_CIPHER_SM1_ROUND_BUTT,
-    HI_UNF_CIPHER_SM1_ROUND_INVALID  = 0xffffffff,
-}HI_UNF_CIPHER_SM1_ROUND_E;
-
-/** Structure of the cipher control information */
-typedef struct hiHI_UNF_CIPHER_CTRL_S
-{
-    HI_U32 u32Key[8];                               /**< Key input */
-    HI_U32 u32IV[4];                                /**< Initialization vector (IV) */
-    HI_BOOL bKeyByCA;                               /**< Encryption using advanced conditional access (CA) or decryption using keys */
-    HI_UNF_CIPHER_CA_TYPE_E enCaType;               /**< Select keyladder type when using advanced CA */
-    HI_UNF_CIPHER_ALG_E enAlg;                      /**< Cipher algorithm */
-    HI_UNF_CIPHER_BIT_WIDTH_E enBitWidth;           /**< Bit width for encryption or decryption */
-    HI_UNF_CIPHER_WORK_MODE_E enWorkMode;           /**< Operating mode */
-    HI_UNF_CIPHER_KEY_LENGTH_E enKeyLen;            /**< Key length */
-    HI_UNF_CIPHER_CTRL_CHANGE_FLAG_S stChangeFlags; /**< control information exchange choices, we default all would be change except they have been in the choices */
-} HI_UNF_CIPHER_CTRL_S;
-
-/** Structure of the cipher AES control information */
-typedef struct hiHI_UNF_CIPHER_CTRL_AES_S
-{
-    HI_U32 u32EvenKey[8];                           /**< Key input, default use this key*/
-    HI_U32 u32OddKey[8];                            /**< Key input, only valid for Multi encrypt/decrypt*/
-    HI_U32 u32IV[4];                                /**< Initialization vector (IV) */
-    HI_UNF_CIPHER_BIT_WIDTH_E enBitWidth;           /**< Bit width for encryption or decryption */
-    HI_UNF_CIPHER_KEY_LENGTH_E enKeyLen;            /**< Key length */
-    HI_UNF_CIPHER_CTRL_CHANGE_FLAG_S stChangeFlags; /**< control information exchange choices, we default all woulde be change except they have been in the choices */
-} HI_UNF_CIPHER_CTRL_AES_S;
-
-/** Structure of the cipher AES CCM/GCM control information */
-typedef struct hiHI_UNF_CIPHER_CTRL_AES_CCM_GCM_S
-{
-    HI_U32 u32Key[8];                               /**< Key input */
-    HI_U32 u32IV[4];                                /**< Initialization vector (IV) */
-    HI_UNF_CIPHER_KEY_LENGTH_E enKeyLen;            /**< Key length */
-    HI_U32 u32IVLen;                                /**< IV lenght for CCM/GCM, which is an element of {4,6,8,10,12,14,16} for CCM, and is an element of [1-16] for GCM*/
-    HI_U32 u32TagLen;                               /**< Tag lenght for CCM which is an element of {4,6,8,10,12,14,16}*/
-    HI_U32 u32ALen;                                 /**< Associated data for CCM and GCM*/
-    HI_SIZE_T szAPhyAddr;                             /**< Physical address of Associated data for CCM and GCM*/
-} HI_UNF_CIPHER_CTRL_AES_CCM_GCM_S;
-
-/** Structure of the cipher DES control information */
-typedef struct hiHI_UNF_CIPHER_CTRL_DES_S
-{
-    HI_U32 u32Key[2];                               /**< Key input */
-    HI_U32 u32IV[2];                                /**< Initialization vector (IV) */
-    HI_UNF_CIPHER_BIT_WIDTH_E enBitWidth;           /**< Bit width for encryption or decryption */
-    HI_UNF_CIPHER_CTRL_CHANGE_FLAG_S stChangeFlags; /**< control information exchange choices, we default all woulde be change except they have been in the choices */
-} HI_UNF_CIPHER_CTRL_DES_S;
-
-/** Structure of the cipher 3DES control information */
-typedef struct hiHI_UNF_CIPHER_CTRL_3DES_S
-{
-    HI_U32 u32Key[6];                               /**< Key input */
-    HI_U32 u32IV[2];                                /**< Initialization vector (IV) */
-    HI_UNF_CIPHER_BIT_WIDTH_E enBitWidth;           /**< Bit width for encryption or decryption */
-    HI_UNF_CIPHER_KEY_LENGTH_E enKeyLen;            /**< Key length */
-    HI_UNF_CIPHER_CTRL_CHANGE_FLAG_S stChangeFlags; /**< control information exchange choices, we default all woulde be change except they have been in the choices */
-} HI_UNF_CIPHER_CTRL_3DES_S;
-
-/** Structure of the cipher SM1 control information */
-typedef struct hiHI_UNF_CIPHER_CTRL_SM1_S
-{
-    HI_U32 u32EK[4];                               /**< Key of EK input */
-    HI_U32 u32AK[4];                               /**< Key of AK input */
-    HI_U32 u32SK[4];                               /**< Key of SK input */
-    HI_U32 u32IV[4];                                /**< Initialization vector (IV) */
-    HI_UNF_CIPHER_BIT_WIDTH_E enBitWidth;           /**< Bit width for encryption or decryption */
-    HI_UNF_CIPHER_SM1_ROUND_E enSm1Round;           /**< SM1 round number, should be 8, 10, 12 or 14*/
-    HI_UNF_CIPHER_CTRL_CHANGE_FLAG_S stChangeFlags; /**< control information exchange choices, we default all woulde be change except they have been in the choices */
-} HI_UNF_CIPHER_CTRL_SM1_S;
-
-/** Structure of the cipher SM4 control information */
-typedef struct hiHI_UNF_CIPHER_CTRL_SM4_S
-{
-    HI_U32 u32Key[4];                               /**< Key  input */
-    HI_U32 u32IV[4];                                /**< Initialization vector (IV) */
-    HI_UNF_CIPHER_CTRL_CHANGE_FLAG_S stChangeFlags; /**< control information exchange choices, we default all woulde be change except they have been in the choices */
-} HI_UNF_CIPHER_CTRL_SM4_S;
-
-/** Expand Structure of the cipher control information */
-typedef struct hiHI_UNF_CIPHER_CTRL_EX_S
-{
-    HI_UNF_CIPHER_ALG_E enAlg;                      /**< Cipher algorithm */
-    HI_UNF_CIPHER_WORK_MODE_E enWorkMode;           /**< Operating mode */
-    HI_BOOL bKeyByCA;                               /**< Encryption using advanced conditional access (CA) or decryption using keys */
-    /**< Parameter for special algorithm
-        for AES, the pointer should point to HI_UNF_CIPHER_CTRL_AES_S;
-        for AES_CCM or AES_GCM, the pointer should point to HI_UNF_CIPHER_CTRL_AES_CCM_GCM_S;
-        for DES, the pointer should point to HI_UNF_CIPHER_CTRL_DES_S;
-        for 3DES, the pointer should point to HI_UNF_CIPHER_CTRL_3DES_S;
-        for SM1, the pointer should point to HI_UNF_CIPHER_CTRL_SM1_S;
-        for SM4, the pointer should point to HI_UNF_CIPHER_CTRL_SM4_S;
-    */
-    HI_VOID *pParam;
-} HI_UNF_CIPHER_CTRL_EX_S;
-
-/** Cipher data */
-typedef struct hiHI_UNF_CIPHER_DATA_S
-{
-    HI_SIZE_T szSrcPhyAddr;     /**< phy address of the original data */
-    HI_SIZE_T szDestPhyAddr;    /**< phy address of the purpose data */
-    HI_U32 u32ByteLength;     /**< cigher data length*/
-    HI_BOOL bOddKey;          /**< Use odd key or even key*/
-} HI_UNF_CIPHER_DATA_S;
-
-/** Hash algrithm type */
-typedef enum hiHI_UNF_CIPHER_HASH_TYPE_E
-{
-    HI_UNF_CIPHER_HASH_TYPE_SHA1,
-    HI_UNF_CIPHER_HASH_TYPE_SHA224,
-    HI_UNF_CIPHER_HASH_TYPE_SHA256,
-    HI_UNF_CIPHER_HASH_TYPE_SHA384,
-    HI_UNF_CIPHER_HASH_TYPE_SHA512,
-    HI_UNF_CIPHER_HASH_TYPE_HMAC_SHA1,
-    HI_UNF_CIPHER_HASH_TYPE_HMAC_SHA224,
-    HI_UNF_CIPHER_HASH_TYPE_HMAC_SHA256,
-    HI_UNF_CIPHER_HASH_TYPE_HMAC_SHA384,
-    HI_UNF_CIPHER_HASH_TYPE_HMAC_SHA512,
-    HI_UNF_CIPHER_HASH_TYPE_SM3,
-    HI_UNF_CIPHER_HASH_TYPE_BUTT,
-    HI_UNF_CIPHER_HASH_TYPE_INVALID  = 0xffffffff,
-}HI_UNF_CIPHER_HASH_TYPE_E;
-
-/** Hash init struct input */
-typedef struct
-{
-    HI_U8 *pu8HMACKey;
-    HI_U32 u32HMACKeyLen;
-    HI_UNF_CIPHER_HASH_TYPE_E eShaType;
-}HI_UNF_CIPHER_HASH_ATTS_S;
-
-typedef enum hiHI_UNF_CIPHER_RSA_ENC_SCHEME_E
-{
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_NO_PADDING,            /**< without padding */
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_BLOCK_TYPE_0,          /**< PKCS#1 block type 0 padding*/
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_BLOCK_TYPE_1,          /**< PKCS#1 block type 1 padding*/
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_BLOCK_TYPE_2,          /**< PKCS#1 block type 2 padding*/
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_RSAES_OAEP_SHA1,       /**< PKCS#1 RSAES-OAEP-SHA1 padding*/
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_RSAES_OAEP_SHA224,     /**< PKCS#1 RSAES-OAEP-SHA224 padding*/
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_RSAES_OAEP_SHA256,     /**< PKCS#1 RSAES-OAEP-SHA256 padding*/
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_RSAES_OAEP_SHA384,     /**< PKCS#1 RSAES-OAEP-SHA384 padding*/
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_RSAES_OAEP_SHA512,     /**< PKCS#1 RSAES-OAEP-SHA512 padding*/
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_RSAES_PKCS1_V1_5,      /**< PKCS#1 RSAES-PKCS1_V1_5 padding*/
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_BUTT,
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_INVALID  = 0xffffffff,
-}HI_UNF_CIPHER_RSA_ENC_SCHEME_E;
-
-typedef enum hiHI_UNF_CIPHER_RSA_SIGN_SCHEME_E
-{
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_RSASSA_PKCS1_V15_SHA1 = 0x100, /**< PKCS#1 RSASSA_PKCS1_V15_SHA1 signature*/
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_RSASSA_PKCS1_V15_SHA224,       /**< PKCS#1 RSASSA_PKCS1_V15_SHA224 signature*/
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_RSASSA_PKCS1_V15_SHA256,       /**< PKCS#1 RSASSA_PKCS1_V15_SHA256 signature*/
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_RSASSA_PKCS1_V15_SHA384,       /**< PKCS#1 RSASSA_PKCS1_V15_SHA384 signature*/
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_RSASSA_PKCS1_V15_SHA512,       /**< PKCS#1 RSASSA_PKCS1_V15_SHA512 signature*/
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_RSASSA_PKCS1_PSS_SHA1,         /**< PKCS#1 RSASSA_PKCS1_PSS_SHA1 signature*/
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_RSASSA_PKCS1_PSS_SHA224,       /**< PKCS#1 RSASSA_PKCS1_PSS_SHA224 signature*/
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_RSASSA_PKCS1_PSS_SHA256,       /**< PKCS#1 RSASSA_PKCS1_PSS_SHA256 signature*/
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_RSASSA_PKCS1_PSS_SHA384,       /**< PKCS#1 RSASSA_PKCS1_PSS_SHA1 signature*/
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_RSASSA_PKCS1_PSS_SHA512,       /**< PKCS#1 RSASSA_PKCS1_PSS_SHA256 signature*/
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_BUTT,
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_INVALID  = 0xffffffff,
-}HI_UNF_CIPHER_RSA_SIGN_SCHEME_E;
-
-typedef struct
-{
-    HI_U8  *pu8N;              /**< point to public modulus  */
-    HI_U8  *pu8E;              /**< point to public exponent */
-    HI_U16 u16NLen;            /**< length of public modulus, max value is 512Byte*/
-    HI_U16 u16ELen;            /**< length of public exponent, max value is 512Byte*/
-}HI_UNF_CIPHER_RSA_PUB_KEY_S;
-
-/** RSA private key struct */
-typedef struct
-{
-    HI_U8 *pu8N;                      /*!<  public modulus    */
-    HI_U8 *pu8E;                      /*!<  public exponent   */
-    HI_U8 *pu8D;                      /*!<  private exponent  */
-    HI_U8 *pu8P;                      /*!<  1st prime factor  */
-    HI_U8 *pu8Q;                      /*!<  2nd prime factor  */
-    HI_U8 *pu8DP;                     /*!<  D % (P - 1)       */
-    HI_U8 *pu8DQ;                     /*!<  D % (Q - 1)       */
-    HI_U8 *pu8QP;                     /*!<  1 / (Q % P)       */
-    HI_U16 u16NLen;                   /**< length of public modulus */
-    HI_U16 u16ELen;                   /**< length of public exponent */
-    HI_U16 u16DLen;                   /**< length of private exponent */
-    HI_U16 u16PLen;                   /**< length of 1st prime factor */
-    HI_U16 u16QLen;                   /**< length of 2nd prime factor */
-    HI_U16 u16DPLen;                  /**< length of D % (P - 1) */
-    HI_U16 u16DQLen;                  /**< length of D % (Q - 1) */
-    HI_U16 u16QPLen;                  /**< length of 1 / (Q % P) */
-}HI_UNF_CIPHER_RSA_PRI_KEY_S;
-
-/** RSA public key encryption struct input */
-typedef struct
-{
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_E enScheme;   /** RSA encryption scheme*/
-    HI_UNF_CIPHER_RSA_PUB_KEY_S stPubKey;      /** RSA private key struct */
-    HI_UNF_CIPHER_CA_TYPE_E enCaType;
-}HI_UNF_CIPHER_RSA_PUB_ENC_S;
-
-/** RSA private key decryption struct input */
-typedef struct
-{
-    HI_UNF_CIPHER_RSA_ENC_SCHEME_E enScheme; /** RSA encryption scheme */
-    HI_UNF_CIPHER_RSA_PRI_KEY_S stPriKey;    /** RSA public key struct */
-    HI_UNF_CIPHER_CA_TYPE_E enCaType;
-}HI_UNF_CIPHER_RSA_PRI_ENC_S;
-
-/** RSA signature struct input */
-typedef struct
-{
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_E enScheme;  /** RSA signature scheme*/
-    HI_UNF_CIPHER_RSA_PRI_KEY_S stPriKey;      /** RSA private key struct */
-    HI_UNF_CIPHER_CA_TYPE_E enCaType;
- }HI_UNF_CIPHER_RSA_SIGN_S;
-
-/** RSA signature verify struct input */
-typedef struct
-{
-    HI_UNF_CIPHER_RSA_SIGN_SCHEME_E enScheme; /** RSA signature scheme*/
-    HI_UNF_CIPHER_RSA_PUB_KEY_S stPubKey;     /** RSA public key struct */
- }HI_UNF_CIPHER_RSA_VERIFY_S;
-
-/** @} */  /** <!-- ==== Structure Definition End ==== */
-
-
-#define HI_UNF_CIPHER_Open(HI_VOID) HI_UNF_CIPHER_Init(HI_VOID);
-#define HI_UNF_CIPHER_Close(HI_VOID) HI_UNF_CIPHER_DeInit(HI_VOID);
-
-/******************************* API Declaration *****************************/
-/** \addtogroup      CIPHER */
-/** @{ */  /** <!-- [CIPHER] */
-/* ---CIPHER---*/
-/**
-\attention \n
-This API is used to start the cipher device.
-\param N/A
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-\retval ::HI_ERR_CIPHER_FAILED_INIT  The cipher device fails to be initialized.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_Init(HI_VOID);
-
-/**
-\brief  Deinit the cipher device.
-\attention \n
-This API is used to stop the cipher device. If this API is called repeatedly, HI_SUCCESS is returned, but only the first operation takes effect.
-
-\param N/A
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_DeInit(HI_VOID);
-
-/**
-\brief Obtain a cipher handle for encryption and decryption.
-
-\param[out] phCipher Cipher handle
-\param[in] cipher attributes
-\retval ::HI_SUCCESS Call this API successful.
-\retval ::HI_FAILURE Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\retval ::HI_ERR_CIPHER_INVALID_POINT  The pointer is null.
-\retval ::HI_ERR_CIPHER_FAILED_GETHANDLE  The cipher handle fails to be obtained, because there are no available cipher handles.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_CreateHandle(HI_HANDLE* phCipher, const HI_UNF_CIPHER_ATTS_S *pstCipherAttr);
-
-/**
-\attention \n
-This API is used to destroy existing cipher handles.
-
-\param[in] hCipher Cipher handle
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_DestroyHandle(HI_HANDLE hCipher);
-
-/**
-\brief Configures the cipher control information.
-\attention \n
-Before encryption or decryption, you must call this API to configure the cipher control information.
-The first 64-bit data and the last 64-bit data should not be the same when using TDES algorithm.
-
-\param[in] hCipher Cipher handle.
-\param[in] pstCtrl Cipher control information.
-\retval ::HI_SUCCESS Call this API successful.
-\retval ::HI_FAILURE Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\retval ::HI_ERR_CIPHER_INVALID_POINT  The pointer is null.
-\retval ::HI_ERR_CIPHER_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_CIPHER_INVALID_HANDLE  The handle is invalid.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_ConfigHandle(HI_HANDLE hCipher, const HI_UNF_CIPHER_CTRL_S* pstCtrl);
-
-/**
-\brief Configures the cipher control information.
-\attention \n
-Before encryption or decryption, you must call this API to configure the cipher control information.
-The first 64-bit data and the last 64-bit data should not be the same when using TDES algorithm.
-
-\param[in] hCipher Cipher handle.
-\param[in] pstExCtrl Cipher control information.
-\retval ::HI_SUCCESS Call this API successful.
-\retval ::HI_FAILURE Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\retval ::HI_ERR_CIPHER_INVALID_POINT  The pointer is null.
-\retval ::HI_ERR_CIPHER_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_CIPHER_INVALID_HANDLE  The handle is invalid.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_ConfigHandleEx(HI_HANDLE hCipher, const HI_UNF_CIPHER_CTRL_EX_S* pstExCtrl);
-
-/**
-\brief Performs encryption.
-
-\attention \n
-This API is used to perform encryption by using the cipher module.
-The length of the encrypted data should be a multiple of 8 in TDES mode and 16 in AES mode. Besides, the length can not be bigger than 0xFFFFF.After this operation, the result will affect next operation.If you want to remove vector, you need to config IV(config pstCtrl->stChangeFlags.bit1IV with 1) by transfering HI_UNF_CIPHER_ConfigHandle.
-\param[in] hCipher Cipher handle
-\param[in] u32SrcPhyAddr Physical address of the source data
-\param[in] u32DestPhyAddr Physical address of the target data
-\param[in] u32ByteLength   Length of the encrypted data
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\retval ::HI_ERR_CIPHER_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_CIPHER_INVALID_HANDLE  The handle is invalid.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_Encrypt(HI_HANDLE hCipher, HI_SIZE_T szSrcPhyAddr, HI_SIZE_T szDestPhyAddr, HI_U32 u32ByteLength);
-
-/**
-\brief Performs decryption.
-
-\attention \n
-This API is used to perform decryption by using the cipher module.
-The length of the decrypted data should be a multiple of 8 in TDES mode and 16 in AES mode. Besides, the length can not be bigger than 0xFFFFF.After this operation, the result will affect next operation.If you want to remove vector, you need to config IV(config pstCtrl->stChangeFlags.bit1IV with 1) by transfering HI_UNF_CIPHER_ConfigHandle.
-\param[in] hCipher Cipher handle.
-\param[in] u32SrcPhyAddr Physical address of the source data.
-\param[in] u32DestPhyAddr Physical address of the target data.
-\param[in] u32ByteLength Length of the decrypted data
-\retval ::HI_SUCCESS Call this API successful.
-\retval ::HI_FAILURE Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\retval ::HI_ERR_CIPHER_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_CIPHER_INVALID_HANDLE  The handle is invalid.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_Decrypt(HI_HANDLE hCipher, HI_SIZE_T szSrcPhyAddr, HI_SIZE_T szDestPhyAddr, HI_U32 u32ByteLength);
-
-/**
-\brief Performs encryption.
-
-\attention \n
-This API is used to perform encryption by using the cipher module.
-The length of the encrypted data should be a multiple of 8 in TDES mode and 16 in AES mode. Besides, the length can not be bigger than 0xFFFFF.After this operation, the result will affect next operation.If you want to remove vector, you need to config IV(config pstCtrl->stChangeFlags.bit1IV with 1) by transfering HI_UNF_CIPHER_ConfigHandle.
-\param[in] hCipher Cipher handle
-\param[in] pu8SrcData: buffer of the source data.
-\param[out] pu8DestData: buffer of the target data
-\param[in] u32ByteLength   Length of the encrypted data
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\retval ::HI_ERR_CIPHER_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_CIPHER_INVALID_HANDLE  The handle is invalid.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_EncryptVir(HI_HANDLE hCipher, const HI_U8 *pu8SrcData, HI_U8 *pu8DestData, HI_U32 u32ByteLength);
-
-/**
-\brief Performs decryption.
-
-\attention \n
-This API is used to perform decryption by using the cipher module.
-The length of the decrypted data should be a multiple of 8 in TDES mode and 16 in AES mode. Besides, the length can not be bigger than 0xFFFFF.After this operation, the result will affect next operation.If you want to remove vector, you need to config IV(config pstCtrl->stChangeFlags.bit1IV with 1) by transfering HI_UNF_CIPHER_ConfigHandle.
-\param[in] hCipher Cipher handle.
-\param[in] pu8SrcData: buffer of the source data.
-\param[out] pu8DestData: buffer of the target data
-\param[in] u32ByteLength Length of the decrypted data
-\retval ::HI_SUCCESS Call this API successful.
-\retval ::HI_FAILURE Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\retval ::HI_ERR_CIPHER_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_CIPHER_INVALID_HANDLE  The handle is invalid.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_DecryptVir(HI_HANDLE hCipher, const HI_U8 *pu8SrcData, HI_U8 *pu8DestData, HI_U32 u32ByteLength);
-
-/**
-\brief Encrypt multiple packaged data.
-\attention \n
-You can not encrypt more than 128 data package one time. When HI_ERR_CIPHER_BUSY return, the data package you send will not be deal, the customer should decrease the number of data package or run cipher again.Note:When encrypting more than one packaged data, every one package will be calculated using initial vector configured by HI_UNF_CIPHER_ConfigHandle.Previous result will not affect the later result.
-\param[in] hCipher cipher handle
-\param[in] pstDataPkg data package ready for cipher
-\param[in] u32DataPkgNum  number of package ready for cipher
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  cipher device have not been initialized
-\retval ::HI_ERR_CIPHER_INVALID_PARA  parameter error
-\retval ::HI_ERR_CIPHER_INVALID_HANDLE  handle invalid
-\retval ::HI_ERR_CIPHER_BUSY  hardware is busy, it can not deal with all data package once time
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_EncryptMulti(HI_HANDLE hCipher, const HI_UNF_CIPHER_DATA_S *pstDataPkg, HI_U32 u32DataPkgNum);
-
-/**
-\brief Get the cipher control information.
-
-\param[in] hCipher Cipher handle.
-\param[in] pstCtrl Cipher control information.
-\retval ::HI_SUCCESS Call this API successful.
-\retval ::HI_FAILURE Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\retval ::HI_ERR_CIPHER_INVALID_POINT  The pointer is null.
-\retval ::HI_ERR_CIPHER_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_CIPHER_INVALID_HANDLE  The handle is invalid.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_GetHandleConfig(HI_HANDLE hCipher, HI_UNF_CIPHER_CTRL_S* pstCtrl);
-
-/**
-\brief Decrypt multiple packaged data.
-\attention \n
-You can not decrypt more than 128 data package one time.When HI_ERR_CIPHER_BUSY return, the data package you send will not be deal, the custmer should decrease the number of data package or run cipher again.Note:When decrypting more than one packaged data, every one package will be calculated using initial vector configured by HI_UNF_CIPHER_ConfigHandle.Previous result will not affect the later result.
-\param[in] hCipher cipher handle
-\param[in] pstDataPkg data package ready for cipher
-\param[in] u32DataPkgNum  number of package ready for cipher
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  cipher device have not been initialized
-\retval ::HI_ERR_CIPHER_INVALID_PARA  parameter error
-\retval ::HI_ERR_CIPHER_INVALID_HANDLE  handle invalid
-\retval ::HI_ERR_CIPHER_BUSY  hardware is busy, it can not deal with all data package once time
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_DecryptMulti(HI_HANDLE hCipher, const HI_UNF_CIPHER_DATA_S *pstDataPkg, HI_U32 u32DataPkgNum);
-
-/**
-\brief Get the tag data of CCM/GCM.
-
-\attention \n
-This API is used to get the tag data of CCM/GCM.
-\param[in] hCipher cipher handle
-\param[out] pu8Tag tag data of CCM/GCM
-\param[in/out] pu32TagLen tag data length of CCM/GCM, the input should be 16 now.
-\retval ::HI_SUCCESS  Call this API succussful.
-\retval ::HI_FAILURE  Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\retval ::HI_ERR_CIPHER_INVALID_PARA  The parameter is invalid.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_GetTag(HI_HANDLE hCipher, HI_U8 *pu8Tag, HI_U32 *pu32TagLen);
-
-/**
-\brief Encrypt the clean key data by KLAD.
-\attention \n
-N/A
-\param[in] enRootKey klad root key.
-\param[in] pu8CleanKey clean key.
-\param[in] enTarget the module who to use this key.
-\param[out] pu8EcnryptKey encrypt key.
-\param[in] u32KeyLen clean key.
-\retval ::HI_SUCCESS Call this API successful.
-\retval ::HI_FAILURE Call this API fails.
-\retval ::HI_ERR_CIPHER_NOT_INIT  The cipher device is not initialized.
-\retval ::HI_ERR_CIPHER_INVALID_POINT  The pointer is null.
-\retval ::HI_ERR_CIPHER_INVALID_PARA  The parameter is invalid.
-\retval ::HI_ERR_CIPHER_INVALID_HANDLE  The handle is invalid.
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_KladEncryptKey(HI_UNF_CIPHER_CA_TYPE_E enRootKey,
-                                    HI_UNF_CIPHER_KLAD_TARGET_E enTarget,
-                                    const HI_U8 *pu8CleanKey, HI_U8* pu8EcnryptKey, HI_U32 u32KeyLen);
-
-/**
-\brief Get the random number.
-
-\attention \n
-This API is used to obtain the random number from the hardware.
-
-\param[out] pu32RandomNumber Point to the random number.
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_GetRandomNumber(HI_U32 *pu32RandomNumber);
-
-/**
-\brief Init the hash module, if other program is using the hash module, the API will return failure.
-
-\attention \n
-N/A
-
-\param[in] pstHashAttr: The hash calculating structure input.
-\param[out] pHashHandle: The output hash handle.
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_HashInit(const HI_UNF_CIPHER_HASH_ATTS_S *pstHashAttr, HI_HANDLE *pHashHandle);
-
-/**
-\brief Calculate the hash, if the size of the data to be calculated is very big and the DDR ram is not enough, this API can calculate the data one block by one block. Attention: The input block length must be 64bytes aligned except for the last block.
-
-\attention \n
-N/A
-
-\param[in] hHashHandl:  Hash handle.
-\param[in] pu8InputData:  The input data buffer.
-\param[in] u32InputDataLen:  The input data length, attention: the block length input must be 64bytes aligned except the last block!
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_HashUpdate(HI_HANDLE hHashHandle, const HI_U8 *pu8InputData, HI_U32 u32InputDataLen);
-
-
-
-/**
-\brief Get the final hash value, after calculate all of the data, call this API to get the final hash value and close the handle.If there is some reason need to interrupt the calculation, this API should also be call to close the handle.
-
-\attention \n
-N/A
-
-\param[in] hHashHandle:  Hash handle.
-\param[out] pu8OutputHash:  The final output hash value.
-
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_HashFinal(HI_HANDLE hHashHandle, HI_U8 *pu8OutputHash);
-
-/**
-\brief RSA encryption a plaintext with a RSA public key.
-
-\attention \n
-N/A
-
-\param[in] pstRsaEnc:   encryption struct.
-\param[in] pu8Input:    input data to be encryption
-\param[out] u32InLen:   length of input data to be encryption
-\param[out] pu8Output: output data to be encryption
-\param[out] pu32OutLen: length of output data to be encryption
-
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_RsaPublicEncrypt(const HI_UNF_CIPHER_RSA_PUB_ENC_S *pstRsaEnc,
-                                  const HI_U8 *pu8Input, HI_U32 u32InLen,
-                                  HI_U8 *pu8Output, HI_U32 *pu32OutLen);
-
-/**
-\brief RSA decryption a ciphertext with a RSA private key.
-
-\attention \n
-N/A
-
-\param[in] pstRsaDec:   decryption struct.
-\param[in] pu8Input:    input data to be decryption
-\param[out] u32InLen:   length of input data to be decryption
-\param[out] pu8Output:  output data to be decryption
-\param[out] pu32OutLen: length of output data to be decryption
-
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_RsaPrivateDecrypt(const HI_UNF_CIPHER_RSA_PRI_ENC_S *pstRsaDec,
-                                    const HI_U8 *pu8Input, HI_U32 u32InLen,
-                                    HI_U8 *pu8Output, HI_U32 *pu32OutLen);
-
-/**
-\brief RSA encryption a plaintext with a RSA private key.
-
-\attention \n
-N/A
-
-\param[in] pstRsaSign:   encryption struct.
-\param[in] pu8Input:     input data to be encryption
-\param[out] u32InLen:   length of input data to be encryption
-\param[out] pu8Output:  output data to be encryption
-\param[out] pu32OutLen: length of output data to be encryption
-
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_RsaPrivateEncrypt(const HI_UNF_CIPHER_RSA_PRI_ENC_S *pstRsaEnc,
-                                    const HI_U8 *pu8Input, HI_U32 u32InLen,
-                                    HI_U8 *pu8Output, HI_U32 *pu32OutLen);
-
-/**
-\brief RSA decryption a ciphertext with a RSA public key.
-
-\attention \n
-N/A
-
-\param[in] pstRsaVerify:   decryption struct.
-\param[in] pu8Input:   input data to be decryption
-\param[out] u32InLen:   length of input data to be decryption
-\param[out] pu8Output: output data to be decryption
-\param[out] pu32OutLen: length of output data to be decryption
-
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_RsaPublicDecrypt(const HI_UNF_CIPHER_RSA_PUB_ENC_S *pstRsaDec,
-                               const HI_U8 *pu8Input, HI_U32 u32InLen,
-                               HI_U8 *pu8Output, HI_U32 *pu32OutLen);
-
-/**
-\brief RSA signature a context with appendix, where a signer's RSA private key is used.
-
-\attention \n
-N/A
-
-\param[in] pstRsaSign:      signature struct.
-\param[in] pu8Input:        input context to be signature.
-\param[in] u32InLen:        length of input context to be signature
-\param[in] pu8HashData:    hash value of context,if NULL, let pu8HashData = Hash(context) automatically
-\param[out] pu8OutSign:    output message of signature
-\param[out] pu32OutSignLen: length of message of signature
-
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_RsaSign(const HI_UNF_CIPHER_RSA_SIGN_S *pstRsaSign,
-                             const HI_U8 *pu8InData, HI_U32 u32InDataLen,
-                             const HI_U8 *pu8HashData,
-                             HI_U8 *pu8OutSign, HI_U32 *pu32OutSignLen);
-
-/**
-\brief RSA signature verification a context with appendix, where a signer's RSA public key is used.
-
-\attention \n
-N/A
-
-\param[in] pstRsaVerify:    signature verification struct.
-\param[in] pu8Input:       input context to be signature verification, maybe null
-\param[in] u32InLen:        length of input context to be signature
-\param[in] pu8HashData:    hash value of context,if NULL, let pu8HashData = Hash(context) automatically
-\param[in] pu8InSign:      message of signature
-\param[in] pu32InSignLen:   length of message of signature
-
-\retval ::HI_SUCCESS  Call this API successful.
-\retval ::HI_FAILURE  Call this API fails.
-
-\see \n
-N/A
-*/
-HI_S32 HI_UNF_CIPHER_RsaVerify(const HI_UNF_CIPHER_RSA_VERIFY_S *pstRsaVerify,
-                               const HI_U8 *pu8InData, HI_U32 u32InDataLen,
-                               const HI_U8 *pu8HashData,
-                               const HI_U8 *pu8InSign, HI_U32 u32InSignLen);
-
-/** @} */  /** <!-- ==== API declaration end ==== */
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_UNF_CIPHER_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_vqe_register_api.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_vqe_register_api.h
deleted file mode 100644
index 479fceb9..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hi_vqe_register_api.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef __HI_VQE_REGISTER_API_H__
-#define __HI_VQE_REGISTER_API_H__
-
-#include "hi_type.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-/* VQE module function api, return pointer to handle of VQE module */
-
-//record
-HI_VOID * HI_VQE_RECORD_GetHandle(HI_VOID);
-//HPF
-HI_VOID * HI_VQE_HPF_GetHandle(HI_VOID);
-//AEC
-HI_VOID * HI_VQE_AEC_GetHandle(HI_VOID);
-//ANR
-HI_VOID * HI_VQE_ANR_GetHandle(HI_VOID);
-//RNR
-HI_VOID * HI_VQE_RNR_GetHandle(HI_VOID);
-//HDR
-HI_VOID * HI_VQE_HDR_GetHandle(HI_VOID);
-//DRC
-HI_VOID * HI_VQE_DRC_GetHandle(HI_VOID);
-//PEQ
-HI_VOID * HI_VQE_PEQ_GetHandle(HI_VOID);
-//AGC
-HI_VOID * HI_VQE_AGC_GetHandle(HI_VOID);
-//EQ
-HI_VOID * HI_VQE_EQ_GetHandle(HI_VOID);
-//RESAMPLE
-HI_VOID * HI_VQE_RESAMPLE_GetHandle(HI_VOID);
-//GAIN
-HI_VOID * HI_VQE_GAIN_GetHandle(HI_VOID);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __HI_VQE_REGISTER_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hifb.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/hifb.h
deleted file mode 100644
index c3787071..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/hifb.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2001-2011, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hifb.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       :
-  Description   :
-  History       :
-  1.Date        : 2009/03/12
-    Author      :
-    Modification: Created file
-******************************************************************************/
-
-
-#ifndef __HIFB_H__
-#define __HIFB_H__
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"{
-#endif
-#endif /* __cplusplus */
-
-#include "hi_type.h"
-#include "hi_common.h"
-#ifdef __HuaweiLite__
-#include <fb.h>
-#include <linux/wait.h>
-#include "stdlib.h"
-#include <linux/workqueue.h>
-#include <linux/kernel.h>
-#include <linux/device.h>
-#include "liteos/fb.h"
-
-
-#else
-#include <linux/fb.h>
-#endif
-
-/*************************** Structure Definition ****************************/
-
-#define IOC_TYPE_HIFB       'F'
-/** To obtain the colorkey of an overlay layer */
-#define FBIOGET_COLORKEY_HIFB       _IOR(IOC_TYPE_HIFB, 90, HIFB_COLORKEY_S)
-/** To set the colorkey of an overlay layer */
-#define FBIOPUT_COLORKEY_HIFB       _IOW(IOC_TYPE_HIFB, 91, HIFB_COLORKEY_S)
-/** To get the alpha of an overlay layer */
-#define FBIOGET_ALPHA_HIFB          _IOR(IOC_TYPE_HIFB, 92, HIFB_ALPHA_S)
-/** To set the alpha of an overlay layer */
-#define FBIOPUT_ALPHA_HIFB          _IOW(IOC_TYPE_HIFB, 93, HIFB_ALPHA_S)
-/** To get the origin of an overlay layer on the screen */
-#define FBIOGET_SCREEN_ORIGIN_HIFB  _IOR(IOC_TYPE_HIFB, 94, HIFB_POINT_S)
-/** To set the origin of an overlay layer on the screen */
-#define FBIOPUT_SCREEN_ORIGIN_HIFB  _IOW(IOC_TYPE_HIFB, 95, HIFB_POINT_S)
-/** To obtain the anti-flicker setting of an overlay layer */
-#define FBIOGET_DEFLICKER_HIFB       _IOR(IOC_TYPE_HIFB, 98, HIFB_DEFLICKER_S)
-/** To set the anti-flicker setting of an overlay layer */
-#define FBIOPUT_DEFLICKER_HIFB       _IOW(IOC_TYPE_HIFB, 99, HIFB_DEFLICKER_S)
-/** To wait for the vertical blanking region of an overlay layer */
-#define FBIOGET_VBLANK_HIFB         _IO(IOC_TYPE_HIFB, 100)
-/** To set the display state of an overlay layer */
-#define FBIOPUT_SHOW_HIFB           _IOW(IOC_TYPE_HIFB, 101, HI_BOOL)
-/** To obtain the display state of an overlay layer */
-#define FBIOGET_SHOW_HIFB           _IOR(IOC_TYPE_HIFB, 102, HI_BOOL)
-/** to obtain the capability of an overlay layer */
-#define FBIOGET_CAPABILITY_HIFB    _IOR(IOC_TYPE_HIFB, 103, HIFB_CAPABILITY_S)
-/** set the screen output size */
-#define FBIOPUT_SCREENSIZE          _IOW(IOC_TYPE_HIFB, 130, HIFB_SIZE_S)
-/** get the screen output size */
-#define FBIOGET_SCREENSIZE          _IOR(IOC_TYPE_HIFB, 131, HIFB_SIZE_S)
-
-/** To display multiple surfaces in turn and set the alpha and colorkey attributes */
-#define FBIOFLIP_SURFACE            _IOW(IOC_TYPE_HIFB, 132, HIFB_SURFACEEX_S)
-
-/**To set the compression function status of an overlay layer*/
-#define FBIOPUT_COMPRESSION_HIFB    _IOW(IOC_TYPE_HIFB, 133, HI_BOOL)
-/**To obtain the compression function status of an overlay layer*/
-#define FBIOGET_COMPRESSION_HIFB    _IOR(IOC_TYPE_HIFB, 134, HI_BOOL)
-
-/**To set the hdr function status of an overlay layer*/
-#define FBIOPUT_DYNAMIC_RANGE_HIFB  _IOW(IOC_TYPE_HIFB, 139, HIFB_DYNAMIC_RANGE_E)
-/**To get the hdr function status of an overlay layer*/
-#define FBIOGET_DYNAMIC_RANGE_HIFB  _IOR(IOC_TYPE_HIFB, 140, HIFB_DYNAMIC_RANGE_E)
-
-/**To release the layer*/
-#define FBIO_RELEASE_HIFB           _IO(IOC_TYPE_HIFB, 150)
-
-typedef struct
-{
-    HI_U32  u32Width;
-    HI_U32  u32Height;
-}HIFB_SIZE_S;
-#ifndef __HuaweiLite__
-static inline HI_U8  hifb_rgb(const struct fb_bitfield* pBit, HI_S32 color)
-{
-    return ((HI_U8)((((HI_U32)color)>>pBit->offset) << (8-pBit->length)) +
-             ((HI_U8)(((HI_U32)(color)>>pBit->offset) << (8-pBit->length)) >> pBit->length));
-}
-
-static inline HI_S32 hifb_color2key(const struct fb_var_screeninfo* pVar, HI_S32 color)
-{
-   if (pVar->bits_per_pixel <= 8)
-   {
-       return color;
-   }
-   else
-   {
-      HI_U8 r, g, b;
-      r = hifb_rgb(&pVar->red, color);
-      g = hifb_rgb(&pVar->green, color);
-      b = hifb_rgb(&pVar->blue, color);
-      return (r<<16) + (g<<8) + b;
-   }
-}
-#endif
-typedef enum hifbDYNAMIC_RANGE_E
-{
-    HIFB_DYNAMIC_RANGE_SDR8 = 0,
-    HIFB_DYNAMIC_RANGE_SDR10,
-    HIFB_DYNAMIC_RANGE_HDR10,
-    HIFB_DYNAMIC_RANGE_HLG,
-    HIFB_DYNAMIC_RANGE_SLF,
-    HIFB_DYNAMIC_RANGE_BUTT
-} HIFB_DYNAMIC_RANGE_E;
-
-
-typedef struct
-{
-    HI_BOOL bKeyEnable;         /* colorkey enable flag */
-    HI_U32 u32Key;              /* colorkey value, maybe contains alpha */
-}HIFB_COLORKEY_S;
-
-typedef struct
-{
-    HI_S32 x;
-    HI_S32 y;
-    HI_S32 w;
-    HI_S32 h;
-} HIFB_RECT;
-
-typedef struct
-{
-    HI_S32 s32XPos;         /**<  horizontal position */
-    HI_S32 s32YPos;         /**<  vertical position */
-}HIFB_POINT_S;
-
-typedef struct hiHIFB_DEFLICKER_S
-{
-    HI_U32  u32HDfLevel;    /**<  horizontal deflicker level */
-    HI_U32  u32VDfLevel;    /**<  vertical deflicker level */
-    HI_U8   ATTRIBUTE *pu8HDfCoef;    /**<  horizontal deflicker coefficient */
-    HI_U8   ATTRIBUTE *pu8VDfCoef;    /**<  vertical deflicker coefficient */
-}HIFB_DEFLICKER_S;
-
-/** Alpha info */
-typedef struct
-{
-    HI_BOOL bAlphaEnable;   /**<  alpha enable flag */
-    HI_BOOL bAlphaChannel;  /**<  alpha channel enable flag */
-    HI_U8 u8Alpha0;         /**<  alpha0 value, used in ARGB1555 */
-    HI_U8 u8Alpha1;         /**<  alpha1 value, used in ARGB1555 */
-    HI_U8 u8GlobalAlpha;    /**<  global alpha value */
-    HI_U8 u8Reserved;
-}HIFB_ALPHA_S;
-
-typedef enum
-{
-    HIFB_FMT_RGB565 = 0,
-    HIFB_FMT_RGB888,              /**<  RGB888 24bpp */
-
-    HIFB_FMT_KRGB444,       /**<  RGB444 16bpp */
-    HIFB_FMT_KRGB555,       /**<  RGB555 16bpp */
-    HIFB_FMT_KRGB888,       /**<  RGB888 32bpp */
-
-    HIFB_FMT_ARGB4444,      /**< ARGB4444 */
-    HIFB_FMT_ARGB1555,      /**< ARGB1555 */
-    HIFB_FMT_ARGB8888,      /**< ARGB8888 */
-    HIFB_FMT_ARGB8565,      /**< ARGB8565 */
-
-    HIFB_FMT_RGBA4444,      /**< ARGB4444 */
-    HIFB_FMT_RGBA5551,      /**< RGBA5551 */
-    HIFB_FMT_RGBA5658,      /**< RGBA5658 */
-    HIFB_FMT_RGBA8888,      /**< RGBA8888 */
-
-    HIFB_FMT_BGR565,        /**< BGR565 */
-    HIFB_FMT_BGR888,        /**< BGR888 */
-    HIFB_FMT_ABGR4444,      /**< ABGR4444 */
-    HIFB_FMT_ABGR1555,      /**< ABGR1555 */
-    HIFB_FMT_ABGR8888,      /**< ABGR8888 */
-    HIFB_FMT_ABGR8565,      /**< ABGR8565 */
-    HIFB_FMT_KBGR444,       /**< BGR444 16bpp */
-    HIFB_FMT_KBGR555,       /**< BGR555 16bpp */
-    HIFB_FMT_KBGR888,       /**< BGR888 32bpp */
-
-    HIFB_FMT_1BPP,          /**<  clut1 */
-    HIFB_FMT_2BPP,          /**<  clut2 */
-    HIFB_FMT_4BPP,          /**<  clut4 */
-    HIFB_FMT_8BPP,          /**< clut8 */
-    HIFB_FMT_ACLUT44,       /**< AClUT44*/
-    HIFB_FMT_ACLUT88,         /**< ACLUT88 */
-    HIFB_FMT_PUYVY,         /**< UYVY */
-    HIFB_FMT_PYUYV,         /**< YUYV */
-    HIFB_FMT_PYVYU,         /**< YVYU */
-    HIFB_FMT_YUV888,        /**< YUV888 */
-    HIFB_FMT_AYUV8888,      /**< AYUV8888 */
-    HIFB_FMT_YUVA8888,      /**< YUVA8888 */
-    HIFB_FMT_BUTT
-}HIFB_COLOR_FMT_E;
-
-typedef struct
-{
-    HI_BOOL bKeyRgb;
-    HI_BOOL bKeyAlpha;      /**<  whether support colorkey alpha */
-    HI_BOOL bGlobalAlpha;   /**<  whether support global alpha */
-    HI_BOOL bCmap;          /**<  whether support color map */
-    HI_BOOL bHasCmapReg;    /**<  whether has color map register*/
-    HI_BOOL bColFmt[HIFB_FMT_BUTT]; /**<  support which color format */
-    HI_BOOL bVoScale;       /**< support vo scale*/
-    HI_BOOL bLayerSupported;    /**< whether support a certain layer, for example:x5 HD support HIFB_SD_0 not support HIFB_SD_1*/
-    HI_U32  u32MaxWidth;    /**<  the max pixels per line */
-    HI_U32  u32MaxHeight;   /**<  the max lines */
-    HI_U32  u32MinWidth;    /**<  the min pixels per line */
-    HI_U32  u32MinHeight;   /**<  the min lines */
-    HI_U32  u32VDefLevel;   /**<  vertical deflicker level, 0 means vertical deflicker is unsupported */
-    HI_U32  u32HDefLevel;   /**<  horizontal deflicker level, 0 means horizontal deflicker is unsupported  */
-    HI_BOOL  bDcmp;
-    HI_BOOL  bPreMul;
-    HI_BOOL  bGHDR;         /* NEW Feature. Is GHDR supported. */
-}HIFB_CAPABILITY_S;
-
-/*refresh mode*/
-typedef enum
-{
-    HIFB_LAYER_BUF_DOUBLE = 0x0,       /**<  2 display buf in fb */
-    HIFB_LAYER_BUF_ONE    = 0x1,       /**<  1 display buf in fb */
-    HIFB_LAYER_BUF_NONE   = 0x2,       /**<  no display buf in fb,the buf user refreshed will be directly set to VO*/
-    HIFB_LAYER_BUF_DOUBLE_IMMEDIATE=0x3, /**< 2 display buf in fb, each refresh will be displayed*/
-    HIFB_LAYER_BUF_FENCE = 0x4, /**<  2 display buf in fb with fence */
-    HIFB_LAYER_BUF_BUTT
-} HIFB_LAYER_BUF_E;
-
-/* surface info */
-typedef struct
-{
-    HI_U64  u64PhyAddr;     /**<  start physical address */
-    HI_U64  u64GBPhyAddr;   // TODO new
-    HI_U32  u32Width;       /**<  width pixels */
-    HI_U32  u32Height;      /**<  height pixels */
-    HI_U32  u32Pitch;       /**<  line pixels */
-    HIFB_COLOR_FMT_E enFmt; /**<  color format */
-    HIFB_DYNAMIC_RANGE_E  enDynamicRange;    /* NEW dynamic range. */
-}HIFB_SURFACE_S;
-
-typedef struct
-{
-    HI_U64 u64PhyAddr;
-    HIFB_ALPHA_S stAlpha;
-    HIFB_COLORKEY_S stColorkey;
-}HIFB_SURFACEEX_S;
-
-/* refresh surface info */
-typedef struct
-{
-    HIFB_SURFACE_S stCanvas;
-    HIFB_RECT UpdateRect;       /* refresh region*/
-}HIFB_BUFFER_S;
-
-/* cursor info */
-typedef struct
-{
-    HIFB_SURFACE_S stCursor;
-    HIFB_POINT_S stHotPos;
-} HIFB_CURSOR_S;
-
-/* DDR detect zone info */
-typedef struct
-{
-    HI_U32 u32StartSection;
-    HI_U32 u32ZoneNums;
-} HIFB_DDRZONE_S;
-
-/* crusor handle */
-/* Attention:surface in cursor will be released by user*/
-#define FBIOPUT_CURSOR_INFO           _IOW(IOC_TYPE_HIFB, 104, HIFB_CURSOR_S )
-#define FBIOGET_CURSOR_INFO           _IOW(IOC_TYPE_HIFB, 105, HIFB_CURSOR_S )
-
-#define FBIOPUT_CURSOR_STATE          _IOW(IOC_TYPE_HIFB, 106, HI_BOOL )
-#define FBIOGET_CURSOR_STATE          _IOW(IOC_TYPE_HIFB, 107, HI_BOOL )
-
-#define FBIOPUT_CURSOR_POS            _IOW(IOC_TYPE_HIFB, 108, HIFB_POINT_S )
-#define FBIOGET_CURSOR_POS            _IOR(IOC_TYPE_HIFB, 109, HIFB_POINT_S )
-
-#define FBIOPUT_CURSOR_COLORKEY       _IOR(IOC_TYPE_HIFB, 110, HIFB_COLORKEY_S )
-#define FBIOGET_CURSOR_COLORKEY       _IOW(IOC_TYPE_HIFB, 111, HIFB_COLORKEY_S )
-#define FBIOPUT_CURSOR_ALPHA          _IOR(IOC_TYPE_HIFB, 112, HIFB_ALPHA_S )
-#define FBIOGET_CURSOR_ALPHA          _IOW(IOC_TYPE_HIFB, 113, HIFB_ALPHA_S )
-
-/** cursor will be separated from attached layer automatically if you attach cursor to another layer,that means
-cursor can be attached to only one layer at any time*/
-#define FBIOPUT_CURSOR_ATTCHCURSOR    _IOW(IOC_TYPE_HIFB, 114, HI_U32 )
-#define FBIOPUT_CURSOR_DETACHCURSOR   _IOW(IOC_TYPE_HIFB, 115, HI_U32 )
-
-/**antiflicker level*/
-/**Auto means fb will choose a appropriate antiflicker level automatically according to the color info of map*/
-typedef enum
-{
-    HIFB_LAYER_ANTIFLICKER_NONE = 0x0,  /**< no antiflicker*/
-    HIFB_LAYER_ANTIFLICKER_LOW = 0x1,   /**< low level*/
-    HIFB_LAYER_ANTIFLICKER_MIDDLE = 0x2,/**< middle level*/
-    HIFB_LAYER_ANTIFLICKER_HIGH = 0x3, /**< high level*/
-    HIFB_LAYER_ANTIFLICKER_AUTO = 0x4, /**< auto*/
-    HIFB_LAYER_ANTIFLICKER_BUTT
-}HIFB_LAYER_ANTIFLICKER_LEVEL_E;
-
-/* MIRROR mode  */
-typedef enum
-{
-    HIFB_MIRROR_NONE = 0x0,
-    HIFB_MIRROR_HORIZONTAL = 0x1,
-    HIFB_MIRROR_VERTICAL = 0x2,
-    HIFB_MIRROR_BOTH= 0x3,
-    HIFB_MIRROR_BUTT
-}HIFB_MIRROR_MODE_E;
-
-/* ROTATE mode  */
-typedef enum
-{
-    HIFB_ROTATE_NONE = 0x0,
-    HIFB_ROTATE_90 = 0x1,
-    HIFB_ROTATE_180 = 0x2,
-    HIFB_ROTATE_270= 0x3,
-    HIFB_ROTATE_BUTT
-}HIFB_ROTATE_MODE_E;
-
-/*layer info maskbit*/
-typedef enum
-{
-    HIFB_LAYERMASK_BUFMODE = 0x1,           /**< BUFMODE bitmask */
-    HIFB_LAYERMASK_ANTIFLICKER_MODE = 0x2,  /**< ANTIFLICKER_MODE bitmask */
-    HIFB_LAYERMASK_POS = 0x4,               /**< the position bitmask */
-    HIFB_LAYERMASK_CANVASSIZE = 0x8,      /**< canvassize bitmask */
-    HIFB_LAYERMASK_DISPSIZE = 0x10,       /**< displaysize bitmask */
-    HIFB_LAYERMASK_SCREENSIZE = 0x20,     /**< screensize bitmask */
-    HIFB_LAYERMASK_BMUL = 0x40,           /**< pre-mult bitmask */
-    HIFB_LAYERMASK_BUTT
-}HIFB_LAYER_INFO_MASKBIT;
-
-/**layer info*/
-typedef struct
-{
-    HIFB_LAYER_BUF_E BufMode;
-    HIFB_LAYER_ANTIFLICKER_LEVEL_E eAntiflickerLevel;
-    HI_S32 s32XPos;           /**<  the x pos of origion point in screen */
-    HI_S32 s32YPos;           /**<  the y pos of origion point in screen */
-    HI_U32 u32CanvasWidth;    /**<  the width of canvas buffer */
-    HI_U32 u32CanvasHeight;   /**<  the height of canvas buffer */
-    HI_U32 u32DisplayWidth;   /**<  the width of display buf in fb.for 0 buf ,there is no display buf in fb, so it's effectless*/
-    HI_U32 u32DisplayHeight;  /**<  the height of display buf in fb. */
-    HI_U32 u32ScreenWidth;    /**<  the width of screen */
-    HI_U32 u32ScreenHeight;   /**<  the height of screen */
-    HI_BOOL bPreMul;          /**<  The data drawed in buf is premul data or not*/
-    HI_U32 u32Mask;           /**<  param modify mask bit*/
-}HIFB_LAYER_INFO_S;
-
-/** To set the layer information */
-#define FBIOPUT_LAYER_INFO                _IOW(IOC_TYPE_HIFB, 120, HIFB_LAYER_INFO_S)
-/** To get the layer information */
-#define FBIOGET_LAYER_INFO                _IOR(IOC_TYPE_HIFB, 121, HIFB_LAYER_INFO_S)
-/** To get canvas buf */
-#define FBIOGET_CANVAS_BUFFER             _IOR(IOC_TYPE_HIFB, 123, HIFB_BUFFER_S)
-/** To refresh the displayed contents in extended mode */
-#define FBIO_REFRESH                      _IOW(IOC_TYPE_HIFB, 124, HIFB_BUFFER_S)
-
-/**sync refresh*/
-#define FBIO_WAITFOR_FREFRESH_DONE        _IO(IOC_TYPE_HIFB, 125)
-
-/* To set the mirror mode */
-#define FBIOPUT_MIRROR_MODE            _IOW(IOC_TYPE_HIFB, 126, HIFB_MIRROR_MODE_E)
-/* To get the mirror mode */
-#define FBIOGET_MIRROR_MODE            _IOW(IOC_TYPE_HIFB, 127, HIFB_MIRROR_MODE_E)
-
-/* To set the rotate mode */
-#define FBIOPUT_ROTATE_MODE            _IOW(IOC_TYPE_HIFB, 128, HIFB_ROTATE_MODE_E)
-/* To get the rotate mode */
-#define FBIOGET_ROTATE_MODE            _IOW(IOC_TYPE_HIFB, 129, HIFB_ROTATE_MODE_E)
-
-/**To set the DDR detect zone of an overlay layer*/
-#define FBIOPUT_MDDRDETECT_HIFB    _IOW(IOC_TYPE_HIFB, 135, HIFB_DDRZONE_S)
-/**To get the DDR detect zone of an overlay layer*/
-#define FBIOGET_MDDRDETECT_HIFB    _IOW(IOC_TYPE_HIFB, 136, HIFB_DDRZONE_S)
-
-#ifdef __HuaweiLite__
-#define FBIOGET_SCREENINFO_HIFB 0x4600
-#define FBIOPUT_SCREENINFO_HIFB 0x4601
-#define FBIOPAN_DISPLAY_HIFB 0x4606
-
-struct hifb_info
-{
-    struct fb_vtable_s vtable; /* FB interfaces */
-    struct fb_videoinfo_s vinfo;    /* This structure descrides the overall video controller */
-    struct fb_overlayinfo_s oinfo;  /* This structure descrides one overlay */
-#ifdef CONFIG_FB_CMAP
-    struct fb_cmap_s cmap; /* Current camp */
-#endif
-
-    int activate;
-    void *par; /* Private data */
-};
-
-extern HI_S32 hifb_init(void* pArgs);
-#endif
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-
-#endif /* __HIFB_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/ivs_md.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/ivs_md.h
deleted file mode 100644
index 14673a9c..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/ivs_md.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2001-2015, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : ivs_md.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software (IVE) group
-  Created       : 2014/11/10
-  Description   :
-  History       :
-  1.Date        : 2014/11/10
-    Author      :
-    Modification: Created file
-  2.Date        : 2015/11/24
-	Author      :
-	Modification: Add HI_IVS_MD_Process sad parameter
-
-******************************************************************************/
-
-#ifndef _HI_IVS_MD_H_
-#define _HI_IVS_MD_H_
-
-#include "hi_md.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-/*****************************************************************************
-*   Prototype    : HI_IVS_MD_Init
-*   Description  : Motion Detection(MD) initialization.
-*   Parameters   : HI_VOID.
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2014/11/11
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_IVS_MD_Init(HI_VOID);
-
-/*****************************************************************************
-*   Prototype    : HI_IVS_MD_Exit
-*   Description  : Motion Detection(MD) exit.
-*   Parameters   : HI_VOID.
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2014/11/11
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_IVS_MD_Exit(HI_VOID);
-
-/*****************************************************************************
-*   Prototype    : HI_IVS_MD_CreateChn
-*   Description  : Create Motion Detection(MD) Chn.
-*   Parameters   : MD_CHN			MdChn		Md chn.
-*                  MD_ATTR_S		*pstMdAttr	Md attribute parameters
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2014/11/11
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_IVS_MD_CreateChn(MD_CHN MdChn, MD_ATTR_S *pstMdAttr);
-
-/*****************************************************************************
-*   Prototype    : HI_IVS_MD_DestroyChn
-*   Description  : Destroy Motion Detection(MD) chn.
-*   Parameters   : MD_CHN		MdChn   Md chn that would be destroy.
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2014/11/11
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_IVS_MD_DestroyChn(MD_CHN MdChn);
-
-/*****************************************************************************
-*   Prototype    : HI_IVS_MD_SetChnAttr
-*   Description  : Set Motion Detection(MD) chn attribute.
-*   Parameters   : MD_CHN			MdChn		Md chn.
-*                  MD_ATTR_S		*pstMdAttr	Md attribute parameters
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2015/04/10
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_IVS_MD_SetChnAttr(MD_CHN MdChn, MD_ATTR_S *pstMdAttr);
-
-/*****************************************************************************
-*   Prototype    : HI_IVS_MD_GetChnAttr
-*   Description  : Get Motion Detection(MD) chn attribute.
-*   Parameters   : MD_CHN			MdChn		Md chn.
-*                  MD_ATTR_S		*pstMdAttr	Md attribute parameters
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2015/04/10
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_IVS_MD_GetChnAttr(MD_CHN MdChn, MD_ATTR_S *pstMdAttr);
-
-/*****************************************************************************
-*   Prototype    : HI_IVS_MD_GetBg
-*   Description  : Get Motion Detection(MD) background image.
-*   Parameters   : MD_CHN				MdChn		Md chn.
-*                  IVE_DST_IMAGE_S	*pstBg		Output background image
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2014/11/11
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_IVS_MD_GetBg(MD_CHN MdChn, IVE_DST_IMAGE_S *pstBg);
-
-/*****************************************************************************
-*   Prototype    : HI_IVS_MD_Process
-*   Description  : Motion Detection(MD) process.
-*   Parameters   : MD_CHN					MdChn	    Md chn.
-*                  IVE_SRC_IMAGE_S		*pstCur	    Current image
-* 				    IVE_SRC_IMAGE_S		*pstRef    Reference image
-* 				    IVE_DST_IMAGE_S      *pstSad    Output result of sad value
-* 				    IVE_DST_MEM_INFO_S	*pstBlob   Output blob
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2014/11/11
-*           Author       :
-*           Modification : Created function
-*       2.  Date         : 2015/11/24
-*           Author       :
-*           Modification : Add pstSad parameter
-*
-*****************************************************************************/
-HI_S32 HI_IVS_MD_Process(MD_CHN MdChn, IVE_SRC_IMAGE_S *pstCur, IVE_SRC_IMAGE_S *pstRef,
-                         IVE_DST_IMAGE_S *pstSad, IVE_DST_MEM_INFO_S *pstBlob);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-#endif /* _HI_IVS_MD_H_ */
\ No newline at end of file
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/list.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/list.h
deleted file mode 100644
index f6af2810..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/list.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef __HI_LIST_H__
-#define __HI_LIST_H__
-
-#ifndef _LINUX_LIST_H
-
-#define INIT_LIST_HEAD(ptr) \
-do {                        \
-    (ptr)->next = (ptr);    \
-    (ptr)->prev = (ptr);    \
-} while (0)
-
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
-
-struct list_head {
-    struct list_head *next, *prev;
-};
-
-static inline void __list_add(struct list_head * _new, struct list_head * prev, struct list_head * next)
-{
-    next->prev = _new;
-    _new->next = next;
-    _new->prev = prev;
-    prev->next = _new;
-}
-
-static inline void list_add(struct list_head *_new, struct list_head *head)
-{
-    __list_add(_new, head, head->next);
-}
-
-static inline void list_add_tail(struct list_head *_new, struct list_head *head)
-{
-    __list_add(_new, head->prev, head);
-}
-
-static inline void __list_del(struct list_head * prev, struct list_head * next)
-{
-    next->prev = prev;
-    prev->next = next;
-}
-
-static inline void list_del(struct list_head *entry)
-{
-    __list_del(entry->prev, entry->next);
-}
-
-static inline void list_del_init(struct list_head *entry)
-{
-    __list_del(entry->prev, entry->next);
-    INIT_LIST_HEAD(entry);
-}
-
-static inline void list_move(struct list_head *list, struct list_head *head)
-{
-    __list_del(list->prev, list->next);
-    list_add(list, head);
-}
-
-static inline void list_move_tail(struct list_head *list,
-                  struct list_head *head)
-{
-    __list_del(list->prev, list->next);
-    list_add_tail(list, head);
-}
-
-static inline int list_empty(struct list_head *head)
-{
-    return head->next == head;
-}
-
-static inline void __list_splice(struct list_head *list,
-                                 struct list_head *head)
-{
-    struct list_head *first = list->next;
-    struct list_head *last = list->prev;
-    struct list_head *at = head->next;
-
-    first->prev = head;
-    head->next = first;
-
-    last->next = at;
-    at->prev = last;
-}
-
-static inline void list_splice(struct list_head *list, struct list_head *head)
-{
-    if (!list_empty(list))
-    {
-        __list_splice(list, head);
-    }
-}
-
-static inline void list_splice_init(struct list_head *list, struct list_head *head)
-{
-    if (!list_empty(list))
-    {
-        __list_splice(list, head);
-        INIT_LIST_HEAD(list);
-    }
-}
-
-#define list_entry(ptr, type, member) \
-    ((type *)((uintptr_t)(ptr)-((unsigned long)(&((type *)1)->member) - 1)))
-
-#define list_for_each(pos, head) \
-    for (pos = (head)->next; pos != (head); pos = pos->next)
-
-#define list_for_each_safe(pos, n, head) \
-    for (pos = (head)->next, n = pos->next; pos != (head); \
-        pos = n, n = pos->next)
-
-#define get_first_item(attached, type, member) \
-    ((type *)((char *)((attached)->next)-(unsigned long)(&((type *)0)->member)))
-
-#endif
-
-#endif
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_ae.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_ae.h
deleted file mode 100644
index f260fe9a..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_ae.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : mpi_ae.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2014/04/01
-  Description   :
-  History       :
-  1.Date        : 2014/04/01
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-#ifndef __MPI_AE_H__
-#define __MPI_AE_H__
-
-#include "hi_comm_isp.h"
-#include "hi_comm_3a.h"
-#include "hi_ae_comm.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-
-/* The interface of ae lib register to isp. */
-HI_S32 HI_MPI_AE_Register(VI_PIPE ViPipe, ALG_LIB_S *pstAeLib);
-HI_S32 HI_MPI_AE_UnRegister(VI_PIPE ViPipe, ALG_LIB_S *pstAeLib);
-
-/* The callback function of sensor register to ae lib. */
-HI_S32 HI_MPI_AE_SensorRegCallBack(VI_PIPE ViPipe, ALG_LIB_S *pstAeLib, ISP_SNS_ATTR_INFO_S *pstSnsAttrInfo,
-                                   AE_SENSOR_REGISTER_S *pstRegister);
-HI_S32 HI_MPI_AE_SensorUnRegCallBack(VI_PIPE ViPipe, ALG_LIB_S *pstAeLib, SENSOR_ID SensorId);
-
-HI_S32 HI_MPI_ISP_SetExposureAttr(VI_PIPE ViPipe, const ISP_EXPOSURE_ATTR_S *pstExpAttr);
-HI_S32 HI_MPI_ISP_GetExposureAttr(VI_PIPE ViPipe, ISP_EXPOSURE_ATTR_S *pstExpAttr);
-
-HI_S32 HI_MPI_ISP_SetWDRExposureAttr(VI_PIPE ViPipe, const ISP_WDR_EXPOSURE_ATTR_S *pstWDRExpAttr);
-HI_S32 HI_MPI_ISP_GetWDRExposureAttr(VI_PIPE ViPipe, ISP_WDR_EXPOSURE_ATTR_S *pstWDRExpAttr);
-
-HI_S32 HI_MPI_ISP_SetHDRExposureAttr(VI_PIPE ViPipe, const ISP_HDR_EXPOSURE_ATTR_S *pstHDRExpAttr);
-HI_S32 HI_MPI_ISP_GetHDRExposureAttr(VI_PIPE ViPipe, ISP_HDR_EXPOSURE_ATTR_S *pstHDRExpAttr);
-
-HI_S32 HI_MPI_ISP_SetAERouteAttr(VI_PIPE ViPipe, const ISP_AE_ROUTE_S *pstAERouteAttr);
-HI_S32 HI_MPI_ISP_GetAERouteAttr(VI_PIPE ViPipe, ISP_AE_ROUTE_S *pstAERouteAttr);
-
-HI_S32 HI_MPI_ISP_SetAERouteSFAttr(VI_PIPE ViPipe, const ISP_AE_ROUTE_S *pstAERouteSFAttr);
-HI_S32 HI_MPI_ISP_GetAERouteSFAttr(VI_PIPE ViPipe, ISP_AE_ROUTE_S *pstAERouteSFAttr);
-
-HI_S32 HI_MPI_ISP_QueryExposureInfo(VI_PIPE ViPipe, ISP_EXP_INFO_S *pstExpInfo);
-
-HI_S32 HI_MPI_ISP_SetIrisAttr(VI_PIPE ViPipe, const ISP_IRIS_ATTR_S *pstIrisAttr);
-HI_S32 HI_MPI_ISP_GetIrisAttr(VI_PIPE ViPipe, ISP_IRIS_ATTR_S *pstIrisAttr);
-
-HI_S32 HI_MPI_ISP_SetDcirisAttr(VI_PIPE ViPipe, const ISP_DCIRIS_ATTR_S *pstDcirisAttr);
-HI_S32 HI_MPI_ISP_GetDcirisAttr(VI_PIPE ViPipe, ISP_DCIRIS_ATTR_S *pstDcirisAttr);
-
-HI_S32 HI_MPI_ISP_SetPirisAttr(VI_PIPE ViPipe, const ISP_PIRIS_ATTR_S *pstPirisAttr);
-HI_S32 HI_MPI_ISP_GetPirisAttr(VI_PIPE ViPipe, ISP_PIRIS_ATTR_S *pstPirisAttr);
-
-HI_S32 HI_MPI_ISP_SetAERouteAttrEx(VI_PIPE ViPipe, const ISP_AE_ROUTE_EX_S *pstAERouteAttrEx);
-HI_S32 HI_MPI_ISP_GetAERouteAttrEx(VI_PIPE ViPipe, ISP_AE_ROUTE_EX_S *pstAERouteAttrEx);
-
-HI_S32 HI_MPI_ISP_SetAERouteSFAttrEx(VI_PIPE ViPipe, const ISP_AE_ROUTE_EX_S *pstAERouteSFAttrEx);
-HI_S32 HI_MPI_ISP_GetAERouteSFAttrEx(VI_PIPE ViPipe, ISP_AE_ROUTE_EX_S *pstAERouteSFAttrEx);
-
-HI_S32 HI_MPI_ISP_SetSmartExposureAttr(VI_PIPE ViPipe, const ISP_SMART_EXPOSURE_ATTR_S *pstSmartExpAttr);
-HI_S32 HI_MPI_ISP_GetSmartExposureAttr(VI_PIPE ViPipe, ISP_SMART_EXPOSURE_ATTR_S *pstSmartExpAttr);
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_audio.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_audio.h
deleted file mode 100644
index 0acab74e..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_audio.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016-2018, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : mpi_audio.h
-  Version         : Initial Draft
-  Author          : Hisilicon multimedia software group
-  Created        : 2016/6/15
-  Last Modified :
-  Description    :
-  Function List  :
-******************************************************************************/
-
-#ifndef __MPI_AUDIO_H__
-#define __MPI_AUDIO_H__
-
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_comm_aio.h"
-#include "hi_comm_aenc.h"
-#include "hi_comm_adec.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C"
-{
-#endif
-#endif /* __cplusplus */
-
-#define AENC_ADAPT_MAGIC 0Xfcfcfcfc
-
-/* Audio function api. */
-HI_S32 HI_MPI_AUDIO_SetModParam(const AUDIO_MOD_PARAM_S *pstModParam);
-HI_S32 HI_MPI_AUDIO_GetModParam(AUDIO_MOD_PARAM_S *pstModParam);
-HI_S32 HI_MPI_AUDIO_RegisterVQEModule(const AUDIO_VQE_REGISTER_S *pstVqeRegister);
-
-/* AI function api. */
-HI_S32 HI_MPI_AI_SetPubAttr(AUDIO_DEV AiDevId, const AIO_ATTR_S *pstAttr);
-HI_S32 HI_MPI_AI_GetPubAttr(AUDIO_DEV AiDevId, AIO_ATTR_S *pstAttr);
-
-HI_S32 HI_MPI_AI_Enable(AUDIO_DEV AiDevId);
-HI_S32 HI_MPI_AI_Disable(AUDIO_DEV AiDevId);
-
-HI_S32 HI_MPI_AI_EnableChn(AUDIO_DEV AiDevId, AI_CHN AiChn);
-HI_S32 HI_MPI_AI_DisableChn(AUDIO_DEV AiDevId, AI_CHN AiChn);
-
-HI_S32 HI_MPI_AI_GetFrame(AUDIO_DEV AiDevId, AI_CHN AiChn, AUDIO_FRAME_S *pstFrm, AEC_FRAME_S *pstAecFrm, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_AI_ReleaseFrame(AUDIO_DEV AiDevId, AI_CHN AiChn, const AUDIO_FRAME_S *pstFrm, const AEC_FRAME_S *pstAecFrm);
-
-HI_S32 HI_MPI_AI_SetChnParam(AUDIO_DEV AiDevId, AI_CHN AiChn, const AI_CHN_PARAM_S *pstChnParam);
-HI_S32 HI_MPI_AI_GetChnParam(AUDIO_DEV AiDevId, AI_CHN AiChn, AI_CHN_PARAM_S *pstChnParam);
-
-HI_S32 HI_MPI_AI_SetRecordVqeAttr(AUDIO_DEV AiDevId, AI_CHN AiChn, const AI_RECORDVQE_CONFIG_S *pstVqeConfig);
-HI_S32 HI_MPI_AI_GetRecordVqeAttr(AUDIO_DEV AiDevId, AI_CHN AiChn, AI_RECORDVQE_CONFIG_S *pstVqeConfig);
-
-HI_S32 HI_MPI_AI_EnableVqe(AUDIO_DEV AiDevId, AI_CHN AiChn);
-HI_S32 HI_MPI_AI_DisableVqe(AUDIO_DEV AiDevId, AI_CHN AiChn);
-
-HI_S32 HI_MPI_AI_EnableReSmp(AUDIO_DEV AiDevId, AI_CHN AiChn, AUDIO_SAMPLE_RATE_E enOutSampleRate);
-HI_S32 HI_MPI_AI_DisableReSmp(AUDIO_DEV AiDevId, AI_CHN AiChn);
-
-HI_S32 HI_MPI_AI_SetTrackMode(AUDIO_DEV AiDevId, AUDIO_TRACK_MODE_E enTrackMode);
-HI_S32 HI_MPI_AI_GetTrackMode(AUDIO_DEV AiDevId, AUDIO_TRACK_MODE_E *penTrackMode);
-HI_S32 HI_MPI_AI_SaveFile(AUDIO_DEV AiDevId, AI_CHN AiChn, const AUDIO_SAVE_FILE_INFO_S *pstSaveFileInfo);
-HI_S32 HI_MPI_AI_QueryFileStatus(AUDIO_DEV AiDevId, AI_CHN AiChn, AUDIO_FILE_STATUS_S* pstFileStatus);
-
-HI_S32 HI_MPI_AI_ClrPubAttr(AUDIO_DEV AiDevId);
-
-HI_S32 HI_MPI_AI_GetFd(AUDIO_DEV AiDevId, AI_CHN AiChn);
-
-HI_S32 HI_MPI_AI_EnableAecRefFrame(AUDIO_DEV AiDevId, AI_CHN AiChn, AUDIO_DEV AoDevId, AO_CHN AoChn);
-HI_S32 HI_MPI_AI_DisableAecRefFrame(AUDIO_DEV AiDevId, AI_CHN AiChn);
-
-HI_S32 HI_MPI_AI_SetTalkVqeAttr(AUDIO_DEV AiDevId, AI_CHN AiChn, AUDIO_DEV AoDevId, AO_CHN AoChn, const AI_TALKVQE_CONFIG_S *pstVqeConfig);
-HI_S32 HI_MPI_AI_GetTalkVqeAttr(AUDIO_DEV AiDevId, AI_CHN AiChn, AI_TALKVQE_CONFIG_S *pstVqeConfig);
-
-/* AO function api. */
-HI_S32 HI_MPI_AO_SetPubAttr(AUDIO_DEV AoDevId, const AIO_ATTR_S *pstAttr);
-HI_S32 HI_MPI_AO_GetPubAttr(AUDIO_DEV AoDevId, AIO_ATTR_S *pstAttr);
-
-HI_S32 HI_MPI_AO_Enable(AUDIO_DEV AoDevId);
-HI_S32 HI_MPI_AO_Disable(AUDIO_DEV AoDevId);
-
-HI_S32 HI_MPI_AO_EnableChn(AUDIO_DEV AoDevId, AO_CHN AoChn);
-HI_S32 HI_MPI_AO_DisableChn(AUDIO_DEV AoDevId, AO_CHN AoChn);
-
-HI_S32 HI_MPI_AO_SendFrame(AUDIO_DEV AoDevId, AO_CHN AoChn, const AUDIO_FRAME_S *pstData, HI_S32 s32MilliSec);
-
-HI_S32 HI_MPI_AO_EnableReSmp(AUDIO_DEV AoDevId, AO_CHN AoChn, AUDIO_SAMPLE_RATE_E enInSampleRate);
-HI_S32 HI_MPI_AO_DisableReSmp(AUDIO_DEV AoDevId, AO_CHN AoChn);
-
-HI_S32 HI_MPI_AO_ClearChnBuf(AUDIO_DEV AoDevId, AO_CHN AoChn);
-HI_S32 HI_MPI_AO_QueryChnStat(AUDIO_DEV AoDevId, AO_CHN AoChn, AO_CHN_STATE_S *pstStatus);
-
-HI_S32 HI_MPI_AO_PauseChn(AUDIO_DEV AoDevId, AO_CHN AoChn);
-HI_S32 HI_MPI_AO_ResumeChn(AUDIO_DEV AoDevId, AO_CHN AoChn);
-
-HI_S32 HI_MPI_AO_SetVolume(AUDIO_DEV AoDevId, HI_S32 s32VolumeDb);
-HI_S32 HI_MPI_AO_GetVolume(AUDIO_DEV AoDevId, HI_S32 *ps32VolumeDb);
-
-HI_S32 HI_MPI_AO_SetMute(AUDIO_DEV AoDevId, HI_BOOL bEnable, const AUDIO_FADE_S *pstFade);
-HI_S32 HI_MPI_AO_GetMute(AUDIO_DEV AoDevId, HI_BOOL *pbEnable, AUDIO_FADE_S *pstFade);
-
-HI_S32 HI_MPI_AO_SetTrackMode(AUDIO_DEV AoDevId, AUDIO_TRACK_MODE_E enTrackMode);
-HI_S32 HI_MPI_AO_GetTrackMode(AUDIO_DEV AoDevId, AUDIO_TRACK_MODE_E *penTrackMode);
-
-HI_S32 HI_MPI_AO_GetFd(AUDIO_DEV AoDevId, AO_CHN AoChn);
-
-HI_S32 HI_MPI_AO_ClrPubAttr(AUDIO_DEV AoDevId);
-
-HI_S32 HI_MPI_AO_SetVqeAttr(AUDIO_DEV AoDevId, AO_CHN AoChn, const AO_VQE_CONFIG_S *pstVqeConfig);
-HI_S32 HI_MPI_AO_GetVqeAttr(AUDIO_DEV AoDevId, AO_CHN AoChn, AO_VQE_CONFIG_S *pstVqeConfig);
-
-HI_S32 HI_MPI_AO_EnableVqe(AUDIO_DEV AoDevId, AO_CHN AoChn);
-HI_S32 HI_MPI_AO_DisableVqe(AUDIO_DEV AoDevId, AO_CHN AoChn);
-
-/* AENC function api. */
-HI_S32 HI_MPI_AENC_CreateChn(AENC_CHN AeChn, const AENC_CHN_ATTR_S *pstAttr);
-HI_S32 HI_MPI_AENC_DestroyChn(AENC_CHN AeChn);
-
-HI_S32 HI_MPI_AENC_SendFrame(AENC_CHN AeChn, const AUDIO_FRAME_S *pstFrm, const AEC_FRAME_S *pstAecFrm);
-
-HI_S32 HI_MPI_AENC_GetStream(AENC_CHN AeChn, AUDIO_STREAM_S *pstStream, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_AENC_ReleaseStream(AENC_CHN AeChn, const AUDIO_STREAM_S *pstStream);
-
-HI_S32 HI_MPI_AENC_GetFd(AENC_CHN AeChn);
-
-HI_S32 HI_MPI_AENC_RegisterEncoder(HI_S32 *ps32Handle, const AENC_ENCODER_S *pstEncoder);
-HI_S32 HI_MPI_AENC_UnRegisterEncoder(HI_S32 s32Handle);
-
-HI_S32 HI_MPI_AENC_GetStreamBufInfo(AENC_CHN AeChn, HI_U64* pu64PhysAddr, HI_U32* pu32Size);
-
-/* ADEC function api. */
-HI_S32 HI_MPI_ADEC_CreateChn(ADEC_CHN AdChn, const ADEC_CHN_ATTR_S *pstAttr);
-HI_S32 HI_MPI_ADEC_DestroyChn(ADEC_CHN AdChn);
-
-HI_S32 HI_MPI_ADEC_SendStream(ADEC_CHN AdChn, const AUDIO_STREAM_S *pstStream, HI_BOOL bBlock);
-
-HI_S32 HI_MPI_ADEC_ClearChnBuf(ADEC_CHN AdChn);
-
-HI_S32 HI_MPI_ADEC_RegisterDecoder(HI_S32 *ps32Handle, const ADEC_DECODER_S *pstDecoder);
-HI_S32 HI_MPI_ADEC_UnRegisterDecoder(HI_S32 s32Handle);
-
-HI_S32 HI_MPI_ADEC_GetFrame(ADEC_CHN AdChn, AUDIO_FRAME_INFO_S *pstFrmInfo, HI_BOOL bBlock);
-HI_S32 HI_MPI_ADEC_ReleaseFrame(ADEC_CHN AdChn, const AUDIO_FRAME_INFO_S *pstFrmInfo);
-HI_S32 HI_MPI_ADEC_SendEndOfStream(ADEC_CHN AdChn, HI_BOOL bInstant);
-HI_S32 HI_MPI_ADEC_QueryChnStat(ADEC_CHN AdChn, ADEC_CHN_STATE_S *pstBufferStatus);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __MPI_AI_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_awb.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_awb.h
deleted file mode 100644
index 807faa77..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_awb.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : mpi_awb.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2012/12/19
-  Description   :
-  History       :
-  1.Date        : 2012/12/19
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-#ifndef __MPI_AWB_H__
-#define __MPI_AWB_H__
-
-#include "hi_comm_isp.h"
-#include "hi_comm_3a.h"
-#include "hi_awb_comm.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-/* The interface of awb lib register to isp. */
-HI_S32 HI_MPI_AWB_Register(VI_PIPE ViPipe, ALG_LIB_S *pstAwbLib);
-HI_S32 HI_MPI_AWB_UnRegister(VI_PIPE ViPipe, ALG_LIB_S *pstAwbLib);
-
-/* The callback function of sensor register to awb lib. */
-HI_S32 HI_MPI_AWB_SensorRegCallBack(VI_PIPE ViPipe, ALG_LIB_S *pstAwbLib, ISP_SNS_ATTR_INFO_S *pstSnsAttrInfo,
-                                    AWB_SENSOR_REGISTER_S *pstRegister);
-HI_S32 HI_MPI_AWB_SensorUnRegCallBack(VI_PIPE ViPipe, ALG_LIB_S *pstAwbLib, SENSOR_ID SensorId);
-
-HI_S32 HI_MPI_ISP_SetWBAttr(VI_PIPE ViPipe, const ISP_WB_ATTR_S *pstWBAttr);
-HI_S32 HI_MPI_ISP_GetWBAttr(VI_PIPE ViPipe, ISP_WB_ATTR_S *pstWBAttr);
-
-HI_S32 HI_MPI_ISP_SetAWBAttrEx(VI_PIPE ViPipe, ISP_AWB_ATTR_EX_S *pstAWBAttrEx);
-HI_S32 HI_MPI_ISP_GetAWBAttrEx(VI_PIPE ViPipe, ISP_AWB_ATTR_EX_S *pstAWBAttrEx);
-
-HI_S32 HI_MPI_ISP_SetCCMAttr(VI_PIPE ViPipe, const ISP_COLORMATRIX_ATTR_S *pstCCMAttr);
-HI_S32 HI_MPI_ISP_GetCCMAttr(VI_PIPE ViPipe, ISP_COLORMATRIX_ATTR_S *pstCCMAttr);
-
-HI_S32 HI_MPI_ISP_SetSaturationAttr(VI_PIPE ViPipe, const ISP_SATURATION_ATTR_S *pstSatAttr);
-HI_S32 HI_MPI_ISP_GetSaturationAttr(VI_PIPE ViPipe, ISP_SATURATION_ATTR_S *pstSatAttr);
-
-HI_S32 HI_MPI_ISP_QueryWBInfo(VI_PIPE ViPipe, ISP_WB_INFO_S *pstWBInfo);
-HI_S32 HI_MPI_ISP_CalGainByTemp(VI_PIPE ViPipe, const ISP_WB_ATTR_S *pstWBAttr, HI_U16 u16ColorTemp, HI_S16 s16Shift, HI_U16 *pu16AWBGain);
-HI_S32 HI_MPI_ISP_SetSpecAwbAttr(VI_PIPE ViPipe, const ISP_SPECAWB_ATTR_S *pstSpecAwbAttr);
-HI_S32 HI_MPI_ISP_SetCaaControlAttr(VI_PIPE ViPipe, const ISP_SPECAWB_CAA_CONTROl_S *pstSpecAwbCaaAttr);
-HI_S32 HI_MPI_ISP_GetCaaControlAttr(VI_PIPE ViPipe, ISP_SPECAWB_CAA_CONTROl_S *pstSpecAwbCaaAttr);
-HI_S32 HI_MPI_ISP_GetSpecAwbAttr(VI_PIPE ViPipe, ISP_SPECAWB_ATTR_S *pstSpecAwbAttr);
-HI_S32 HI_MPI_ISP_SetSpecAwbControlAttr(VI_PIPE ViPipe, ISP_SPECAWB_CONTROL_ATTR_S *pstSpecAwbControlAttr);
-HI_S32 HI_MPI_ISP_GetSpecAwbControlAttr(VI_PIPE ViPipe, ISP_SPECAWB_CONTROL_ATTR_S *pstSpecAwbControlAttr);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_isp.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_isp.h
deleted file mode 100644
index 3c7b7bcc..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_isp.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2016, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : mpi_isp.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software group
-  Created       : 2010/12/20
-  Description   :
-  History       :
-  1.Date        : 2010/12/20
-    Author      :
-    Modification: Created file
-
-******************************************************************************/
-
-#ifndef __MPI_ISP_H__
-#define __MPI_ISP_H__
-
-#include "hi_comm_isp.h"
-#include "hi_comm_sns.h"
-#include "hi_comm_3a.h"
-#include "hi_comm_video.h"
-
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-/* Firmware Main Operation */
-HI_S32 HI_MPI_ISP_Init(VI_PIPE ViPipe);
-HI_S32 HI_MPI_ISP_MemInit(VI_PIPE ViPipe);
-HI_S32 HI_MPI_ISP_Run(VI_PIPE ViPipe);
-HI_S32 HI_MPI_ISP_RunOnce(VI_PIPE ViPipe);
-HI_S32 HI_MPI_ISP_Exit(VI_PIPE ViPipe);
-
-HI_S32 HI_MPI_ISP_SensorRegCallBack(VI_PIPE ViPipe, ISP_SNS_ATTR_INFO_S *pstSnsAttrInfo, ISP_SENSOR_REGISTER_S *pstRegister);
-HI_S32 HI_MPI_ISP_SensorUnRegCallBack(VI_PIPE ViPipe, SENSOR_ID SensorId);
-
-/* if have registered multy libs, set bind attr to appoint the active lib. */
-HI_S32 HI_MPI_ISP_SetBindAttr(VI_PIPE ViPipe, const ISP_BIND_ATTR_S *pstBindAttr);
-HI_S32 HI_MPI_ISP_GetBindAttr(VI_PIPE ViPipe, ISP_BIND_ATTR_S *pstBindAttr);
-HI_S32 HI_MPI_ISP_AELibRegCallBack(VI_PIPE ViPipe, ALG_LIB_S *pstAeLib,
-                                   ISP_AE_REGISTER_S *pstRegister);
-HI_S32 HI_MPI_ISP_AWBLibRegCallBack(VI_PIPE ViPipe, ALG_LIB_S *pstAwbLib,
-                                    ISP_AWB_REGISTER_S *pstRegister);
-HI_S32 HI_MPI_ISP_AELibUnRegCallBack(VI_PIPE ViPipe, ALG_LIB_S *pstAeLib);
-HI_S32 HI_MPI_ISP_AWBLibUnRegCallBack(VI_PIPE ViPipe, ALG_LIB_S *pstAwbLib);
-
-HI_S32 HI_MPI_ISP_GetLightboxGain(VI_PIPE ViPipe, ISP_AWB_Calibration_Gain_S *pstAWBCalibrationGain);
-HI_S32 HI_MPI_ISP_SetPubAttr(VI_PIPE ViPipe, const ISP_PUB_ATTR_S *pstPubAttr);
-HI_S32 HI_MPI_ISP_GetPubAttr(VI_PIPE ViPipe, ISP_PUB_ATTR_S *pstPubAttr);
-
-HI_S32 HI_MPI_ISP_SetPipeDifferAttr(VI_PIPE ViPipe, const ISP_PIPE_DIFF_ATTR_S *pstPipeDiffer);
-HI_S32 HI_MPI_ISP_GetPipeDifferAttr(VI_PIPE ViPipe, ISP_PIPE_DIFF_ATTR_S *pstPipeDiffer);
-
-HI_S32 HI_MPI_ISP_GetVDTimeOut(VI_PIPE ViPipe, ISP_VD_TYPE_E enIspVDType, HI_U32 u32MilliSec);
-HI_S32 HI_MPI_ISP_QueryInnerStateInfo(VI_PIPE ViPipe, ISP_INNER_STATE_INFO_S *pstInnerStateInfo);
-
-HI_S32 HI_MPI_ISP_GetAEStatistics(VI_PIPE ViPipe, ISP_AE_STATISTICS_S *pstAeStat);
-HI_S32 HI_MPI_ISP_GetAEStitchStatistics(VI_PIPE ViPipe, ISP_AE_STITCH_STATISTICS_S *pstStitchStat);
-HI_S32 HI_MPI_ISP_GetMGStatistics(VI_PIPE ViPipe, ISP_MG_STATISTICS_S *pstMgStat);
-HI_S32 HI_MPI_ISP_GetWBStatistics(VI_PIPE ViPipe, ISP_WB_STATISTICS_S *pstWBStat);
-HI_S32 HI_MPI_ISP_GetWBStitchStatistics(VI_PIPE ViPipe, ISP_WB_STITCH_STATISTICS_S *pstStitchWBStat);
-HI_S32 HI_MPI_ISP_GetFocusStatistics(VI_PIPE ViPipe, ISP_AF_STATISTICS_S *pstAfStat);
-
-HI_S32 HI_MPI_ISP_SetStatisticsConfig(VI_PIPE ViPipe, const ISP_STATISTICS_CFG_S *pstStatCfg);
-HI_S32 HI_MPI_ISP_GetStatisticsConfig(VI_PIPE ViPipe, ISP_STATISTICS_CFG_S *pstStatCfg);
-
-HI_S32 HI_MPI_ISP_GetISPRegAttr(VI_PIPE ViPipe, ISP_REG_ATTR_S *pstIspRegAttr);
-
-HI_S32 HI_MPI_ISP_SetFMWState(VI_PIPE ViPipe, const ISP_FMW_STATE_E enState);
-HI_S32 HI_MPI_ISP_GetFMWState(VI_PIPE ViPipe, ISP_FMW_STATE_E *penState);
-
-HI_S32 HI_MPI_ISP_SetDebug(VI_PIPE ViPipe, const ISP_DEBUG_INFO_S *pstIspDebug);
-HI_S32 HI_MPI_ISP_GetDebug(VI_PIPE ViPipe, ISP_DEBUG_INFO_S *pstIspDebug);
-
-HI_S32 HI_MPI_ISP_SetModParam(const ISP_MOD_PARAM_S *pstModParam);
-HI_S32 HI_MPI_ISP_GetModParam(ISP_MOD_PARAM_S *pstModParam);
-
-HI_S32 HI_MPI_ISP_SetCtrlParam(VI_PIPE ViPipe, const ISP_CTRL_PARAM_S *pstIspCtrlParam);
-HI_S32 HI_MPI_ISP_GetCtrlParam(VI_PIPE ViPipe, ISP_CTRL_PARAM_S *pstIspCtrlParam);
-
-HI_S32 HI_MPI_ISP_SetFSWDRAttr(VI_PIPE ViPipe, const ISP_WDR_FS_ATTR_S *pstFSWDRAttr);
-HI_S32 HI_MPI_ISP_GetFSWDRAttr(VI_PIPE ViPipe, ISP_WDR_FS_ATTR_S *pstFSWDRAttr);
-
-HI_S32 HI_MPI_ISP_SetDRCAttr(VI_PIPE ViPipe, const ISP_DRC_ATTR_S *pstDRC);
-HI_S32 HI_MPI_ISP_GetDRCAttr(VI_PIPE ViPipe, ISP_DRC_ATTR_S *pstDRC);
-
-HI_S32 HI_MPI_ISP_SetDehazeAttr(VI_PIPE ViPipe, const ISP_DEHAZE_ATTR_S *pstDehazeAttr);
-HI_S32 HI_MPI_ISP_GetDehazeAttr(VI_PIPE ViPipe, ISP_DEHAZE_ATTR_S *pstDehazeAttr);
-
-HI_S32 HI_MPI_ISP_SetLDCIAttr(VI_PIPE ViPipe, const ISP_LDCI_ATTR_S *pstLDCIAttr);
-HI_S32 HI_MPI_ISP_GetLDCIAttr(VI_PIPE ViPipe, ISP_LDCI_ATTR_S *pstLDCIAttr);
-
-HI_S32 HI_MPI_ISP_SetSnsSlaveAttr(SLAVE_DEV SlaveDev, const ISP_SLAVE_SNS_SYNC_S *pstSnsSync);
-HI_S32 HI_MPI_ISP_GetSnsSlaveAttr(SLAVE_DEV SlaveDev, ISP_SLAVE_SNS_SYNC_S *pstSnsSync);
-
-HI_S32 HI_MPI_ISP_SetModuleControl(VI_PIPE ViPipe, const ISP_MODULE_CTRL_U *punModCtrl);
-HI_S32 HI_MPI_ISP_GetModuleControl(VI_PIPE ViPipe, ISP_MODULE_CTRL_U *punModCtrl);
-
-HI_S32 HI_MPI_ISP_SetDPCalibrate(VI_PIPE ViPipe, const ISP_DP_STATIC_CALIBRATE_S *pstDPCalibrate);
-HI_S32 HI_MPI_ISP_GetDPCalibrate(VI_PIPE ViPipe, ISP_DP_STATIC_CALIBRATE_S *pstDPCalibrate);
-
-HI_S32 HI_MPI_ISP_SetDPStaticAttr(VI_PIPE ViPipe, const ISP_DP_STATIC_ATTR_S *pstDPStaticAttr);
-HI_S32 HI_MPI_ISP_GetDPStaticAttr(VI_PIPE ViPipe,  ISP_DP_STATIC_ATTR_S *pstDPStaticAttr);
-
-HI_S32 HI_MPI_ISP_SetDPDynamicAttr(VI_PIPE ViPipe, const ISP_DP_DYNAMIC_ATTR_S *pstDPDynamicAttr);
-HI_S32 HI_MPI_ISP_GetDPDynamicAttr(VI_PIPE ViPipe, ISP_DP_DYNAMIC_ATTR_S *pstDPDynamicAttr);
-
-HI_S32 HI_MPI_ISP_SetDISAttr(VI_PIPE ViPipe, const ISP_DIS_ATTR_S *pstDISAttr);
-HI_S32 HI_MPI_ISP_GetDISAttr(VI_PIPE ViPipe, ISP_DIS_ATTR_S *pstDISAttr);
-
-HI_S32 HI_MPI_ISP_SetMeshShadingAttr(VI_PIPE ViPipe, const ISP_SHADING_ATTR_S *pstShadingAttr);
-HI_S32 HI_MPI_ISP_GetMeshShadingAttr(VI_PIPE ViPipe, ISP_SHADING_ATTR_S *pstShadingAttr);
-
-HI_S32 HI_MPI_ISP_SetMeshShadingGainLutAttr(VI_PIPE ViPipe, const ISP_SHADING_LUT_ATTR_S *pstShadingGainLutAttr);
-HI_S32 HI_MPI_ISP_GetMeshShadingGainLutAttr(VI_PIPE ViPipe, ISP_SHADING_LUT_ATTR_S *pstShadingGainLutAttr);
-
-HI_S32 HI_MPI_ISP_SetRadialShadingAttr(VI_PIPE ViPipe, const ISP_RADIAL_SHADING_ATTR_S *pstRaShadingAttr);
-HI_S32 HI_MPI_ISP_GetRadialShadingAttr(VI_PIPE ViPipe, ISP_RADIAL_SHADING_ATTR_S *pstRaShadingAttr);
-
-HI_S32 HI_MPI_ISP_SetRadialShadingLUT(VI_PIPE ViPipe, const ISP_RADIAL_SHADING_LUT_ATTR_S *pstRaShadingLutAttr);
-HI_S32 HI_MPI_ISP_GetRadialShadingLUT(VI_PIPE ViPipe, ISP_RADIAL_SHADING_LUT_ATTR_S *pstRaShadingLutAttr);
-
-HI_S32 HI_MPI_ISP_MeshShadingCalibration(VI_PIPE ViPipe, HI_U16 *pu16SrcRaw, ISP_MLSC_CALIBRATION_CFG_S *pstMLSCCaliCfg, ISP_MESH_SHADING_TABLE_S *pstMLSCTable);
-
-HI_S32 HI_MPI_ISP_SetNRAttr(VI_PIPE ViPipe, const ISP_NR_ATTR_S *pstNRAttr);
-HI_S32 HI_MPI_ISP_GetNRAttr(VI_PIPE ViPipe, ISP_NR_ATTR_S *pstNRAttr);
-
-HI_S32 HI_MPI_ISP_SetDEAttr(VI_PIPE ViPipe, const ISP_DE_ATTR_S *pstDEAttr);
-HI_S32 HI_MPI_ISP_GetDEAttr(VI_PIPE ViPipe, ISP_DE_ATTR_S *pstDEAttr);
-
-HI_S32 HI_MPI_ISP_SetColorToneAttr(VI_PIPE ViPipe, const ISP_COLOR_TONE_ATTR_S *pstCTAttr);
-HI_S32 HI_MPI_ISP_GetColorToneAttr(VI_PIPE ViPipe, ISP_COLOR_TONE_ATTR_S *pstCTAttr);
-
-HI_S32 HI_MPI_ISP_SetGammaAttr(VI_PIPE ViPipe, const ISP_GAMMA_ATTR_S *pstGammaAttr);
-HI_S32 HI_MPI_ISP_GetGammaAttr(VI_PIPE ViPipe, ISP_GAMMA_ATTR_S *pstGammaAttr);
-
-HI_S32 HI_MPI_ISP_SetPreGammaAttr(VI_PIPE ViPipe, const ISP_PREGAMMA_ATTR_S *pstPreGammaAttr);
-HI_S32 HI_MPI_ISP_GetPreGammaAttr(VI_PIPE ViPipe, ISP_PREGAMMA_ATTR_S *pstPreGammaAttr);
-
-HI_S32 HI_MPI_ISP_SetPreLogLUTAttr(VI_PIPE ViPipe, const ISP_PRELOGLUT_ATTR_S *pstPreLogLUTAttr);
-HI_S32 HI_MPI_ISP_GetPreLogLUTAttr(VI_PIPE ViPipe, ISP_PRELOGLUT_ATTR_S *pstPreLogLUTAttr);
-
-HI_S32 HI_MPI_ISP_SetLogLUTAttr(VI_PIPE ViPipe, const ISP_LOGLUT_ATTR_S *pstLogLUTAttr);
-HI_S32 HI_MPI_ISP_GetLogLUTAttr(VI_PIPE ViPipe, ISP_LOGLUT_ATTR_S *pstLogLUTAttr);
-
-HI_S32 HI_MPI_ISP_SetLocalCacAttr(VI_PIPE ViPipe, const ISP_LOCAL_CAC_ATTR_S *pstLocalCacAttr);
-HI_S32 HI_MPI_ISP_GetLocalCacAttr(VI_PIPE ViPipe, ISP_LOCAL_CAC_ATTR_S *pstLocalCacAttr);
-
-HI_S32 HI_MPI_ISP_SetGlobalCacAttr(VI_PIPE ViPipe, const ISP_GLOBAL_CAC_ATTR_S *pstGlobalCacAttr);
-HI_S32 HI_MPI_ISP_GetGlobalCacAttr(VI_PIPE ViPipe, ISP_GLOBAL_CAC_ATTR_S *pstGlobalCacAttr);
-
-HI_S32 HI_MPI_ISP_SetRcAttr(VI_PIPE ViPipe, const ISP_RC_ATTR_S *pstRcAttr);
-HI_S32 HI_MPI_ISP_GetRcAttr(VI_PIPE ViPipe, ISP_RC_ATTR_S *pstRcAttr);
-
-HI_S32 HI_MPI_ISP_SetIspSharpenAttr(VI_PIPE ViPipe, const ISP_SHARPEN_ATTR_S *pstIspShpAttr);
-HI_S32 HI_MPI_ISP_GetIspSharpenAttr(VI_PIPE ViPipe, ISP_SHARPEN_ATTR_S *pstIspShpAttr);
-
-HI_S32 HI_MPI_ISP_SetIspEdgeMarkAttr(VI_PIPE ViPipe, const ISP_EDGEMARK_ATTR_S *pstIspEdgeMarkAttr);
-HI_S32 HI_MPI_ISP_GetIspEdgeMarkAttr(VI_PIPE ViPipe, ISP_EDGEMARK_ATTR_S *pstIspEdgeMarkAttr);
-
-HI_S32 HI_MPI_ISP_SetIspHlcAttr(VI_PIPE ViPipe, const ISP_HLC_ATTR_S *pstIspHlcAttr);
-HI_S32 HI_MPI_ISP_GetIspHlcAttr(VI_PIPE ViPipe, ISP_HLC_ATTR_S *pstIspHlcAttr);
-
-HI_S32 HI_MPI_ISP_SetCrosstalkAttr(VI_PIPE ViPipe, const ISP_CR_ATTR_S *pstCRAttr);
-HI_S32 HI_MPI_ISP_GetCrosstalkAttr(VI_PIPE ViPipe, ISP_CR_ATTR_S *pstCRAttr);
-
-HI_S32 HI_MPI_ISP_SetCAAttr(VI_PIPE ViPipe, const ISP_CA_ATTR_S *pstCAAttr);
-HI_S32 HI_MPI_ISP_GetCAAttr(VI_PIPE ViPipe, ISP_CA_ATTR_S *pstCAAttr);
-
-HI_S32 HI_MPI_ISP_SetAntiFalseColorAttr(VI_PIPE ViPipe, const ISP_ANTIFALSECOLOR_ATTR_S *pstAntiFalseColor);
-HI_S32 HI_MPI_ISP_GetAntiFalseColorAttr(VI_PIPE ViPipe, ISP_ANTIFALSECOLOR_ATTR_S *pstAntiFalseColor);
-
-HI_S32 HI_MPI_ISP_SetDemosaicAttr(VI_PIPE ViPipe, const ISP_DEMOSAIC_ATTR_S *pstDemosaicAttr);
-HI_S32 HI_MPI_ISP_GetDemosaicAttr(VI_PIPE ViPipe, ISP_DEMOSAIC_ATTR_S *pstDemosaicAttr);
-
-HI_S32 HI_MPI_ISP_SetBlackLevelAttr(VI_PIPE ViPipe, const ISP_BLACK_LEVEL_S *pstBlackLevel);
-HI_S32 HI_MPI_ISP_GetBlackLevelAttr(VI_PIPE ViPipe, ISP_BLACK_LEVEL_S *pstBlackLevel);
-
-HI_S32 HI_MPI_ISP_SetClutAttr(VI_PIPE ViPipe, const ISP_CLUT_ATTR_S *pstClutAttr);
-HI_S32 HI_MPI_ISP_GetClutAttr(VI_PIPE ViPipe, ISP_CLUT_ATTR_S *pstClutAttr);
-
-HI_S32 HI_MPI_ISP_SetClutCoeff(VI_PIPE ViPipe, const ISP_CLUT_LUT_S *pstClutLUT);
-HI_S32 HI_MPI_ISP_GetClutCoeff(VI_PIPE ViPipe, ISP_CLUT_LUT_S *pstClutLUT);
-
-HI_S32 HI_MPI_ISP_SetDCFInfo(VI_PIPE ViPipe, const ISP_DCF_INFO_S *pstIspDCF);
-HI_S32 HI_MPI_ISP_GetDCFInfo(VI_PIPE ViPipe, ISP_DCF_INFO_S *pstIspDCF);
-
-HI_S32 HI_MPI_ISP_SetCSCAttr(VI_PIPE ViPipe, const ISP_CSC_ATTR_S *pstCSCAttr);
-HI_S32 HI_MPI_ISP_GetCSCAttr(VI_PIPE ViPipe, ISP_CSC_ATTR_S *pstCSCFAttr);
-
-HI_S32 HI_MPI_ISP_SetRGBIRAttr(VI_PIPE ViPipe, const ISP_RGBIR_ATTR_S *pstRGBIRAttr);
-HI_S32 HI_MPI_ISP_GetRGBIRAttr(VI_PIPE ViPipe, ISP_RGBIR_ATTR_S *pstRGBIRAttr);
-HI_S32 HI_MPI_ISP_SetRegister(VI_PIPE ViPipe, HI_U32 u32Addr, HI_U32 u32Value);
-HI_S32 HI_MPI_ISP_GetRegister(VI_PIPE ViPipe, HI_U32 u32Addr, HI_U32 *pu32Value);
-
-/* block, return fpn frame when this is function is called. */
-HI_S32 HI_MPI_ISP_FPNCalibrate(VI_PIPE ViPipe, ISP_FPN_CALIBRATE_ATTR_S *pstCalibrateAttr);
-HI_S32 HI_MPI_ISP_SetFPNAttr(VI_PIPE ViPipe, const ISP_FPN_ATTR_S *pstFPNAttr);
-HI_S32 HI_MPI_ISP_GetFPNAttr(VI_PIPE ViPipe, ISP_FPN_ATTR_S *pstFPNAttr);
-
-HI_S32 HI_MPI_ISP_GetDngImageStaticInfo(VI_PIPE ViPipe, DNG_IMAGE_STATIC_INFO_S *pstDngImageStaticInfo);
-HI_S32 HI_MPI_ISP_SetDngColorParam(VI_PIPE ViPipe, const ISP_DNG_COLORPARAM_S *pstDngColorParam);
-HI_S32 HI_MPI_ISP_GetDngColorParam(VI_PIPE ViPipe, ISP_DNG_COLORPARAM_S *pstDngColorParam);
-HI_S32 HI_MPI_ISP_IrAutoRunOnce(VI_PIPE ViPipe, ISP_IR_AUTO_ATTR_S *pstIrAttr);
-
-HI_S32 HI_MPI_ISP_SetSmartInfo(VI_PIPE ViPipe, const ISP_SMART_INFO_S *pstSmartInfo);
-HI_S32 HI_MPI_ISP_GetSmartInfo(VI_PIPE ViPipe, ISP_SMART_INFO_S *pstSmartInfo);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* __MPI_ISP_H__ */
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_ive.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_ive.h
deleted file mode 100644
index 0d2ce834..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_ive.h
+++ /dev/null
@@ -1,1390 +0,0 @@
-/******************************************************************************
-
-  Copyright (C), 2001-2014, Hisilicon Tech. Co., Ltd.
-
- ******************************************************************************
-  File Name     : hi_comm_ive.h
-  Version       : Initial Draft
-  Author        : Hisilicon multimedia software (IVE) group
-  Created       : 2011/05/16
-  Description   :
-  1.Date        : 2011/05/16
-    Modification: Created file
-
-  2.Date        : 2013/07/01~2014/08/08
-    Modification: Add MPI function
-******************************************************************************/
-#ifndef _HI_MPI_IVE_H_
-#define _HI_MPI_IVE_H_
-
-#include "hi_ive.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_DMA
-*   Description  : Direct memory access (DMA):
-*                  1.Direct memory copy;
-* 				     2. Copy with interval bytes;
-*                  3. Memset using 3 bytes;
-* 				     4. Memset using 8 bytes;
-*   Parameters   : IVE_HANDLE          *pIveHandle        Returned handle ID of a task.
-*                  IVE_DATA_S          *pstSrc            Input source data.The input data is treated as U8C1 data.
-* 				     IVE_DATA_S          *pstDst            Output result data.
-*                  IVE_DMA_CTRL_S      *pstDmaCtrl        DMA control parameter.
-*                  HI_BOOL              bInstant          Flag indicating whether to generate an interrupt.
-*                                                         If the output result blocks the next operation,
-*                                                         set bInstant to HI_TRUE.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 32x1 pixels to 1920x1080 pixels.
-*                  The stride must be 16-byte-aligned.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-* 		2.  Data		 : 2013-07-19
-* 			Author		 :
-* 			Modification : Modify parameters
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_DMA(IVE_HANDLE *pIveHandle, IVE_DATA_S *pstSrc, IVE_DST_DATA_S *pstDst, 
-    IVE_DMA_CTRL_S *pstDmaCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Filter
-*   Description  : 5x5 template filter.
-*   Parameters   : IVE_HANDLE            *pIveHandle         Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S       *pstSrc             Input source data.
-*                                                            The U8C1,SP420 and SP422 input formats are supported.
-*                  IVE_DST_IMAGE_S       *pstDst             Output result, of same type with the input.
-*                  IVE_FILTER_CTRL_S     *pstFltCtrl         Control parameters of filter
-*                  HI_BOOL               bInstant            For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*       2.  Date         : 2013-07-23
-*           Author       :
-*           Modification : Modified function parameters
-
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Filter(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_FILTER_CTRL_S *pstFltCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_CSC
-*   Description  : YUV2RGB\YUV2HSV\YUV2LAB\RGB2YUV color space conversion are supported.
-*   Parameters   : IVE_HANDLE         *pIveHandle       Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S    *pstSrc           Input source data:
-*                                                       1. SP420\SP422 type for YUV2RGB\YUV2HSV\YUV2LAB;
-*                                                       2. U8C3_PACKAGE\U8C3_PLANAR type for RGB2YUV;
-*                  IVE_DST_IMAGE_S    *pstDst           Output result:
-*                                                       1. U8C3_PACKAGE\U8C3_PLANAR typed for YUV2RGB\YUV2HSV\YUV2LAB;
-*                                                       2. SP420\SP422 type for RGB2YUV;
-*                  IVE_CSC_CTRL_S     *pstCscCtrl       Control parameters for CSC
-*                  HI_BOOL             bInstant         For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*       2.  Date         : 2013-08-09
-*           Author       :
-*           Modification : Modified function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_CSC(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_CSC_CTRL_S *pstCscCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_FILTER_AND_CSC
-*   Description  : Only support YUV2RGB color space conversion.
-*   Parameters   : IVE_HANDLE                 *pIveHandle        Returned handle ID of a task.
-*                  IVE_SRC_IMAGE_S            *pstSrc            Input source data.Only SP420\SP422 type are supported.
-*                  IVE_DST_IMAGE_S            *pstDst            Output result.Only U8C3_PACKAGE\U8C3_PLANAR are supported.
-*                  IVE_FILTER_AND_CSC_CTRL_S  *pstFltCscCtrl     Control parameters.
-*                  HI_BOOL                     bInstant          For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*       2.  Date         : 2013-08-09
-*           Author       :
-*           Modification : Modified function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_FilterAndCSC(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_FILTER_AND_CSC_CTRL_S *pstFltCscCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Sobel
-*   Description  : SOBEL is used to extract the gradient information.
-*   Parameters   : IVE_HANDLE           *pIveHandle      Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S      *pstSrc          Input source data. Only the U8C1 input image is supported.
-*                  IVE_DST_IMAGE_S      *pstDstH         The (horizontal) result of input image filtered by the input mask;
-*                  IVE_DST_IMAGE_S      *pstDstV         The (vertical) result  of input image filtered by the transposed mask;
-*                  IVE_SOBEL_CTRL_S     *pstSobelCtrl    Control parameters
-*                  HI_BOOL               bInstant        For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*       2.  Date         : 2013-07-23
-*           Author       :
-*           Modification : Modified function parameters
-*
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Sobel(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDstH, 
-    IVE_DST_IMAGE_S *pstDstV, IVE_SOBEL_CTRL_S *pstSobelCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_MagAndAng
-*   Description  : MagAndAng is used to extract the edge information.
-*   Parameters   : IVE_HANDLE              *pIveHandle         Returned handle ID of a task
-*                  IVE_SRC_INFO_S          *pstSrc             Input source data. Only the U8C1 input format is supported.
-*                  IVE_MEM_INFO_S          *pstDstMag          Output magnitude.
-*                  IVE_MEM_INFO_S          *pstDstAng          Output angle.
-*                                                              If the output mode is set to magnitude only,
-*                                                              this item can be set to null.
-*                  IVE_MAG_AND_ANG_CTRL_S  *pstMagAndAngCtrl   Control parameters
-*                  HI_BOOL                  bInstant           For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-* 		2.  Date         : 2013-07-17
-* 			Author       :
-* 			Modification : Modified function and control parameter name
-* 		3.  Date         : 2013-07-23
-* 			Author       :
-* 			Modification : Modified function parameters
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_MagAndAng(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDstMag, 
-    IVE_DST_IMAGE_S *pstDstAng, IVE_MAG_AND_ANG_CTRL_S *pstMagAndAngCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Dilate
-*   Description  : 5x5 template dilate. Only the U8C1 binary image input is supported.Or else the result is not expected.
-*   Parameters   : IVE_HANDLE             *pIveHandle          Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S        *pstSrc              Input binary image, which consists of 0 or 255;
-*                  IVE_DST_IMAGE_S        *pstDst              Output result.
-*                  IVE_DILATE_CTRL_S      *pstDilateCtrl       Control parameters.
-*                  HI_BOOL                 bInstant            For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*                  The input value, output value, and mask value must be 0 or 255.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*       2.  Date         : 2013-07-23
-*           Author       :
-*           Modification : Modified parameters
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Dilate(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_DILATE_CTRL_S *pstDilateCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Erode
-*   Parameters   : 5x5 template erode. Only the U8C1 binary image input is supported.Or else the result is not correct.
-*   Input        : IVE_HANDLE               *pIveHandle       Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S          *pstSrc           Input binary image, which consists of 0 or 255;
-*                  IVE_DST_IMAGE_S          *pstDst           Output result.
-*                  IVE_ERODE_CTRL_S         *pstErodeCtrl     Control parameters
-*                  HI_BOOL                   bInstant         For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*                  The input value, output value, and mask value must be 0 or 255.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*       2.  Date         : 2013-07-23
-*           Author       :
-*           Modification : Modified parameters
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Erode(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_ERODE_CTRL_S *pstErodeCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Thresh
-*   Description  : Thresh operation to the input image.
-*   Parameters   : IVE_HANDLE           *pIveHandle       Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S      *pstSrc           Input source data. Only the U8C1 input format is supported.
-*                  IVE_DST_IMAGE_S      *pstDst           Output result
-*                  IVE_THRESH_CTRL_S    *pstThrCtrl    Control parameters
-*                  HI_BOOL               bInstant         For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-* 		2.   Date         : 2013-07-23
-*           Author		:
-* 			 Modification  : Modification
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Thresh(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_THRESH_CTRL_S *pstThrCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_And
-*   Description  : Binary images' And operation.
-*   Parameters   : IVE_HANDLE          *pIveHandle       Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S     *pstSrc1          The input source1. Only U8C1 input format is supported.
-*                  IVE_SRC_IMAGE_S     *pstSrc2          The input source2.Only U8C1 input format is supported.
-*                  IVE_DST_IMAGE_S     *pstDst           Output result of " src1 & src2 ".
-*                  HI_BOOL              bInstant         For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The stride must be 16-pixel-aligned.
-*                  The types, widths, heights of two input sources must be the same.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_And(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc1, IVE_SRC_IMAGE_S *pstSrc2, 
-    IVE_DST_IMAGE_S *pstDst, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Sub
-*   Description  : Two gray images' Sub operation.
-*   Parameters   : IVE_HANDLE          *pIveHandle   Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S     *pstSrc1      Minuend of the input source.Only the U8C1 input format is supported.
-*                  IVE_SRC_IMAGE_S     *pstSrc2      Subtrahend of the input source.Only the U8C1 input format is supported.
-*                  IVE_DST_IMAGE_S     *pstDst       Output result of src1 minus src2
-*                  IVE_SUB_CTRL_S      *pstSubCtrl   Control parameter
-*                  HI_BOOL              bInstant     For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The stride must be 16-pixel-aligned.
-*                  The types, widths, heights of two input sources must be the same.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*       2.  Date         : 2013-08-09
-*           Author       :
-*           Modification : Modified function parameter
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Sub(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc1, IVE_SRC_IMAGE_S *pstSrc2, 
-    IVE_DST_IMAGE_S *pstDst, IVE_SUB_CTRL_S *pstSubCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Or
-*   Description  : Two binary images' Or operation.
-*   Parameters   : IVE_HANDLE          *pIveHandle    Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S     *pstSrc1       Input source1. Only the U8C1 input format is supported.
-*                  IVE_SRC_IMAGE_S     *pstSrc2       Input source2. Only the U8C1 input format is supported.
-*                  IVE_DST_IMAGE_S     *pstDst        Output result src1 or src2
-*                  HI_BOOL              bInstant        For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The stride must be 16-pixel-aligned.
-*                  The types, widths, heights of two input sources must be the same.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*       2.  Date         : 2013-08-09
-*           Author       :
-*           Modification : Modified function parameter
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Or(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc1, IVE_SRC_IMAGE_S *pstSrc2, 
-    IVE_DST_IMAGE_S *pstDst, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_INTEG
-*   Description  : Calculate the input gray image's integral image.
-*   Parameters   : IVE_HANDLE           *pIveHandle        Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S      *pstSrc            Input source data.Only the U8C1 input format is supported.
-*                  IVE_DST_IMAGE_S      *pstDst            Output result.Can be U32C1 or U64C1, relied on the control parameter.
-* 				   IVE_INTEG_CTRL_S     *pstIntegCtrl      Integ Control
-*                  HI_BOOL               bInstant          For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*                  The pixel can be 32bit or 64 bit relied on the control parameter.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*       2.	 Date		   : 2013-03-18
-* 			 Author		   :
-* 			 Modification : Modified function
-* 		3.  Date		   : 2013-07-15
-* 		    Author		   :
-* 			Modification : Modified function
-* 			Spec		  : Modify IVE_INTEG_OUT_FMT_E to  IVE_INTEG_CTRL_S
-*       4.	Date		  : 2013-07-23
-* 			Author		  :
-* 			Modification : Modified parameters
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Integ(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_INTEG_CTRL_S *pstIntegCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Hist
-*   Description  : Calculate the input gray image's histogram.
-*   Parameters   : IVE_HANDLE          *pIveHandle      Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S     *pstSrc          Input source data. Only the U8C1 input format is supported.
-*                  IVE_DST_MEM_INFO_S  *pstDst          Output result.
-*                  HI_BOOL              bInstant        For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Hist(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_MEM_INFO_S *pstDst, 
-    HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Thresh_S16
-*   Description	 : S16 image's THRESH operation.
-*   Parameters   : IVE_HANDLE              *pIveHandle             Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S         *pstSrc                 Input source data.Only the S16 input format is supported.
-*                  IVE_DST_IMAGE_S         *pstDst                 Output result.
-*                  IVE_THRESH_S16_CTRL_S   *pstThrS16Ctrl          Control parameters
-*                  HI_BOOL                  bInstant               For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The physical addresses of the input data must be 2-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-05-16
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Thresh_S16(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_THRESH_S16_CTRL_S *pstThrS16Ctrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Thresh_U16
-*   Description	 : U16 image's THRESH operation.
-*   Parameters   : IVE_HANDLE                *pIveHandle        Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S           *pstSrc            Input source data. Only the U16 input format is supported.
-*                  IVE_DST_IMAGE_S           *pstDst            Output result
-*                  IVE_THRESH_U16_CTRL_S     *pstThrU16Ctrl     Control parameters
-*                  HI_BOOL                    bInstant          For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The physical addresses of the input data must be 2-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-05-16
-*           Author       :
-*           Modification : Created function
-*       2.  Date         : 2013-08-07
-*           Author       :
-*           Modification : Implement function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Thresh_U16(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_THRESH_U16_CTRL_S *pstThrU16Ctrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_16BitTo8Bit
-*   Description  : Scale the input 16bit data to the output 8bit data.
-*   Parameters   : IVE_HANDLE                *pIveHandle              Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S           *pstSrc                  Input source data.Only U16C1\S16C1 input is supported.
-*                  IVE_DST_IMAGE_S           *pstDst                  Output result
-* 				   IVE_16BITTO8BIT_CTRL_S    *pst16BitTo8BitCtrl      control parameter
-*                  HI_BOOL                    bInstant                For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The physical addresses of the input data must be 2-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-08-12
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_16BitTo8Bit(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_16BIT_TO_8BIT_CTRL_S *pst16BitTo8BitCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_OrdStatFilter
-*   Description  : Order Statistic Filter. It can be used as median\max\min value filter.
-*   Parameters   : IVE_HANDLE                   *pIveHandle          Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S              *pstSrc              Input source data. Only U8C1 input is supported
-*                  IVE_DST_IMAGE_S              *pstDst              Output result
-* 				   IVE_ORD_STAT_FILTER_CTRL_S   *pstOrdStatFltCtrl   Control parameter
-*                  HI_BOOL                       bInstant            For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-08-12
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_OrdStatFilter(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_ORD_STAT_FILTER_CTRL_S *pstOrdStatFltCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Map
-*   Description  : Map a image to another through a lookup table.
-*   Parameters   : IVE_HANDLE           *pIveHandle  Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S      *pstSrc          Input source. Only the U8C1 input format is supported.
-*                  IVE_SRC_MEM_INFO_S   *pstMap          Input lookup table. Must be an U8 array of size 256.
-*                  IVE_DST_IMAGE_S      *pstDst          Output result.
-* 				   IVE_MAP_CTRL_S       *pstMapCtrl      Map control parameter.
-*                  HI_BOOL               bInstant        For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-08-17
-*           Author       :
-*           Modification : Created function
-*       2.  Date         : 2015-03-02
-*           Author       :
-*           Modification : Add s16/u16 map
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Map(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_SRC_MEM_INFO_S *pstMap, 
-    IVE_DST_IMAGE_S *pstDst, IVE_MAP_CTRL_S *pstMapCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_EqualizeHist
-*   Description  : Enhance the input image's contrast through histogram equalization.
-*   Parameters   : IVE_HANDLE                 *pIveHandle              Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S            *pstSrc                  Input source.Only U8C1 input format is supported.
-*                  IVE_DST_IMAGE_S            *pstDst                  Output result.
-* 				   IVE_EQUALIZEHIST_CTRL_S    *pstEqualizeHistCtrl     EqualizeHist control parameter.
-*                  HI_BOOL                     bInstant                For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The physical addresses of map data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-07-17
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_EqualizeHist(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_EQUALIZE_HIST_CTRL_S *pstEqualizeHistCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Add
-*   Description  : Two gray images' Add operation.
-*   Parameters   : IVE_HANDLE          *pIveHandle      Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S     *pstSrc1         Augend of the input source.Only the U8C1 input format is supported.
-*                  IVE_SRC_IMAGE_S     *pstSrc2         Addend of the input source.Only the U8C1 input format is supported.
-*                  IVE_DST_IMAGE_S     *pstDst          Output result of src1 plus src2
-* 				     IVE_ADD_CTRL_S      *pstAddCtrl      Control parameter
-*                  HI_BOOL              bInstant        For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The stride must be 16-pixel-aligned.
-*                  The types, widths, heights of two input sources must be the same.
-*   History:
-*
-*       1.  Date         : 2013-07-17
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Add(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc1, IVE_SRC_IMAGE_S *pstSrc2, 
-    IVE_DST_IMAGE_S *pstDst, IVE_ADD_CTRL_S *pstAddCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Xor
-*   Description  : Two binary images' Xor operation.
-*   Parameters   : IVE_HANDLE           *pIveHandle    Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S      *pstSrc1       The input source1.Only the U8C1 input format is supported.
-*                  IVE_SRC_IMAGE_S      *pstSrc2       The input source2.
-*                  IVE_DST_IMAGE_S      *pstDst        Output result
-*                  HI_BOOL               bInstant      For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The stride must be 16-pixel-aligned.
-*                  The types, widths, heights of two input sources must be the same.
-*   History:
-*
-*       1.  Date         : 2013-07-17
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Xor(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc1, IVE_SRC_IMAGE_S *pstSrc2, 
-    IVE_DST_IMAGE_S *pstDst, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_NCC
-*   Description  : Calculate two gray images' NCC (Normalized Cross Correlation).
-*   Parameters   : IVE_HANDLE            *pIveHandle     Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S       *pstSrc1        Input source1. Only the U8C1 input format is supported.
-*                  IVE_SRC_IMAGE_S       *pstSrc2        Input source2. Must be of the same type, size of source1.
-*                  IVE_DST_MEM_INFO_S    *pstDst         Output result
-*                  HI_BOOL                bInstant       For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-08-16
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_NCC(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc1, IVE_SRC_IMAGE_S *pstSrc2, 
-    IVE_DST_MEM_INFO_S *pstDst, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_CCL
-*   Description  : Connected Component Labeling. Only 8-Connected method is supported.
-*   Parameters   : IVE_HANDLE         *pIveHandle      Returned handle ID of a task
-*                  IVE_IMAGE_S        *pstSrcDst       Input source
-*                  IVE_MEM_INFO_S     *pstBlob         Output result of detected region;
-* 				   IVE_CCL_CTRL_S     *pstCclCtrl      CCL control parameter
-*                  HI_BOOL             bInstant        For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 720x640 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-08-1
-*           Author       :
-*           Modification : Created function
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_CCL(IVE_HANDLE *pIveHandle, IVE_IMAGE_S *pstSrcDst, IVE_DST_MEM_INFO_S *pstBlob, 
-    IVE_CCL_CTRL_S *pstCclCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_GMM
-*   Description  : Separate foreground and background using GMM(Gaussian Mixture Model) method;
-*                  Gray or RGB GMM are supported.
-*   Parameters   : IVE_HANDLE          *pIveHandle  Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S     *pstSrc       Input source. Only support U8C1 or U8C3_PACKAGE input.
-* 				   IVE_DST_IMAGE_S     *pstFg        Output foreground (Binary) image.
-* 				   IVE_DST_IMAGE_S     *pstBg        Output background image. Of the sampe type of pstSrc.
-* 				   IVE_MEM_INFO_S      *pstModel     Model data.
-* 				   IVE_GMM_CTRL_S      *pstGmmCtrl   Control parameter.
-*                  HI_BOOL              bInstant     For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 720x576 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-08-07
-*           Author       :
-*           Modification : Created function
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_GMM(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstFg,
-    IVE_DST_IMAGE_S *pstBg, IVE_MEM_INFO_S *pstModel, IVE_GMM_CTRL_S *pstGmmCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_GMM2
-*   Description  : Separate foreground and background using GMM(Gaussian Mixture Model) method;
-*                  Gray or RGB GMM are supported.
-*   Parameters   : IVE_HANDLE          *pIveHandle			Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S     *pstSrc				Only U8C1 or U8C3_PACKAGE input are supported.
-* 				   IVE_SRC_IMAGE_S	   *pstFactor			U16C1 input, low-8bits is sensitivity factor, and high-8bits is life update factor.
-* 				   IVE_DST_IMAGE_S     *pstFg				Output foreground (Binary) image.
-* 				   IVE_DST_IMAGE_S     *pstBg				Output background image. With same type of pstSrc.
-* 				   IVE_DST_IMAGE_S     *pstMatchModelInfo	Output U8C1 match model info image. Low-1bit is match flag,and high-7bits is max freq index.
-* 				   IVE_MEM_INFO_S      *pstModel			Model data.
-* 				   IVE_GMM2_CTRL_S     *pstGmm2Ctrl			Control parameter.
-*                  HI_BOOL              bInstant			For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1280x720 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2015-04-16
-*           Author       :
-*           Modification : Created function
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_GMM2(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_SRC_IMAGE_S *pstFactor,
-    IVE_DST_IMAGE_S *pstFg, IVE_DST_IMAGE_S *pstBg, IVE_DST_IMAGE_S *pstMatchModelInfo, IVE_MEM_INFO_S *pstModel, 
-    IVE_GMM2_CTRL_S *pstGmm2Ctrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_CannyHysEdge
-*   Description  : The first part of canny Edge detection. Including step: gradient calculation,
-*                  magnitude and angle calculation, hysteresis threshold, NMS(Non-Maximum Suppression)
-*   Parameters   : IVE_HANDLE           *pIveHandle        Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S      *pstSrc            Input source. Only the U8C1 input format is supported
-*                  IVE_DST_IMAGE_S      *pstEdge           Output result.
-*                  IVE_DST_MEM_INFO_S   *pstStack          OutPut stack for CannyEdge
-* 				   IVE_CANNY_HYS_EDGE_CTRL_S     *pstCannyHysEdgeCtrl      Control parameter.
-*                  HI_BOOL               bInstant        For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned. .
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-08-12
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_CannyHysEdge(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstEdge,
-    IVE_DST_MEM_INFO_S *pstStack, IVE_CANNY_HYS_EDGE_CTRL_S *pstCannyHysEdgeCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_CannyEdge
-*   Description  : The second part of canny Edge detection: trace strong edge by weak edge.
-*   Parameters   : IVE_IMAGE_S      *pstEdge        Input and Output source. Only the U8C1 format is supported
-*                  IVE_MEM_INFO_S   *pstStack       stack for CannyEdge
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-08-12
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_CannyEdge(IVE_IMAGE_S *pstEdge, IVE_MEM_INFO_S *pstStack);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_LBP
-*   Description  : LBP calculation using the original method and a extensional method.
-*   Parameters   : IVE_HANDLE         *pIveHandle     Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S    *pstSrc         Input source.Only the U8C1 inpu format is supported.
-*                  IVE_DST_IMAGE_S    *pstDst         Output result
-* 				   IVE_LBP_CTRL_S     *pstLbpCtrl     Control parameter
-*                  HI_BOOL             bInstant       For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-09-22
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_LBP(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDst, 
-    IVE_LBP_CTRL_S *pstLbpCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_NormGrad
-*   Description  : Gradient calculation and the output is normalized to S8.
-*   Parameters   : IVE_HANDLE             *pIveHandle        Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S        *pstSrc            Input source data
-*                  IVE_DST_IMAGE_S        *pstDstH           The (horizontal) result of input image filtered by the input mask;
-*                  IVE_DST_IMAGE_S        *pstDstV           The (vertical) result  of input image filtered by the transposed mask;
-* 				   IVE_DST_IMAGE_S        *pstDstHV          Output the horizontal and vertical component in single image in package format.
-* 				   IVE_NORM_GRAD_CTRL_S   *pstNormGradCtrl   Control parameter
-*                  HI_BOOL                 bInstant          For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1024 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-08-12
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_NormGrad(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstDstH, 
-    IVE_DST_IMAGE_S *pstDstV, IVE_DST_IMAGE_S *pstDstHV, IVE_NORM_GRAD_CTRL_S *pstNormGradCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_LKOpticalFlowPyr
-*   Description  : Calculate LK Optical Flow using multi-layer of the pyramid-images.
-*   Parameters   : IVE_HANDLE						*pIveHandle          Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S					astSrcPrevPyr        Prev-frame's pyramid. Must be U8C1 images.
-* 				   IVE_SRC_IMAGE_S					astSrcNextPyr		 Next-frame's pyramid. Same size and type with astSrcPrePyr.
-*                  IVE_SRC_MEM_INFO_S				*pstPrevPts		     Intresting points on astSrcPrePyr[0].
-*                  IVE_MEM_INFO_S					*pstNextPts          Output points. When bUseInitFlow is true, must have the same
-* 																		 size of pstPrevPts as input.
-*                  IVE_LK_OPTICAL_FLOW_PYR_CTRL_S	*pstLkOptiFlowCtrl   Control parameters.
-*                  HI_BOOL							bInstant             For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1280x720 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2015-03-20
-*           Author       :
-*           Modification : Created function
-****************************************************************************/
-HI_S32 HI_MPI_IVE_LKOpticalFlowPyr(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S astSrcPrevPyr[],
-    IVE_SRC_IMAGE_S astSrcNextPyr[], IVE_SRC_MEM_INFO_S *pstPrevPts, IVE_MEM_INFO_S *pstNextPts, 
-    IVE_DST_MEM_INFO_S *pstStatus, IVE_DST_MEM_INFO_S *pstErr, IVE_LK_OPTICAL_FLOW_PYR_CTRL_S *pstLkOptiFlowPyrCtrl, 
-    HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_STCandiCorner
-*   Description  : The first part of corners detection using Shi-Tomasi-like method: calculate candidate corners.
-*   Parameters   : IVE_HANDLE              *pIveHandle         Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S         *pstSrc             Input source data
-*                  IVE_DST_IMAGE_S         *pstCandiCorner     Output result of eig
-* 				   IVE_ST_CANDI_CORNER_CTRL_S    *pstStCandiCornerCtrl   Control parameter
-*                  HI_BOOL                  bInstant           For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 720x576 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-09-16
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_STCandiCorner(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_DST_IMAGE_S *pstCandiCorner,
-    IVE_ST_CANDI_CORNER_CTRL_S *pstStCandiCornerCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_STCorner
-*   Description  : The second part of corners detection using Shi-Tomasi-like method: select corners by certain rules.
-*                  IVE_SRC_IMAGE_S         *pstCandiCorner     Input source data
-*                  IVE_DST_MEM_INFO_S *pstCorner    Output result of Corner
-* 				   IVE_ST_CORNER_CTRL_S    *pstStCornerCtrl   Control parameter
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 720x576 pixels.
-*                  The physical addresses of the input data and output data must be 16-byte-aligned.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2013-09-16
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_STCorner(IVE_SRC_IMAGE_S *pstCandiCorner, IVE_DST_MEM_INFO_S *pstCorner,
-    IVE_ST_CORNER_CTRL_S *pstStCornerCtrl);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_GradFg
-*   Description  :
-*   Parameters   : IVE_HANDLE            *pIveHandle       Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S       *pstBgDiffFg      Background subtraction foreground image
-*                  IVE_SRC_IMAGE_S       *pstCurGrad       Current gradient image, both horizontally and vertically
-*                                                          graded in accordance with [xyxyxy ...] format
-*                  IVE_SRC_IMAGE_S       *pstBgGrad        Background gradient image
-*                  IVE_DST_IMAGE_S       *pstGradFg        Gradient foreground image
-*                  IVE_GRAD_FG_CTRL_S    *pstGradFgCtrl    Gradient calculation parameters
-*                  HI_BOOL                bInstant         For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2013-10-29
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_GradFg(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstBgDiffFg, IVE_SRC_IMAGE_S *pstCurGrad,
-    IVE_SRC_IMAGE_S *pstBgGrad, IVE_DST_IMAGE_S *pstGradFg, IVE_GRAD_FG_CTRL_S *pstGradFgCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_MatchBgModel
-*   Description  :
-*   Parameters   : IVE_HANDLE                  *pIveHandle            Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S             *pstCurImg             Current grayscale image
-*                  IVE_DATA_S                  *pstBgModel            Background model data
-*                  IVE_IMAGE_S                 *pstFgFlag             Foreground status image
-*                  IVE_DST_IMAGE_S             *pstBgDiffFg           Foreground image obtained by background matching,
-*                                                                     the background pixel value is 0, the foreground pixel
-*                                                                     value is the gray difference value
-*                  IVE_DST_IMAGE_S             *pstFrmDiffFg          Foreground image obtained by interframe difference,
-*                                                                     the background pixel value is 0, the foreground pixel
-*                                                                     value is the gray difference value
-*                  IVE_DST_MEM_INFO_S          *pstStatData           result status data
-*                  IVE_MATCH_BG_MODEL_CTRL_S   *pstMatchBgModelCtrl   Background matching parameters
-*                  HI_BOOL                      bInstant              For details, see HI_MPI_IVE_DMA.
-
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2013-10-29
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_MatchBgModel(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstCurImg, IVE_DATA_S *pstBgModel,
-    IVE_IMAGE_S *pstFgFlag, IVE_DST_IMAGE_S *pstBgDiffFg, IVE_DST_IMAGE_S *pstFrmDiffFg, 
-    IVE_DST_MEM_INFO_S *pstStatData, IVE_MATCH_BG_MODEL_CTRL_S *pstMatchBgModelCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_UpdateBgModel
-*   Description  :
-*   Parameters   : IVE_HANDLE                  *pIveHandle              Returned handle ID of a task
-*                  IVE_DATA_S                  *pstBgModel              Background model data
-*                  IVE_IMAGE_S                 *pstFgFlag               Foreground status image
-*                  IVE_DST_IMAGE_S             *pstBgImg                Background grayscale image
-*                  IVE_DST_IMAGE_S             *pstChgStaImg            Change state life image, for still detection
-*                  IVE_DST_IMAGE_S             *pstChgStaFg             Change state grayscale image, for still detection
-*                  IVE_DST_IMAGE_S             *pstChgStaLife           Change state foreground image, for still detection
-*                  IVE_DST_MEM_INFO_S          *pstStatData             result status data
-*                  IVE_UPDATE_BG_MODEL_CTRL_S  *pstUpdateBgModelCtrl    Background update parameters
-*                  HI_BOOL                      bInstant                For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2013-10-29
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_UpdateBgModel(IVE_HANDLE *pIveHandle, IVE_DATA_S *pstBgModel, IVE_IMAGE_S *pstFgFlag,
-    IVE_DST_IMAGE_S *pstBgImg, IVE_DST_IMAGE_S *pstChgStaImg, IVE_DST_IMAGE_S *pstChgStaFg,
-    IVE_DST_IMAGE_S *pstChgStaLife, IVE_DST_MEM_INFO_S *pstStatData, IVE_UPDATE_BG_MODEL_CTRL_S *pstUpdateBgModelCtrl, 
-    HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_ANN_MLP_LoadModel
-*   Description  : Load ANN_MLP model data from ".bin" file.
-*   Parameters   : HI_CHAR			        *pchFileName        ANN_MLP model file name, must be ".bin" file.
-*                  IVE_ANN_MLP_MODEL_S      *pstAnnMlpModel	    ANN_MLP model data.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2014-05-13
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_ANN_MLP_LoadModel(const HI_CHAR *pchFileName, IVE_ANN_MLP_MODEL_S *pstAnnMlpModel);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_ANN_MLP_UnloadModel
-*   Description  : Unload ANN_MLP model data.
-*   Parameters   : IVE_ANN_MLP_MODEL_S      *pstAnnMlpModel	    ANN_MLP model data.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2014-05-13
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_VOID HI_MPI_IVE_ANN_MLP_UnloadModel(IVE_ANN_MLP_MODEL_S *pstAnnMlpModel);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_ANN_MLP_Predict
-*   Description  :
-*   Parameters   : IVE_HANDLE			   *pIveHandle          Returned handle ID of a task
-* 				   IVE_SRC_DATA_S	       *pstSrc			    Input samples
-*                  IVE_SRC_MEM_INFO_S      *pstActivFuncTable   Look-up talbe for active function
-*                  IVE_ANN_MLP_MODEL_S     *pstAnnMlpModel	    ANN_MLP model
-*                  IVE_DST_DATA_S          *pstDst              Output layers of every intput sample
-*                  HI_BOOL				    bInstant            For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2013-11-28
-*           Author       :
-*           Modification : Created function
-* 		2.  Date		 : 2015-05-21
-* 			Author		 :
-* 			Modification : support 1024d feature vector and array of vectors input
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_ANN_MLP_Predict(IVE_HANDLE *pIveHandle, IVE_SRC_DATA_S *pstSrc,
-    IVE_LOOK_UP_TABLE_S *pstActivFuncTab, IVE_ANN_MLP_MODEL_S *pstAnnMlpModel, IVE_DST_DATA_S *pstDst, 
-    HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_SVM_LoadModel
-*   Description  : Load SVM model data from ".bin" file.
-*   Parameters   : HI_CHAR			    *pchFileName        SVM model file name, must be ".bin" file.
-*                  IVE_SVM_MODEL_S      *pstSvmModel	    SVM model data.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2014-05-13
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_SVM_LoadModel(const HI_CHAR *pchFileName, IVE_SVM_MODEL_S *pstSvmModel);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_SVM_UnloadModel
-*   Description  : Unload SVM model data.
-*   Parameters   : IVE_SVM_MODEL_S      *pstSvmModel	    SVM model data.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2014-05-13
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_VOID HI_MPI_IVE_SVM_UnloadModel(IVE_SVM_MODEL_S *pstSvmModel);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_SVM_Predict
-*   Description  :
-*   Parameters   : IVE_HANDLE			   *pIveHandle          Returned handle ID of a task
-* 				   IVE_SRC_DATA_S	       *pstSrc			    Input sample
-*                  IVE_SRC_MEM_INFO_S      *pstKernelTable      Look-up talbe for active function
-*                  IVE_SVM_MODEL_S         *pstSvmModel         SVM model
-*                  IVE_SRC_DATA_S          *pstDstVote          Output Votes' array of each class
-*                  HI_BOOL				    bInstant            For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2013-11-28
-*           Author       :
-*           Modification : Created function
-* 		2.  Date		 : 2015-04-21
-* 			Author		 :
-* 			Modification : support 1024d feature vector and array of vectors input
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_SVM_Predict(IVE_HANDLE *pIveHandle, IVE_SRC_DATA_S *pstSrc, IVE_LOOK_UP_TABLE_S *pstKernelTab, 
-    IVE_SVM_MODEL_S *pstSvmModel, IVE_DST_DATA_S *pstDstVote, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_SAD
-*   Description  : Sum of absolute differences.
-*   Parameters   : IVE_HANDLE          *pIveHandle   Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S     *pstSrc1      The input source1.Only the U8C1 input format is supported.
-*                  IVE_SRC_IMAGE_S     *pstSrc2      The input source2.Only the U8C1 input format is supported.
-*                  IVE_DST_IMAGE_S     *pstSad       Output result of sad value.Only the U8C1/U16C1 format is supported.
-*                  IVE_DST_IMAGE_S     *pstThr       Output result of thresh.Only the U8C1 format is supported.
-*                  IVE_SAD_CTRL_S	   *pstSadCtrl   Control parameter
-*                  HI_BOOL             bInstant     For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 64x64 pixels to 1920x1080 pixels.
-*                  The stride must be 16-pixel-aligned.
-*                  The types, widths, heights of two input sources must be the same.
-*   History:
-*
-*       1.  Date         : 2014-08-28
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_SAD(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc1, IVE_SRC_IMAGE_S *pstSrc2, 
-    IVE_DST_IMAGE_S *pstSad, IVE_DST_IMAGE_S *pstThr, IVE_SAD_CTRL_S *pstSadCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Resize
-*   Description  : Resize.
-*   Parameters   : IVE_HANDLE          *pIveHandle		Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S     astSrc[]			The input source.Only the U8C1/U8C3_PLANAR input format is supported.
-*                  IVE_DST_IMAGE_S     astDst[]			Output result.Only the U8C1/U8C3_PLANAR format is supported.
-*                  IVE_RESIZE_CTRL_S   *pstResizeCtrl   Control parameter
-*                  HI_BOOL             bInstant			For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The size of the input data ranges from 32x16 pixels to 1920x1080 pixels.
-*                  The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2015-03-26
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Resize(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S astSrc[], IVE_DST_IMAGE_S astDst[], 
-    IVE_RESIZE_CTRL_S *pstResizeCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_CNN_LoadModel
-*   Description  : Load CNN model data from ".bin" file.
-*   Parameters   : HI_CHAR			*pchFileName     CNN model file name, must be ".bin" file.
-* 		  		     IVE_CNN_MODEL_S	*pstCnnModel	   CNN model data.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2015-04-19
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_CNN_LoadModel(const HI_CHAR *pchFileName, IVE_CNN_MODEL_S *pstCnnModel);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_CNN_UnloadModel
-*   Description  : Unload CNN model data and release memory.
-*   Parameters   : IVE_CNN_MODEL_S *pstCnnModel)	 CNN model data.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2015-4-19
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_VOID HI_MPI_IVE_CNN_UnloadModel(IVE_CNN_MODEL_S *pstCnnModel);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_CNN_Predict
-*   Description  : Perform CNN prediction on input sample(s), and output responses for corresponding sample(s)
-*   Parameters   : IVE_HANDLE			*pIveHandle        	Returned handle ID of a task
-* 				    IVE_SRC_IMAGE_S	 	astSrc[]          	Input images array. Only the U8C1 and U8C3_PLANAR input are supported
-* 				    IVE_CNN_MODEL_S		*pstCnnModel       	CNN model data
-* 				    IVE_CNN_CTRL_S   		*pstCnnCtrl        	CNN control parameter
-* 				    IVE_DST_DATA_S   		*pstDst            	Output vectors of CNN_Predict
-* 				    HI_BOOL           	bInstant          	For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success; Error codes: Failure.
-*   Spec         : The stride must be 16-pixel-aligned.
-* 				   The types, widths, heights and strides of input images must be the same.
-*   History:
-*
-*       1.  Date         : 2015-4-19
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_CNN_Predict(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S astSrc[], IVE_CNN_MODEL_S *pstCnnModel, 
-    IVE_DST_DATA_S *pstDst, IVE_CNN_CTRL_S *pstCnnCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_CNN_GetResult
-*   Description  : Calculate classification and confidence with CNN output by softmax regression.
-*   Parameters   : IVE_SRC_DATA_S			*pstSrc						The result of CNN_Predict output.
-* 		            IVE_DST_MEM_INFO_S		*pstDst						The prediction about classification label index and confidence.
-* 				     IVE_CNN_MODEL_S       	*pstpstCnnModel         	CNN model data
-* 		            IVE_CNN_CTRL_S        	*pstCnnCtrl				CNN control parameter
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2015-4-19
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_CNN_GetResult(IVE_SRC_DATA_S *pstSrc, IVE_DST_MEM_INFO_S *pstDst,
-    IVE_CNN_MODEL_S *pstCnnModel, IVE_CNN_CTRL_S *pstCnnCtrl);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_PerspTrans
-*   Description  : Perspective transform
-*   Parameters  : IVE_HANDLE		         *pIveHandle        Returned handle ID of a task.
-* 		          IVE_SRC_IMAGE_S            *pstSrc			The input source.Only the U8C1/YUVSP420 input format is supported..
-* 				  IVE_RECT_U32_S             astRoi[]           Roi array.
-* 				  IVE_SRC_MEM_INFO_S         astPointPair[]     Point pair array.
-* 				  IVE_DST_IMAGE_S            astDst[]           Output result.Only the U8C1/YUVSP420/U8C3_PACKAGE format is supported.
-* 		          IVE_PERSP_TRANS_CTRL_S     *pstPerspTransCtrl PerspTrans control parameter.
-* 				  HI_BOOL                    bInstant           For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         : The stride must be 16-pixel-aligned.
-*   History:
-*
-*       1.  Date         : 2018-9-15
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_PerspTrans(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_RECT_U32_S astRoi[],
-    IVE_SRC_MEM_INFO_S astPointPair[], IVE_DST_IMAGE_S astDst[], IVE_PERSP_TRANS_CTRL_S *pstPerspTransCtrl,
-    HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_KCF_GetMemSize
-*   Description  : KCF get object memory size
-*   Parameters  :  HI_U32 u32MaxObjNum    The maximum numbers of tracking object.
-* 		          HI_U32 *pu32Size       memmory size.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018-10-15
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_KCF_GetMemSize(HI_U32 u32MaxObjNum, HI_U32 *pu32Size);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_KCF_CreateObjList
-*   Description  : KCF creste object list
-*   Parameters  :  IVE_MEM_INFO_S *pstMem  The memory of object for object list.
-* 		          HI_U32 u32MaxObjNum The maximum numbers of tracking object (list node).
-*                  IVE_KCF_OBJ_LIST_S *pstObjList  The object list.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018-10-15
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_KCF_CreateObjList(IVE_MEM_INFO_S *pstMem, HI_U32 u32MaxObjNum, IVE_KCF_OBJ_LIST_S *pstObjList);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_KCF_DestroyObjList
-*   Description  : KCF destroy object list
-*   Parameters  :  IVE_KCF_OBJ_LIST_S *pstObjList  The object list.
-*
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018-10-15
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_KCF_DestroyObjList(IVE_KCF_OBJ_LIST_S *pstObjList);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_KCF_CreateGaussPeak
-*   Description  : KCF calculate gauss peak
-*   Parameters  :  HI_U3Q5 u3q5Padding The multiple of roi rectangle's width and height.
-*                  IVE_DST_MEM_INFO_S *pstGaussPeak The memory of gauss peak.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018-10-15
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_KCF_CreateGaussPeak(HI_U3Q5 u3q5Padding, IVE_DST_MEM_INFO_S *pstGaussPeak);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_KCF_CreateCosWin
-*   Description  : KCF calculate cos window x and y.
-*   Parameters  :  IVE_DST_MEM_INFO_S *pstCosWinX The memory of cos window x.
-*                  IVE_DST_MEM_INFO_S *pstCosWinY The memory of cos window y.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018-10-15
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_KCF_CreateCosWin(IVE_DST_MEM_INFO_S *pstCosWinX, IVE_DST_MEM_INFO_S *pstCosWinY);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_KCF_GetTrainObj
-*   Description  : KCF get train object.
-*   Parameters  :  HI_U3Q5 u3q5Padding The multiple of roi rectangle's width and height.
-*                  IVE_ROI_INFO_S astRoiInfo[] The array of roi information.
-*                  HI_U32 u32ObjNum The numbers of RoiInfo and object.
-*                  IVE_MEM_INFO_S *pstCosWinX The memory of cos window x.
-*                  IVE_MEM_INFO_S *pstCosWinY The memory of cos window y.
-*                  IVE_MEM_INFO_S *pstGaussPeak The memory of gauss peak.
-*                  IVE_KCF_OBJ_LIST_S *pstObjList The object list.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018-10-15
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_KCF_GetTrainObj(HI_U3Q5 u3q5Padding, IVE_ROI_INFO_S astRoiInfo[], HI_U32 u32ObjNum,
-    IVE_MEM_INFO_S *pstCosWinX, IVE_MEM_INFO_S *pstCosWinY, IVE_MEM_INFO_S *pstGaussPeak,
-    IVE_KCF_OBJ_LIST_S *pstObjList);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_KCF_Process
-*   Description  : KCF process.
-*   Parameters   : IVE_HANDLE         *pIveHandle     Returned handle ID of a task
-*                  IVE_SRC_IMAGE_S    *pstSrc         Input source.Only the YUV420SP inpu format is supported.
-*                  IVE_KCF_OBJ_LIST_S *pstObjList     The object list.
-* 				 IVE_KCF_PRO_CTRL_S *pstKcfProCtrl  Control parameter.
-*                  HI_BOOL             bInstant       For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018-10-15
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_KCF_Process(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_KCF_OBJ_LIST_S *pstObjList, 
-    IVE_KCF_PRO_CTRL_S *pstKcfProCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_KCF_GetObjBbox
-*   Description  : KCF get track object bbox information.
-*   Parameters  :  IVE_KCF_OBJ_LIST_S *pstObjList The object list.
-*                  IVE_KCF_BBOX_S astBbox   The output bbox of object.
-*                  HI_U32 *pu32BboxObjNum   The valid numbers of output bbox.
-*                  IVE_KCF_BBOX_CTRL_S *pstKcfBboxCtrl Control parameter.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018-10-15
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_KCF_GetObjBbox(IVE_KCF_OBJ_LIST_S *pstObjList, IVE_KCF_BBOX_S astBbox[],
-    HI_U32 *pu32BboxObjNum, IVE_KCF_BBOX_CTRL_S *pstKcfBboxCtrl);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_KCF_JudgeObjBboxTrackState
-*   Description  : KCF judge object tracking state.
-*   Parameters  :  IVE_KCF_OBJ_LIST_S *pstObjList The object list.
-*                  IVE_KCF_BBOX_S astBbox   The bbox of object.
-*                  HI_BOOL *pbTrackOk  The tracking state of object.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018-10-15
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_KCF_JudgeObjBboxTrackState(IVE_ROI_INFO_S *pstRoiInfo, IVE_KCF_BBOX_S *pstBbox, 
-    HI_BOOL *pbTrackOk);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_KCF_ObjUpdate
-*   Description  : KCF update object.
-*   Parameters  :  IVE_KCF_OBJ_LIST_S *pstObjList The object list.
-*                  IVE_KCF_BBOX_S astBbox   The bbox information of update object.
-*                  HI_U32 u32BboxObjNum The update numbers of bbox.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018-10-15
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_KCF_ObjUpdate(IVE_KCF_OBJ_LIST_S *pstObjList, IVE_KCF_BBOX_S astBbox[],
-    HI_U32 u32BboxObjNum);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Hog
-*   Description  : get Hog feature.
-*   Parameters  :  IVE_HANDLE         *pIveHandle     Returned handle ID of a task.
-*                  IVE_SRC_IMAGE_S    *pstSrc         Input source.Only the YUV420SP inpu format is supported.
-*                  IVE_RECT_U32_S      astRoi[]       The array of roi.
-*                  IVE_DST_BLOB_S      astDst[]       The array of Hog feature.
-*                  IVE_HOG_CTRL_S     *pstHogCtrl     Control parameter.
-*                  HI_BOOL             bInstant       For details, see HI_MPI_IVE_DMA.
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2018-11-12
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Hog(IVE_HANDLE *pIveHandle, IVE_SRC_IMAGE_S *pstSrc, IVE_RECT_U32_S astRoi[],
-    IVE_DST_BLOB_S astDst[], IVE_HOG_CTRL_S *pstHogCtrl, HI_BOOL bInstant);
-
-/*****************************************************************************
-*   Prototype    : HI_MPI_IVE_Query
-*   Description  : This API is used to query the status of a called function by using the returned IveHandle of the function.
-                   In block mode, the system waits until the function that is being queried is called.
-                   In non-block mode, the current status is queried and no action is taken.
-*   Parameters   : IVE_HANDLE     IveHandle     IveHandle of a called function. It is entered by users.
-*                  HI_BOOL       *pbFinish      Returned status
-*                  HI_BOOL        bBlock        Flag indicating the block mode or non-block mode
-*                  HI_BOOL  *pbFinish
-*   Return Value : HI_SUCCESS: Success;Error codes: Failure.
-*   Spec         :
-*   History:
-*
-*       1.  Date         : 2011-05-16
-*           Author       :
-*           Modification : Created function
-*
-*****************************************************************************/
-HI_S32 HI_MPI_IVE_Query(IVE_HANDLE IveHandle, HI_BOOL *pbFinish, HI_BOOL bBlock);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-#endif/*__MPI_IVE_H__*/
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_region.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_region.h
deleted file mode 100644
index 1bc586ea..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_region.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2016-2019. All rights reserved.
- * Description: mpi_region.h
- * Author:
- * Create: 2016-11-15
- */
-#ifndef __MPI_REGION_H__
-#define __MPI_REGION_H__
-
-#include "hi_comm_region.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif
-
-HI_S32 HI_MPI_RGN_Create(RGN_HANDLE Handle, const RGN_ATTR_S *pstRegion);
-HI_S32 HI_MPI_RGN_Destroy(RGN_HANDLE Handle);
-
-HI_S32 HI_MPI_RGN_GetAttr(RGN_HANDLE Handle, RGN_ATTR_S *pstRegion);
-HI_S32 HI_MPI_RGN_SetAttr(RGN_HANDLE Handle, const RGN_ATTR_S *pstRegion);
-
-HI_S32 HI_MPI_RGN_SetBitMap(RGN_HANDLE Handle, const BITMAP_S *pstBitmap);
-
-HI_S32 HI_MPI_RGN_AttachToChn(RGN_HANDLE Handle, const MPP_CHN_S *pstChn, const RGN_CHN_ATTR_S *pstChnAttr);
-HI_S32 HI_MPI_RGN_DetachFromChn(RGN_HANDLE Handle, const MPP_CHN_S *pstChn);
-
-HI_S32 HI_MPI_RGN_SetDisplayAttr(RGN_HANDLE Handle, const MPP_CHN_S *pstChn, const RGN_CHN_ATTR_S *pstChnAttr);
-HI_S32 HI_MPI_RGN_GetDisplayAttr(RGN_HANDLE Handle, const MPP_CHN_S *pstChn, RGN_CHN_ATTR_S *pstChnAttr);
-
-HI_S32 HI_MPI_RGN_GetCanvasInfo(RGN_HANDLE Handle, RGN_CANVAS_INFO_S *pstCanvasInfo);
-HI_S32 HI_MPI_RGN_UpdateCanvas(RGN_HANDLE Handle);
-
-HI_S32 HI_MPI_RGN_BatchBegin(RGN_HANDLEGROUP *pu32Group, HI_U32 u32Num, const RGN_HANDLE handle[]);
-HI_S32 HI_MPI_RGN_BatchEnd(RGN_HANDLEGROUP u32Group);
-
-HI_S32 HI_MPI_RGN_GetFd(HI_VOID);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-
-#endif
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_snap.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_snap.h
deleted file mode 100644
index eb266455..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_snap.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2012-2018. All rights reserved.
- * Description: mpi_snap.h
- * Author:
- * Create: 2017-06-16
- */
-
-#ifndef __MPI_SNAP_H__
-#define __MPI_SNAP_H__
-
-#include "hi_comm_video.h"
-#include "hi_comm_snap.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-HI_S32 HI_MPI_SNAP_SetPipeAttr(VI_PIPE ViPipe, const SNAP_ATTR_S *pstSnapAttr);
-HI_S32 HI_MPI_SNAP_GetPipeAttr(VI_PIPE ViPipe, SNAP_ATTR_S *pstSnapAttr);
-HI_S32 HI_MPI_SNAP_EnablePipe(VI_PIPE ViPipe);
-HI_S32 HI_MPI_SNAP_DisablePipe(VI_PIPE ViPipe);
-HI_S32 HI_MPI_SNAP_TriggerPipe(VI_PIPE ViPipe);
-
-HI_S32 HI_MPI_SNAP_MultiTrigger(VI_STITCH_GRP StitchGrp);
-
-/* HDR */
-HI_S32 HI_MPI_SNAP_SetProSharpenParam(VI_PIPE ViPipe, const ISP_PRO_SHARPEN_PARAM_S *pstIspShpParam);
-HI_S32 HI_MPI_SNAP_GetProSharpenParam(VI_PIPE ViPipe, ISP_PRO_SHARPEN_PARAM_S *pstIspShpParam);
-HI_S32 HI_MPI_SNAP_SetProBNRParam(VI_PIPE ViPipe, const ISP_PRO_BNR_PARAM_S *pstNrParma);
-HI_S32 HI_MPI_SNAP_GetProBNRParam(VI_PIPE ViPipe, ISP_PRO_BNR_PARAM_S *pstNrParma);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __MPI_SNAP_H__ */
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_sys.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_sys.h
deleted file mode 100644
index 1b25d4ea..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_sys.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2016-2019. All rights reserved.
- * Description: Interface declaration of sys
- * Author: Hisilicon multimedia software group
- * Create: 2016-07-15
- */
-
-#ifndef __MPI_SYS_H__
-#define __MPI_SYS_H__
-
-#include "hi_type.h"
-#include "hi_common.h"
-#include "hi_comm_sys.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-HI_S32 HI_MPI_SYS_Init(HI_VOID);
-HI_S32 HI_MPI_SYS_Exit(HI_VOID);
-
-HI_S32 HI_MPI_SYS_SetConfig(const MPP_SYS_CONFIG_S *pstSysConfig);
-HI_S32 HI_MPI_SYS_GetConfig(MPP_SYS_CONFIG_S *pstSysConfig);
-
-HI_S32 HI_MPI_SYS_Bind(const MPP_CHN_S *pstSrcChn, const MPP_CHN_S *pstDestChn);
-HI_S32 HI_MPI_SYS_UnBind(const MPP_CHN_S *pstSrcChn, const MPP_CHN_S *pstDestChn);
-HI_S32 HI_MPI_SYS_GetBindbyDest(const MPP_CHN_S *pstDestChn, MPP_CHN_S *pstSrcChn);
-HI_S32 HI_MPI_SYS_GetBindbySrc(const MPP_CHN_S *pstSrcChn, MPP_BIND_DEST_S *pstBindDest);
-
-HI_S32 HI_MPI_SYS_GetVersion(MPP_VERSION_S *pstVersion);
-
-HI_S32 HI_MPI_SYS_GetChipId(HI_U32 *pu32ChipId);
-
-HI_S32 HI_MPI_SYS_GetUniqueId(HI_UNIQUE_ID_S *pstUniqueId);
-
-HI_S32 HI_MPI_SYS_GetCustomCode(HI_U32 *pu32CustomCode);
-
-/*
- * u64Base is the global PTS of the system.
- * ADVICE:
- * 1. Better to call HI_MPI_SYS_GetCurPTS on the host board to get u64Base.
- * 2. When os start up, call HI_MPI_SYS_InitPTSBase to set the init PTS.
- * 3. When media bussines is running, synchronize the PTS one time per minute
- *     by calling HI_MPI_SYS_SyncPTS.
- */
-HI_S32 HI_MPI_SYS_GetCurPTS(HI_U64 *pu64CurPTS);
-HI_S32 HI_MPI_SYS_InitPTSBase(HI_U64 u64PTSBase);
-HI_S32 HI_MPI_SYS_SyncPTS(HI_U64 u64PTSBase);
-
-/* alloc mmz memory in user context */
-HI_S32 HI_MPI_SYS_MmzAlloc(HI_U64 *pu64PhyAddr, HI_VOID **ppVirAddr,
-                           const HI_CHAR *strMmb, const HI_CHAR *strZone, HI_U32 u32Len);
-
-/* alloc mmz memory with cache */
-HI_S32 HI_MPI_SYS_MmzAlloc_Cached(HI_U64 *pu64PhyAddr, HI_VOID **ppVirAddr,
-                                  const HI_CHAR *pstrMmb, const HI_CHAR *pstrZone, HI_U32 u32Len);
-
-/* free mmz memory in user context */
-HI_S32 HI_MPI_SYS_MmzFree(HI_U64 u64PhyAddr, HI_VOID *pVirAddr);
-
-/* fulsh cache */
-HI_S32 HI_MPI_SYS_MmzFlushCache(HI_U64 u64PhyAddr, HI_VOID *pVirAddr, HI_U32 u32Size);
-
-/*
- * Call the mmap function to map physical address to virtual address
- * The system function mmap is too complicated, so we packge it.
- */
-HI_VOID *HI_MPI_SYS_Mmap(HI_U64 u64PhyAddr, HI_U32 u32Size);
-HI_VOID *HI_MPI_SYS_MmapCache(HI_U64 u64PhyAddr, HI_U32 u32Size);
-HI_S32 HI_MPI_SYS_Munmap(HI_VOID *pVirAddr, HI_U32 u32Size);
-HI_S32 HI_MPI_SYS_MflushCache(HI_U64 u64PhyAddr, HI_VOID *pVirAddr, HI_U32 u32Size);
-
-HI_S32 HI_MPI_SYS_SetMemConfig(const MPP_CHN_S *pstMppChn, const HI_CHAR *pcMmzName);
-HI_S32 HI_MPI_SYS_GetMemConfig(const MPP_CHN_S *pstMppChn, HI_CHAR *pcMmzName);
-
-/* Close all the FD which is used by sys module */
-HI_S32 HI_MPI_SYS_CloseFd(HI_VOID);
-
-/* Get virtual meminfo according to virtual addr, should be in one process */
-HI_S32 HI_MPI_SYS_GetVirMemInfo(const void *pVirAddr, SYS_VIRMEM_INFO_S *pstMemInfo);
-
-/* Set/get Scale coefficient level for VPSS/VGS */
-HI_S32 HI_MPI_SYS_SetScaleCoefLevel(const SCALE_RANGE_S *pstScaleRange,
-    const SCALE_COEFF_LEVEL_S *pstScaleCoeffLevel);
-HI_S32 HI_MPI_SYS_GetScaleCoefLevel(const SCALE_RANGE_S *pstScaleRange, SCALE_COEFF_LEVEL_S *pstScaleCoeffLevel);
-
-/* Set/Get local timezone, range: [-86400, 86400] seconds (that is: [-24, 24] hours)  */
-HI_S32 HI_MPI_SYS_SetTimeZone(HI_S32 s32TimeZone);
-HI_S32 HI_MPI_SYS_GetTimeZone(HI_S32 *ps32TimeZone);
-
-HI_S32 HI_MPI_SYS_SetGPSInfo(const GPS_INFO_S *pstGPSInfo);
-HI_S32 HI_MPI_SYS_GetGPSInfo(GPS_INFO_S *pstGPSInfo);
-
-HI_S32 HI_MPI_SYS_SetTuningConnect(HI_S32 s32Connect);
-HI_S32 HI_MPI_SYS_GetTuningConnect(HI_S32 *ps32Connect);
-
-HI_S32 HI_MPI_SYS_SetVIVPSSMode(const VI_VPSS_MODE_S *pstVIVPSSMode);
-HI_S32 HI_MPI_SYS_GetVIVPSSMode(VI_VPSS_MODE_S *pstVIVPSSMode);
-
-HI_S32 HI_MPI_SYS_GetVPSSVENCWrapBufferLine(VPSS_VENC_WRAP_PARAM_S *pWrapParam, HI_U32 *pu32BufLine);
-
-HI_S32 HI_MPI_LOG_SetLevelConf(LOG_LEVEL_CONF_S *pstConf);
-HI_S32 HI_MPI_LOG_GetLevelConf(LOG_LEVEL_CONF_S *pstConf);
-
-HI_S32 HI_MPI_SYS_SetRawFrameCompressParam(const RAW_FRAME_COMPRESS_PARAM_S *pstCompressParam);
-HI_S32 HI_MPI_SYS_GetRawFrameCompressParam(RAW_FRAME_COMPRESS_PARAM_S *pstCompressParam);
-
-HI_S32 HI_MPI_LOG_SetWaitFlag(HI_BOOL bWait);
-
-HI_S32 HI_MPI_LOG_Read(HI_CHAR *pBuf, HI_U32 u32Size);
-
-HI_VOID HI_MPI_LOG_Close(HI_VOID);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* End of #ifdef __cplusplus */
-
-#endif /* __MPI_SYS_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vb.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vb.h
deleted file mode 100644
index 8a762690..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vb.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) Hisilicon Technologies Co., Ltd. 2012-2019. All rights reserved.
-* Description:
-* Author: Hisilicon multimedia software group
-* Create: 2011/06/28
-*/
-
-
-#ifndef __MPI_VB_H__
-#define __MPI_VB_H__
-
-#include "hi_comm_vb.h"
-#include "hi_comm_video.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif
-
-VB_POOL HI_MPI_VB_CreatePool(VB_POOL_CONFIG_S *pstVbPoolCfg);
-HI_S32 HI_MPI_VB_DestroyPool(VB_POOL Pool);
-
-VB_BLK HI_MPI_VB_GetBlock(VB_POOL Pool, HI_U64 u64BlkSize, const HI_CHAR *pcMmzName);
-HI_S32 HI_MPI_VB_ReleaseBlock(VB_BLK Block);
-
-VB_BLK HI_MPI_VB_PhysAddr2Handle(HI_U64 u64PhyAddr);
-HI_U64 HI_MPI_VB_Handle2PhysAddr(VB_BLK Block);
-VB_POOL HI_MPI_VB_Handle2PoolId(VB_BLK Block);
-
-HI_S32 HI_MPI_VB_InquireUserCnt(VB_BLK Block);
-
-HI_S32 HI_MPI_VB_GetSupplementAddr(VB_BLK Block, VIDEO_SUPPLEMENT_S *pstSupplement);
-HI_S32 HI_MPI_VB_SetSupplementConfig(const VB_SUPPLEMENT_CONFIG_S *pstSupplementConfig);
-HI_S32 HI_MPI_VB_GetSupplementConfig(VB_SUPPLEMENT_CONFIG_S *pstSupplementConfig);
-
-HI_S32 HI_MPI_VB_Init(HI_VOID);
-HI_S32 HI_MPI_VB_Exit(HI_VOID);
-HI_S32 HI_MPI_VB_SetConfig(const VB_CONFIG_S *pstVbConfig);
-HI_S32 HI_MPI_VB_GetConfig(VB_CONFIG_S *pstVbConfig);
-
-HI_S32 HI_MPI_VB_MmapPool(VB_POOL Pool);
-HI_S32 HI_MPI_VB_MunmapPool(VB_POOL Pool);
-
-HI_S32 HI_MPI_VB_GetBlockVirAddr(VB_POOL Pool, HI_U64 u64PhyAddr, HI_VOID **ppVirAddr);
-
-HI_S32 HI_MPI_VB_InitModCommPool(VB_UID_E enVbUid);
-HI_S32 HI_MPI_VB_ExitModCommPool(VB_UID_E enVbUid);
-
-HI_S32 HI_MPI_VB_SetModPoolConfig(VB_UID_E enVbUid, const VB_CONFIG_S *pstVbConfig);
-HI_S32 HI_MPI_VB_GetModPoolConfig(VB_UID_E enVbUid, VB_CONFIG_S *pstVbConfig);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-
-#endif /* __MPI_VI_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_venc.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_venc.h
deleted file mode 100644
index e0e44d3a..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_venc.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2016-2019. All rights reserved.
- * Description:
- * Author: Hisilicon multimedia software group
- * Create: 2016/11/15
- * History:
- */
-#ifndef __MPI_VENC_H__
-#define __MPI_VENC_H__
-
-#include "hi_common.h"
-#include "hi_comm_video.h"
-#include "hi_comm_venc.h"
-#include "hi_comm_vb.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-HI_S32 HI_MPI_VENC_CreateChn(VENC_CHN VeChn, const VENC_CHN_ATTR_S *pstAttr);
-HI_S32 HI_MPI_VENC_DestroyChn(VENC_CHN VeChn);
-
-HI_S32 HI_MPI_VENC_ResetChn(VENC_CHN VeChn);
-
-HI_S32 HI_MPI_VENC_StartRecvFrame(VENC_CHN VeChn, const VENC_RECV_PIC_PARAM_S *pstRecvParam);
-HI_S32 HI_MPI_VENC_StopRecvFrame(VENC_CHN VeChn);
-
-HI_S32 HI_MPI_VENC_QueryStatus(VENC_CHN VeChn, VENC_CHN_STATUS_S *pstStatus);
-
-HI_S32 HI_MPI_VENC_SetChnAttr(VENC_CHN VeChn, const VENC_CHN_ATTR_S *pstChnAttr);
-HI_S32 HI_MPI_VENC_GetChnAttr(VENC_CHN VeChn, VENC_CHN_ATTR_S *pstChnAttr);
-
-HI_S32 HI_MPI_VENC_GetStream(VENC_CHN VeChn, VENC_STREAM_S *pstStream, HI_S32 s32MilliSec);
-
-HI_S32 HI_MPI_VENC_ReleaseStream(VENC_CHN VeChn, VENC_STREAM_S *pstStream);
-
-HI_S32 HI_MPI_VENC_InsertUserData(VENC_CHN VeChn, HI_U8 *pu8Data, HI_U32 u32Len);
-
-HI_S32 HI_MPI_VENC_SendFrame(VENC_CHN VeChn, const VIDEO_FRAME_INFO_S *pstFrame, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_VENC_SendFrameEx(VENC_CHN VeChn, const USER_FRAME_INFO_S *pstFrame, HI_S32 s32MilliSec);
-
-HI_S32 HI_MPI_VENC_RequestIDR(VENC_CHN VeChn, HI_BOOL bInstant);
-
-HI_S32 HI_MPI_VENC_GetFd(VENC_CHN VeChn);
-HI_S32 HI_MPI_VENC_CloseFd(VENC_CHN VeChn);
-
-HI_S32 HI_MPI_VENC_SetRoiAttr(VENC_CHN VeChn, const VENC_ROI_ATTR_S *pstRoiAttr);
-HI_S32 HI_MPI_VENC_GetRoiAttr(VENC_CHN VeChn, HI_U32 u32Index, VENC_ROI_ATTR_S *pstRoiAttr);
-
-HI_S32 HI_MPI_VENC_GetRoiAttrEx(VENC_CHN VeChn, HI_U32 u32Index, VENC_ROI_ATTR_EX_S *pstRoiAttrEx);
-HI_S32 HI_MPI_VENC_SetRoiAttrEx(VENC_CHN VeChn, const VENC_ROI_ATTR_EX_S *pstRoiAttrEx);
-
-HI_S32 HI_MPI_VENC_SetRoiBgFrameRate(VENC_CHN VeChn, const VENC_ROIBG_FRAME_RATE_S *pstRoiBgFrmRate);
-HI_S32 HI_MPI_VENC_GetRoiBgFrameRate(VENC_CHN VeChn, VENC_ROIBG_FRAME_RATE_S *pstRoiBgFrmRate);
-
-HI_S32 HI_MPI_VENC_SetH264SliceSplit(VENC_CHN VeChn, const VENC_H264_SLICE_SPLIT_S *pstSliceSplit);
-HI_S32 HI_MPI_VENC_GetH264SliceSplit(VENC_CHN VeChn, VENC_H264_SLICE_SPLIT_S *pstSliceSplit);
-
-HI_S32 HI_MPI_VENC_SetH264IntraPred(VENC_CHN VeChn, const VENC_H264_INTRA_PRED_S *pstH264IntraPred);
-HI_S32 HI_MPI_VENC_GetH264IntraPred(VENC_CHN VeChn, VENC_H264_INTRA_PRED_S *pstH264IntraPred);
-
-HI_S32 HI_MPI_VENC_SetH264Trans(VENC_CHN VeChn, const VENC_H264_TRANS_S *pstH264Trans);
-HI_S32 HI_MPI_VENC_GetH264Trans(VENC_CHN VeChn, VENC_H264_TRANS_S *pstH264Trans);
-
-HI_S32 HI_MPI_VENC_SetH264Entropy(VENC_CHN VeChn, const VENC_H264_ENTROPY_S *pstH264EntropyEnc);
-HI_S32 HI_MPI_VENC_GetH264Entropy(VENC_CHN VeChn, VENC_H264_ENTROPY_S *pstH264EntropyEnc);
-
-HI_S32 HI_MPI_VENC_SetH264Dblk(VENC_CHN VeChn, const VENC_H264_DBLK_S *pstH264Dblk);
-HI_S32 HI_MPI_VENC_GetH264Dblk(VENC_CHN VeChn, VENC_H264_DBLK_S *pstH264Dblk);
-
-HI_S32 HI_MPI_VENC_SetH264Vui(VENC_CHN VeChn, const VENC_H264_VUI_S *pstH264Vui);
-HI_S32 HI_MPI_VENC_GetH264Vui(VENC_CHN VeChn, VENC_H264_VUI_S *pstH264Vui);
-
-HI_S32 HI_MPI_VENC_SetH265Vui(VENC_CHN VeChn, const VENC_H265_VUI_S *pstH265Vui);
-HI_S32 HI_MPI_VENC_GetH265Vui(VENC_CHN VeChn, VENC_H265_VUI_S *pstH265Vui);
-
-HI_S32 HI_MPI_VENC_SetJpegParam(VENC_CHN VeChn, const VENC_JPEG_PARAM_S *pstJpegParam);
-HI_S32 HI_MPI_VENC_GetJpegParam(VENC_CHN VeChn, VENC_JPEG_PARAM_S *pstJpegParam);
-
-HI_S32 HI_MPI_VENC_SetMjpegParam(VENC_CHN VeChn, const VENC_MJPEG_PARAM_S *pstMjpegParam);
-HI_S32 HI_MPI_VENC_GetMjpegParam(VENC_CHN VeChn, VENC_MJPEG_PARAM_S *pstMjpegParam);
-
-HI_S32 HI_MPI_VENC_GetRcParam(VENC_CHN VeChn, VENC_RC_PARAM_S *pstRcParam);
-HI_S32 HI_MPI_VENC_SetRcParam(VENC_CHN VeChn, const VENC_RC_PARAM_S *pstRcParam);
-
-HI_S32 HI_MPI_VENC_SetRefParam(VENC_CHN VeChn, const VENC_REF_PARAM_S *pstRefParam);
-HI_S32 HI_MPI_VENC_GetRefParam(VENC_CHN VeChn, VENC_REF_PARAM_S *pstRefParam);
-
-HI_S32 HI_MPI_VENC_SetJpegEncodeMode(VENC_CHN VeChn, const VENC_JPEG_ENCODE_MODE_E enJpegEncodeMode);
-HI_S32 HI_MPI_VENC_GetJpegEncodeMode(VENC_CHN VeChn, VENC_JPEG_ENCODE_MODE_E *penJpegEncodeMode);
-
-HI_S32 HI_MPI_VENC_EnableIDR(VENC_CHN VeChn, HI_BOOL bEnableIDR);
-
-HI_S32 HI_MPI_VENC_GetStreamBufInfo(VENC_CHN VeChn, VENC_STREAM_BUF_INFO_S *pstStreamBufInfo);
-
-HI_S32 HI_MPI_VENC_SetH265SliceSplit(VENC_CHN VeChn, const VENC_H265_SLICE_SPLIT_S *pstSliceSplit);
-HI_S32 HI_MPI_VENC_GetH265SliceSplit(VENC_CHN VeChn, VENC_H265_SLICE_SPLIT_S *pstSliceSplit);
-
-HI_S32 HI_MPI_VENC_SetH265PredUnit(VENC_CHN VeChn, const VENC_H265_PU_S *pstPredUnit);
-HI_S32 HI_MPI_VENC_GetH265PredUnit(VENC_CHN VeChn, VENC_H265_PU_S *pstPredUnit);
-
-HI_S32 HI_MPI_VENC_SetH265Trans(VENC_CHN VeChn, const VENC_H265_TRANS_S *pstH265Trans);
-HI_S32 HI_MPI_VENC_GetH265Trans(VENC_CHN VeChn, VENC_H265_TRANS_S *pstH265Trans);
-
-HI_S32 HI_MPI_VENC_SetH265Entropy(VENC_CHN VeChn, const VENC_H265_ENTROPY_S *pstH265Entropy);
-HI_S32 HI_MPI_VENC_GetH265Entropy(VENC_CHN VeChn, VENC_H265_ENTROPY_S *pstH265Entropy);
-
-HI_S32 HI_MPI_VENC_SetH265Dblk(VENC_CHN VeChn, const VENC_H265_DBLK_S *pstH265Dblk);
-HI_S32 HI_MPI_VENC_GetH265Dblk(VENC_CHN VeChn, VENC_H265_DBLK_S *pstH265Dblk);
-
-HI_S32 HI_MPI_VENC_SetH265Sao(VENC_CHN VeChn, const VENC_H265_SAO_S *pstH265Sao);
-HI_S32 HI_MPI_VENC_GetH265Sao(VENC_CHN VeChn, VENC_H265_SAO_S *pstH265Sao);
-
-HI_S32 HI_MPI_VENC_SetFrameLostStrategy(VENC_CHN VeChn, const VENC_FRAMELOST_S *pstFrmLostParam);
-HI_S32 HI_MPI_VENC_GetFrameLostStrategy(VENC_CHN VeChn, VENC_FRAMELOST_S *pstFrmLostParam);
-
-HI_S32 HI_MPI_VENC_SetSuperFrameStrategy(VENC_CHN VeChn, const VENC_SUPERFRAME_CFG_S *pstSuperFrmParam);
-HI_S32 HI_MPI_VENC_GetSuperFrameStrategy(VENC_CHN VeChn, VENC_SUPERFRAME_CFG_S *pstSuperFrmParam);
-
-HI_S32 HI_MPI_VENC_SetIntraRefresh(VENC_CHN VeChn, const VENC_INTRA_REFRESH_S *pstIntraRefresh);
-HI_S32 HI_MPI_VENC_GetIntraRefresh(VENC_CHN VeChn, VENC_INTRA_REFRESH_S *pstIntraRefresh);
-
-HI_S32 HI_MPI_VENC_GetSSERegion(VENC_CHN VeChn, HI_U32 u32Index, VENC_SSE_CFG_S *pstSSECfg);
-HI_S32 HI_MPI_VENC_SetSSERegion(VENC_CHN VeChn, const VENC_SSE_CFG_S *pstSSECfg);
-
-HI_S32 HI_MPI_VENC_SetChnParam(VENC_CHN VeChn, const VENC_CHN_PARAM_S *pstChnParam);
-HI_S32 HI_MPI_VENC_GetChnParam(VENC_CHN VeChn, VENC_CHN_PARAM_S *pstChnParam);
-
-HI_S32 HI_MPI_VENC_SetModParam(const VENC_PARAM_MOD_S *pstModParam);
-HI_S32 HI_MPI_VENC_GetModParam(VENC_PARAM_MOD_S *pstModParam);
-
-HI_S32 HI_MPI_VENC_GetForegroundProtect(VENC_CHN VeChn, VENC_FOREGROUND_PROTECT_S *pstForegroundProtect);
-HI_S32 HI_MPI_VENC_SetForegroundProtect(VENC_CHN VeChn, const VENC_FOREGROUND_PROTECT_S *pstForegroundProtect);
-
-HI_S32 HI_MPI_VENC_SetSceneMode(VENC_CHN VeChn, const VENC_SCENE_MODE_E enSceneMode);
-HI_S32 HI_MPI_VENC_GetSceneMode(VENC_CHN VeChn, VENC_SCENE_MODE_E *penSceneMode);
-
-HI_S32 HI_MPI_VENC_AttachVbPool(VENC_CHN VeChn, const VENC_CHN_POOL_S *pstPool);
-HI_S32 HI_MPI_VENC_DetachVbPool(VENC_CHN VeChn);
-
-HI_S32 HI_MPI_VENC_SetCuPrediction(VENC_CHN VeChn, const VENC_CU_PREDICTION_S *pstCuPrediction);
-HI_S32 HI_MPI_VENC_GetCuPrediction(VENC_CHN VeChn, VENC_CU_PREDICTION_S *pstCuPrediction);
-
-HI_S32 HI_MPI_VENC_SetSkipBias(VENC_CHN VeChn, const VENC_SKIP_BIAS_S *pstSkipBias);
-HI_S32 HI_MPI_VENC_GetSkipBias(VENC_CHN VeChn, VENC_SKIP_BIAS_S *pstSkipBias);
-
-HI_S32 HI_MPI_VENC_SetDeBreathEffect(VENC_CHN VeChn, const VENC_DEBREATHEFFECT_S *pstDeBreathEffect);
-HI_S32 HI_MPI_VENC_GetDeBreathEffect(VENC_CHN VeChn, VENC_DEBREATHEFFECT_S *pstDeBreathEffect);
-
-HI_S32 HI_MPI_VENC_SetHierarchicalQp(VENC_CHN VeChn, const VENC_HIERARCHICAL_QP_S *pstHierarchicalQp);
-HI_S32 HI_MPI_VENC_GetHierarchicalQp(VENC_CHN VeChn, VENC_HIERARCHICAL_QP_S *pstHierarchicalQp);
-
-HI_S32 HI_MPI_VENC_SetRcAdvParam(VENC_CHN VeChn, const VENC_RC_ADVPARAM_S *pstRcAdvParam);
-HI_S32 HI_MPI_VENC_GetRcAdvParam(VENC_CHN VeChn, VENC_RC_ADVPARAM_S *pstRcAdvParam);
-
-HI_S32 HI_MPI_VENC_EnableSvc(VENC_CHN VeChn, HI_BOOL bEnable);
-HI_S32 HI_MPI_VENC_SetSvcParam(VENC_CHN VeChn, const VENC_SVC_PARAM_S *pstSvcParam);
-HI_S32 HI_MPI_VENC_GetSvcParam(VENC_CHN VeChn, VENC_SVC_PARAM_S *pstSvcParam);
-HI_S32 HI_MPI_VENC_GetSvcSceneComplexity(VENC_CHN VeChn, VENC_SVC_DETECT_RESULT_S *pstSvcDetectResult);
-
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __MPI_VENC_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vgs.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vgs.h
deleted file mode 100644
index 7216ab7e..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vgs.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2016-2019. All rights reserved.
- * Description: mpi functions declaration
- * Author: Hisilicon multimedia software group
- * Create: 2016-07-24
- */
-
-#ifndef __MPI_VGS_H__
-#define __MPI_VGS_H__
-
-#include "hi_common.h"
-#include "hi_comm_video.h"
-#include "hi_comm_vgs.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-HI_S32 HI_MPI_VGS_BeginJob(VGS_HANDLE *phHandle);
-
-HI_S32 HI_MPI_VGS_EndJob(VGS_HANDLE hHandle);
-
-HI_S32 HI_MPI_VGS_CancelJob(VGS_HANDLE hHandle);
-
-HI_S32 HI_MPI_VGS_AddScaleTask(VGS_HANDLE hHandle, const VGS_TASK_ATTR_S *pstTask,
-                               VGS_SCLCOEF_MODE_E enScaleCoefMode);
-
-HI_S32 HI_MPI_VGS_AddDrawLineTask(VGS_HANDLE hHandle, const VGS_TASK_ATTR_S *pstTask,
-                                  const VGS_DRAW_LINE_S *pstVgsDrawLine);
-
-HI_S32 HI_MPI_VGS_AddCoverTask(VGS_HANDLE hHandle, const VGS_TASK_ATTR_S *pstTask,
-                               const VGS_ADD_COVER_S *pstVgsAddCover);
-
-HI_S32 HI_MPI_VGS_AddOsdTask(VGS_HANDLE hHandle, const VGS_TASK_ATTR_S *pstTask,
-                             const VGS_ADD_OSD_S *pstVgsAddOsd);
-
-HI_S32 HI_MPI_VGS_AddDrawLineTaskArray(VGS_HANDLE hHandle, const VGS_TASK_ATTR_S *pstTask,
-                                       const VGS_DRAW_LINE_S astVgsDrawLine[], HI_U32 u32ArraySize);
-
-HI_S32 HI_MPI_VGS_AddCoverTaskArray(VGS_HANDLE hHandle, const VGS_TASK_ATTR_S *pstTask,
-                                    const VGS_ADD_COVER_S astVgsAddCover[], HI_U32 u32ArraySize);
-
-HI_S32 HI_MPI_VGS_AddOsdTaskArray(VGS_HANDLE hHandle, const VGS_TASK_ATTR_S *pstTask,
-                                  const VGS_ADD_OSD_S astVgsAddOsd[], HI_U32 u32ArraySize);
-
-HI_S32 HI_MPI_VGS_AddRotationTask(VGS_HANDLE hHandle, const VGS_TASK_ATTR_S *pstTask, ROTATION_E enRotationAngle);
-
-HI_S32 HI_MPI_VGS_AddLumaTaskArray(VGS_HANDLE hHandle, VGS_TASK_ATTR_S *pstTask, const RECT_S astVgsLumaRect[],
-                                   HI_U32 u32ArraySize, HI_U64 au64LumaData[]);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* end of __MPI_VGS_H__ */
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vi.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vi.h
deleted file mode 100644
index 55103714..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vi.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2012-2018. All rights reserved.
- * Description: mpi_vi.h
- * Author:
- * Create: 2016-09-19
- */
-
-#ifndef __MPI_VI_H__
-#define __MPI_VI_H__
-
-#include "hi_comm_vi.h"
-#include "hi_comm_dis.h"
-#include "hi_comm_gdc.h"
-#include "hi_comm_vb.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-/* 1 for vi device */
-HI_S32 HI_MPI_VI_SetDevAttr(VI_DEV ViDev, const VI_DEV_ATTR_S *pstDevAttr);
-HI_S32 HI_MPI_VI_GetDevAttr(VI_DEV ViDev, VI_DEV_ATTR_S *pstDevAttr);
-
-HI_S32 HI_MPI_VI_SetDevAttrEx(VI_DEV ViDev, const VI_DEV_ATTR_EX_S *pstDevAttrEx);
-HI_S32 HI_MPI_VI_GetDevAttrEx(VI_DEV ViDev, VI_DEV_ATTR_EX_S *pstDevAttrEx);
-
-HI_S32 HI_MPI_VI_SetVSSignalAttr(VI_DEV ViDev, const VI_VS_SIGNAL_ATTR_S *pstVSSignalAttr);
-HI_S32 HI_MPI_VI_GetVSSignalAttr(VI_DEV ViDev, VI_VS_SIGNAL_ATTR_S *pstVSSignalAttr);
-HI_S32 HI_MPI_VI_TriggerVSSignal(VI_DEV ViDev, HI_BOOL bEnable);
-
-HI_S32 HI_MPI_VI_EnableDev(VI_DEV ViDev);
-HI_S32 HI_MPI_VI_DisableDev(VI_DEV ViDev);
-
-HI_S32 HI_MPI_VI_SetMipiBindDev(VI_DEV ViDev, MIPI_DEV MipiDev);
-HI_S32 HI_MPI_VI_GetMipiBindDev(VI_DEV ViDev, MIPI_DEV *pMipiDev);
-
-HI_S32 HI_MPI_VI_SetDevBindPipe(VI_DEV ViDev, const VI_DEV_BIND_PIPE_S *pstDevBindPipe);
-HI_S32 HI_MPI_VI_GetDevBindPipe(VI_DEV ViDev, VI_DEV_BIND_PIPE_S *pstDevBindPipe);
-
-HI_S32 HI_MPI_VI_SetDevTimingAttr(VI_DEV ViDev, const VI_DEV_TIMING_ATTR_S *pstTimingAttr);
-HI_S32 HI_MPI_VI_GetDevTimingAttr(VI_DEV ViDev, VI_DEV_TIMING_ATTR_S *pstTimingAttr);
-
-/* 2 for vi pipe */
-HI_S32 HI_MPI_VI_GetPipeCmpParam(VI_PIPE ViPipe, VI_CMP_PARAM_S *pCmpParam);
-
-HI_S32 HI_MPI_VI_SetUserPic(VI_PIPE ViPipe, const VI_USERPIC_ATTR_S *pstUsrPic);
-HI_S32 HI_MPI_VI_EnableUserPic(VI_PIPE ViPipe);
-HI_S32 HI_MPI_VI_DisableUserPic(VI_PIPE ViPipe);
-
-HI_S32 HI_MPI_VI_CreatePipe(VI_PIPE ViPipe, const VI_PIPE_ATTR_S *pstPipeAttr);
-HI_S32 HI_MPI_VI_DestroyPipe(VI_PIPE ViPipe);
-
-HI_S32 HI_MPI_VI_SetPipeAttr(VI_PIPE ViPipe, const VI_PIPE_ATTR_S *pstPipeAttr);
-HI_S32 HI_MPI_VI_GetPipeAttr(VI_PIPE ViPipe, VI_PIPE_ATTR_S *pstPipeAttr);
-
-HI_S32 HI_MPI_VI_StartPipe(VI_PIPE ViPipe);
-HI_S32 HI_MPI_VI_StopPipe(VI_PIPE ViPipe);
-
-HI_S32 HI_MPI_VI_SetPipeCrop(VI_PIPE ViPipe, const CROP_INFO_S *pstCropInfo);
-HI_S32 HI_MPI_VI_GetPipeCrop(VI_PIPE ViPipe, CROP_INFO_S *pstCropInfo);
-
-HI_S32 HI_MPI_VI_SetPipeFisheyeConfig(VI_PIPE ViPipe, const FISHEYE_CONFIG_S *pstFishEyeConfig);
-HI_S32 HI_MPI_VI_GetPipeFisheyeConfig(VI_PIPE ViPipe, FISHEYE_CONFIG_S *pstFishEyeConfig);
-
-HI_S32 HI_MPI_VI_FisheyePosQueryDst2Src(VI_PIPE ViPipe, VI_CHN ViChn, HI_U32 u32RegionIndex,
-    const POINT_S *pstDstPointIn, POINT_S *pstSrcPointOut);
-
-HI_S32 HI_MPI_VI_SetPipeDumpAttr(VI_PIPE ViPipe, const VI_DUMP_ATTR_S *pstDumpAttr);
-HI_S32 HI_MPI_VI_GetPipeDumpAttr(VI_PIPE ViPipe, VI_DUMP_ATTR_S *pstDumpAttr);
-
-HI_S32 HI_MPI_VI_SetPipeFrameSource(VI_PIPE ViPipe, const VI_PIPE_FRAME_SOURCE_E enSource);
-HI_S32 HI_MPI_VI_GetPipeFrameSource(VI_PIPE ViPipe, VI_PIPE_FRAME_SOURCE_E *penSource);
-
-HI_S32 HI_MPI_VI_GetPipeFrame(VI_PIPE ViPipe, VIDEO_FRAME_INFO_S *pstVideoFrame, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_VI_ReleasePipeFrame(VI_PIPE ViPipe, const VIDEO_FRAME_INFO_S *pstVideoFrame);
-
-HI_S32 HI_MPI_VI_SendPipeYUV(VI_PIPE ViPipe, const VIDEO_FRAME_INFO_S *pstVideoFrame, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_VI_SendPipeRaw(HI_U32 u32PipeNum, VI_PIPE PipeId[], const VIDEO_FRAME_INFO_S *pstVideoFrame[],
-                             HI_S32 s32MilliSec);
-
-HI_S32 HI_MPI_VI_SetPipeNRXParam(VI_PIPE ViPipe, const VI_PIPE_NRX_PARAM_S *pstNrXParam);
-HI_S32 HI_MPI_VI_GetPipeNRXParam(VI_PIPE ViPipe, VI_PIPE_NRX_PARAM_S *pstNrXParam);
-
-HI_S32 HI_MPI_VI_SetPipeRepeatMode(VI_PIPE ViPipe, const VI_PIPE_REPEAT_MODE_E enPepeatMode);
-HI_S32 HI_MPI_VI_GetPipeRepeatMode(VI_PIPE ViPipe, VI_PIPE_REPEAT_MODE_E *penPepeatMode);
-
-HI_S32 HI_MPI_VI_QueryPipeStatus(VI_PIPE ViPipe, VI_PIPE_STATUS_S *pstStatus);
-
-HI_S32 HI_MPI_VI_EnablePipeInterrupt(VI_PIPE ViPipe);
-HI_S32 HI_MPI_VI_DisablePipeInterrupt(VI_PIPE ViPipe);
-
-HI_S32 HI_MPI_VI_SetPipeVCNumber(VI_PIPE ViPipe, HI_U32 u32VCNumber);
-HI_S32 HI_MPI_VI_GetPipeVCNumber(VI_PIPE ViPipe, HI_U32 *pu32VCNumber);
-
-HI_S32 HI_MPI_VI_SetPipeFrameInterruptAttr(VI_PIPE ViPipe, const FRAME_INTERRUPT_ATTR_S *pstFrameIntAttr);
-HI_S32 HI_MPI_VI_GetPipeFrameInterruptAttr(VI_PIPE ViPipe, FRAME_INTERRUPT_ATTR_S *pstFrameIntAttr);
-
-HI_S32 HI_MPI_VI_SetPipeBNRRawDumpAttr(VI_PIPE ViPipe, const BNR_DUMP_ATTR_S *pstBnrDumpAttr);
-HI_S32 HI_MPI_VI_GetPipeBNRRawDumpAttr(VI_PIPE ViPipe, BNR_DUMP_ATTR_S *pstBnrDumpAttr);
-
-HI_S32 HI_MPI_VI_GetPipeBNRRaw(VI_PIPE ViPipe, VIDEO_FRAME_INFO_S *pstVideoFrame, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_VI_ReleasePipeBNRRaw(VI_PIPE ViPipe, const VIDEO_FRAME_INFO_S *pstVideoFrame);
-
-HI_S32 HI_MPI_VI_PipeAttachVbPool(VI_PIPE ViPipe, VB_POOL VbPool);
-HI_S32 HI_MPI_VI_PipeDetachVbPool(VI_PIPE ViPipe);
-
-HI_S32 HI_MPI_VI_GetPipeFd(VI_PIPE ViPipe);
-
-/* 3 for vi chn */
-HI_S32 HI_MPI_VI_SetChnAttr(VI_PIPE ViPipe, VI_CHN ViChn, const VI_CHN_ATTR_S *pstChnAttr);
-HI_S32 HI_MPI_VI_GetChnAttr(VI_PIPE ViPipe, VI_CHN ViChn, VI_CHN_ATTR_S *pstChnAttr);
-
-HI_S32 HI_MPI_VI_EnableChn(VI_PIPE ViPipe, VI_CHN ViChn);
-HI_S32 HI_MPI_VI_DisableChn(VI_PIPE ViPipe, VI_CHN ViChn);
-
-HI_S32 HI_MPI_VI_SetChnCrop(VI_PIPE ViPipe, VI_CHN ViChn, const VI_CROP_INFO_S *pstCropInfo);
-HI_S32 HI_MPI_VI_GetChnCrop(VI_PIPE ViPipe, VI_CHN ViChn, VI_CROP_INFO_S *pstCropInfo);
-
-HI_S32 HI_MPI_VI_SetChnRotation(VI_PIPE ViPipe, VI_CHN ViChn, const ROTATION_E enRotation);
-HI_S32 HI_MPI_VI_GetChnRotation(VI_PIPE ViPipe, VI_CHN ViChn, ROTATION_E *penRotation);
-
-HI_S32 HI_MPI_VI_SetChnRotationEx(VI_PIPE ViPipe, VI_CHN ViChn, const VI_ROTATION_EX_ATTR_S *pstViRotationExAttr);
-HI_S32 HI_MPI_VI_GetChnRotationEx(VI_PIPE ViPipe, VI_CHN ViChn, VI_ROTATION_EX_ATTR_S *pstViRotationExAttr);
-
-HI_S32 HI_MPI_VI_SetChnLDCAttr(VI_PIPE ViPipe, VI_CHN ViChn, const VI_LDC_ATTR_S *pstLDCAttr);
-HI_S32 HI_MPI_VI_GetChnLDCAttr(VI_PIPE ViPipe, VI_CHN ViChn, VI_LDC_ATTR_S *pstLDCAttr);
-
-HI_S32 HI_MPI_VI_SetChnLDCV2Attr(VI_PIPE ViPipe, VI_CHN ViChn, const VI_LDCV2_ATTR_S *pstLDCV2Attr);
-HI_S32 HI_MPI_VI_GetChnLDCV2Attr(VI_PIPE ViPipe, VI_CHN ViChn, VI_LDCV2_ATTR_S *pstLDCV2Attr);
-
-HI_S32 HI_MPI_VI_SetChnLDCV3Attr(VI_PIPE ViPipe, VI_CHN ViChn, const VI_LDCV3_ATTR_S *pstLDCV3Attr);
-HI_S32 HI_MPI_VI_GetChnLDCV3Attr(VI_PIPE ViPipe, VI_CHN ViChn, VI_LDCV3_ATTR_S *pstLDCV3Attr);
-
-HI_S32 HI_MPI_VI_SetChnSpreadAttr(VI_PIPE ViPipe, VI_CHN ViChn, const SPREAD_ATTR_S *pstSpreadAttr);
-HI_S32 HI_MPI_VI_GetChnSpreadAttr(VI_PIPE ViPipe, VI_CHN ViChn, SPREAD_ATTR_S *pstSpreadAttr);
-
-HI_S32 HI_MPI_VI_SetChnLowDelayAttr(VI_PIPE ViPipe, VI_CHN ViChn, const VI_LOW_DELAY_INFO_S *pstLowDelayInfo);
-HI_S32 HI_MPI_VI_GetChnLowDelayAttr(VI_PIPE ViPipe, VI_CHN ViChn, VI_LOW_DELAY_INFO_S *pstLowDelayInfo);
-
-HI_S32 HI_MPI_VI_GetChnRegionLuma(VI_PIPE ViPipe, VI_CHN ViChn, const VIDEO_REGION_INFO_S *pstRegionInfo,
-                                  HI_U64 *pu64LumaData, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_VI_SetChnDISConfig(VI_PIPE ViPipe, VI_CHN ViChn, const DIS_CONFIG_S *pstDISConfig);
-HI_S32 HI_MPI_VI_GetChnDISConfig(VI_PIPE ViPipe, VI_CHN ViChn, DIS_CONFIG_S *pstDISConfig);
-HI_S32 HI_MPI_VI_SetChnDISAttr(VI_PIPE ViPipe, VI_CHN ViChn, const DIS_ATTR_S *pstDISAttr);
-HI_S32 HI_MPI_VI_GetChnDISAttr(VI_PIPE ViPipe, VI_CHN ViChn, DIS_ATTR_S *pstDISAttr);
-
-HI_S32 HI_MPI_VI_SetExtChnFisheye(VI_PIPE ViPipe, VI_CHN ViChn, const FISHEYE_ATTR_S *pstFishEyeAttr);
-HI_S32 HI_MPI_VI_GetExtChnFisheye(VI_PIPE ViPipe, VI_CHN ViChn, FISHEYE_ATTR_S *pstFishEyeAttr);
-
-HI_S32 HI_MPI_VI_SetExtChnAttr(VI_PIPE ViPipe, VI_CHN ViChn, const VI_EXT_CHN_ATTR_S *pstExtChnAttr);
-HI_S32 HI_MPI_VI_GetExtChnAttr(VI_PIPE ViPipe, VI_CHN ViChn, VI_EXT_CHN_ATTR_S *pstExtChnAttr);
-
-HI_S32 HI_MPI_VI_GetChnFrame(VI_PIPE ViPipe, VI_CHN ViChn, VIDEO_FRAME_INFO_S *pstFrameInfo, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_VI_ReleaseChnFrame(VI_PIPE ViPipe, VI_CHN ViChn, const VIDEO_FRAME_INFO_S *pstFrameInfo);
-
-HI_S32 HI_MPI_VI_SetChnEarlyInterrupt(VI_PIPE ViPipe, VI_CHN ViChn, const VI_EARLY_INTERRUPT_S *pstEarlyInterrupt);
-HI_S32 HI_MPI_VI_GetChnEarlyInterrupt(VI_PIPE ViPipe, VI_CHN ViChn, VI_EARLY_INTERRUPT_S *pstEarlyInterrupt);
-
-HI_S32 HI_MPI_VI_SetChnAlign(VI_PIPE ViPipe, VI_CHN ViChn, HI_U32 u32Align);
-HI_S32 HI_MPI_VI_GetChnAlign(VI_PIPE ViPipe, VI_CHN ViChn, HI_U32 *pu32Align);
-
-HI_S32 HI_MPI_VI_ChnAttachVbPool(VI_PIPE ViPipe, VI_CHN ViChn, VB_POOL VbPool);
-HI_S32 HI_MPI_VI_ChnDetachVbPool(VI_PIPE ViPipe, VI_CHN ViChn);
-
-HI_S32 HI_MPI_VI_QueryChnStatus(VI_PIPE ViPipe, VI_CHN ViChn, VI_CHN_STATUS_S *pstChnStatus);
-
-HI_S32 HI_MPI_VI_GetChnFd(VI_PIPE ViPipe, VI_CHN ViChn);
-
-/* 4 for vi stitch group */
-HI_S32 HI_MPI_VI_SetStitchGrpAttr(VI_STITCH_GRP StitchGrp, const VI_STITCH_GRP_ATTR_S *pstStitchGrpAttr);
-HI_S32 HI_MPI_VI_GetStitchGrpAttr(VI_STITCH_GRP StitchGrp, VI_STITCH_GRP_ATTR_S *pstStitchGrpAttr);
-
-/* 5 for vi module */
-HI_S32 HI_MPI_VI_SetModParam(const VI_MOD_PARAM_S *pstModParam);
-HI_S32 HI_MPI_VI_GetModParam(VI_MOD_PARAM_S *pstModParam);
-
-HI_S32 HI_MPI_VI_CloseFd(HI_VOID);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __MPI_VI_H__ */
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vo.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vo.h
deleted file mode 100644
index 2d829017..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vo.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-* Copyright (c) Hisilicon Technologies Co., Ltd. 2012-2019. All rights reserved.
-* Description: Common defination of video output
-* Author: Hisilicon multimedia software group
-* Create: 2017/07/04
-* Function List: VO device interface, video layer interface, graphic layer interface,
-                 channel interface, wbc interface.
-*/
-#ifndef __MPI_VO_H__
-#define __MPI_VO_H__
-
-#include "hi_comm_vo.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-/* Device Relative Settings */
-HI_S32 HI_MPI_VO_SetPubAttr(VO_DEV VoDev, const VO_PUB_ATTR_S *pstPubAttr);
-HI_S32 HI_MPI_VO_GetPubAttr(VO_DEV VoDev, VO_PUB_ATTR_S *pstPubAttr);
-
-HI_S32 HI_MPI_VO_Enable(VO_DEV VoDev);
-HI_S32 HI_MPI_VO_Disable(VO_DEV VoDev);
-
-HI_S32 HI_MPI_VO_CloseFd(HI_VOID);
-HI_S32 HI_MPI_VO_SetUserIntfSyncInfo(VO_DEV VoDev, VO_USER_INTFSYNC_INFO_S *pstUserInfo);
-
-/* Video Relative Settings */
-HI_S32 HI_MPI_VO_SetVideoLayerAttr(VO_LAYER VoLayer, const VO_VIDEO_LAYER_ATTR_S *pstLayerAttr);
-HI_S32 HI_MPI_VO_GetVideoLayerAttr(VO_LAYER VoLayer, VO_VIDEO_LAYER_ATTR_S *pstLayerAttr);
-
-HI_S32 HI_MPI_VO_EnableVideoLayer(VO_LAYER VoLayer);
-HI_S32 HI_MPI_VO_DisableVideoLayer(VO_LAYER VoLayer);
-
-HI_S32 HI_MPI_VO_BindVideoLayer(VO_LAYER VoLayer, VO_DEV VoDev);
-HI_S32 HI_MPI_VO_UnBindVideoLayer(VO_LAYER VoLayer, VO_DEV VoDev);
-
-HI_S32 HI_MPI_VO_SetVideoLayerPriority(VO_LAYER VoLayer, HI_U32 u32Priority);
-HI_S32 HI_MPI_VO_GetVideoLayerPriority(VO_LAYER VoLayer, HI_U32 *pu32Priority);
-
-HI_S32 HI_MPI_VO_SetVideoLayerCSC(VO_LAYER VoLayer, const VO_CSC_S *pstVideoCSC);
-HI_S32 HI_MPI_VO_GetVideoLayerCSC(VO_LAYER VoLayer, VO_CSC_S *pstVideoCSC);
-
-HI_S32 HI_MPI_VO_SetVideoLayerPartitionMode(VO_LAYER VoLayer, VO_PART_MODE_E enPartMode);
-HI_S32 HI_MPI_VO_GetVideoLayerPartitionMode(VO_LAYER VoLayer, VO_PART_MODE_E *penPartMode);
-
-HI_S32 HI_MPI_VO_BatchBegin(VO_LAYER VoLayer);
-HI_S32 HI_MPI_VO_BatchEnd(VO_LAYER VoLayer);
-
-HI_S32 HI_MPI_VO_SetVideoLayerBoundary(VO_LAYER VoLayer, const VO_LAYER_BOUNDARY_S *pstLayerBoundary);
-HI_S32 HI_MPI_VO_GetVideoLayerBoundary(VO_LAYER VoLayer, VO_LAYER_BOUNDARY_S *pstLayerBoundary);
-
-HI_S32 HI_MPI_VO_SetVideoLayerParam(VO_LAYER VoLayer, const VO_LAYER_PARAM_S *pstLayerParam);
-HI_S32 HI_MPI_VO_GetVideoLayerParam(VO_LAYER VoLayer, VO_LAYER_PARAM_S *pstLayerParam);
-
-HI_S32 HI_MPI_VO_SetVideoLayerDecompress(VO_LAYER VoLayer, HI_BOOL bSupportDecompress);
-HI_S32 HI_MPI_VO_GetVideoLayerDecompress(VO_LAYER VoLayer, HI_BOOL *pbSupportDecompress);
-
-HI_S32 HI_MPI_VO_SetVideoLayerCrop(VO_LAYER VoLayer, const CROP_INFO_S *pstCropInfo);
-HI_S32 HI_MPI_VO_GetVideoLayerCrop(VO_LAYER VoLayer, CROP_INFO_S *pstCropInfo);
-
-/* Display relative operations */
-HI_S32 HI_MPI_VO_SetPlayToleration(VO_LAYER VoLayer, HI_U32 u32Toleration);
-HI_S32 HI_MPI_VO_GetPlayToleration(VO_LAYER VoLayer, HI_U32 *pu32Toleration);
-
-HI_S32 HI_MPI_VO_GetScreenFrame(VO_LAYER VoLayer, VIDEO_FRAME_INFO_S *pstVFrame, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_VO_ReleaseScreenFrame(VO_LAYER VoLayer, const VIDEO_FRAME_INFO_S *pstVFrame);
-
-HI_S32 HI_MPI_VO_SetDisplayBufLen(VO_LAYER VoLayer, HI_U32 u32BufLen);
-HI_S32 HI_MPI_VO_GetDisplayBufLen(VO_LAYER VoLayer, HI_U32 *pu32BufLen);
-
-/* Channel Relative Operations */
-HI_S32 HI_MPI_VO_SetChnAttr(VO_LAYER VoLayer, VO_CHN VoChn, const VO_CHN_ATTR_S *pstChnAttr);
-HI_S32 HI_MPI_VO_GetChnAttr(VO_LAYER VoLayer, VO_CHN VoChn, VO_CHN_ATTR_S *pstChnAttr);
-
-HI_S32 HI_MPI_VO_EnableChn(VO_LAYER VoLayer, VO_CHN VoChn);
-HI_S32 HI_MPI_VO_DisableChn(VO_LAYER VoLayer, VO_CHN VoChn);
-
-HI_S32 HI_MPI_VO_SetChnParam(VO_LAYER VoLayer, VO_CHN VoChn, const VO_CHN_PARAM_S *pstChnParam);
-HI_S32 HI_MPI_VO_GetChnParam(VO_LAYER VoLayer, VO_CHN VoChn, VO_CHN_PARAM_S *pstChnParam);
-
-HI_S32 HI_MPI_VO_SetChnDisplayPosition(VO_LAYER VoLayer, VO_CHN VoChn, const POINT_S *pstDispPos);
-HI_S32 HI_MPI_VO_GetChnDisplayPosition(VO_LAYER VoLayer, VO_CHN VoChn, POINT_S *pstDispPos);
-
-HI_S32 HI_MPI_VO_SetChnFrameRate(VO_LAYER VoLayer, VO_CHN VoChn, HI_S32 s32ChnFrmRate);
-HI_S32 HI_MPI_VO_GetChnFrameRate(VO_LAYER VoLayer, VO_CHN VoChn, HI_S32 *ps32ChnFrmRate);
-
-HI_S32 HI_MPI_VO_GetChnFrame(VO_LAYER VoLayer, VO_CHN VoChn, VIDEO_FRAME_INFO_S *pstFrame, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_VO_ReleaseChnFrame(VO_LAYER VoLayer, VO_CHN VoChn, const VIDEO_FRAME_INFO_S *pstFrame);
-
-HI_S32 HI_MPI_VO_PauseChn(VO_LAYER VoLayer, VO_CHN VoChn);
-HI_S32 HI_MPI_VO_ResumeChn(VO_LAYER VoLayer, VO_CHN VoChn);
-HI_S32 HI_MPI_VO_StepChn(VO_LAYER VoLayer, VO_CHN VoChn);
-
-HI_S32 HI_MPI_VO_RefreshChn(VO_LAYER VoLayer, VO_CHN VoChn);
-
-HI_S32 HI_MPI_VO_ShowChn(VO_LAYER VoLayer, VO_CHN VoChn);
-HI_S32 HI_MPI_VO_HideChn(VO_LAYER VoLayer, VO_CHN VoChn);
-
-HI_S32 HI_MPI_VO_SetZoomInWindow(VO_LAYER VoLayer, VO_CHN VoChn, const VO_ZOOM_ATTR_S *pstZoomAttr);
-HI_S32 HI_MPI_VO_GetZoomInWindow(VO_LAYER VoLayer, VO_CHN VoChn, VO_ZOOM_ATTR_S *pstZoomAttr);
-
-HI_S32 HI_MPI_VO_GetChnPTS(VO_LAYER VoLayer, VO_CHN VoChn, HI_U64 *pu64ChnPTS);
-HI_S32 HI_MPI_VO_QueryChnStatus(VO_LAYER VoLayer, VO_CHN VoChn, VO_QUERY_STATUS_S *pstStatus);
-
-HI_S32 HI_MPI_VO_SendFrame(VO_LAYER VoLayer, VO_CHN VoChn, VIDEO_FRAME_INFO_S *pstVFrame, HI_S32 s32MilliSec);
-
-HI_S32 HI_MPI_VO_ClearChnBuf(VO_LAYER VoLayer, VO_CHN VoChn, HI_BOOL bClrAll);
-
-HI_S32 HI_MPI_VO_SetChnBorder(VO_LAYER VoLayer, VO_CHN VoChn, const VO_BORDER_S *pstBorder);
-HI_S32 HI_MPI_VO_GetChnBorder(VO_LAYER VoLayer, VO_CHN VoChn, VO_BORDER_S *pstBorder);
-
-HI_S32 HI_MPI_VO_SetChnBoundary(VO_LAYER VoLayer, VO_CHN VoChn, const VO_CHN_BOUNDARY_S *pstChnBoundary);
-HI_S32 HI_MPI_VO_GetChnBoundary(VO_LAYER VoLayer, VO_CHN VoChn, VO_CHN_BOUNDARY_S *pstChnBoundary);
-
-HI_S32 HI_MPI_VO_SetChnRecvThreshold(VO_LAYER VoLayer, VO_CHN VoChn, HI_U32 u32Threshold);
-HI_S32 HI_MPI_VO_GetChnRecvThreshold(VO_LAYER VoLayer, VO_CHN VoChn, HI_U32 *pu32Threshold);
-
-HI_S32 HI_MPI_VO_SetChnRotation(VO_LAYER VoLayer, VO_CHN VoChn, ROTATION_E enRotation);
-HI_S32 HI_MPI_VO_GetChnRotation(VO_LAYER VoLayer, VO_CHN VoChn, ROTATION_E *penRotation);
-
-HI_S32 HI_MPI_VO_GetChnRegionLuma(VO_LAYER VoLayer, VO_CHN VoChn, VO_REGION_INFO_S *pstRegionInfo,
-                                  HI_U64 *pu64LumaData, HI_S32 s32MilliSec);
-
-/* WBC(Write Back Control) Relative Settings */
-HI_S32 HI_MPI_VO_SetWBCSource(VO_WBC VoWBC, const VO_WBC_SOURCE_S *pstWBCSource);
-HI_S32 HI_MPI_VO_GetWBCSource(VO_WBC VoWBC, VO_WBC_SOURCE_S *pstWBCSources);
-
-HI_S32 HI_MPI_VO_SetWBCAttr(VO_WBC VoWBC, const VO_WBC_ATTR_S *pstWBCAttr);
-HI_S32 HI_MPI_VO_GetWBCAttr(VO_WBC VoWBC, VO_WBC_ATTR_S *pstWBCAttr);
-
-HI_S32 HI_MPI_VO_EnableWBC(VO_WBC VoWBC);
-HI_S32 HI_MPI_VO_DisableWBC(VO_WBC VoWBC);
-
-HI_S32 HI_MPI_VO_SetWBCMode(VO_WBC VoWBC, VO_WBC_MODE_E enWBCMode);
-HI_S32 HI_MPI_VO_GetWBCMode(VO_WBC VoWBC, VO_WBC_MODE_E *penWBCMode);
-
-HI_S32 HI_MPI_VO_SetWBCDepth(VO_WBC VoWBC, HI_U32 u32Depth);
-HI_S32 HI_MPI_VO_GetWBCDepth(VO_WBC VoWBC, HI_U32 *pu32Depth);
-
-HI_S32 HI_MPI_VO_GetWBCFrame(VO_WBC VoWBC, VIDEO_FRAME_INFO_S *pstVFrame, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_VO_ReleaseWBCFrame(VO_WBC VoWBC, const VIDEO_FRAME_INFO_S *pstVFrame);
-
-/* Graphic Relative Settings */
-HI_S32 HI_MPI_VO_BindGraphicLayer(GRAPHIC_LAYER GraphicLayer, VO_DEV VoDev);
-HI_S32 HI_MPI_VO_UnBindGraphicLayer(GRAPHIC_LAYER GraphicLayer, VO_DEV VoDev);
-
-HI_S32 HI_MPI_VO_SetGraphicLayerCSC(GRAPHIC_LAYER GraphicLayer, const VO_CSC_S *pstCSC);
-HI_S32 HI_MPI_VO_GetGraphicLayerCSC(GRAPHIC_LAYER GraphicLayer, VO_CSC_S *pstCSC);
-
-HI_S32 HI_MPI_VO_SetDevFrameRate(VO_DEV VoDev, HI_U32 u32FrameRate);
-HI_S32 HI_MPI_VO_GetDevFrameRate(VO_DEV VoDev, HI_U32 *pu32FrameRate);
-
-/* Module Parameter Settings */
-HI_S32 HI_MPI_VO_SetModParam(const VO_MOD_PARAM_S *pstModParam);
-HI_S32 HI_MPI_VO_GetModParam(VO_MOD_PARAM_S *pstModParam);
-HI_S32 HI_MPI_VO_SetVtth(VO_DEV VoDev, HI_U32 u32Vtth);
-HI_S32 HI_MPI_VO_GetVtth(VO_DEV VoDev, HI_U32 *pu32Vtth);
-HI_S32 HI_MPI_VO_SetVtth2(VO_DEV VoDev, HI_U32 u32Vtth);
-HI_S32 HI_MPI_VO_GetVtth2(VO_DEV VoDev, HI_U32 *pu32Vtth);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __MPI_VO_H__ */
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vpss.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vpss.h
deleted file mode 100644
index 0279c82a..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/mpi_vpss.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) Hisilicon Technologies Co., Ltd. 2016-2019. All rights reserved.
- * Description: Vpss mpi interface
- * Author: Hisilicon multimedia software group
- * Create: 2016/09/27
- */
-
-#ifndef __MPI_VPSS_H__
-#define __MPI_VPSS_H__
-
-#include "hi_common.h"
-#include "hi_comm_video.h"
-#include "hi_comm_vb.h"
-#include "hi_comm_vpss.h"
-#include "hi_comm_gdc.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif /* __cplusplus */
-
-/* Group Settings */
-HI_S32 HI_MPI_VPSS_CreateGrp(VPSS_GRP VpssGrp, const VPSS_GRP_ATTR_S *pstGrpAttr);
-HI_S32 HI_MPI_VPSS_DestroyGrp(VPSS_GRP VpssGrp);
-
-HI_S32 HI_MPI_VPSS_StartGrp(VPSS_GRP VpssGrp);
-HI_S32 HI_MPI_VPSS_StopGrp(VPSS_GRP VpssGrp);
-
-HI_S32 HI_MPI_VPSS_ResetGrp(VPSS_GRP VpssGrp);
-
-HI_S32 HI_MPI_VPSS_GetGrpAttr(VPSS_GRP VpssGrp, VPSS_GRP_ATTR_S *pstGrpAttr);
-HI_S32 HI_MPI_VPSS_SetGrpAttr(VPSS_GRP VpssGrp, const VPSS_GRP_ATTR_S *pstGrpAttr);
-
-HI_S32 HI_MPI_VPSS_SetGrpCrop(VPSS_GRP VpssGrp, const VPSS_CROP_INFO_S *pstCropInfo);
-HI_S32 HI_MPI_VPSS_GetGrpCrop(VPSS_GRP VpssGrp, VPSS_CROP_INFO_S *pstCropInfo);
-
-HI_S32 HI_MPI_VPSS_SendFrame(VPSS_GRP VpssGrp, VPSS_GRP_PIPE VpssGrpPipe,
-    const VIDEO_FRAME_INFO_S *pstVideoFrame, HI_S32 s32MilliSec);
-
-HI_S32 HI_MPI_VPSS_GetGrpFrame(VPSS_GRP VpssGrp, VPSS_GRP_PIPE VpssGrpPipe, VIDEO_FRAME_INFO_S *pstVideoFrame);
-HI_S32 HI_MPI_VPSS_ReleaseGrpFrame(VPSS_GRP VpssGrp, VPSS_GRP_PIPE VpssGrpPipe,
-    const VIDEO_FRAME_INFO_S *pstVideoFrame);
-
-HI_S32 HI_MPI_VPSS_EnableBackupFrame(VPSS_GRP VpssGrp);
-HI_S32 HI_MPI_VPSS_DisableBackupFrame(VPSS_GRP VpssGrp);
-
-HI_S32 HI_MPI_VPSS_SetGrpSharpen(VPSS_GRP VpssGrp, const VPSS_GRP_SHARPEN_ATTR_S *pstGrpSharpenAttr);
-HI_S32 HI_MPI_VPSS_GetGrpSharpen(VPSS_GRP VpssGrp, VPSS_GRP_SHARPEN_ATTR_S *pstGrpSharpenAttr);
-
-HI_S32 HI_MPI_VPSS_SetGrpDelay(VPSS_GRP VpssGrp, HI_U32 u32Delay);
-HI_S32 HI_MPI_VPSS_GetGrpDelay(VPSS_GRP VpssGrp, HI_U32 *pu32Delay);
-
-HI_S32 HI_MPI_VPSS_SetGrpFisheyeConfig(VPSS_GRP VpssGrp, const FISHEYE_CONFIG_S *pstFisheyeConfig);
-HI_S32 HI_MPI_VPSS_GetGrpFisheyeConfig(VPSS_GRP VpssGrp, FISHEYE_CONFIG_S *pstFisheyeConfig);
-
-HI_S32 HI_MPI_VPSS_EnableUserFrameRateCtrl(VPSS_GRP VpssGrp);
-HI_S32 HI_MPI_VPSS_DisableUserFrameRateCtrl(VPSS_GRP VpssGrp);
-
-HI_S32 HI_MPI_VPSS_SetGrpFrameInterruptAttr(VPSS_GRP VpssGrp, const FRAME_INTERRUPT_ATTR_S *pstFrameIntAttr);
-HI_S32 HI_MPI_VPSS_GetGrpFrameInterruptAttr(VPSS_GRP VpssGrp, FRAME_INTERRUPT_ATTR_S *pstFrameIntAttr);
-
-/* Chn Settings */
-HI_S32 HI_MPI_VPSS_SetChnAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, const VPSS_CHN_ATTR_S *pstChnAttr);
-HI_S32 HI_MPI_VPSS_GetChnAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, VPSS_CHN_ATTR_S *pstChnAttr);
-
-HI_S32 HI_MPI_VPSS_EnableChn(VPSS_GRP VpssGrp, VPSS_CHN VpssChn);
-HI_S32 HI_MPI_VPSS_DisableChn(VPSS_GRP VpssGrp, VPSS_CHN VpssChn);
-
-HI_S32 HI_MPI_VPSS_SetChnCrop(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, const VPSS_CROP_INFO_S *pstCropInfo);
-HI_S32 HI_MPI_VPSS_GetChnCrop(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, VPSS_CROP_INFO_S *pstCropInfo);
-
-HI_S32 HI_MPI_VPSS_SetChnRotation(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, ROTATION_E enRotation);
-HI_S32 HI_MPI_VPSS_GetChnRotation(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, ROTATION_E *penRotation);
-
-HI_S32 HI_MPI_VPSS_SetChnRotationEx(VPSS_GRP VpssGrp, VPSS_CHN VpssChn,
-    const VPSS_ROTATION_EX_ATTR_S *pstRotationExAttr);
-HI_S32 HI_MPI_VPSS_GetChnRotationEx(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, VPSS_ROTATION_EX_ATTR_S *pstRotationExAttr);
-
-HI_S32 HI_MPI_VPSS_SetChnLDCAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, const VPSS_LDC_ATTR_S *pstLDCAttr);
-HI_S32 HI_MPI_VPSS_GetChnLDCAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, VPSS_LDC_ATTR_S *pstLDCAttr);
-
-HI_S32 HI_MPI_VPSS_SetChnLDCV3Attr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, const VPSS_LDCV3_ATTR_S *pstLDCV3Attr);
-HI_S32 HI_MPI_VPSS_GetChnLDCV3Attr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, VPSS_LDCV3_ATTR_S *pstLDCV3Attr);
-
-HI_S32 HI_MPI_VPSS_SetChnSpreadAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, const SPREAD_ATTR_S *pstSpreadAttr);
-HI_S32 HI_MPI_VPSS_GetChnSpreadAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, SPREAD_ATTR_S *pstSpreadAttr);
-
-HI_S32 HI_MPI_VPSS_GetChnFrame(VPSS_GRP VpssGrp, VPSS_CHN VpssChn,
-    VIDEO_FRAME_INFO_S *pstVideoFrame, HI_S32 s32MilliSec);
-HI_S32 HI_MPI_VPSS_ReleaseChnFrame(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, const VIDEO_FRAME_INFO_S *pstVideoFrame);
-
-HI_S32 HI_MPI_VPSS_GetRegionLuma(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, const VIDEO_REGION_INFO_S *pstRegionInfo,
-                                 HI_U64 *pu64LumaData, HI_S32 s32MilliSec);
-
-HI_S32 HI_MPI_VPSS_SetLowDelayAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, const VPSS_LOW_DELAY_INFO_S *pstLowDelayInfo);
-HI_S32 HI_MPI_VPSS_GetLowDelayAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, VPSS_LOW_DELAY_INFO_S *pstLowDelayInfo);
-
-HI_S32 HI_MPI_VPSS_SetChnBufWrapAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, const VPSS_CHN_BUF_WRAP_S *pstVpssChnBufWrap);
-HI_S32 HI_MPI_VPSS_GetChnBufWrapAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, VPSS_CHN_BUF_WRAP_S *pstVpssChnBufWrap);
-
-HI_S32 HI_MPI_VPSS_TriggerSnapFrame(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, HI_U32 u32FrameCnt);
-
-HI_S32 HI_MPI_VPSS_AttachVbPool(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, VB_POOL hVbPool);
-HI_S32 HI_MPI_VPSS_DetachVbPool(VPSS_GRP VpssGrp, VPSS_CHN VpssChn);
-
-HI_S32 HI_MPI_VPSS_EnableBufferShare(VPSS_GRP VpssGrp, VPSS_CHN VpssChn);
-HI_S32 HI_MPI_VPSS_DisableBufferShare(VPSS_GRP VpssGrp, VPSS_CHN VpssChn);
-
-HI_S32 HI_MPI_VPSS_SetChnAlign(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, HI_U32 u32Align);
-HI_S32 HI_MPI_VPSS_GetChnAlign(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, HI_U32 *pu32Align);
-
-HI_S32 HI_MPI_VPSS_SetChnProcMode(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, VPSS_CHN_PROC_MODE_E enVpssChnProcMode);
-HI_S32 HI_MPI_VPSS_GetChnProcMode(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, VPSS_CHN_PROC_MODE_E *penVpssChnProcMode);
-
-/* ExtChn Settings */
-HI_S32 HI_MPI_VPSS_SetExtChnAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, const VPSS_EXT_CHN_ATTR_S *pstExtChnAttr);
-HI_S32 HI_MPI_VPSS_GetExtChnAttr(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, VPSS_EXT_CHN_ATTR_S *pstExtChnAttr);
-
-HI_S32 HI_MPI_VPSS_SetExtChnFisheye(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, const FISHEYE_ATTR_S *pstFishEyeAttr);
-HI_S32 HI_MPI_VPSS_GetExtChnFisheye(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, FISHEYE_ATTR_S *pstFishEyeAttr);
-
-HI_S32 HI_MPI_VPSS_FisheyePosQueryDst2Src(VPSS_GRP VpssGrp, VPSS_CHN VpssChn, HI_U32 u32RegionIndex,
-                                          const POINT_S *pstDstPointIn, POINT_S *pstSrcPointOut);
-
-/* 3DNR */
-HI_S32 HI_MPI_VPSS_SetGrpNRXParam(VPSS_GRP VpssGrp, const VPSS_GRP_NRX_PARAM_S *pstNRXParam);
-HI_S32 HI_MPI_VPSS_GetGrpNRXParam(VPSS_GRP VpssGrp, VPSS_GRP_NRX_PARAM_S *pstNRXParam);
-
-/* Module Param Settings */
-HI_S32 HI_MPI_VPSS_SetModParam(const VPSS_MOD_PARAM_S *pstModParam);
-HI_S32 HI_MPI_VPSS_GetModParam(VPSS_MOD_PARAM_S *pstModParam);
-
-HI_S32 HI_MPI_VPSS_GetChnFd(VPSS_GRP VpssGrp, VPSS_CHN VpssChn);
-HI_S32 HI_MPI_VPSS_CloseFd(HI_VOID);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif /* __cplusplus */
-
-#endif /* __MPI_VPSS_H__ */
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/securec.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/securec.h
deleted file mode 100644
index d2860c36..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/securec.h
+++ /dev/null
@@ -1,448 +0,0 @@
-/*******************************************************************************
-* Copyright @ Huawei Technologies Co., Ltd. 1998-2014. All rights reserved.  
-* File name: securec.h
-* Decription: 
-*             the user of this secure c library should include this header file
-*             in you source code. This header file declare all supported API
-*             prototype of the library, such as memcpy_s, strcpy_s, wcscpy_s,
-*             strcat_s, strncat_s, sprintf_s, scanf_s, and so on.
-* History:   
-*     1. Date: 
-*         Author:  
-*         Modification: 
-********************************************************************************
-*/
-
-#ifndef __SECUREC_H__5D13A042_DC3F_4ED9_A8D1_882811274C27
-#define __SECUREC_H__5D13A042_DC3F_4ED9_A8D1_882811274C27
-
-/* If you need high performance, enable the WITH_PERFORMANCE_ADDONS macro! */
-//#define WITH_PERFORMANCE_ADDONS
-
-#include "securectype.h"    /*lint !e537*/
-#include <stdarg.h>
-
-/* If stack size on some embedded platform is limited, you can define the following macro
-*  which will put some variables on heap instead of stack.
-#define STACK_SIZE_LESS_THAN_1K
-*/
-
-/* for performance consideration, the following macro will call the corresponding API 
-* of libC for memcpy, memmove and memset
-*/
-#define CALL_LIBC_COR_API
-
-/* codes should run under the macro COMPATIBLE_LINUX_FORMAT in unknow system on default, 
-   and strtold. The function 
-   strtold is referenced first at ISO9899:1999(C99), and some old compilers can
-   not support these functions. Here provides a macro to open these functions:
-       
-       SECUREC_SUPPORT_STRTOLD  -- if defined, strtold will   be used
-*/
-
-/*define error code*/
-#ifndef errno_t
-typedef int errno_t;
-#endif
-
-/* success */
-#define EOK (0)
-
-/* invalid parameter */
-#ifdef EINVAL
-#undef EINVAL
-#endif
-#define EINVAL (22)
-#define EINVAL_AND_RESET (22 | 0X80)
-/* invalid parameter range */
-#ifdef ERANGE
-#undef ERANGE  /* to avoid redefinition */
-#endif
-#define ERANGE (34)
-#define ERANGE_AND_RESET  (34 | 0X80)
-
-#ifdef EOVERLAP_AND_RESET
-#undef EOVERLAP_AND_RESET
-#endif
-/*Once the buffer overlap is detected, the dest buffer must be reseted! */
-#define EOVERLAP_AND_RESET (54 | 0X80)
-
-/*if you need export the function of this library in Win32 dll, use __declspec(dllexport) */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-   /**
-    * @Description:The getHwSecureCVersion function get SecureC Version string and version number .
-    * @param verStr -   address to store verison string
-    * @param bufSize -The maximum length of dest 
-    * @param verNumber - to store version number
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    void getHwSecureCVersion(char* verStr, int bufSize, unsigned short* verNumber);
-
-
-    /**
-    * @Description:The wmemcpy_s function copies n successive wide characters from the object pointed to by src into the object pointed to by dest.
-    * @param dest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param src -source  address
-    * @param count -copies count wide characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t wmemcpy_s(wchar_t* dest, size_t destMax, const wchar_t* src, size_t count);
-    
-    /**
-    * @Description:The memmove_s function copies n characters from the object pointed to by src into the object pointed to by dest.
-    * @param dest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param src -source  address
-    * @param count -copies count wide characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t memmove_s(void* dest, size_t destMax, const void* src, size_t count);
-    
-   /**
-    * @Description:The wmemmove_s function copies n successive wide characters from the object pointed to by src into the object pointed to by dest.
-    * @param dest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param src -source  address
-    * @param count -copies count wide characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t wmemmove_s(wchar_t* dest, size_t destMax, const wchar_t* src, size_t count);
-
-    /**
-    * @Description:The wcscpy_s function copies the wide string pointed to by strSrc (including theterminating null wide character) into the array pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param strSrc -source  address
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t wcscpy_s(wchar_t* strDest, size_t destMax, const wchar_t* strSrc);
-
-    /**
-    * @Description:The wcsncpy_s function copies not more than n successive wide characters (not including the terminating null wide character) 
-    *                       from the array pointed to by strSrc to the array pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating wide character) 
-    * @param strSrc -source  address
-    * @param count -copies count wide characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t wcsncpy_s(wchar_t* strDest, size_t destMax, const wchar_t* strSrc, size_t count);
-
-    /**
-    * @Description:The wcscat_s function appends a copy of the wide string pointed to by strSrc (including the terminating null wide character) 
-    *                     to the end of the wide string pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating wide character) 
-    * @param strSrc -source  address
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t wcscat_s(wchar_t* strDest, size_t destMax, const wchar_t* strSrc);
-
-    /**
-    * @Description:The wcsncat_s function appends not more than n successive wide characters (not including the terminating null wide character) 
-    *                       from the array pointed to by strSrc to the end of the wide string pointed to by strDest.
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating wide character) 
-    * @param strSrc -source  address
-    * @param count -copies count wide characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t wcsncat_s(wchar_t* strDest, size_t destMax, const wchar_t* strSrc, size_t count);
-
-    /**
-    * @Description: The  strtok_s  function parses a string into a sequence of tokens,On the first call to strtok_s the string to be parsed should be specified in strToken.  
-    *                       In each subsequent call that should parse the same string, strToken should be NULL
-    * @param strToken - the string to be delimited
-    * @param strDelimit -specifies a set of characters that delimit the tokens in the parsed string
-    * @param context -is a pointer to a char * variable that is used internally by strtok_s function
-    * @return:returns a pointer to the first character of a token, or a null pointer if there is no token or there is a runtime-constraint violation.
-    */
-    char* strtok_s(char* strToken, const char* strDelimit, char** context);
-
-     /**
-    * @Description: The  wcstok_s  function  is  the  wide-character  equivalent  of the strtok_s function
-    * @param strToken - the string to be delimited
-    * @param strDelimit -specifies a set of characters that delimit the tokens in the parsed string
-    * @param context -is a pointer to a char * variable that is used internally by strtok_s function
-    * @return:returns a pointer to the first character of a token, or a null pointer if there is no token or there is a runtime-constraint violation.
-    */
-    wchar_t* wcstok_s(wchar_t* strToken, const wchar_t* strDelimit, wchar_t** context);
-
-    /**
-    * @Description: The sprintf_s function is equivalent to the sprintf function except for the parameter destMax and the explicit runtime-constraints violation
-    * @param strDest -  produce output according to a format ,write to the character string strDest
-    * @param destMax - The maximum length of destination buffer(including the terminating null byte ('\0'))
-    * @param format - fromat string
-    * @return:success the number of characters printed(not including the terminating null byte ('\0')), If an error occurred return -1.
-    */
-    int sprintf_s(char* strDest, size_t destMax, const char* format, ...) SECUREC_ATTRIBUTE(3,4);
-
-    /**
-    * @Description: The  swprintf_s  function  is  the  wide-character  equivalent  of the sprintf_s function
-    * @param strDest -  produce output according to a format ,write to the character string strDest
-    * @param destMax - The maximum length of destination buffer(including the terminating null )
-    * @param format - fromat string
-    * @return:success the number of characters printed(not including the terminating null wide characte), If an error occurred return -1.
-    */
-    int swprintf_s(wchar_t* strDest, size_t destMax, const wchar_t* format, ...);
-
-    /**
-    * @Description: The vsprintf_s function is equivalent to the vsprintf function except for the parameter destMax and the explicit runtime-constraints violation
-    * @param strDest -  produce output according to a format ,write to the character string strDest
-    * @param destMax - The maximum length of destination buffer(including the terminating null wide characte)
-    * @param format - fromat string
-    * @param argptr - instead of  a variable  number of arguments
-    * @return:return the number of characters printed(not including the terminating null byte ('\0')), If an error occurred return -1.
-    */
-    int vsprintf_s(char* strDest, size_t destMax, const char* format, va_list argptr) SECUREC_ATTRIBUTE(3,0);
-
-   /**
-    * @Description: The  vswprintf_s  function  is  the  wide-character  equivalent  of the vsprintf_s function
-    * @param strDest -  produce output according to a format ,write to the character string strDest
-    * @param destMax - The maximum length of destination buffer(including the terminating null )
-    * @param format - fromat string
-    * @param argptr - instead of  a variable  number of arguments
-    * @return:return the number of characters printed(not including the terminating null wide characte), If an error occurred return -1.
-    */
-    int vswprintf_s(wchar_t* strDest, size_t destMax, const wchar_t* format, va_list argptr);
-
-    /**
-    * @Description: The vsnprintf_s function is equivalent to the vsnprintf function except for the parameter destMax/count and the explicit runtime-constraints violation
-    * @param strDest -  produce output according to a format ,write to the character string strDest
-    * @param destMax - The maximum length of destination buffer(including the terminating null  byte ('\0'))
-    * @param count - do not write more than count bytes to strDest(not including the terminating null  byte ('\0'))
-    * @param format - fromat string
-    * @param argptr - instead of  a variable  number of arguments
-    * @return:return the number of characters printed(not including the terminating null byte ('\0')), If an error occurred return -1.
-    */
-    int vsnprintf_s(char* strDest, size_t destMax, size_t count, const char* format, va_list arglist) SECUREC_ATTRIBUTE(4,0);
-
-    /**
-    * @Description: The snprintf_s function is equivalent to the snprintf function except for the parameter destMax/count and the explicit runtime-constraints violation
-    * @param strDest -  produce output according to a format ,write to the character string strDest
-    * @param destMax - The maximum length of destination buffer(including the terminating null  byte ('\0'))
-    * @param count - do not write more than count bytes to strDest(not including the terminating null  byte ('\0'))
-    * @param format - fromat string
-    * @param argptr - instead of  a variable  number of arguments
-    * @return:return the number of characters printed(not including the terminating null byte ('\0')), If an error occurred return -1.
-    */
-    int snprintf_s(char* strDest, size_t destMax, size_t count, const char* format, ...) SECUREC_ATTRIBUTE(4,5);
-
-    /**
-    * @Description: The scanf_s function is equivalent to fscanf_s with the argument stdin interposed before the arguments to scanf_s
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int scanf_s(const char* format, ...);
-
-    /**
-    * @Description: The  wscanf_s  function  is  the  wide-character  equivalent  of the scanf_s function
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int wscanf_s(const wchar_t* format, ...);
-
-    /**
-    * @Description: The vscanf_s function is equivalent to scanf_s, with the variable argument list replaced by arglist,
-    * @param format - fromat string
-    * @param arglist - instead of  a variable  number of arguments
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int vscanf_s(const char* format, va_list arglist);
-
-    /**
-    * @Description: The  vwscanf_s  function  is  the  wide-character  equivalent  of the vscanf_s function
-    * @param format - fromat string
-    * @param arglist - instead of  a variable  number of arguments
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int vwscanf_s(const wchar_t* format, va_list arglist);
-
-    /**
-    * @Description: The fscanf_s function is equivalent to fscanf except that the c, s, and [ conversion specifiers apply to a pair of arguments (unless assignment suppression is indicated by a*)
-    * @param stream - stdio file stream
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int fscanf_s(FILE* stream, const char* format, ...);
-
-    /**
-    * @Description: The  fwscanf_s  function  is  the  wide-character  equivalent  of the fscanf_s function
-    * @param stream - stdio file stream
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int fwscanf_s(FILE* stream, const wchar_t* format, ...);
-    
-    /**
-    * @Description: The vfscanf_s function is equivalent to fscanf_s, with the variable argument list replaced by arglist
-    * @param stream - stdio file stream
-    * @param format - fromat string
-    * @param arglist - instead of  a variable  number of arguments
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int vfscanf_s(FILE* stream, const char* format, va_list arglist);
-
-    /**
-    * @Description: The  vfwscanf_s  function  is  the  wide-character  equivalent  of the vfscanf_s function
-    * @param stream - stdio file stream
-    * @param format - fromat string
-    * @param arglist - instead of  a variable  number of arguments
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int vfwscanf_s(FILE* stream, const wchar_t* format, va_list arglist);
-
-    /**
-    * @Description: The sscanf_s function is equivalent to fscanf_s, except that input is obtained from a string (specified by the argument buffer) rather than from a stream
-    * @param buffer -  read character from  buffer
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int sscanf_s(const char* buffer, const char* format, ...);
-
-    /**
-    * @Description: The  swscanf_s  function  is  the  wide-character  equivalent  of the sscanf_s function
-    * @param buffer -  read character from  buffer
-    * @param format - fromat string
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int swscanf_s(const wchar_t* buffer, const wchar_t* format, ...);
-
-    /**
-    * @Description: The vsscanf_s function is equivalent to sscanf_s, with the variable argument list replaced by argptr
-    * @param buffer -  read character from  buffer
-    * @param format - fromat string
-    * @param arglist - instead of  a variable  number of arguments
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int vsscanf_s(const char* buffer, const char* format, va_list argptr);
-
-    /**
-    * @Description: The  vswscanf_s  function  is  the  wide-character  equivalent  of the vsscanf_s function
-    * @param buffer -  read character from  buffer
-    * @param format - fromat string
-    * @param arglist - instead of  a variable  number of arguments
-    * @return:returns the number of input items assigned, If an error occurred return -1.
-    */
-    int vswscanf_s(const wchar_t* buffer, const wchar_t* format, va_list arglist);
-
-    /**
-    * @Description:The gets_s function reads at most one less than the number of characters specified by destMax from the stream pointed to by stdin, into the array pointed to by buffer
-    * @param buffer - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating null character) 
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    char* gets_s(char* buffer, size_t destMax);
-    
-     /**
-    * @Description:The memset_s function copies the value of c (converted to an unsigned char) into each of the first count characters of the object pointed to by dest.
-    * @param dest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param c - the value to be copied
-    * @param count -copies fisrt count characters of  dest
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t memset_s(void* dest, size_t destMax, int c, size_t count);
-
-    /**
-    * @Description:The memcpy_s function copies n characters from the object pointed to by src into the object pointed to by dest.
-    * @param dest - destination  address
-    * @param destMax -The maximum length of destination buffer
-    * @param src -source  address
-    * @param count -copies count  characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t memcpy_s(void* dest, size_t destMax, const void* src, size_t count);
-
-    /**
-    * @Description:The strcpy_s function copies the string pointed to by strSrc (including the terminating null character) into the array pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating null character) 
-    * @param strSrc -source  address
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t strcpy_s(char* strDest, size_t destMax, const char* strSrc);
-    
-    /**
-    * @Description:The strncpy_s function copies not more than n successive characters (not including the terminating null character) 
-    *                     from the array pointed to by strSrc to the array pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating null character) 
-    * @param strSrc -source  address
-    * @param count -copies count  characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t strncpy_s(char* strDest, size_t destMax, const char* strSrc, size_t count);
-
-    /**
-    * @Description:The strcat_s function appends a copy of the  string pointed to by strSrc (including the terminating null  character) 
-    *                     to the end of the  string pointed to by strDest
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating null wide character) 
-    * @param strSrc -source  address
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t strcat_s(char* strDest, size_t destMax, const char* strSrc);
-
-    
-    /**
-    * @Description:The strncat_s function appends not more than n successive  characters (not including the terminating null  character) 
-    *                       from the array pointed to by strSrc to the end of the  string pointed to by strDest.
-    * @param strDest - destination  address
-    * @param destMax -The maximum length of destination buffer(including the terminating null character) 
-    * @param strSrc -source  address
-    * @param count -copies count  characters from the  src
-    * @return  EOK if there was no runtime-constraint violation
-    */
-    errno_t strncat_s(char* strDest, size_t destMax, const char* strSrc, size_t count);
-
-   /* those functions are used by macro */
-    errno_t strncpy_error(char* strDest, size_t destMax, const char* strSrc, size_t count);
-    errno_t strcpy_error(char* strDest, size_t destMax, const char* strSrc);
-
-#if defined(WITH_PERFORMANCE_ADDONS) 
-    /* those functions are used by macro */
-    errno_t memset_sOptAsm(void* dest, size_t destMax, int c, size_t count);
-    errno_t memset_sOptTc(void* dest, size_t destMax, int c, size_t count);
-    errno_t memcpy_sOptAsm(void* dest, size_t destMax, const void* src, size_t count);
-    errno_t memcpy_sOptTc(void* dest, size_t destMax, const void* src, size_t count);
-    
-    /* strcpy_sp is a macro, NOT a function in performance optimization mode. */
-#define strcpy_sp(dest, destMax, src)  /*lint -save -e506 -e1055  -e650 -e778 -e802 */ (( __builtin_constant_p((destMax)) && __builtin_constant_p((src))) ?  \
-    STRCPY_SM((dest), (destMax), (src)) : strcpy_s((dest), (destMax), (src)) ) /*lint -restore */
-
-    /* strncpy_sp is a macro, NOT a function in performance optimization mode. */
-#define strncpy_sp(dest, destMax, src, count)  /*lint -save -e506 -e1055 -e666  -e650 -e778 -e802 */ ((__builtin_constant_p((count)) &&  __builtin_constant_p((destMax)) && __builtin_constant_p((src))) ?  \
-    STRNCPY_SM((dest), (destMax), (src), (count)) : strncpy_s((dest), (destMax), (src), (count)) ) /*lint -restore */
-
-    /* strcat_sp is a macro, NOT a function in performance optimization mode. */
-#define strcat_sp(dest, destMax, src)  /*lint -save -e506 -e1055  -e650 -e778 -e802 */ (( __builtin_constant_p((destMax)) && __builtin_constant_p((src))) ?  \
-    STRCAT_SM((dest), (destMax), (src)) : strcat_s((dest), (destMax), (src)) ) /*lint -restore */
-
-    /* strncat_sp is a macro, NOT a function in performance optimization mode. */
-#define strncat_sp(dest, destMax, src, count)  /*lint -save -e506 -e1055 -e666  -e650 -e778 -e802 */ ((__builtin_constant_p((count)) &&  __builtin_constant_p((destMax)) && __builtin_constant_p((src))) ?  \
-    STRNCAT_SM((dest), (destMax), (src), (count)) : strncat_s((dest), (destMax), (src), (count)) ) /*lint -restore */
-
-    /* memcpy_sp is a macro, NOT a function in performance optimization mode. */
-#define memcpy_sp(dest, destMax, src, count)  /*lint -save -e506 -e1055 -e650 -e778 -e802 */ (__builtin_constant_p((count)) ? (MEMCPY_SM((dest), (destMax),  (src), (count))) :  \
-       (__builtin_constant_p((destMax)) ? (((size_t)(destMax) > 0 && (((UINT64T)(destMax) & (UINT64T)(-2)) < SECUREC_MEM_MAX_LEN)) ? memcpy_sOptTc((dest), (destMax), (src), (count)) : ERANGE ) :  memcpy_sOptAsm((dest), (destMax), (src), (count)))) /*lint -restore */
-
-    /* memset_sp is a macro, NOT a function in performance optimization mode. */
-#define memset_sp(dest, destMax, c, count)  /*lint -save -e506 -e1055 -e650 -e778 -e802 */ (__builtin_constant_p((count)) ? (MEMSET_SM((dest), (destMax),  (c), (count))) :  \
-       (__builtin_constant_p((destMax)) ? (((size_t)(destMax) > 0 && (((UINT64T)(destMax) & (UINT64T)(-2)) < SECUREC_MEM_MAX_LEN)) ? memset_sOptTc((dest), (destMax), (c), (count)) : ERANGE ) :  memset_sOptAsm((dest), (destMax), (c), (count)))) /*lint -restore */
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif/* __SECUREC_H__5D13A042_DC3F_4ED9_A8D1_882811274C27 */
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/securectype.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/securectype.h
deleted file mode 100644
index 29bd4bb0..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/securectype.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/*******************************************************************************
-* Copyright @ Huawei Technologies Co., Ltd. 1998-2014. All rights reserved.  
-* File name: securectype.h
-* Decription: 
-*             define internal used macro and data type. The marco of SECUREC_ON_64BITS
-*             will be determined in this header file, which is a switch for part
-*             of code. Some macro are used to supress warning by MS compiler.
-*Note:        
-*             user can change the value of SECUREC_STRING_MAX_LEN and SECUREC_MEM_MAX_LEN
-*             macro to meet their special need.
-* History:   
-********************************************************************************
-*/
-
-#ifndef __SECURECTYPE_H__A7BBB686_AADA_451B_B9F9_44DACDAE18A7
-#define __SECURECTYPE_H__A7BBB686_AADA_451B_B9F9_44DACDAE18A7
-
-/*Shielding VC symbol redefinition warning*/
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
-#ifdef __STDC_WANT_SECURE_LIB__
-    #undef __STDC_WANT_SECURE_LIB__
-#endif
-    #define __STDC_WANT_SECURE_LIB__ 0
-#ifdef _CRTIMP_ALTERNATIVE
-    #undef _CRTIMP_ALTERNATIVE
-#endif
-    #define _CRTIMP_ALTERNATIVE //comment microsoft *_s function
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-/* #include <limits.h> this file is used to define some macros, such as  INT_MAX and SIZE_MAX */
-
-/*if enable COMPATIBLE_WIN_FORMAT, the output format will be compatible to Windows.*/
-#if (defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER))
-#define COMPATIBLE_WIN_FORMAT
-#endif
-#if defined(COMPATIBLE_WIN_FORMAT)
-/* in windows platform, can't use optimized function for there is no __builtin_constant_p like function */
-/* If need optimized macro, can define this: #define __builtin_constant_p(x) 1 */
-#ifdef WITH_PERFORMANCE_ADDONS
-#undef WITH_PERFORMANCE_ADDONS
-#endif
-#endif
-
-#if (defined(__VXWORKS__) || defined(__vxworks) || defined(__VXWORKS) || defined(_VXWORKS_PLATFORM_)  || defined(SECUREC_VXWORKS_VERSION_5_4))
-#if  !defined(SECUREC_VXWORKS_PLATFORM)
-#define SECUREC_VXWORKS_PLATFORM 
-#endif
-#endif
-
-#ifdef SECUREC_VXWORKS_PLATFORM
-#include <version.h>
-#endif
-
-/*if enable COMPATIBLE_LINUX_FORMAT, the output format will be compatible to Linux.*/
-#if !(defined(COMPATIBLE_WIN_FORMAT) || defined(SECUREC_VXWORKS_PLATFORM))
-#define COMPATIBLE_LINUX_FORMAT
-#endif
-#ifdef COMPATIBLE_LINUX_FORMAT
-#include <stddef.h>
-#endif
-
-#if defined(__GNUC__)  && !defined(WIN32) && !defined(SECUREC_PCLINT)
-#define SECUREC_ATTRIBUTE(x,y)  __attribute__((format(printf, (x), (y) ))) 
-#else
-#define SECUREC_ATTRIBUTE(x,y)
-#endif
-
-#if defined(__GNUC__) && ((__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3 /*above 3.4*/ ))  ) 
-    long __builtin_expect(long exp, long c);
-#define LIKELY(x) __builtin_expect(!!(x), 1)
-#define UNLIKELY(x) __builtin_expect(!!(x), 0)
-#else
-#define LIKELY(x) (x)
-#define UNLIKELY(x) (x) 
-#endif
-
-#ifndef TWO_MIN
-#define TWO_MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
-#define WCHAR_SIZE sizeof(wchar_t)
-
-/*ref //sourceforge.net/p/predef/wiki/OperatingSystems/ 
-#if !(defined(__hpux) || defined(_AIX) || defined(__VXWORKS__) || defined(__vxworks) ||defined(__ANDROID__) || defined(__WRLINUX__)|| defined(_TYPE_uint8_t))
-typedef unsigned char unit8_t;
-#endif 
-*/ 
-typedef signed char INT8T;
-typedef unsigned char UINT8T;
-
-#if defined(COMPATIBLE_WIN_FORMAT) || defined(__ARMCC_VERSION)
-typedef  __int64 INT64T;
-typedef unsigned __int64 UINT64T;
-#if defined(__ARMCC_VERSION)
-typedef int INT32T;
-typedef unsigned int UINT32T;
-#else
-typedef  __int32 INT32T;
-typedef unsigned __int32 UINT32T;
-#endif
-#else
-typedef int INT32T;
-typedef unsigned int UINT32T;
-typedef long long INT64T;
-typedef unsigned long long UINT64T;
-#endif
-
-/* define the max length of the string */
-#define SECUREC_STRING_MAX_LEN (0x7fffffffUL)
-#define SECUREC_WCHAR_STRING_MAX_LEN (SECUREC_STRING_MAX_LEN / WCHAR_SIZE)
-
-/* add SECUREC_MEM_MAX_LEN for memcpy and memmove*/
-#define SECUREC_MEM_MAX_LEN (0x7fffffffUL)
-#define SECUREC_WCHAR_MEM_MAX_LEN (SECUREC_MEM_MAX_LEN / WCHAR_SIZE)
-
-#if SECUREC_STRING_MAX_LEN > 0x7fffffff
-#error "max string is 2G, or you may remove this macro"
-#endif
-
-#if (defined(__GNUC__ ) && defined(__SIZEOF_POINTER__ ))
-#if (__SIZEOF_POINTER__ != 4) && (__SIZEOF_POINTER__ != 8)
-#error "unsupported system, contact Security Design Technology Department of 2012 Labs"
-#endif
-#endif
-
-#define IN_REGISTER register
-
-#define SECC_MALLOC(x) malloc((size_t)(x))
-#define SECC_FREE(x)   free((void *)(x))
-
-#if defined(_WIN64) || defined(WIN64) || defined(__LP64__) || defined(_LP64)
-#define SECUREC_ON_64BITS
-#endif
-
-#if (!defined(SECUREC_ON_64BITS) && defined(__GNUC__ ) && defined(__SIZEOF_POINTER__ ))
-#if __SIZEOF_POINTER__ == 8
-#define SECUREC_ON_64BITS
-#endif
-#endif
-
-#if defined(__SVR4) || defined(__svr4__)
-#define __SOLARIS
-#endif
-
-#if (defined(__hpux) || defined(_AIX) || defined(__SOLARIS))
-#define __UNIX
-#endif
-
-#if ((!defined(SECUREC_SUPPORT_STRTOLD)) && defined(COMPATIBLE_LINUX_FORMAT))
-#if  defined(__USE_ISOC99)  \
-      || (defined(_AIX) && defined(_ISOC99_SOURCE)) \
-      || (defined(__hpux) && defined(__ia64)) \
-      || (defined(__SOLARIS) &&  (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) || defined(_STDC_C99) || defined(__EXTENSIONS__))
-#define SECUREC_SUPPORT_STRTOLD
-#endif
-#endif
-#if ((defined(SECUREC_WRLINUX_BELOW4) || defined(_WRLINUX_BELOW4_)) && defined(SECUREC_SUPPORT_STRTOLD))
-#undef SECUREC_SUPPORT_STRTOLD
-#endif
-
-#if defined(WITH_PERFORMANCE_ADDONS) 
-    /* for strncpy_s performance optimization */
-#define STRNCPY_SM(dest, destMax, src, count) \
-    ((NULL != (void*)dest && NULL != (void*)src && (size_t)destMax >0 && (((UINT64T)(destMax) & (UINT64T)(-2)) < SECUREC_STRING_MAX_LEN) && (TWO_MIN(count , strlen(src)) + 1) <= (size_t)destMax ) ?  ( (count < strlen(src))? (memcpy(dest, src, count), *((char*)dest + count) = '\0', EOK) :( memcpy(dest, src, strlen(src) + 1), EOK ) ) :(strncpy_error(dest, destMax, src, count))  )
-
-#define STRCPY_SM(dest, destMax, src) \
-    (( NULL != (void*)dest && NULL != (void*)src  && (size_t)destMax >0 && (((UINT64T)(destMax) & (UINT64T)(-2)) < SECUREC_STRING_MAX_LEN) && ( strlen(src) + 1) <= (size_t)destMax )? (memcpy(dest, src, strlen(src) + 1), EOK) :( strcpy_error(dest, destMax, src)))
-
-   /* for strcat_s performance optimization */
-#if defined(__GNUC__)
-#define STRCAT_SM(dest, destMax, src) \
-    ({ int catRet =EOK;\
-    if ( NULL != (void*)dest && NULL != (void*)src && (size_t)(destMax) >0 && (((UINT64T)(destMax) & (UINT64T)(-2)) < SECUREC_STRING_MAX_LEN) ) {\
-        char* pCatTmpDst = (dest);\
-        size_t catRestSz = (destMax);\
-        do{\
-            while(catRestSz > 0 && *pCatTmpDst) {\
-                ++pCatTmpDst;\
-                --catRestSz;\
-            }\
-            if (catRestSz == 0) {\
-                catRet = EINVAL;\
-                break;\
-            }\
-            if ( ( strlen(src) + 1) <= catRestSz ) {\
-                memcpy(pCatTmpDst, (src), strlen(src) + 1);\
-                catRet = EOK;\
-            }else{\
-                catRet = ERANGE;\
-            }\
-        }while(0);\
-        if ( EOK != catRet) catRet = strcat_s((dest), (destMax), (src));\
-    }else{\
-        catRet = strcat_s((dest), (destMax), (src));\
-    }\
-    catRet;})
-#else
-#define STRCAT_SM(dest, destMax, src) strcat_s(dest, destMax, src)
-#endif
-
-    /*for strncat_s performance optimization*/
-#if defined(__GNUC__)
-#define STRNCAT_SM(dest, destMax, src, count) \
-    ({ int ncatRet = EOK;\
-    if (NULL != (void*)dest && NULL != (void*)src && (size_t)destMax > 0 && (((UINT64T)(destMax) & (UINT64T)(-2)) < SECUREC_STRING_MAX_LEN)  && (((UINT64T)(count) & (UINT64T)(-2)) < SECUREC_STRING_MAX_LEN)) {\
-        char* pCatTmpDest = (dest);\
-        size_t ncatRestSz = (destMax);\
-        do{\
-            while(ncatRestSz > 0 && *pCatTmpDest) {\
-                ++pCatTmpDest;\
-                --ncatRestSz;\
-            }\
-            if (ncatRestSz == 0) {\
-                ncatRet = EINVAL;\
-                break;\
-            }\
-            if ( (TWO_MIN((count) , strlen(src)) + 1) <= ncatRestSz ) {\
-                if ((count) < strlen(src)) {\
-                    memcpy(pCatTmpDest, (src), (count));\
-                    *(pCatTmpDest + (count)) = '\0';\
-                }else {\
-                    memcpy(pCatTmpDest, (src), strlen(src) + 1);\
-                }\
-            }else{\
-                ncatRet = ERANGE;\
-            }\
-        }while(0);\
-        if ( EOK != ncatRet) ncatRet = strncat_s((dest), (destMax), (src), (count));\
-    }else{\
-        ncatRet = strncat_s((dest), (destMax), (src), (count));\
-    }\
-    ncatRet;})
-#else
-#define STRNCAT_SM(dest, destMax, src, count) strncat_s(dest, destMax, src, count)
-#endif
-
-    /*
-    MEMCPY_SM do NOT check buffer overlap by default, or you can add this check to improve security
-    condCheck = condCheck || (dest == src) || (dest > src && dest < (void*)((UINT8T*)src + count));\
-    condCheck = condCheck || (src > dest && src < (void*)((UINT8T*)dest + count)); \
-    */
-
-#define  MEMCPY_SM(dest, destMax, src, count)\
-    (!(((size_t)destMax== 0 )||(((UINT64T)(destMax) & (UINT64T)(-2)) > SECUREC_MEM_MAX_LEN)||((size_t)count > (size_t)destMax) || (NULL == (void*)dest) || (NULL == (void*)src))? (memcpy(dest, src, count), EOK) : (memcpy_s(dest, destMax, src, count)))
-
-#define  MEMSET_SM(dest, destMax, c, count)\
-    (!(((size_t)destMax == 0 ) || (((UINT64T)(destMax) & (UINT64T)(-2)) > SECUREC_MEM_MAX_LEN) || (NULL == (void*)dest) || ((size_t)count > (size_t)destMax)) ? (memset(dest, c, count), EOK) : ( memset_s(dest, destMax, c, count)))
-
-#endif /* WITH_PERFORMANCE_ADDONS */
-
-/* 20150105 For software and hardware decoupling,such as UMG*/
-#ifdef SECUREC_SYSAPI4VXWORKS
-#ifdef feof
-#undef feof
-#endif
-extern int feof(FILE *stream);
-
-#ifndef isspace
-#define isspace(c)      (((c) == ' ') || ((c) == '\t') || ((c) == '\r') || ((c) == '\n'))
-#endif
-#ifndef isascii
-#define isascii(c)       (((unsigned char)(c))<=0x7f)
-#endif
-#ifndef isupper
-#define isupper(c)       ((c) >= 'A' && (c) <= 'Z')
-#endif
-#ifndef islower
-#define islower(c)       ((c) >= 'a' && (c) <= 'z')
-#endif
-#ifndef isalpha
-#define isalpha(c)       (isupper(c) || (islower(c)))
-#endif
-#ifndef isdigit
-#define isdigit(c)       ((c) >= '0' && (c) <= '9')
-#endif
-#ifndef isxdigit
-#define isxupper(c)      ((c) >= 'A' && (c) <= 'F')
-#define isxlower(c)      ((c) >= 'a' && (c) <= 'f')
-#define isxdigit(c)      (isdigit(c) || isxupper(c) ||isxlower(c))
-#endif
-#endif
-
-#endif    /*__SECURECTYPE_H__A7BBB686_AADA_451B_B9F9_44DACDAE18A7*/
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/vou_exp.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/vou_exp.h
deleted file mode 100644
index 31cef02f..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/vou_exp.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) Hisilicon Technologies Co., Ltd. 2012-2019. All rights reserved.
-* Description:
-* Author: Hisilicon multimedia software group
-* Create: 2011/06/28
-*/
-#include "hi_common.h"
-
-#ifndef __HI_VOU_EXP_H__
-#define __HI_VOU_EXP_H__
-
-typedef struct hiVOU_EXPORT_CALLBACK_S {
-    void (*pfnVoNotify)(int module_id, int vodev);
-} VOU_EXPORT_CALLBACK_S;
-
-typedef HI_S32 FN_VO_RegisterExternCallback(VOU_EXPORT_CALLBACK_S *pstExpCallback);
-
-typedef struct hiVOU_EXPORT_SYMBOL_S {
-    FN_VO_RegisterExternCallback *pfnVoRegisterExpCallback;
-} VOU_EXPORT_SYMBOL_S;
-
-#endif /* __HI_VOU_EXP_H__ */
-
-
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/files/include/watchdog.h b/general/package/hisilicon-osdrv-hi3516ev300/files/include/watchdog.h
deleted file mode 100644
index 9419e584..00000000
--- a/general/package/hisilicon-osdrv-hi3516ev300/files/include/watchdog.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *    Generic watchdog defines. Derived from..
- *
- * Berkshire PC Watchdog Defines
- * by Ken Hollis <khollis@bitgate.com>
- *
- */
-
-#ifndef _LINUX_WATCHDOG_H
-#define _LINUX_WATCHDOG_H
-
-#define    WATCHDOG_IOCTL_BASE    'W'
-
-struct watchdog_info {
-    unsigned int options;        /* Options the card/driver supports */
-    unsigned int firmware_version;    /* Firmware version of the card */
-    unsigned char identity[32];    /* Identity of the board */
-};
-
-#define    WDIOC_GETSUPPORT     _IOR(WATCHDOG_IOCTL_BASE, 0, struct watchdog_info)
-#define    WDIOC_GETSTATUS      _IOR(WATCHDOG_IOCTL_BASE, 1, int)
-#define    WDIOC_GETBOOTSTATUS  _IOR(WATCHDOG_IOCTL_BASE, 2, int)
-//#define    WDIOC_GETTEMP        _IOR(WATCHDOG_IOCTL_BASE, 3, int)
-#define    WDIOC_SETOPTIONS     _IOWR(WATCHDOG_IOCTL_BASE, 4, int)
-#define    WDIOC_KEEPALIVE      _IO(WATCHDOG_IOCTL_BASE, 5)
-#define    WDIOC_SETTIMEOUT     _IOWR(WATCHDOG_IOCTL_BASE, 6, int)
-#define    WDIOC_GETTIMEOUT     _IOR(WATCHDOG_IOCTL_BASE, 7, int)
-//#define    WDIOC_SETPRETIMEOUT  _IOWR(WATCHDOG_IOCTL_BASE, 8, int)
-//#define    WDIOC_GETPRETIMEOUT  _IOR(WATCHDOG_IOCTL_BASE, 9, int)
-//#define    WDIOC_GETTIMELEFT    _IOR(WATCHDOG_IOCTL_BASE, 10, int)
-
-#define    WDIOF_UNKNOWN        -1    /* Unknown flag error */
-#define    WDIOS_UNKNOWN        -1    /* Unknown status error */
-
-#define    WDIOF_OVERHEAT       0x0001    /* Reset due to CPU overheat */
-#define    WDIOF_FANFAULT       0x0002    /* Fan failed */
-#define    WDIOF_EXTERN1        0x0004    /* External relay 1 */
-#define    WDIOF_EXTERN2        0x0008    /* External relay 2 */
-#define    WDIOF_POWERUNDER     0x0010    /* Power bad/power fault */
-#define    WDIOF_CARDRESET      0x0020    /* Card previously reset the CPU */
-#define    WDIOF_POWEROVER      0x0040    /* Power over voltage */
-#define    WDIOF_SETTIMEOUT     0x0080  /* Set timeout (in seconds) */
-#define    WDIOF_MAGICCLOSE     0x0100    /* Supports magic close char */
-#define    WDIOF_PRETIMEOUT     0x0200  /* Pretimeout (in seconds), get/set */
-#define    WDIOF_KEEPALIVEPING  0x8000    /* Keep alive ping reply */
-
-#define    WDIOS_DISABLECARD    0x0001    /* Turn off the watchdog timer */
-#define    WDIOS_ENABLECARD     0x0002    /* Turn on the watchdog timer */
-#define    WDIOS_TEMPPANIC      0x0004    /* Kernel panic on temperature trip */
-
-
-#endif  /* ifndef _LINUX_WATCHDOG_H */
diff --git a/scripts/executing_commands_for_glibc.sh b/scripts/executing_commands_for_glibc.sh
index ce9dd5ee..c94c8861 100755
--- a/scripts/executing_commands_for_glibc.sh
+++ b/scripts/executing_commands_for_glibc.sh
@@ -3,7 +3,7 @@
 # Please check BR2_ROOTFS_POST_BUILD_SCRIPT option in config
 #
 
-echo 'Note: BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"'
-#
 date "+OPENIPC_VERSION=2.1.%m.%d" >>${TARGET_DIR}/usr/lib/os-release
 #
+echo 'Note: BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"'
+#
diff --git a/scripts/executing_commands_for_musl.sh b/scripts/executing_commands_for_musl.sh
index 87b32544..906668af 100755
--- a/scripts/executing_commands_for_musl.sh
+++ b/scripts/executing_commands_for_musl.sh
@@ -3,10 +3,13 @@
 # Please check BR2_ROOTFS_POST_BUILD_SCRIPT option in config
 #
 
+date "+OPENIPC_VERSION=2.1.%m.%d" >>${TARGET_DIR}/usr/lib/os-release
+#
 echo 'Note: BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"'
 #
 ln -sfv /lib/libc.so ${TARGET_DIR}/lib/ld-uClibc.so.0
 ln -sfv ../../lib/libc.so ${TARGET_DIR}/usr/bin/ldd
 #
-date "+OPENIPC_VERSION=2.1.%m.%d" >>${TARGET_DIR}/usr/lib/os-release
-#
\ No newline at end of file
+# Comment out this line if you want to save the libraries
+rm -f ${TARGET_DIR}/usr/lib/libstdc++*
+#
diff --git a/scripts/executing_commands_for_uclibc.sh b/scripts/executing_commands_for_uclibc.sh
index ca862fa3..20c5a971 100755
--- a/scripts/executing_commands_for_uclibc.sh
+++ b/scripts/executing_commands_for_uclibc.sh
@@ -3,7 +3,7 @@
 # Please check BR2_ROOTFS_POST_BUILD_SCRIPT option in config
 #
 
-echo 'Note: BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"'
-#
 date "+OPENIPC_VERSION=2.1.%m.%d" >>${TARGET_DIR}/usr/lib/os-release
 #
+echo 'Note: BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"'
+#