[misc]: Change interface header file dependency

Move MppCtx, MppParam, MppFrame, MppPacket, MppBuffer, MppBufferGroup,
MppTask and MppMeta to rk_type.h.

Later development need to bring in cross reference between these
objects. So we choose to move these declaration together.

Change-Id: I7ea39138ca87d6ca4cb86556464a5de89d172846
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>

inc/mpp_buffer.h

@@ -20,30 +20,6 @@
 #include "rk_type.h"
 #include "mpp_err.h"
 
-/*
- * because buffer usage maybe unknown when decoder is not started
- * buffer group may need to set a default group size limit
- */
-#define SZ_1K           (1024)
-#define SZ_2K           (SZ_1K*2)
-#define SZ_4K           (SZ_1K*4)
-#define SZ_8K           (SZ_1K*8)
-#define SZ_16K          (SZ_1K*16)
-#define SZ_32K          (SZ_1K*32)
-#define SZ_64K          (SZ_1K*64)
-#define SZ_128K         (SZ_1K*128)
-#define SZ_256K         (SZ_1K*256)
-#define SZ_512K         (SZ_1K*512)
-#define SZ_1M           (SZ_1K*SZ_1K)
-#define SZ_2M           (SZ_1M*2)
-#define SZ_4M           (SZ_1M*4)
-#define SZ_8M           (SZ_1M*8)
-#define SZ_16M          (SZ_1M*16)
-#define SZ_32M          (SZ_1M*32)
-#define SZ_64M          (SZ_1M*64)
-#define SZ_80M          (SZ_1M*80)
-#define SZ_128M         (SZ_1M*128)
-
 /*
  * MppBuffer module has several functions:
  *
@@ -76,8 +52,6 @@
  *    user can only use MppBufferType to choose.
  *
  */
-typedef void* MppBuffer;
-typedef void* MppBufferGroup;
 
 /*
  * mpp buffer group support two work flow mode:

inc/mpp_frame.h

@@ -19,8 +19,6 @@
 
 #include "mpp_buffer.h"
 
-typedef void* MppFrame;
-
 /*
  * bit definition for mode flag in MppFrame
  */
