summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRockchip2015-05-14 16:21:19 +0800
committerRockchip2015-05-14 16:23:20 +0800
commit6b2f73a30bb6267325b8e1ac7291f3fbf103d6c4 (patch)
treee38f5a300d581062deac2c49a0dc88cb18318734
parent7f06366f8241ed75373d72ce5e83a03f8ba2a1e8 (diff)
jpeghw: remove div3/vp6/rv/spark
-rw-r--r--src_dec/common/8170enum.h14
-rw-r--r--src_dec/common/regdrv.h11
-rw-r--r--src_dec/inc/decapicommon.h22
-rw-r--r--src_dec/inc/dwl.h18
4 files changed, 26 insertions, 39 deletions
diff --git a/src_dec/common/8170enum.h b/src_dec/common/8170enum.h
index 2c9445a..a39f6e2 100644
--- a/src_dec/common/8170enum.h
+++ b/src_dec/common/8170enum.h
@@ -28,7 +28,7 @@
HWIF_DEC_MODE,
HWIF_RLC_MODE_E,
HWIF_SKIP_MODE,
- HWIF_DIVX3_E,
+ HWIF_RESV1_E,
HWIF_PJPEG_E,
HWIF_PIC_INTERLACE_E,
HWIF_PIC_FIELDMODE_E,
@@ -36,7 +36,7 @@
HWIF_PIC_INTER_E,
HWIF_PIC_TOPFIELD_E,
HWIF_FWD_INTERLACE_E,
- HWIF_SORENSON_E,
+ HWIF_RESV3_E,
HWIF_REF_TOPFIELD_E,
HWIF_DEC_OUT_DIS,
HWIF_FILTERING_DIS,
@@ -152,12 +152,12 @@
HWIF_MV_THRESHOLD,
HWIF_VAR_THRESHOLD,
HWIF_DIVX_IDCT_E,
- HWIF_DIVX3_SLICE_SIZE,
+ HWIF_RESV1_SLICE_SIZE,
HWIF_PJPEG_REST_FREQ,
- HWIF_RV_PROFILE,
- HWIF_RV_OSV_QUANT,
- HWIF_RV_FWD_SCALE,
- HWIF_RV_BWD_SCALE,
+ HWIF_RESV0_PROFILE,
+ HWIF_RESV0_OSV_QUANT,
+ HWIF_RESV0_FWD_SCALE,
+ HWIF_RESV0_BWD_SCALE,
HWIF_INIT_DC_COMP0,
HWIF_INIT_DC_COMP1,
HWIF_PPS_ID,
diff --git a/src_dec/common/regdrv.h b/src_dec/common/regdrv.h
index f54cd1f..99d9d12 100644
--- a/src_dec/common/regdrv.h
+++ b/src_dec/common/regdrv.h
@@ -65,16 +65,15 @@ typedef enum
/* aliases */
HWIF_MPEG4_DC_BASE = HWIF_I4X4_OR_DC_BASE,
HWIF_INTRA_4X4_BASE = HWIF_I4X4_OR_DC_BASE,
- /* VP6 */
- HWIF_VP6HWGOLDEN_BASE = HWIF_REFER4_BASE,
- HWIF_VP6HWPART1_BASE = HWIF_REFER13_BASE,
- HWIF_VP6HWPART2_BASE = HWIF_RLC_VLC_BASE,
- HWIF_VP6HWPROBTBL_BASE = HWIF_QTABLE_BASE,
+ HWIF_RESV2HWGOLDEN_BASE = HWIF_REFER4_BASE,
+ HWIF_RESV2HWPART1_BASE = HWIF_REFER13_BASE,
+ HWIF_RESV2HWPART2_BASE = HWIF_RLC_VLC_BASE,
+ HWIF_RESV2HWPROBTBL_BASE = HWIF_QTABLE_BASE,
/* progressive JPEG */
HWIF_PJPEG_COEFF_BUF = HWIF_DIR_MV_BASE,
/* MVC */
- HWIF_MVC_E = HWIF_DIVX3_E,
+ HWIF_MVC_E = HWIF_RESV1_E,
HWIF_INTER_VIEW_BASE = HWIF_REFER15_BASE,
} hwIfName_e;
diff --git a/src_dec/inc/decapicommon.h b/src_dec/inc/decapicommon.h
index 6369b59..1c462dc 100644
--- a/src_dec/inc/decapicommon.h
+++ b/src_dec/inc/decapicommon.h
@@ -53,10 +53,6 @@
#define PP_SCALING (RK_U32)(0x0C000000)
#define PP_DEINTERLACING (RK_U32)(0x02000000)
#define PP_ALPHA_BLENDING (RK_U32)(0x01000000)
-#define SORENSON_SPARK_NOT_SUPPORTED (RK_U32)(0x00)
-#define SORENSON_SPARK_SUPPORTED (RK_U32)(0x01)
-#define VP6_NOT_SUPPORTED (RK_U32)(0x00)
-#define VP6_SUPPORTED (RK_U32)(0x01)
#define VP7_NOT_SUPPORTED (RK_U32)(0x00)
#define VP7_SUPPORTED (RK_U32)(0x01)
#define VP8_NOT_SUPPORTED (RK_U32)(0x00)
@@ -69,8 +65,6 @@
#define AVS_SUPPORTED (RK_U32)(0x01)
#define JPEG_EXT_NOT_SUPPORTED (RK_U32)(0x00)
#define JPEG_EXT_SUPPORTED (RK_U32)(0x01)
-#define RV_NOT_SUPPORTED (RK_U32)(0x00)
-#define RV_SUPPORTED (RK_U32)(0x01)
#define MVC_NOT_SUPPORTED (RK_U32)(0x00)
#define MVC_SUPPORTED (RK_U32)(0x01)
@@ -80,12 +74,8 @@
#define MPEG4_FUSE_ENABLED (RK_U32)(0x01)
#define MPEG2_NOT_SUPPORTED_FUSE (RK_U32)(0x00)
#define MPEG2_FUSE_ENABLED (RK_U32)(0x01)
-#define SORENSON_SPARK_NOT_SUPPORTED_FUSE (RK_U32)(0x00)
-#define SORENSON_SPARK_ENABLED (RK_U32)(0x01)
#define JPEG_NOT_SUPPORTED_FUSE (RK_U32)(0x00)
#define JPEG_FUSE_ENABLED (RK_U32)(0x01)
-#define VP6_NOT_SUPPORTED_FUSE (RK_U32)(0x00)
-#define VP6_FUSE_ENABLED (RK_U32)(0x01)
#define VP7_NOT_SUPPORTED_FUSE (RK_U32)(0x00)
#define VP7_FUSE_ENABLED (RK_U32)(0x01)
#define VP8_NOT_SUPPORTED_FUSE (RK_U32)(0x00)
@@ -125,13 +115,13 @@
decHwCfg.vc1Support = dwlHwCfg.vc1Support; \
decHwCfg.ppSupport = dwlHwCfg.ppSupport; \
decHwCfg.ppConfig = dwlHwCfg.ppConfig; \
- decHwCfg.sorensonSparkSupport = dwlHwCfg.sorensonSparkSupport; \
- decHwCfg.vp6Support = dwlHwCfg.vp6Support; \
+ decHwCfg.resv3Support = dwlHwCfg.resv3Support; \
+ decHwCfg.resv2Support = dwlHwCfg.resv2Support; \
decHwCfg.vp7Support = dwlHwCfg.vp7Support; \
decHwCfg.vp8Support = dwlHwCfg.vp8Support; \
decHwCfg.refBufSupport = dwlHwCfg.refBufSupport; \
decHwCfg.avsSupport = dwlHwCfg.avsSupport; \
- decHwCfg.rvSupport = dwlHwCfg.rvSupport; \
+ decHwCfg.resv0Support = dwlHwCfg.resv0Support; \
decHwCfg.customMpeg4Support = dwlHwCfg.customMpeg4Support; \
decHwCfg.mvcSupport = dwlHwCfg.mvcSupport;
@@ -148,14 +138,14 @@ typedef struct DecHwConfig_
RK_U32 ppSupport; /* PP_SUPPORTED or PP_NOT_SUPPORTED */
RK_U32 ppConfig; /* Bitwise list of PP function */
RK_U32 maxPpOutPicWidth; /* maximum post-processor output picture width */
- RK_U32 sorensonSparkSupport; /* one of the SORENSON_SPARK values defined above */
+ RK_U32 resv3Support;
RK_U32 refBufSupport; /* one of the REF_BUF values defined above */
- RK_U32 vp6Support; /* one of the VP6 values defined above */
+ RK_U32 resv2Support;
RK_U32 vp7Support; /* one of the VP7 values defined above */
RK_U32 vp8Support; /* one of the VP8 values defined above */
RK_U32 avsSupport; /* one of the AVS values defined above */
RK_U32 jpegESupport; /* one of the JPEG EXT values defined above */
- RK_U32 rvSupport; /* one of the HUKKA values defined above */
+ RK_U32 resv0Support;
RK_U32 mvcSupport; /* one of the MVC values defined above */
} DecHwConfig;
diff --git a/src_dec/inc/dwl.h b/src_dec/inc/dwl.h
index 4aa1deb..06e4c11 100644
--- a/src_dec/inc/dwl.h
+++ b/src_dec/inc/dwl.h
@@ -51,9 +51,7 @@ extern "C"
#define DWL_CLIENT_TYPE_PP 4U
#define DWL_CLIENT_TYPE_VC1_DEC 5U
#define DWL_CLIENT_TYPE_MPEG2_DEC 6U
-#define DWL_CLIENT_TYPE_VP6_DEC 7U
#define DWL_CLIENT_TYPE_AVS_DEC 9U /* TODO: fix */
-#define DWL_CLIENT_TYPE_RV_DEC 8U
#define DWL_CLIENT_TYPE_VP8_DEC 10U
/* Linear memory area descriptor */
@@ -84,14 +82,14 @@ extern "C"
RK_U32 mpeg2Support; /* HW supports MPEG-2 */
RK_U32 ppSupport; /* HW supports post-processor */
RK_U32 ppConfig; /* HW post-processor functions bitmask */
- RK_U32 sorensonSparkSupport; /* HW supports Sorenson Spark */
+ RK_U32 resv3Support;
RK_U32 refBufSupport; /* HW supports reference picture buffering */
- RK_U32 vp6Support; /* HW supports VP6 */
+ RK_U32 resv2Support;
RK_U32 vp7Support; /* HW supports VP7 */
RK_U32 vp8Support; /* HW supports VP8 */
RK_U32 avsSupport; /* HW supports AVS */
RK_U32 jpegESupport; /* HW supports JPEG extensions */
- RK_U32 rvSupport; /* HW supports REAL */
+ RK_U32 resv0Support;
RK_U32 mvcSupport; /* HW supports H264 MVC extension */
} DWLHwConfig_t;
@@ -100,11 +98,11 @@ extern "C"
RK_U32 h264SupportFuse; /* HW supports h.264 */
RK_U32 mpeg4SupportFuse; /* HW supports MPEG-4 */
RK_U32 mpeg2SupportFuse; /* HW supports MPEG-2 */
- RK_U32 sorensonSparkSupportFuse; /* HW supports Sorenson Spark */
+ RK_U32 resv3SupportFuse;
RK_U32 jpegSupportFuse; /* HW supports JPEG */
- RK_U32 vp6SupportFuse; /* HW supports VP6 */
- RK_U32 vp7SupportFuse; /* HW supports VP6 */
- RK_U32 vp8SupportFuse; /* HW supports VP6 */
+ RK_U32 resv2SupportFuse;
+ RK_U32 vp7SupportFuse; /* HW supports VP7 */
+ RK_U32 vp8SupportFuse; /* HW supports VP8 */
RK_U32 vc1SupportFuse; /* HW supports VC-1 Simple */
RK_U32 jpegProgSupportFuse; /* HW supports Progressive JPEG */
RK_U32 ppSupportFuse; /* HW supports post-processor */
@@ -113,7 +111,7 @@ extern "C"
RK_U32 maxPpOutPicWidthFuse; /* Maximum output width of Post-Processor */
RK_U32 refBufSupportFuse; /* HW supports reference picture buffering */
RK_U32 avsSupportFuse; /* one of the AVS values defined above */
- RK_U32 rvSupportFuse; /* one of the REAL values defined above */
+ RK_U32 resv0SupportFuse;
RK_U32 mvcSupportFuse;
RK_U32 customMpeg4SupportFuse; /* Fuse for custom MPEG-4 */