package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-05 17:16:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[mpp_log]: change mpp_dbg to _mpp_dbg, redefine new mpp_dbg

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@174 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-08-28 01:55:19 +00:00
parent fa58085605
commit d9644ded0e
9 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mpp/mpi_impl.h
View File

@@ -24,7 +24,7 @@
#define mpi_dbg(flag, fmt, ...) mpp_dbg(mpi_debug, flag, fmt, ## __VA_ARGS__) #define mpi_dbg(flag, fmt, ...) _mpp_dbg(mpi_debug, flag, fmt, ## __VA_ARGS__)
#define MPI_FUNCTION_ENTER() mpi_dbg(MPI_DBG_FUNCTION, "%s enter\n", __FUNCTION__) #define MPI_FUNCTION_ENTER() mpi_dbg(MPI_DBG_FUNCTION, "%s enter\n", __FUNCTION__)
#define MPI_FUNCTION_LEAVE() mpi_dbg(MPI_DBG_FUNCTION, "%s leave\n", __FUNCTION__) #define MPI_FUNCTION_LEAVE() mpi_dbg(MPI_DBG_FUNCTION, "%s leave\n", __FUNCTION__)

12
mpp/mpp.cpp
View File

@@ -18,6 +18,7 @@
#include "mpp_log.h" #include "mpp_log.h"
#include "mpp_mem.h" #include "mpp_mem.h"
#include "mpp_env.h"
#include "mpp_time.h" #include "mpp_time.h"
#include "mpp.h" #include "mpp.h"
@@ -30,6 +31,8 @@
#define MPP_TEST_FRAME_SIZE SZ_1M #define MPP_TEST_FRAME_SIZE SZ_1M
RK_U32 mpp_debug = 0;
Mpp::Mpp(MppCtxType type, MppCodingType coding) Mpp::Mpp(MppCtxType type, MppCodingType coding)
: mPackets(NULL), : mPackets(NULL),
mFrames(NULL), mFrames(NULL),
@@ -40,6 +43,7 @@ Mpp::Mpp(MppCtxType type, MppCodingType coding)
mFrameGetCount(0), mFrameGetCount(0),
mTaskPutCount(0), mTaskPutCount(0),
mTaskGetCount(0), mTaskGetCount(0),
mInternalGroup(NULL),
mPacketGroup(NULL), mPacketGroup(NULL),
mFrameGroup(NULL), mFrameGroup(NULL),
mTheadCodec(NULL), mTheadCodec(NULL),
@@ -58,6 +62,7 @@ Mpp::Mpp(MppCtxType type, MppCodingType coding)
mTheadCodec = new MppThread(mpp_dec_thread, this); mTheadCodec = new MppThread(mpp_dec_thread, this);
mThreadHal = new MppThread(mpp_hal_thread, this); mThreadHal = new MppThread(mpp_hal_thread, this);
mTask = mpp_malloc(MppHalDecTask*, mTaskNum); mTask = mpp_malloc(MppHalDecTask*, mTaskNum);
mpp_buffer_group_normal_get(&mInternalGroup, MPP_BUFFER_TYPE_ION);
mpp_buffer_group_normal_get(&mPacketGroup, MPP_BUFFER_TYPE_NORMAL); mpp_buffer_group_normal_get(&mPacketGroup, MPP_BUFFER_TYPE_NORMAL);
mpp_buffer_group_limited_get(&mFrameGroup, MPP_BUFFER_TYPE_ION); mpp_buffer_group_limited_get(&mFrameGroup, MPP_BUFFER_TYPE_ION);
mpp_buffer_group_limit_config(mFrameGroup, 4, MPP_TEST_FRAME_SIZE); mpp_buffer_group_limit_config(mFrameGroup, 4, MPP_TEST_FRAME_SIZE);
@@ -69,6 +74,7 @@ Mpp::Mpp(MppCtxType type, MppCodingType coding)
mTheadCodec = new MppThread(mpp_enc_thread, this); mTheadCodec = new MppThread(mpp_enc_thread, this);
mThreadHal = new MppThread(mpp_hal_thread, this); mThreadHal = new MppThread(mpp_hal_thread, this);
mTask = mpp_malloc(MppHalDecTask*, mTaskNum); mTask = mpp_malloc(MppHalDecTask*, mTaskNum);
mpp_buffer_group_normal_get(&mInternalGroup, MPP_BUFFER_TYPE_ION);
mpp_buffer_group_normal_get(&mPacketGroup, MPP_BUFFER_TYPE_NORMAL); mpp_buffer_group_normal_get(&mPacketGroup, MPP_BUFFER_TYPE_NORMAL);
mpp_buffer_group_limited_get(&mFrameGroup, MPP_BUFFER_TYPE_ION); mpp_buffer_group_limited_get(&mFrameGroup, MPP_BUFFER_TYPE_ION);
} break; } break;
@@ -84,6 +90,8 @@ Mpp::Mpp(MppCtxType type, MppCodingType coding)
mThreadHal->start(); mThreadHal->start();
} else } else
clear(); clear();
mpp_env_get_u32("mpp_debug", &mpp_debug, 0);
} }
Mpp::~Mpp () Mpp::~Mpp ()
@@ -118,6 +126,10 @@ void Mpp::clear()
delete mTasks; delete mTasks;
mTasks = NULL; mTasks = NULL;
} }
if (mInternalGroup) {
mpp_buffer_group_put(mInternalGroup);
mInternalGroup = NULL;
}
if (mPacketGroup) { if (mPacketGroup) {
mpp_buffer_group_put(mPacketGroup); mpp_buffer_group_put(mPacketGroup);
mPacketGroup = NULL; mPacketGroup = NULL;

21
mpp/mpp.h
View File

@@ -22,6 +22,17 @@
#include "mpp_thread.h" #include "mpp_thread.h"
#include "mpp_hal.h" #include "mpp_hal.h"
extern RK_U32 mpp_debug;
#define MPP_DBG_FUNCTION (0x00000001)
#define MPP_DBG_PACKET (0x00000002)
#define MPP_DBG_FRAME (0x00000004)
#define MPP_DBG_BUFFER (0x00000008)
#define mpp_dbg(flag, fmt, ...) _mpp_dbg(mpp_debug, flag, fmt, ## __VA_ARGS__)
class Mpp { class Mpp {
public: public:
Mpp(MppCtxType type, MppCodingType coding); Mpp(MppCtxType type, MppCodingType coding);
@@ -49,6 +60,16 @@ public:
RK_U32 mTaskPutCount; RK_U32 mTaskPutCount;
RK_U32 mTaskGetCount; RK_U32 mTaskGetCount;
/*
* internal buffer group
* - for all kind of table like cabac / scaling list
* fixed to ion buffer group
* packet buffer group
* - packets in I/O, can be ion buffer or normal buffer
* frame buffer group
* - frames in I/O, normally should be a ion buffer group
*/
MppBufferGroup mInternalGroup;
MppBufferGroup mPacketGroup; MppBufferGroup mPacketGroup;
MppBufferGroup mFrameGroup; MppBufferGroup mFrameGroup;

2
mpp/mpp_buffer_impl.h
View File

@@ -23,7 +23,7 @@
#define MPP_BUF_DBG_FUNCTION (0x00000001) #define MPP_BUF_DBG_FUNCTION (0x00000001)
#define mpp_buf_dbg(flag, fmt, ...) mpp_dbg(mpp_buffer_debug, flag, fmt, ## __VA_ARGS__) #define mpp_buf_dbg(flag, fmt, ...) _mpp_dbg(mpp_buffer_debug, flag, fmt, ## __VA_ARGS__)
#define MPP_BUF_FUNCTION_ENTER() mpp_buf_dbg(MPP_BUF_DBG_FUNCTION, "%s enter\n", __FUNCTION__) #define MPP_BUF_FUNCTION_ENTER() mpp_buf_dbg(MPP_BUF_DBG_FUNCTION, "%s enter\n", __FUNCTION__)
#define MPP_BUF_FUNCTION_LEAVE() mpp_buf_dbg(MPP_BUF_DBG_FUNCTION, "%s leave\n", __FUNCTION__) #define MPP_BUF_FUNCTION_LEAVE() mpp_buf_dbg(MPP_BUF_DBG_FUNCTION, "%s leave\n", __FUNCTION__)

2
osal/android/os_allocator.c
View File

@@ -97,7 +97,7 @@ static RK_U32 ion_debug = 0;
#define ION_CLINET (0x00000004) #define ION_CLINET (0x00000004)
#define ION_IOCTL (0x00000008) #define ION_IOCTL (0x00000008)
#define ion_dbg(flag, fmt, ...) mpp_dbg(ion_debug, flag, fmt, ## __VA_ARGS__) #define ion_dbg(flag, fmt, ...) _mpp_dbg(ion_debug, flag, fmt, ## __VA_ARGS__)
static int ion_ioctl(int fd, int req, void *arg) static int ion_ioctl(int fd, int req, void *arg)
{ {

6
osal/inc/mpp_log.h
View File

@@ -30,8 +30,8 @@
#define mpp_log(fmt, ...) _mpp_log(MODULE_TAG, fmt, ## __VA_ARGS__) #define mpp_log(fmt, ...) _mpp_log(MODULE_TAG, fmt, ## __VA_ARGS__)
#define mpp_err(fmt, ...) _mpp_err(MODULE_TAG, fmt, ## __VA_ARGS__) #define mpp_err(fmt, ...) _mpp_err(MODULE_TAG, fmt, ## __VA_ARGS__)
#define mpp_dbg(debug, flag, fmt, ...) \ #define _mpp_dbg(debug, flag, fmt, ...) \
_mpp_dbg(debug, flag, MODULE_TAG, fmt, ## __VA_ARGS__) __mpp_dbg(debug, flag, MODULE_TAG, fmt, ## __VA_ARGS__)
/* /*
* mpp_dbg usage: * mpp_dbg usage:
@@ -85,7 +85,7 @@ RK_U32 mpp_log_get_flag();
void _mpp_log(const char *tag, const char *fmt, ...); void _mpp_log(const char *tag, const char *fmt, ...);
void _mpp_err(const char *tag, const char *fmt, ...); void _mpp_err(const char *tag, const char *fmt, ...);
void _mpp_dbg(RK_U32 debug, RK_U32 flag, const char *tag, const char *fmt, ...); void __mpp_dbg(RK_U32 debug, RK_U32 flag, const char *tag, const char *fmt, ...);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
osal/mpp_log.cpp
View File

@@ -72,7 +72,7 @@ void _mpp_log(const char *tag, const char *fmt, ...)
va_end(args); va_end(args);
} }
void _mpp_dbg(RK_U32 debug, RK_U32 flag, const char *tag, const char *fmt, ...) void __mpp_dbg(RK_U32 debug, RK_U32 flag, const char *tag, const char *fmt, ...)
{ {
if (debug & flag) { if (debug & flag) {
va_list args; va_list args;

2
osal/mpp_thread.cpp
View File

@@ -23,7 +23,7 @@
static RK_U32 thread_debug = 0; static RK_U32 thread_debug = 0;
#define thread_dbg(flag, fmt, ...) mpp_dbg(thread_debug, flag, fmt, ## __VA_ARGS__) #define thread_dbg(flag, fmt, ...) _mpp_dbg(thread_debug, flag, fmt, ## __VA_ARGS__)
MppThread::MppThread(MppThreadFunc func, void *ctx) MppThread::MppThread(MppThreadFunc func, void *ctx)
: mStatus(MPP_THREAD_UNINITED), : mStatus(MPP_THREAD_UNINITED),

8
osal/test/mpp_log_test.c
View File

@@ -38,13 +38,13 @@ int main()
mpp_assert(flag_set == flag_get); mpp_assert(flag_set == flag_get);
mpp_log("try mpp_dbg test 0 debug %x, flag %x", flag_get, flag_dbg); mpp_log("try _mpp_dbg test 0 debug %x, flag %x", flag_get, flag_dbg);
mpp_dbg(flag_get, flag_dbg, "mpp_dbg printing debug %x, flag %x", flag_get, flag_dbg); _mpp_dbg(flag_get, flag_dbg, "mpp_dbg printing debug %x, flag %x", flag_get, flag_dbg);
flag_dbg = 0; flag_dbg = 0;
mpp_log("try mpp_dbg test 0 debug %x, flag %x", flag_get, flag_dbg); mpp_log("try _mpp_dbg test 0 debug %x, flag %x", flag_get, flag_dbg);
mpp_dbg(flag_get, flag_dbg, "mpp_dbg printing debug %x, flag %x", flag_get, flag_dbg); _mpp_dbg(flag_get, flag_dbg, "mpp_dbg printing debug %x, flag %x", flag_get, flag_dbg);
mpp_err("mpp log log test done\n"); mpp_err("mpp log log test done\n");