[mpp_log]: Add more log helper function

1. Move mpp_log.h to inc for external user.
2. Add mpp_debug.h for mpp internal logging.
3. Fix some warning.
4. Add log level setup function.
5. Check env log_level value in mpp_get_log_level call.

NOTE:
1. mpp internal module should use mpp_debug.h and mpp external user
should use mpp_log.h
2. Use mpp_get_log_level to update mpp_log_level when the env changed.

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

inc/mpp_log.h

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2022 Rockchip Electronics Co. LTD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPP_LOG_H__
+#define __MPP_LOG_H__
+
+#include "rk_type.h"
+#include "mpp_log_def.h"
+
+/*
+ * _c function will add condition check
+ * _f function will add function name to the log
+ * _cf function will add both function name and condition check
+ */
+
+/*
+ * mpp runtime log system usage:
+ * mpp_logf is for fatal logging. For use when aborting
+ * mpp_loge is for error logging. For use with unrecoverable failures.
+ * mpp_logw is for warning logging. For use with recoverable failures.
+ * mpp_logi is for informational logging.
+ * mpp_logd is for debug logging.
+ * mpp_logv is for verbose logging
+ */
+
+#define mpp_logf(fmt, ...)  _mpp_log_l(MPP_LOG_FATAL,   MODULE_TAG, fmt, NULL, ## __VA_ARGS__)
+#define mpp_loge(fmt, ...)  _mpp_log_l(MPP_LOG_ERROR,   MODULE_TAG, fmt, NULL, ## __VA_ARGS__)
+#define mpp_logw(fmt, ...)  _mpp_log_l(MPP_LOG_WARN,    MODULE_TAG, fmt, NULL, ## __VA_ARGS__)
+#define mpp_logi(fmt, ...)  _mpp_log_l(MPP_LOG_INFO,    MODULE_TAG, fmt, NULL, ## __VA_ARGS__)
+#define mpp_logd(fmt, ...)  _mpp_log_l(MPP_LOG_DEBUG,   MODULE_TAG, fmt, NULL, ## __VA_ARGS__)
+#define mpp_logv(fmt, ...)  _mpp_log_l(MPP_LOG_VERBOSE, MODULE_TAG, fmt, NULL, ## __VA_ARGS__)
+
+#define mpp_logf_f(fmt, ...)  _mpp_log_l(MPP_LOG_FATAL,   MODULE_TAG, fmt, __FUNCTION__, ## __VA_ARGS__)
+#define mpp_loge_f(fmt, ...)  _mpp_log_l(MPP_LOG_ERROR,   MODULE_TAG, fmt, __FUNCTION__, ## __VA_ARGS__)
+#define mpp_logw_f(fmt, ...)  _mpp_log_l(MPP_LOG_WARN,    MODULE_TAG, fmt, __FUNCTION__, ## __VA_ARGS__)
+#define mpp_logi_f(fmt, ...)  _mpp_log_l(MPP_LOG_INFO,    MODULE_TAG, fmt, __FUNCTION__, ## __VA_ARGS__)
+#define mpp_logd_f(fmt, ...)  _mpp_log_l(MPP_LOG_DEBUG,   MODULE_TAG, fmt, __FUNCTION__, ## __VA_ARGS__)
+#define mpp_logv_f(fmt, ...)  _mpp_log_l(MPP_LOG_VERBOSE, MODULE_TAG, fmt, __FUNCTION__, ## __VA_ARGS__)
+
+#define mpp_logf_c(cond, fmt, ...)  do { if (cond) mpp_logf(fmt, ## __VA_ARGS__); } while (0)
+#define mpp_loge_c(cond, fmt, ...)  do { if (cond) mpp_loge(fmt, ## __VA_ARGS__); } while (0)
+#define mpp_logw_c(cond, fmt, ...)  do { if (cond) mpp_logw(fmt, ## __VA_ARGS__); } while (0)
+#define mpp_logi_c(cond, fmt, ...)  do { if (cond) mpp_logi(fmt, ## __VA_ARGS__); } while (0)
+#define mpp_logd_c(cond, fmt, ...)  do { if (cond) mpp_logd(fmt, ## __VA_ARGS__); } while (0)
+#define mpp_logv_c(cond, fmt, ...)  do { if (cond) mpp_logv(fmt, ## __VA_ARGS__); } while (0)
+
+#define mpp_logf_cf(cond, fmt, ...) do { if (cond) mpp_logf_f(fmt, ## __VA_ARGS__); } while (0)
+#define mpp_loge_cf(cond, fmt, ...) do { if (cond) mpp_loge_f(fmt, ## __VA_ARGS__); } while (0)
+#define mpp_logw_cf(cond, fmt, ...) do { if (cond) mpp_logw_f(fmt, ## __VA_ARGS__); } while (0)
+#define mpp_logi_cf(cond, fmt, ...) do { if (cond) mpp_logi_f(fmt, ## __VA_ARGS__); } while (0)
+#define mpp_logd_cf(cond, fmt, ...) do { if (cond) mpp_logd_f(fmt, ## __VA_ARGS__); } while (0)
+#define mpp_logv_cf(cond, fmt, ...) do { if (cond) mpp_logv_f(fmt, ## __VA_ARGS__); } while (0)
+
+/*
+ * mpp runtime log system usage:
+ * mpp_err is for error status message, it will print for sure.
+ * mpp_log is for important message like open/close/reset/flush, it will print too.
+ */
+
+#define mpp_log(fmt, ...)   mpp_logi(fmt, ## __VA_ARGS__)
+#define mpp_err(fmt, ...)   mpp_loge(fmt, ## __VA_ARGS__)
+
+#define mpp_log_f(fmt, ...)  mpp_logi_f(fmt, ## __VA_ARGS__)
+#define mpp_err_f(fmt, ...)  mpp_loge_f(fmt, ## __VA_ARGS__)
+
+#define mpp_log_c(cond, fmt, ...)   do { if (cond) mpp_log(fmt, ## __VA_ARGS__); } while (0)
+#define mpp_log_cf(cond, fmt, ...)  do { if (cond) mpp_log_f(fmt, ## __VA_ARGS__); } while (0)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void _mpp_log_l(int level, const char *tag, const char *fmt, const char *func, ...);
+
+void mpp_set_log_level(int level);
+int mpp_get_log_level(void);
+
+/* deprecated function */
+void _mpp_log(const char *tag, const char *fmt, const char *func, ...);
+void _mpp_err(const char *tag, const char *fmt, const char *func, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MPP_LOG_H__*/

inc/mpp_log_def.h

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2022 Rockchip Electronics Co. LTD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MPP_LOG_DEF_H__
+#define __MPP_LOG_DEF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MPP_LOG_UNKNOWN     0   /* internal use only                    */
+#define MPP_LOG_FATAL       1   /* fatal error on aborting              */
+#define MPP_LOG_ERROR       2   /* error log on unrecoverable failures  */
+#define MPP_LOG_WARN        3   /* warning log on recoverable failures  */
+#define MPP_LOG_INFO        4   /* Informational log                    */
+#define MPP_LOG_DEBUG       5   /* Debug log                            */
+#define MPP_LOG_VERBOSE     6   /* Verbose log                          */
+#define MPP_LOG_SILENT      7   /* internal use only                    */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MPP_LOG_DEF_H__*/

mpp/base/inc/mpp_bitput.h

@@ -18,13 +18,9 @@
 #ifndef __MPP_BITPUT_H__
 #define __MPP_BITPUT_H__
 
-#include <stdio.h>
-#include <assert.h>
-
 #include "rk_type.h"
-#include "mpp_log.h"
-#include "mpp_common.h"
 #include "mpp_err.h"
+#include "mpp_common.h"
 
 typedef struct bitput_ctx_t {
     RK_U32          buflen;         //!< max buf length, 64bit uint

mpp/base/inc/mpp_bitread.h

@@ -20,9 +20,8 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "mpp_log.h"
-#include "mpp_common.h"
 #include "mpp_err.h"
+#include "mpp_common.h"
 
 #define   __BITREAD_ERR   __bitread_error
 

mpp/base/mpp_bitwrite.c

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 
 #include "mpp_bitwrite.h"
 

mpp/base/mpp_buf_slot.cpp

@@ -18,10 +18,10 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_env.h"
 #include "mpp_list.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 
 #include "mpp_frame_impl.h"

mpp/base/mpp_buffer.cpp

@@ -18,8 +18,8 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_buffer_impl.h"
 
 MPP_RET mpp_buffer_import_with_tag(MppBufferGroup group, MppBufferInfo *info, MppBuffer *buffer,

mpp/base/mpp_buffer_impl.cpp

@@ -18,10 +18,10 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_env.h"
 #include "mpp_hash.h"
 #include "mpp_lock.h"
+#include "mpp_debug.h"
 #include "mpp_mem_pool.h"
 
 #include "mpp_buffer_impl.h"
@@ -912,9 +912,9 @@ MppBufferGroupImpl *MppBufferService::get_group(const char *tag, const char *cal
     RK_U32 id = get_group_id();
 
     if (tag) {
-        snprintf(p->tag, sizeof(p->tag), "%s_%d", tag, id);
+        snprintf(p->tag, sizeof(p->tag) - 1, "%s_%d", tag, id);
     } else {
-        snprintf(p->tag, sizeof(p->tag), "unknown");
+        snprintf(p->tag, sizeof(p->tag) - 1, "unknown");
     }
     p->group_id = id;
 

mpp/base/mpp_cfg.cpp

@@ -18,8 +18,8 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_cfg.h"
+#include "mpp_debug.h"
 
 const char *cfg_type_names[] = {
     "RK_S32",

mpp/base/mpp_cluster.cpp

@@ -18,11 +18,12 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_env.h"
 #include "mpp_lock.h"
 #include "mpp_time.h"
+#include "mpp_debug.h"
+#include "mpp_common.h"
 
 #include "mpp_cluster.h"
 #include "mpp_dev_defs.h"

mpp/base/mpp_dec_cfg.cpp

@@ -19,9 +19,9 @@
 #include "rk_vdec_cfg.h"
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_time.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 #include "mpp_thread.h"
 

mpp/base/mpp_enc_cfg.cpp

@@ -21,9 +21,9 @@
 #include "rk_venc_cfg.h"
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_time.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 #include "mpp_thread.h"
 

mpp/base/mpp_enc_refs.cpp

@@ -19,8 +19,8 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 
 #include "mpp_enc_ref.h"

mpp/base/mpp_packet.cpp

@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "mpp_mem_pool.h"
 #include "mpp_packet_impl.h"
 #include "mpp_meta_impl.h"

mpp/base/mpp_task_impl.cpp

@@ -19,8 +19,8 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 
 #include "mpp_task_impl.h"
 #include "mpp_meta_impl.h"

mpp/base/test/mpp_buffer_test.c

@@ -21,8 +21,8 @@
 #if defined(_WIN32)
 #include "vld.h"
 #endif
-#include "mpp_log.h"
 #include "mpp_env.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 #include "mpp_buffer.h"
 #include "mpp_allocator.h"

mpp/base/test/mpp_meta_test.c

@@ -18,8 +18,8 @@
 
 #include <pthread.h>
 
-#include "mpp_log.h"
 #include "mpp_time.h"
+#include "mpp_debug.h"
 #include "mpp_meta_impl.h"
 
 #define TEST_MAX    2

mpp/base/test/mpp_task_test.c

@@ -1,5 +1,5 @@
-#include "mpp_log.h"
 #include "mpp_time.h"
+#include "mpp_debug.h"
 #include "mpp_thread.h"
 
 #include "mpp_task.h"

mpp/codec/dec/av1/av1d_api.c

@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "mpp_mem.h"
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "mpp_packet_impl.h"
 
 #include "av1d_codec.h"

mpp/codec/dec/av1/av1d_cbs.c

@@ -18,6 +18,7 @@
 #include <string.h>
 
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_bitread.h"
 
 #include "av1d_parser.h"

mpp/codec/dec/av1/av1d_parser.c

@@ -21,7 +21,7 @@
 
 #include "mpp_env.h"
 #include "mpp_mem.h"
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 #include "mpp_compat_impl.h"
 

mpp/codec/dec/avs/avsd_api.c

@@ -21,9 +21,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mpp_mem.h"
-#include "mpp_log.h"
 #include "mpp_env.h"
+#include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_packet_impl.h"
 
 #include "avsd_syntax.h"

mpp/codec/dec/avs/avsd_parse.c

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

mpp/codec/dec/avs/avsd_parse.h

@@ -17,6 +17,8 @@
 #ifndef __AVSD_PARSE_H__
 #define __AVSD_PARSE_H__
 
+#include "mpp_debug.h"
+
 #include "parser_api.h"
 #include "mpp_bitread.h"
 

mpp/codec/dec/dummy/dummy_dec_api.c

@@ -18,8 +18,8 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 
 #include "dummy_dec_api.h"

mpp/codec/dec/h263/h263d_api.c

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

mpp/codec/dec/h263/h263d_parser.c

@@ -18,8 +18,8 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 
 #include "mpp_bitread.h"
 #include "h263d_parser.h"

mpp/codec/dec/h264/h264d_global.h

@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include "rk_type.h"
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "mpp_bitread.h"
 #include "mpp_mem_pool.h"
 

mpp/codec/dec/h265/h265d_parser.h

@@ -32,7 +32,7 @@
 #include <limits.h>
 #include <string.h>
 
-#include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_bitread.h"
 #include "mpp_buf_slot.h"
 #include "mpp_mem_pool.h"

mpp/codec/dec/jpeg/jpegd_parser.c

@@ -22,6 +22,7 @@
 #include "mpp_env.h"
 #include "mpp_mem.h"
 #include "mpp_soc.h"
+#include "mpp_debug.h"
 #include "mpp_bitread.h"
 #include "mpp_packet_impl.h"
 
@@ -993,7 +994,7 @@ static MPP_RET jpegd_prepare(void *ctx, MppPacket pkt, HalDecTask *task)
         static FILE *jpg_file;
         static char name[32];
 
-        snprintf(name, sizeof(name), "/data/input%02d.jpg",
+        snprintf(name, sizeof(name) - 1, "/data/input%02d.jpg",
                  JpegCtx->input_jpeg_count);
         jpg_file = fopen(name, "wb+");
         if (jpg_file) {

mpp/codec/dec/jpeg/jpegd_parser.h

@@ -21,7 +21,6 @@
 #include <limits.h>
 #include <string.h>
 
-#include "mpp_mem.h"
 #include "mpp_bitread.h"
 
 #include "jpegd_syntax.h"

mpp/codec/dec/m2v/m2vd_api.c

@@ -18,11 +18,6 @@
 
 #include <string.h>
 
-#include "mpp_env.h"
-#include "mpp_mem.h"
-#include "mpp_log.h"
-#include "mpp_packet_impl.h"
-
 #include "m2vd_api.h"
 #include "m2vd_parser.h"
 #include "m2vd_codec.h"

mpp/codec/dec/m2v/m2vd_com.h

@@ -20,8 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "rk_type.h"
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #define M2VD_DEMO_MODE         0
 

mpp/codec/dec/m2v/m2vd_parser.c

@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include "mpp_env.h"
+#include "mpp_debug.h"
 #include "mpp_packet_impl.h"
 
 #include "m2vd_parser.h"

mpp/codec/dec/mpg4/mpg4d_api.c

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

mpp/codec/dec/mpg4/mpg4d_parser.c

@@ -20,15 +20,15 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_bitread.h"
 
 #include "mpg4d_parser.h"
 #include "mpg4d_syntax.h"
 
-
 RK_U32 mpg4d_debug = 0;
+
 #define mpg4d_dbg(flag, fmt, ...)   _mpp_dbg(mpg4d_debug, flag, fmt, ## __VA_ARGS__)
 #define mpg4d_dbg_f(flag, fmt, ...) _mpp_dbg_f(mpg4d_debug, flag, fmt, ## __VA_ARGS__)
 

mpp/codec/dec/vp8/vp8d_parser.c

@@ -18,10 +18,13 @@
 
 #include <string.h>
 
+#include "mpp_env.h"
+#include "mpp_mem.h"
+#include "mpp_debug.h"
+#include "mpp_frame.h"
+
 #include "vp8d_parser.h"
 #include "vp8d_codec.h"
-#include "mpp_frame.h"
-#include "mpp_env.h"
 
 #define FUN_T(tag) \
     do {\

mpp/codec/dec/vp8/vp8d_parser.h

@@ -18,8 +18,7 @@
 #ifndef __VP8D_PARSER_H__
 #define __VP8D_PARSER_H__
 
-#include "mpp_bitread.h"
-#include "mpp_mem.h"
+#include <stdio.h>
 
 #include "parser_api.h"
 #include "vp8d_syntax.h"

mpp/codec/dec/vp9/vp9d_api.c

@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include "mpp_mem.h"
-#include "mpp_log.h"
 #include "mpp_packet_impl.h"
 
 #include "vp9d_codec.h"

mpp/codec/dec/vp9/vp9d_parser.c

@@ -20,7 +20,7 @@
 
 #include "mpp_env.h"
 #include "mpp_mem.h"
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 #include "mpp_bitread.h"
 #include "mpp_packet_impl.h"

mpp/codec/dec/vp9/vp9d_parser.h

@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-#include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_bitread.h"
 
 #include "parser_api.h"

mpp/codec/enc/h264/h264e_api_v2.c

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

mpp/codec/enc/h264/h264e_debug.h

@@ -17,7 +17,7 @@
 #ifndef __H264E_DEBUG_H__
 #define __H264E_DEBUG_H__
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #define H264E_DBG_FUNCTION          (0x00000001)
 #define H264E_DBG_FLOW              (0x00000002)

mpp/codec/enc/h265/h265e_codec.h

@@ -16,7 +16,7 @@
 #ifndef __H265E_CODEC_H__
 #define __H265E_CODEC_H__
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #include "mpp_common.h"
 #include "mpp_rc.h"

mpp/codec/enc/h265/h265e_dpb.c

@@ -18,8 +18,8 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 
 #include "h265e_codec.h"

mpp/codec/enc/h265/h265e_slice.c

@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "h265e_codec.h"
 #include "h265e_slice.h"
 

mpp/codec/enc/jpeg/jpege_api_v2.c

@@ -19,10 +19,9 @@
 #include <string.h>
 
 #include "mpp_err.h"
-#include "mpp_log.h"
 #include "mpp_env.h"
-#include "mpp_common.h"
 #include "mpp_mem.h"
+#include "mpp_common.h"
 #include "mpp_2str.h"
 
 #include "jpege_debug.h"

mpp/codec/enc/jpeg/jpege_debug.h

@@ -17,7 +17,7 @@
 #ifndef __JPEGE_DEBUG_H__
 #define __JPEGE_DEBUG_H__
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #define JPEGE_DBG_FUNCTION          (0x00000001)
 #define JPEGE_DBG_INPUT             (0x00000010)

mpp/codec/enc/vp8/vp8e_api_v2.c

@@ -19,8 +19,8 @@
 #include <vp8e_syntax.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 #include "mpp_rc.h"
 #include "mpp_enc_cfg_impl.h"

mpp/codec/enc/vp8/vp8e_debug.h

@@ -17,9 +17,7 @@
 #ifndef __VP8E_DEBUG_H__
 #define __VP8E_DEBUG_H__
 
-#include "rk_type.h"
-
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #define VP8E_DBG_RC_FUNCTION            (0x00010000)
 #define VP8E_DBG_RC_BPS                 (0x00020000)

mpp/codec/enc_impl.cpp

@@ -19,7 +19,7 @@
 #include <string.h>
 
 #include "mpp_mem.h"
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 #include "mpp_packet_impl.h"
 

mpp/codec/inc/mpp_rc.h

@@ -19,7 +19,6 @@
 
 #include "rk_venc_cmd.h"
 
-#include "mpp_log.h"
 #include "mpp_list.h"
 
 /*

mpp/codec/mpp_dec.cpp

@@ -20,8 +20,8 @@
 
 #include "mpp_env.h"
 #include "mpp_mem.h"
-#include "mpp_log.h"
 #include "mpp_time.h"
+#include "mpp_debug.h"
 
 #include "mpp.h"
 

mpp/codec/mpp_enc_debug.h

@@ -17,7 +17,7 @@
 #ifndef __MPP_ENC_DEBUG_H__
 #define __MPP_ENC_DEBUG_H__
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #define MPP_ENC_DBG_FUNCTION            (0x00000001)
 #define MPP_ENC_DBG_CONTROL             (0x00000002)

mpp/codec/rc/rc_data.cpp

@@ -17,9 +17,9 @@
 #define MODULE_TAG "rc_data"
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_list.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 
 #include "rc_data.h"

mpp/codec/rc/rc_data_impl.cpp

@@ -19,9 +19,9 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_list.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 
 #include "rc_data.h"

mpp/codec/rc/rc_debug.h

@@ -17,7 +17,7 @@
 #ifndef __RC_DEBUG_H__
 #define __RC_DEBUG_H__
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #define RC_DBG_FUNCTION             (0x00000001)
 #define RC_DBG_API_IMPL             (0x00000002)

mpp/hal/common/h264/hal_h264e_debug.h

@@ -17,7 +17,7 @@
 #ifndef __HAL_H264E_DEBUG_H__
 #define __HAL_H264E_DEBUG_H__
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #define HAL_H264E_DBG_SIMPLE            (0x00000001)
 #define HAL_H264E_DBG_FUNCTION          (0x00000002)

mpp/hal/common/h265/hal_h265e_api_v2.c

@@ -22,7 +22,7 @@
 
 #include "mpp_env.h"
 #include "mpp_mem.h"
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #include "mpp_platform.h"
 #include "vepu5xx.h"

mpp/hal/common/h265/hal_h265e_debug.h

@@ -17,7 +17,7 @@
 #ifndef __HAL_H265E_DEBUG_H__
 #define __HAL_H265E_DEBUG_H__
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #define HAL_H265E_DBG_FUNCTION          (0x00000001)
 #define HAL_H265E_DBG_SIMPLE            (0x00000002)

mpp/hal/common/hal_bufs.c

@@ -18,8 +18,8 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 
 #include "hal_bufs.h"

mpp/hal/common/hal_info.c

@@ -17,8 +17,9 @@
 #include <string.h>
 
 #include "mpp_mem.h"
-#include "mpp_log.h"
 #include "mpp_2str.h"
+#include "mpp_debug.h"
+#include "mpp_common.h"
 
 #include "hal_info.h"
 

mpp/hal/hal_task.cpp

@@ -19,9 +19,9 @@
 #include <string.h>
 
 #include "mpp_mem.h"
-#include "mpp_log.h"
 #include "mpp_list.h"
 #include "mpp_lock.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 
 #include "hal_task.h"

mpp/hal/rkdec/avsd/hal_avsd_api.c

@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_env.h"
 #include "mpp_common.h"

mpp/hal/rkdec/avsd/hal_avsd_reg.c

@@ -17,7 +17,6 @@
 
 #define MODULE_TAG "hal_avsd_reg"
 
-#include "mpp_log.h"
 #include "mpp_common.h"
 
 #include "avsd_syntax.h"

mpp/hal/rkdec/avsd/hal_avsd_reg.h

@@ -17,6 +17,7 @@
 #ifndef __HAL_AVSD_REG_H__
 #define __HAL_AVSD_REG_H__
 
+#include "mpp_debug.h"
 #include "mpp_device.h"
 
 #include "parser_api.h"

mpp/hal/rkdec/h264d/hal_h264d_api.c

@@ -24,7 +24,6 @@
 #include <dlfcn.h>
 #include <unistd.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_env.h"
 #include "mpp_platform.h"

mpp/hal/rkdec/h264d/hal_h264d_global.h

@@ -20,7 +20,7 @@
 #define __HAL_H264D_GLOBAL_H__
 
 #include "mpp_hal.h"
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "mpp_device.h"
 #include "hal_bufs.h"
 

mpp/hal/rkdec/h265d/hal_h265d_api.c

@@ -20,8 +20,8 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 
 #include "hal_h265d_ctx.h"
 #include "hal_h265d_api.h"

mpp/hal/rkdec/h265d/hal_h265d_com.c

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

mpp/hal/rkdec/h265d/hal_h265d_debug.h

@@ -18,9 +18,7 @@
 #ifndef __HAL_H265D_DEBUG_H__
 #define __HAL_H265D_DEBUG_H__
 
-#include "rk_type.h"
-#include "mpp_err.h"
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #define H265H_DBG_FUNCTION          (0x00000001)
 #define H265H_DBG_RPS               (0x00000002)

mpp/hal/rkdec/h265d/hal_h265d_rkv.c

@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_bitread.h"
 #include "mpp_bitput.h"

mpp/hal/rkdec/h265d/hal_h265d_rkv_reg.h

@@ -29,7 +29,6 @@
 #define __HAL_H265D_REG_H__
 
 #include "rk_type.h"
-#include "mpp_log.h"
 
 #define HEVC_DECODER_REG_NUM        (48)
 #define RKVDEC_REG_PERF_CYCLE_INDEX (64)

mpp/hal/rkdec/h265d/hal_h265d_vdpu34x.c

@@ -20,7 +20,6 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_bitread.h"
 #include "mpp_bitput.h"

mpp/hal/rkdec/vp9d/hal_vp9d_api.c

@@ -19,7 +19,6 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 
 #include "hal_vp9d_debug.h"
 #include "hal_vp9d_api.h"

mpp/hal/rkdec/vp9d/hal_vp9d_debug.h

@@ -17,7 +17,7 @@
 #ifndef __HAL_VP9D_DEBUG_H__
 #define __HAL_VP9D_DEBUG_H__
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #define HAL_VP9D_DBG_FUNC               (0x00000001)
 #define HAL_VP9D_DBG_PAR                (0x00000002)

mpp/hal/rkdec/vp9d/hal_vp9d_rkv.c

@@ -20,7 +20,6 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_common.h"
 

mpp/hal/rkdec/vp9d/hal_vp9d_vdpu34x.c

@@ -20,7 +20,6 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_common.h"
 #include "mpp_device.h"

mpp/hal/rkenc/common/vepu541_common.c

@@ -18,8 +18,8 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 
 #include "vepu541_common.h"

mpp/hal/vpu/av1d/hal_av1d_api.c

@@ -22,7 +22,6 @@
 #include <dlfcn.h>
 #include <unistd.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_env.h"
 #include "mpp_platform.h"

mpp/hal/vpu/av1d/hal_av1d_common.h

@@ -19,7 +19,7 @@
 #define __HAL_AV1D_GLOBAL_H__
 
 #include "mpp_hal.h"
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "mpp_device.h"
 #include "hal_bufs.h"
 

mpp/hal/vpu/common/vepu_common.c

@@ -17,8 +17,8 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 #include "mpp_frame.h"
 

mpp/hal/vpu/h263d/hal_h263d_api.c

@@ -17,7 +17,7 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "mpp_platform.h"
 
 #include "mpp_hal.h"

mpp/hal/vpu/h263d/hal_h263d_vdpu1.c

@@ -19,9 +19,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_err.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 
 #include "h263d_syntax.h"
 #include "hal_h263d_api.h"

mpp/hal/vpu/h263d/hal_h263d_vdpu2.c

@@ -19,9 +19,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_err.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 
 #include "h263d_syntax.h"
 #include "hal_h263d_api.h"

mpp/hal/vpu/jpegd/hal_jpegd_api.c

@@ -19,7 +19,7 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "osal_2str.h"
 
 #include "mpp_hal.h"

mpp/hal/vpu/jpegd/hal_jpegd_common.c

@@ -21,8 +21,8 @@
 #include <stdint.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_bitread.h"
 #include "mpp_bitput.h"
 

mpp/hal/vpu/jpegd/hal_jpegd_rkv.c

@@ -20,8 +20,8 @@
 #include <stdint.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_frame.h"
 #include "mpp_common.h"
 
@@ -743,7 +743,7 @@ MPP_RET hal_jpegd_rkv_wait(void *hal, HalTaskInfo *task)
         mpp_buf_slot_get_prop(ctx->frame_slots, task->dec.output, SLOT_BUFFER, &outputBuf);
         base = mpp_buffer_get_ptr(outputBuf);
 
-        snprintf(name, sizeof(name), "/data/tmp/output%02d.yuv", ctx->output_yuv_count);
+        snprintf(name, sizeof(name) - 1, "/data/tmp/output%02d.yuv", ctx->output_yuv_count);
         jpg_file = fopen(name, "wb+");
         if (jpg_file) {
             JpegdSyntax *s = (JpegdSyntax *) task->dec.syntax.data;

mpp/hal/vpu/jpegd/hal_jpegd_vdpu1.c

@@ -21,8 +21,8 @@
 #include <stdint.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_frame.h"
 #include "mpp_common.h"
 
@@ -996,7 +996,7 @@ MPP_RET hal_jpegd_vdpu1_wait(void *hal, HalTaskInfo *task)
                               SLOT_BUFFER, &outputBuf);
         base = mpp_buffer_get_ptr(outputBuf);
 
-        snprintf(name, sizeof(name), "/tmp/output%02d.yuv",
+        snprintf(name, sizeof(name) - 1, "/tmp/output%02d.yuv",
                  JpegHalCtx->output_yuv_count);
         jpg_file = fopen(name, "wb+");
         if (jpg_file) {

mpp/hal/vpu/jpegd/hal_jpegd_vdpu2.c

@@ -21,8 +21,8 @@
 #include <stdint.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_frame.h"
 #include "mpp_common.h"
 
@@ -974,7 +974,7 @@ MPP_RET hal_jpegd_vdpu2_wait(void *hal, HalTaskInfo *task)
                               SLOT_BUFFER, &outputBuf);
         base = mpp_buffer_get_ptr(outputBuf);
 
-        snprintf(name, sizeof(name), "/tmp/output%02d.yuv",
+        snprintf(name, sizeof(name) - 1, "/tmp/output%02d.yuv",
                  JpegHalCtx->output_yuv_count);
         jpg_file = fopen(name, "wb+");
         if (jpg_file) {

mpp/hal/vpu/jpege/hal_jpege_debug.h

@@ -17,7 +17,7 @@
 #ifndef __HAL_JPEGE_DEBUG_H__
 #define __HAL_JPEGE_DEBUG_H__
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 
 #define HAL_JPEGE_DBG_FUNCTION          (0x00000001)
 #define HAL_JPEGE_DBG_SIMPLE            (0x00000002)

mpp/hal/vpu/jpege/hal_jpege_hdr.c

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
+#include "mpp_debug.h"
 #include "mpp_common.h"
 
 #include "hal_jpege_hdr.h"

mpp/hal/vpu/m2vd/hal_m2vd_api.c

@@ -18,14 +18,13 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
-#include "mpp_platform.h"
 #include "mpp_env.h"
+
+#include "mpp_platform.h"
 #include "hal_m2vd_base.h"
 #include "hal_m2vd_vpu1.h"
 #include "hal_m2vd_vpu2.h"
 
-
 RK_U32 m2vh_debug = 0;
 
 static MPP_RET hal_m2vd_gen_regs(void *hal, HalTaskInfo *task)

mpp/hal/vpu/m2vd/hal_m2vd_base.h

@@ -18,10 +18,13 @@
 #define __HAL_M2VD_BASE_H__
 
 #include <stdio.h>
+
+#include "mpp_debug.h"
+
 #include "mpp_hal.h"
 #include "mpp_buf_slot.h"
 #include "mpp_device.h"
-#include "mpp_mem.h"
+
 #include "m2vd_syntax.h"
 
 #define M2VD_BUF_SIZE_QPTAB            (256)

mpp/hal/vpu/m2vd/hal_m2vd_vdpu1.c

@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "mpp_log.h"
+#include "mpp_mem.h"
 #include "mpp_common.h"
 
 #include "hal_m2vd_base.h"

mpp/hal/vpu/m2vd/hal_m2vd_vdpu2.c

@@ -19,7 +19,7 @@
 #include <string.h>
 
 #include "mpp_env.h"
-#include "mpp_log.h"
+#include "mpp_mem.h"
 #include "mpp_common.h"
 
 #include "hal_m2vd_base.h"

mpp/hal/vpu/mpg4d/hal_m4vd_api.c

@@ -22,10 +22,10 @@
 #include <dlfcn.h>
 #include <unistd.h>
 
-#include "mpp_log.h"
 #include "mpp_err.h"
 #include "mpp_mem.h"
 #include "mpp_env.h"
+#include "mpp_debug.h"
 #include "mpp_platform.h"
 
 #include "hal_mpg4d_api.h"

mpp/hal/vpu/mpg4d/hal_m4vd_com.c

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "mpp_log.h"
+#include "mpp_debug.h"
 #include "hal_m4vd_com.h"
 
 RK_U8 default_intra_matrix[64] = {

mpp/hal/vpu/mpg4d/hal_m4vd_vdpu1.c

@@ -19,9 +19,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_env.h"
+#include "mpp_debug.h"
 #include "mpp_buffer.h"
 #include "mpp_common.h"
 

mpp/hal/vpu/mpg4d/hal_m4vd_vdpu2.c

@@ -19,9 +19,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mpp_log.h"
 #include "mpp_mem.h"
 #include "mpp_env.h"
+#include "mpp_debug.h"
 #include "mpp_buffer.h"
 #include "mpp_common.h"