From 0c69cc591f57228bfa78355480bcf62d7e705cad Mon Sep 17 00:00:00 2001 From: ChenHengming Date: Wed, 25 Nov 2015 14:53:47 +0000 Subject: [PATCH] [mpp]: use __FUNCTION__ to replace __FILE__, add mpp_debug initial and move mpp_debug to osal git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@485 6e48237b-75ef-9749-8fc9-41990f28c85a --- mpp/codec/dec/h265/test/h265d_parser_test.c | 25 +++++++++++---------- mpp/codec/mpp_buf_slot.cpp | 2 +- mpp/hal/mpp_hal.cpp | 2 +- mpp/mpi_impl.cpp | 1 + mpp/mpp.cpp | 2 -- osal/inc/mpp_log.h | 8 +++---- osal/mpp_log.cpp | 1 + 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/mpp/codec/dec/h265/test/h265d_parser_test.c b/mpp/codec/dec/h265/test/h265d_parser_test.c index b37ae188..a39c7735 100644 --- a/mpp/codec/dec/h265/test/h265d_parser_test.c +++ b/mpp/codec/dec/h265/test/h265d_parser_test.c @@ -25,22 +25,22 @@ #define MODULE_TAG "h265_test" +#include + +#include "mpp_env.h" +#include "mpp_err.h" +#include "mpp_log.h" +#include "mpp_mem.h" +#include "mpp_common.h" + +#include "mpp_dec.h" +#include "mpp_frame.h" + #include "h265d_api.h" #include "hal_h265d_api.h" -#include "mpp_env.h" #include "utils.h" -#include "mpp_log.h" -#include -#include -#include "mpp_err.h" -#include "mpp_mem.h" -#include "mpp_frame.h" #include "openHevcWrapper.h" -#include "mpp_buf_slot.h" -#include "rk_type.h" -#include "mpp_common.h" -#include "mpp_dec.h" #include "h265d_api.h" #include "hal_h265d_api.h" @@ -299,7 +299,7 @@ RK_S32 hevc_parser_test(ParserDemoCmdContext_t *cmd) } curtask = mpp_calloc(HalDecTask, 1); - pretask = mpp_calloc(HalDecTask, 1); + pretask = mpp_calloc(HalDecTask, 1); mpp_codex_ctx = mpp_calloc_size(void, api_h265d_parser.ctx_size); mpp_err("api_h265d_parser.ctx_size = %d", api_h265d_parser.ctx_size); @@ -597,6 +597,7 @@ int main(int argc, char **argv) } //mpp_env_set_u32("buf_slot_debug", 0x10000010, 0); + mpp_env_get_u32("mpp_debug", &mpp_debug, 0); cmd = &demoCmdCtx; memset((void*)cmd, 0, sizeof(ParserDemoCmdContext_t)); diff --git a/mpp/codec/mpp_buf_slot.cpp b/mpp/codec/mpp_buf_slot.cpp index 4f0d4fab..e33b5b6c 100644 --- a/mpp/codec/mpp_buf_slot.cpp +++ b/mpp/codec/mpp_buf_slot.cpp @@ -44,7 +44,7 @@ static RK_U32 buf_slot_debug = 0; if (!(cond)) { \ dump_slots(impl); \ mpp_err("Assertion %s failed at %s:%d\n", \ - MPP_STRINGS(cond), __FILE__, __LINE__); \ + MPP_STRINGS(cond), __FUNCTION__, __LINE__); \ abort(); \ } \ } while (0) diff --git a/mpp/hal/mpp_hal.cpp b/mpp/hal/mpp_hal.cpp index 6fc35909..7497b172 100644 --- a/mpp/hal/mpp_hal.cpp +++ b/mpp/hal/mpp_hal.cpp @@ -155,7 +155,7 @@ MPP_RET mpp_hal_hw_wait(MppHal ctx, HalTaskInfo *task) MPP_RET ret = p->api->wait(p->ctx, task); task->time_end = mpp_time(); - mpp_dbg(MPP_HAL_TIMING, "hal timing: %lld\n", task->time_end - task->time_start); + mpp_dbg(MPP_TIMING, "hal timing: %lld\n", task->time_end - task->time_start); return ret; } diff --git a/mpp/mpi_impl.cpp b/mpp/mpi_impl.cpp index cdf17dda..1aa6cc7e 100644 --- a/mpp/mpi_impl.cpp +++ b/mpp/mpi_impl.cpp @@ -26,5 +26,6 @@ RK_U32 mpi_debug = 0; void get_mpi_debug() { mpp_env_get_u32("mpi_debug", &mpi_debug, 0); + mpp_env_get_u32("mpp_debug", &mpp_debug, 0); } diff --git a/mpp/mpp.cpp b/mpp/mpp.cpp index 917ade07..6b978439 100644 --- a/mpp/mpp.cpp +++ b/mpp/mpp.cpp @@ -32,8 +32,6 @@ #define MPP_TEST_FRAME_SIZE SZ_1M #define MPP_TEST_PACKET_SIZE SZ_512K -RK_U32 mpp_debug = 0; - Mpp::Mpp(MppCtxType type, MppCodingType coding) : mPackets(NULL), mFrames(NULL), diff --git a/osal/inc/mpp_log.h b/osal/inc/mpp_log.h index 41e1fe62..49c23cb8 100644 --- a/osal/inc/mpp_log.h +++ b/osal/inc/mpp_log.h @@ -53,9 +53,7 @@ #define mpp_dbg_f(flag, fmt, ...) _mpp_dbg_f(mpp_debug, flag, fmt, ## __VA_ARGS__) -#define MPP_HAL_TIMING (0x00000001) - -extern RK_U32 mpp_debug; +#define MPP_TIMING (0x00000001) /* * mpp_dbg usage: @@ -101,7 +99,7 @@ extern RK_U32 mpp_debug; #define mpp_assert(cond) do { \ if (!(cond)) { \ mpp_err("Assertion %s failed at %s:%d\n", \ - MPP_STRINGS(cond), __FILE__, __LINE__); \ + MPP_STRINGS(cond), __FUNCTION__, __LINE__); \ mpp_abort(); \ } \ } while (0) @@ -111,6 +109,8 @@ extern RK_U32 mpp_debug; extern "C" { #endif +extern RK_U32 mpp_debug; + void mpp_log_set_flag(RK_U32 flag); RK_U32 mpp_log_get_flag(); diff --git a/osal/mpp_log.cpp b/osal/mpp_log.cpp index b2d71fb9..3c467f6c 100644 --- a/osal/mpp_log.cpp +++ b/osal/mpp_log.cpp @@ -35,6 +35,7 @@ typedef void (*mpp_log_callback)(const char*, const char*, va_list); extern "C" { #endif +RK_U32 mpp_debug = 0; static RK_U32 mpp_log_flag = 0; // TODO: add log timing information and switch flag