@@ -263,7 +261,6 @@ void    mpp_frame_set_chroma_location(MppFrame frame, MppFrameChromaLocation chr
 MppFrameFormat mpp_frame_get_fmt(MppFrame frame);
 void    mpp_frame_set_fmt(MppFrame frame, MppFrameFormat fmt);
 
-
 /*
  * HDR parameter
  */

inc/mpp_meta.h

@@ -20,9 +20,6 @@
 #include <stdint.h>
 #include "rk_type.h"
 
-#include "mpp_frame.h"
-#include "mpp_packet.h"
-
 #define FOURCC_META(a, b, c, d) ((RK_U32)(a) << 24  | \
                                 ((RK_U32)(b) << 16) | \
                                 ((RK_U32)(c) << 8)  | \
@@ -92,10 +89,11 @@ typedef enum MppMetaKey_e {
     KEY_RC_MODE                 = FOURCC_META('r', 'c', 'm', 'o'),
 } MppMetaKey;
 
-typedef void* MppMeta;
-
 #define mpp_meta_get(meta) mpp_meta_get_with_tag(meta, MODULE_TAG, __FUNCTION__)
 
+#include "mpp_frame.h"
+#include "mpp_packet.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

inc/mpp_packet.h

@@ -17,9 +17,7 @@
 #ifndef __MPP_PACKET_H__
 #define __MPP_PACKET_H__
 
-#include "mpp_buffer.h"
+#include "mpp_meta.h"
-
-typedef void* MppPacket;
 
 #ifdef __cplusplus
 extern "C" {

inc/mpp_task.h

@@ -208,7 +208,6 @@ typedef enum {
  * task_enqueue(ctx, PORT_OUTPUT, task);
  */
 /* NOTE: use index rather then handle to descripbe task */
-typedef void* MppTask;
 typedef void* MppPort;
 typedef void* MppTaskQueue;
 

inc/rk_mpi.h

@@ -17,8 +17,8 @@
 #ifndef __RK_MPI_H__
 #define __RK_MPI_H__
 
-#include "mpp_task.h"
 #include "rk_mpi_cmd.h"
+#include "mpp_task.h"
 
 /**
  * @addtogroup rk_mpi
@@ -74,13 +74,10 @@ typedef enum {
     MPP_VIDEO_CodingMax = 0x7FFFFFFF
 } MppCodingType;
 
-typedef void* MppCtx;
-typedef void* MppParam;
-
 /*
  * in decoder mode application need to specify the coding type first
  * send a stream header to mpi ctx using parameter data / size
- * and decoder will try to decode the
+ * and decoder will try to decode the input stream.
  */
 typedef struct MppEncCodecCfg_t {
     MppCodingType       coding;

inc/rk_type.h

@@ -54,6 +54,37 @@ typedef signed long long int    RK_S64;
 #define MODULE_TAG              NULL
 #endif
 
+/*
+ * All external interface object list here.
+ * The interface object is defined as void * for expandability
+ * The cross include between these objects will introduce extra
+ * compiling difficulty. So we move them together in this header.
+ *
+ * Object interface header list:
+ *
+ * MppCtx           - rk_mpi.h
+ * MppParam         - rk_mpi.h
+ *
+ * MppFrame         - mpp_frame.h
+ * MppPacket        - mpp_packet.h
+ *
+ * MppBuffer        - mpp_buffer.h
+ * MppBufferGroup   - mpp_buffer.h
+ *
+ * MppTask          - mpp_task.h
+ * MppMeta          - mpp_meta.h
+ */
 
+typedef void* MppCtx;
+typedef void* MppParam;
+
+typedef void* MppFrame;
+typedef void* MppPacket;
+
+typedef void* MppBuffer;
+typedef void* MppBufferGroup;
+
+typedef void* MppTask;
+typedef void* MppMeta;
 
 #endif /*__RK_TYPE_H__*/

mpp/base/inc/mpp_bitread.h

@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include "rk_type.h"
+
 #include "mpp_log.h"
 #include "mpp_common.h"
 #include "mpp_err.h"

mpp/base/inc/mpp_buf_slot.h

@@ -17,7 +17,6 @@
 #ifndef __MPP_BUF_SLOT_H__
 #define __MPP_BUF_SLOT_H__
 
-#include "rk_type.h"
 #include "mpp_frame.h"
 
 /*

mpp/base/inc/mpp_packet_impl.h

@@ -17,7 +17,7 @@
 #ifndef __MPP_PACKET_IMPL_H__
 #define __MPP_PACKET_IMPL_H__
 
-#include "mpp_buffer.h"
+#include "mpp_meta.h"
 
 #define MPP_PACKET_FLAG_EOS             (0x00000001)
 #define MPP_PACKET_FLAG_EXTRA_DATA      (0x00000002)

mpp/base/mpp_meta.cpp

@@ -20,8 +20,6 @@
 
 #include "mpp_mem.h"
 #include "mpp_list.h"
-#include "mpp_frame.h"
-#include "mpp_packet.h"
 #include "mpp_common.h"
 
 #include "mpp_meta.h"

mpp/base/mpp_packet.cpp

@@ -20,7 +20,6 @@
 
 #include "mpp_log.h"
 #include "mpp_mem.h"
-#include "mpp_packet.h"
 #include "mpp_packet_impl.h"
 
 static const char *module_name = MODULE_TAG;

mpp/base/test/mpp_buffer_test.c

@@ -23,6 +23,7 @@
 #endif
 #include "mpp_log.h"
 #include "mpp_env.h"
+#include "mpp_common.h"
 #include "mpp_buffer.h"
 #include "mpp_allocator.h"
 

mpp/codec/dec/avs/avsd_api.c

@@ -24,7 +24,6 @@
 #include "mpp_mem.h"
 #include "mpp_log.h"
 #include "mpp_env.h"
-#include "mpp_packet.h"
 #include "mpp_packet_impl.h"
 #include "mpp_buffer_impl.h"
 

mpp/codec/dec/avs/avsd_parse.c

@@ -22,7 +22,6 @@
 
 #include "mpp_mem.h"
 #include "mpp_log.h"
-#include "mpp_packet.h"
 #include "mpp_packet_impl.h"
 #include "hal_task.h"
 

mpp/codec/dec/avs/avsd_parse.h

@@ -17,20 +17,12 @@
 #ifndef __AVSD_PARSE_H__
 #define __AVSD_PARSE_H__
 
-
-#include "rk_type.h"
 #include "parser_api.h"
-
-#include "mpp_err.h"
-#include "mpp_packet.h"
-#include "mpp_buf_slot.h"
 #include "mpp_bitread.h"
 
 #include "avsd_syntax.h"
-#include "hal_task.h"
 #include "avsd_api.h"
 
-
 #define AVSD_DBG_ERROR             (0x00000001)
 #define AVSD_DBG_ASSERT            (0x00000002)
 #define AVSD_DBG_WARNNING          (0x00000004)

mpp/codec/dec/dummy/dummy_dec_api.c

@@ -21,7 +21,6 @@
 #include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_common.h"
-#include "mpp_packet.h"
 
 #include "dummy_dec_api.h"
 

mpp/codec/dec/h263/h263d_api.c

@@ -19,8 +19,6 @@
 
 #include <string.h>
 
-#include "rk_mpi.h"
-
 #include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_common.h"

mpp/codec/dec/h263/h263d_parser.c

@@ -20,7 +20,6 @@
 #include "mpp_env.h"
 #include "mpp_log.h"
 #include "mpp_mem.h"
-#include "mpp_packet.h"
 
 #include "mpp_bitread.h"
 #include "h263d_parser.h"

mpp/codec/dec/h264/h264d_api.c

@@ -20,9 +20,8 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_packet.h"
-#include "mpp_packet_impl.h"
 #include "mpp_mem.h"
+#include "mpp_packet_impl.h"
 
 #include "h264d_api.h"
 #include "h264d_global.h"

mpp/codec/dec/h264/h264d_global.h

@@ -29,7 +29,6 @@
 #include "h264d_syntax.h"
 
 
-
 #define H264D_DBG_ERROR             (0x00000001)
 #define H264D_DBG_ASSERT            (0x00000002)
 #define H264D_DBG_WARNNING          (0x00000004)

mpp/codec/dec/h264/h264d_parse.c

@@ -21,7 +21,6 @@
 #include <stdlib.h>
 
 #include "mpp_mem.h"
-#include "mpp_packet.h"
 #include "mpp_packet_impl.h"
 #include "hal_task.h"
 

mpp/codec/dec/h265/h265d_codec.h

@@ -28,8 +28,6 @@
 #ifndef __MPP_CODEC_H__
 #define __MPP_CODEC_H__
 
-#include "mpp_common.h"
-#include "mpp_frame.h"
 #include "mpp_dec.h"
 
 enum MppColorSpace {
@@ -166,10 +164,8 @@ extern "C" {
 #endif
 
 RK_S32 h265d_parser2_syntax(void *ctx);
-
 RK_S32 h265d_syntax_fill_slice(void *ctx, RK_S32 input_index);
 
-
 #ifdef  __cplusplus
 }
 #endif

mpp/codec/dec/h265/h265d_parser.h

@@ -29,16 +29,17 @@
 #ifndef __H265D_PARSER_H__
 #define __H265D_PARSER_H__
 
-#include "mpp_bitread.h"
+#include <limits.h>
-#include "mpp_common.h"
-#include "h265d_codec.h"
-#include "mpp_frame.h"
-#include "limits.h"
 #include <string.h>
-#include <mpp_mem.h>
+
+#include "mpp_mem.h"
 #include "mpp_dec.h"
+#include "mpp_bitread.h"
+
+#include "h265d_codec.h"
 
 extern RK_U32 h265d_debug;
+
 #define H265D_DBG_FUNCTION          (0x00000001)
 #define H265D_DBG_VPS               (0x00000002)
 #define H265D_DBG_SPS               (0x00000004)

mpp/codec/dec/jpeg/jpegd_parser.h

@@ -18,17 +18,14 @@
 #ifndef __JPEGD_PARSER_H__
 #define __JPEGD_PARSER_H__
 
-#include "mpp_bitread.h"
+#include <limits.h>
-#include "mpp_common.h"
-#include "mpp_frame.h"
-#include "limits.h"
 #include <string.h>
-#include <mpp_mem.h>
+
-#include "mpp_dec.h"
+#include "mpp_mem.h"
-#include "mpp_buf_slot.h"
-#include "mpp_packet.h"
 #include "mpp_bitread.h"
 
+#include "mpp_dec.h"
+
 #include "jpegd_syntax.h"
 
 #define JPEG_IDENTIFIER(a, b, c, d) \

mpp/codec/dec/m2v/m2vd_api.c

@@ -17,11 +17,11 @@
 #define MODULE_TAG "m2vd_api"
 
 #include <string.h>
+
 #include "mpp_env.h"
-#include "mpp_packet.h"
-#include "mpp_packet_impl.h"
 #include "mpp_mem.h"
 #include "mpp_log.h"
+#include "mpp_packet_impl.h"
 
 #include "m2vd_api.h"
 #include "m2vd_parser.h"
@@ -41,7 +41,3 @@ const ParserApi api_m2vd_parser = {
     .control = m2vd_parser_control,
     .callback = m2vd_parser_callback,
 };
-
-
-
-

mpp/codec/dec/m2v/m2vd_codec.h

@@ -17,12 +17,8 @@
 #ifndef __M2VD_CODEC_H__
 #define __M2VD_CODEC_H__
 
-#include "rk_type.h"
 #include "mpp_common.h"
-#include "mpp_frame.h"
 #include "mpp_dec.h"
-#include "mpp_packet.h"
-
 
 typedef struct M2VDContext_t {
     void        *parse_ctx;

mpp/codec/dec/m2v/m2vd_parser.c

@@ -15,15 +15,15 @@
  */
 
 #define MODULE_TAG "m2vd_parser"
+
 #include <string.h>
 
+#include "mpp_env.h"
+#include "mpp_packet_impl.h"
+
 #include "m2vd_parser.h"
 #include "m2vd_codec.h"
 
-#include "mpp_packet_impl.h"
-#include "mpp_frame.h"
-#include "mpp_env.h"
-
 #define VPU_BITSTREAM_START_CODE (0x42564b52)  /* RKVB, rockchip video bitstream */
 
 RK_U32 m2vd_debug = 0x0;

mpp/codec/dec/m2v/m2vd_parser.h

@@ -27,14 +27,11 @@
 #ifndef __M2VD_PARSER_H__
 #define __M2VD_PARSER_H__
 
-#include "mpp_common.h"
 #include "mpp_mem.h"
 #include "mpp_bitread.h"
 
-#include "mpp_frame.h"
-#include "mpp_packet.h"
-
 #include "mpp_dec.h"
+
 #include "m2vd_syntax.h"
 #include "m2vd_com.h"
 

mpp/codec/dec/mpg4/mpg4d_api.c

@@ -19,8 +19,6 @@
 
 #include <string.h>
 
-#include "rk_mpi.h"
-
 #include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_common.h"

mpp/codec/dec/mpg4/mpg4d_parser.c

@@ -22,10 +22,8 @@
 #include "mpp_env.h"
 #include "mpp_log.h"
 #include "mpp_mem.h"
-#include "mpp_packet.h"
-#include "mpp_common.h"
-
 #include "mpp_bitread.h"
+
 #include "mpg4d_parser.h"
 #include "mpg4d_syntax.h"
 

mpp/codec/dec/vp8/vp8d_parser.h

@@ -19,11 +19,9 @@
 #define __VP8D_PARSER_H__
 
 #include "mpp_bitread.h"
-#include "mpp_common.h"
-#include "mpp_frame.h"
 #include "mpp_mem.h"
+
 #include "mpp_dec.h"
-#include "mpp_packet.h"
 
 #include "vp8d_syntax.h"
 #include "vp8d_data.h"

mpp/codec/dec/vp9/vp9d_api.c

@@ -21,11 +21,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-//#include "common.h"
-#include "mpp_packet.h"
-#include "mpp_packet_impl.h"
 #include "mpp_mem.h"
 #include "mpp_log.h"
+#include "mpp_packet_impl.h"
+
 #include "vp9d_codec.h"
 #include "vp9d_parser.h"
 #include "vp9d_api.h"

mpp/codec/dec/vp9/vp9d_codec.h

@@ -16,14 +16,13 @@
 */
 #ifndef __VP9D_CODEC_H__
 #define __VP9D_CODEC_H__
+
 #include <stdlib.h>
-#include "rk_type.h"
+
-#include "mpp_packet.h"
-#include "vp9d_syntax.h"
-#include "mpp_frame.h"
-#include "mpp_mem.h"
 #include "hal_task.h"
 
+#include "vp9d_syntax.h"
+
 typedef struct VP9ParseContext {
     RK_S32 n_frames; // 1-8
     RK_S32 size[8];

mpp/codec/dec/vp9/vp9d_parser.c

@@ -15,17 +15,20 @@
 * limitations under the License.
 */
 #include <stdlib.h>
-#include "mpp_packet.h"
+
-#include "mpp_packet_impl.h"
+#include <string.h>
+
+#include "mpp_env.h"
 #include "mpp_mem.h"
 #include "mpp_log.h"
+#include "mpp_common.h"
+#include "mpp_bitread.h"
+#include "mpp_packet_impl.h"
+
 #include "vp9data.h"
 #include "vp9d_codec.h"
 #include "vp9d_parser.h"
-#include "mpp_common.h"
+
-#include "mpp_bitread.h"
-#include "mpp_env.h"
-#include "string.h"
 /**
  * Clip a signed integer into the -(2^p),(2^p-1) range.
  * @param  a value to clip

mpp/codec/dec/vp9/vp9d_parser.h

@@ -16,17 +16,17 @@
 */
 #ifndef __VP9D_PARSER_H__
 #define __VP9D_PARSER_H__
+
 #include <stdlib.h>
-#include "rk_type.h"
+
+#include "mpp_mem.h"
+#include "mpp_bitread.h"
+#include "mpp_dec.h"
+
 #include "vpx_rac.h"
 #include "vp9.h"
 #include "vp9data.h"
-#include "mpp_packet.h"
 #include "vp9d_syntax.h"
-#include "mpp_bitread.h"
-#include "mpp_frame.h"
-#include "mpp_mem.h"
-#include "mpp_dec.h"
 
 extern RK_U32 vp9d_debug;
 

mpp/codec/dec/vp9/vpx_rac.h

@@ -24,9 +24,10 @@
 #define VPX_RAC_H
 
 #include <stdint.h>
-#include "mpp_common.h"
 #include <stdlib.h>
 
+#include "mpp_common.h"
+
 #define DECLARE_ALIGNED(n,t,v)      t v
 
 typedef struct Vpxmv {
@@ -55,4 +56,5 @@ int vpx_rac_get_prob_branchy(VpxRangeCoder *c, int prob);
 // rounding is different than vpx_rac_get, is vpx_rac_get wrong?
 int vpx_rac_get(VpxRangeCoder *c);
 int vpx_rac_get_uint(VpxRangeCoder *c, int bits);
+
 #endif /* VPX_RAC_H */

mpp/codec/enc/vp8/vp8e_rc.h

@@ -17,8 +17,6 @@
 #ifndef __VP8E_RC_H__
 #define __VP8E_RC_H__
 
-#include "rk_mpi.h"
-
 #include "vp8e_syntax.h"
 
 #ifdef  __cplusplus

mpp/codec/inc/encoder_codec_api.h

@@ -17,7 +17,6 @@
 #ifndef __CONTROL_API_H__
 #define __CONTROL_API_H__
 
-#include "rk_mpi.h"
 #include "mpp_buf_slot.h"
 #include "hal_task.h"
 

mpp/codec/inc/h264d_api.h

@@ -19,8 +19,6 @@
 
 #include "parser_api.h"
 
-
-
 typedef enum mpp_decmtd_type {
     MPP_DEC_NULL     = 0,
     MPP_DEC_BY_SLICE = 0x1,

mpp/codec/inc/mpp_enc.h

@@ -17,8 +17,6 @@
 #ifndef __MPP_ENC_H__
 #define __MPP_ENC_H__
 
-#include "rk_mpi.h"
-
 #include "mpp_thread.h"
 #include "mpp_controller.h"
 #include "mpp_hal.h"

mpp/codec/inc/mpp_rc.h

@@ -18,7 +18,7 @@
 #define __MPP_RC__
 
 #include "rk_mpi.h"
-#include "mpp_err.h"
+
 #include "mpp_log.h"
 #include "mpp_list.h"
 

mpp/codec/inc/parser_api.h

@@ -17,7 +17,6 @@
 #ifndef __PARSER_API_H__
 #define __PARSER_API_H__
 
-#include "rk_mpi.h"
 #include "mpp_packet.h"
 #include "mpp_buf_slot.h"
 #include "hal_task.h"

mpp/codec/mpp_dec.cpp

@@ -22,10 +22,8 @@
 #include "mpp_mem.h"
 #include "mpp_log.h"
 #include "mpp_time.h"
-#include "mpp_common.h"
 
 #include "mpp.h"
-#include "mpp_frame.h"
 #include "mpp_buffer_impl.h"
 #include "mpp_packet_impl.h"
 #include "mpp_frame_impl.h"

mpp/codec/mpp_enc.cpp

@@ -21,12 +21,10 @@
 #include "mpp_env.h"
 #include "mpp_log.h"
 #include "mpp_mem.h"
-#include "mpp_common.h"
+
+#include "mpp_packet_impl.h"
 
 #include "mpp.h"
-#include "mpp_frame_impl.h"
-#include "mpp_packet.h"
-#include "mpp_packet_impl.h"
 #include "hal_h264e_api.h"
 
 #define MPP_ENC_DBG_FUNCTION            (0x00000001)

mpp/common/h265e_syntax.h

@@ -17,8 +17,6 @@
 #ifndef __H265E_SYNTAX_H__
 #define __H265E_SYNTAX_H__
 
-#include "mpp_frame.h"
-
 typedef struct H265eSyntax_t {
     RK_S32          idr_request;
 //   RK_S32          eos;

mpp/hal/common/h264/hal_h264e_com.h

@@ -17,9 +17,8 @@
 #ifndef __HAL_H264E_H__
 #define __HAL_H264E_H__
 
-#include "rk_mpi_cmd.h"
-#include "mpp_packet.h"
 #include "mpp_log.h"
+
 #include "mpp_hal.h"
 #include "mpp_rc.h"
 #include "mpp_device.h"

mpp/hal/vpu/h264e/hal_h264e_header.c

@@ -18,7 +18,6 @@
 #include <string.h>
 #include <limits.h>
 
-#include "rk_mpi.h"
 #include "mpp_mem.h"
 #include "mpp_common.h"
 

mpp/hal/vpu/h264e/hal_h264e_header.h

@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "rk_mpi.h"
 #include "hal_h264e_com.h"
 
 MPP_RET h264e_vpu_init_extra_info(void *extra_info);

mpp/hal/vpu/h264e/hal_h264e_rc.c

@@ -18,7 +18,6 @@
 #include <string.h>
 #include <limits.h>
 
-#include "rk_mpi.h"
 #include "mpp_mem.h"
 #include "mpp_common.h"
 

mpp/hal/vpu/h264e/hal_h264e_rc.h

@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "rk_mpi.h"
 #include "hal_h264e_com.h"
 
 extern const RK_S32 h264_q_step[];

mpp/hal/vpu/h264e/hal_h264e_vepu1.c

@@ -18,7 +18,6 @@
 #include <string.h>
 
 #include "mpp_device.h"
-#include "rk_mpi.h"
 
 #include "mpp_rc.h"
 #include "mpp_env.h"

mpp/hal/vpu/h264e/hal_h264e_vepu2.c

@@ -19,7 +19,6 @@
 #include <string.h>
 #include "mpp_device.h"
 
-#include "rk_mpi.h"
 #include "mpp_env.h"
 #include "mpp_mem.h"
 #include "mpp_frame.h"

mpp/hal/worker/mpp_device/mpp_device.c

@@ -24,12 +24,13 @@
 
 #include "mpp_env.h"
 #include "mpp_log.h"
+#include "mpp_mem.h"
 #include "mpp_time.h"
+#include "mpp_common.h"
 
 #include "mpp_device.h"
 #include "mpp_device_patch.h"
 #include "mpp_platform.h"
-#include "mpp_mem.h"
 
 #include "vpu.h"
 

mpp/inc/mpp.h

@@ -17,11 +17,10 @@
 #ifndef __MPP_H__
 #define __MPP_H__
 
-#include "mpp_list.h"
 #include "mpp_queue.h"
+
 #include "mpp_dec.h"
 #include "mpp_enc.h"
-#include "mpp_task.h"
 #include "mpp_impl.h"
 
 #define MPP_DBG_FUNCTION                    (0x00000001)

mpp/legacy/vpu_api_legacy.h

@@ -17,9 +17,10 @@
 #ifndef _VPU_API_LEGACY_H_
 #define _VPU_API_LEGACY_H_
 
+#include <stdio.h>
+
 #include "vpu_api.h"
 #include "rk_mpi.h"
-#include <stdio.h>
 
 #define OMX_BUFFERFLAG_EOS              0x00000001
 

mpp/mpi.cpp

@@ -18,12 +18,10 @@
 
 #include <string.h>
 
-#include "rk_mpi.h"
-
 #include "mpp_log.h"
 #include "mpp_mem.h"
+
 #include "mpi_impl.h"
-#include "mpp.h"
 #include "mpp_info.h"
 #include "mpp_common.h"
 #include "mpp_env.h"

osal/inc/mpp_common.h

@@ -162,6 +162,25 @@
 #define ARG_N_HELPER(...)       ARG_T(ARG_N(__VA_ARGS__))
 #define COUNT_ARG(...)          ARG_N_HELPER(__VA_ARGS__,4,3,2,1,0)
 
+#define SZ_1K                   (1024)
+#define SZ_2K                   (SZ_1K*2)
+#define SZ_4K                   (SZ_1K*4)
+#define SZ_8K                   (SZ_1K*8)
+#define SZ_16K                  (SZ_1K*16)
+#define SZ_32K                  (SZ_1K*32)
+#define SZ_64K                  (SZ_1K*64)
+#define SZ_128K                 (SZ_1K*128)
+#define SZ_256K                 (SZ_1K*256)
+#define SZ_512K                 (SZ_1K*512)
+#define SZ_1M                   (SZ_1K*SZ_1K)
+#define SZ_2M                   (SZ_1M*2)
+#define SZ_4M                   (SZ_1M*4)
+#define SZ_8M                   (SZ_1M*8)
+#define SZ_16M                  (SZ_1M*16)
+#define SZ_32M                  (SZ_1M*32)
+#define SZ_64M                  (SZ_1M*64)
+#define SZ_80M                  (SZ_1M*80)
+#define SZ_128M                 (SZ_1M*128)
 
 #ifdef __cplusplus
 extern "C" {

osal/inc/mpp_log.h

@@ -17,10 +17,11 @@
 #ifndef __MPP_LOG_H__
 #define __MPP_LOG_H__
 
-#include "rk_type.h"
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "rk_type.h"
+
 /*
  * mpp runtime log system usage:
  * mpp_err is for error status message, it will print for sure.

osal/inc/mpp_platform.h

@@ -17,7 +17,6 @@
 #ifndef __MPP_PLATFORM__
 #define __MPP_PLATFORM__
 
-#include "rk_type.h"
 #include "rk_mpi.h"
 
 /*

osal/inc/mpp_runtime.h

@@ -17,7 +17,7 @@
 #ifndef __MPP_RUNTIME__
 #define __MPP_RUNTIME__
 
-#include "rk_mpi.h"
+#include "mpp_buffer.h"
 
 #ifdef __cplusplus
 extern "C" {

osal/mpp_allocator.cpp

@@ -18,6 +18,7 @@
 
 #include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_common.h"
 #include "mpp_allocator.h"
 #include "mpp_allocator_impl.h"
 

test/mpi_test.c

@@ -24,7 +24,7 @@
 #include "rk_mpi.h"
 #include "mpp_log.h"
 #include "mpp_env.h"
-
+#include "mpp_common.h"
 
 #define MPI_DEC_LOOP_COUNT          4
 #define MPI_ENC_LOOP_COUNT          4

utils/utils.h

@@ -19,7 +19,6 @@
 
 #include <stdio.h>
 
-#include "mpp_err.h"
 #include "mpp_frame.h"
 
 typedef struct OptionInfo_t {