[mpp]: Clean up header

Remove extra mpp_dec.h and mpp_enc.h for later modification. Change-Id: I43c0e1c4ca0cf36070887556b1cd9d428f167090 Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2025-10-18 23:14:35 +08:00 · 2019-09-19 11:32:44 +08:00
parent 5526523736
commit 9ee20c594a
21 changed files with 30 additions and 63 deletions
--- a/mpp/codec/dec/h265/h265d_codec.h
+++ b/mpp/codec/dec/h265/h265d_codec.h
@@ -28,7 +28,7 @@
 #ifndef __MPP_CODEC_H__
 #define __MPP_CODEC_H__

-#include "mpp_dec.h"
+#include "mpp_frame.h"

 typedef struct MppRational {
    RK_S32 num; ///< numerator
--- a/mpp/codec/dec/h265/h265d_parser.h
+++ b/mpp/codec/dec/h265/h265d_parser.h
@@ -33,9 +33,10 @@
 #include <string.h>

 #include "mpp_mem.h"
-#include "mpp_dec.h"
 #include "mpp_bitread.h"
+#include "mpp_buf_slot.h"

+#include "hal_task.h"
 #include "h265d_codec.h"

 extern RK_U32 h265d_debug;
--- a/mpp/codec/dec/jpeg/jpegd_parser.h
+++ b/mpp/codec/dec/jpeg/jpegd_parser.h
@@ -24,8 +24,6 @@
 #include "mpp_mem.h"
 #include "mpp_bitread.h"

-#include "mpp_dec.h"
-
 #include "jpegd_syntax.h"

 #define JPEG_IDENTIFIER(a, b, c, d) \
--- a/mpp/codec/dec/m2v/m2vd_codec.h
+++ b/mpp/codec/dec/m2v/m2vd_codec.h
@@ -18,7 +18,6 @@
 #define __M2VD_CODEC_H__

 #include "mpp_common.h"
-#include "mpp_dec.h"

 typedef struct M2VDContext_t {
    void        *parse_ctx;
--- a/mpp/codec/dec/m2v/m2vd_parser.h
+++ b/mpp/codec/dec/m2v/m2vd_parser.h
@@ -30,8 +30,7 @@
 #include "mpp_mem.h"
 #include "mpp_bitread.h"

-#include "mpp_dec.h"
-
+#include "parser_api.h"
 #include "m2vd_syntax.h"
 #include "m2vd_com.h"

--- a/mpp/codec/dec/vp8/vp8d_parser.h
+++ b/mpp/codec/dec/vp8/vp8d_parser.h
@@ -21,8 +21,7 @@
 #include "mpp_bitread.h"
 #include "mpp_mem.h"

-#include "mpp_dec.h"
-
+#include "parser_api.h"
 #include "vp8d_syntax.h"
 #include "vp8d_data.h"

--- a/mpp/codec/dec/vp9/vp9d_parser.h
+++ b/mpp/codec/dec/vp9/vp9d_parser.h
@@ -21,8 +21,8 @@

 #include "mpp_mem.h"
 #include "mpp_bitread.h"
-#include "mpp_dec.h"

+#include "parser_api.h"
 #include "vpx_rac.h"
 #include "vp9.h"
 #include "vp9data.h"
--- a/mpp/hal/inc/hal_vp9d_api.h
+++ b/mpp/hal/inc/hal_vp9d_api.h
@@ -19,12 +19,8 @@
 #ifndef __HAL_VP9D_API_H__
 #define __HAL_VP9D_API_H__

-#include "rk_type.h"
-#include "mpp_err.h"
 #include "mpp_hal.h"

-
-
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/mpp/hal/rkdec/h265d/hal_h265d_reg.c
+++ b/mpp/hal/rkdec/h265d/hal_h265d_reg.c
@@ -30,18 +30,15 @@
 #include <stdio.h>
 #include <string.h>

-#include "hal_h265d_reg.h"
-#include "mpp_buffer.h"
+#include "mpp_env.h"
 #include "mpp_log.h"
-#include "mpp_err.h"
-#include "cabac.h"
 #include "mpp_mem.h"
 #include "mpp_bitread.h"
-#include "mpp_dec.h"
-#include "mpp_device.h"
-#include "mpp_buffer.h"
-#include "mpp_env.h"
 #include "mpp_bitput.h"
+
+#include "mpp_device.h"
+#include "cabac.h"
+#include "hal_h265d_reg.h"
 #include "hal_h265d_api.h"
 #include "h265d_syntax.h"

--- a/mpp/hal/rkdec/vp9d/hal_vp9d_api.c
+++ b/mpp/hal/rkdec/vp9d/hal_vp9d_api.c
@@ -22,18 +22,15 @@
 #include <stdlib.h>
 #include <string.h>

-#include "rk_type.h"
-#include "mpp_log.h"
-#include "mpp_err.h"
-#include "mpp_mem.h"
 #include "mpp_env.h"
+#include "mpp_log.h"
+#include "mpp_mem.h"
 #include "mpp_common.h"
-#include "mpp_dec.h"
+#include "mpp_bitput.h"

+#include "mpp_device.h"
 #include "hal_vp9d_api.h"
 #include "hal_vp9d_reg.h"
-#include "mpp_device.h"
-#include "mpp_bitput.h"
 #include "vp9d_syntax.h"
 #include "hal_vp9d_table.h"

--- a/mpp/hal/rkdec/vp9d/hal_vp9d_reg.h
+++ b/mpp/hal/rkdec/vp9d/hal_vp9d_reg.h
@@ -27,15 +27,15 @@

 #ifndef __HAL_VP9D_REG_H__
 #define __HAL_VP9D_REG_H__
-#include "rk_type.h"
+
 #include "mpp_log.h"

 extern RK_U32 vp9h_debug;
+
 #define VP9H_DBG_FUNCTION          (0x00000001)
 #define VP9H_DBG_PAR               (0x00000002)
 #define VP9H_DBG_REG               (0x00000004)

-
 #define vp9h_dbg(flag, fmt, ...) _mpp_dbg(vp9h_debug, flag, fmt, ## __VA_ARGS__)

 typedef struct {
--- a/mpp/hal/rkdec/vp9d/hal_vp9d_table.h
+++ b/mpp/hal/rkdec/vp9d/hal_vp9d_table.h
@@ -16,6 +16,7 @@
 */
 #ifndef _HAL_VP9D_TABLE_H_
 #define _HAL_VP9D_TABLE_H_
+
 #include "rk_type.h"

 typedef RK_U8 vp9_prob;
--- a/mpp/hal/vpu/jpegd/hal_jpegd_base.h
+++ b/mpp/hal/vpu/jpegd/hal_jpegd_base.h
@@ -18,9 +18,8 @@
 #define __HAL_JPEGD_BASE_H__

 #include <stdio.h>
-#include "rk_type.h"
-#include "mpp_common.h"
-#include "mpp_mem.h"
+
+#include "mpp_hal.h"
 #include "mpp_device.h"

 #define EXTRA_INFO_MAGIC                      (0x4C4A46)
--- a/mpp/hal/vpu/jpegd/hal_jpegd_common.c
+++ b/mpp/hal/vpu/jpegd/hal_jpegd_common.c
@@ -20,16 +20,13 @@
 #include <string.h>
 #include <stdint.h>

-#include "mpp_buffer.h"
+#include "mpp_env.h"
 #include "mpp_log.h"
-#include "mpp_err.h"
 #include "mpp_mem.h"
 #include "mpp_bitread.h"
-#include "mpp_dec.h"
-#include "mpp_buffer.h"
-#include "mpp_env.h"
 #include "mpp_bitput.h"

+#include "hal_task.h"
 #include "jpegd_syntax.h"
 #include "jpegd_api.h"
 #include "hal_jpegd_common.h"
--- a/mpp/hal/vpu/jpegd/hal_jpegd_common.h
+++ b/mpp/hal/vpu/jpegd/hal_jpegd_common.h
@@ -16,6 +16,7 @@
 */
 #ifndef __HAL_JPEGD_COMMON_H__
 #define __HAL_JPEGD_COMMON_H__
+
 #include "hal_jpegd_base.h"

 #define BRIGHTNESS                                  4    /* -128 ~ 127 */
--- a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.c
+++ b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.c
@@ -20,16 +20,10 @@
 #include <string.h>
 #include <stdint.h>

-#include "mpp_buffer.h"
-#include "mpp_log.h"
-#include "mpp_err.h"
-#include "mpp_mem.h"
-#include "mpp_bitread.h"
-#include "mpp_dec.h"
-#include "mpp_device.h"
-#include "mpp_buffer.h"
 #include "mpp_env.h"
-#include "mpp_bitput.h"
+#include "mpp_log.h"
+#include "mpp_mem.h"
+#include "mpp_frame.h"

 #include "jpegd_syntax.h"
 #include "hal_jpegd_common.h"
--- a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.h
+++ b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.h
@@ -16,6 +16,7 @@
 */
 #ifndef __HAL_JPEGD_VDPU1_H__
 #define __HAL_JPEGD_VDPU1_H__
+
 #include "rk_type.h"

 MPP_RET hal_jpegd_vdpu1_init(void *hal, MppHalCfg *cfg);
--- a/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c
+++ b/mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c
@@ -20,16 +20,10 @@
 #include <string.h>
 #include <stdint.h>

-#include "mpp_buffer.h"
-#include "mpp_log.h"
-#include "mpp_err.h"
-#include "mpp_mem.h"
-#include "mpp_bitread.h"
-#include "mpp_dec.h"
-#include "mpp_device.h"
-#include "mpp_buffer.h"
 #include "mpp_env.h"
-#include "mpp_bitput.h"
+#include "mpp_log.h"
+#include "mpp_mem.h"
+#include "mpp_frame.h"

 #include "jpegd_syntax.h"
 #include "hal_jpegd_common.h"
--- a/mpp/hal/vpu/mpg4d/hal_m4vd_vdpu1.c
+++ b/mpp/hal/vpu/mpg4d/hal_m4vd_vdpu1.c
@@ -20,14 +20,12 @@
 #include <string.h>

 #include "mpp_log.h"
-#include "mpp_err.h"
 #include "mpp_mem.h"
 #include "mpp_env.h"
 #include "mpp_buffer.h"
 #include "mpp_common.h"

 #include "mpp_device.h"
-#include "mpp_dec.h"
 #include "mpg4d_syntax.h"
 #include "hal_mpg4d_api.h"
 #include "hal_m4vd_com.h"
--- a/mpp/hal/vpu/mpg4d/hal_m4vd_vdpu2.c
+++ b/mpp/hal/vpu/mpg4d/hal_m4vd_vdpu2.c
@@ -20,14 +20,12 @@
 #include <string.h>

 #include "mpp_log.h"
-#include "mpp_err.h"
 #include "mpp_mem.h"
 #include "mpp_env.h"
 #include "mpp_buffer.h"
 #include "mpp_common.h"

 #include "mpp_device.h"
-#include "mpp_dec.h"
 #include "mpg4d_syntax.h"
 #include "hal_mpg4d_api.h"
 #include "hal_m4vd_com.h"
--- a/mpp/mpp.cpp
+++ b/mpp/mpp.cpp
@@ -27,8 +27,6 @@
 #include "mpp_impl.h"

 #include "mpp.h"
-#include "mpp_dec.h"
-#include "mpp_enc.h"
 #include "mpp_hal.h"
 #include "mpp_task_impl.h"
 #include "mpp_buffer_impl.h"