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

[misc]: Fix a few compile warnings and errors

Browse Source 
Reported by llvm-clang.

Change-Id: I62f22fe5754d3e8d77405d213c81fda5d9f5e27d
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
This commit is contained in:
Jeffy Chen
2022-03-11 16:09:13 +08:00
committed by Herman Chen
parent da6654c148
commit c07169d533
15 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mpp/base/mpp_buffer_impl.cpp
View File

@@ -121,8 +121,8 @@ static const char *ops2str[BUF_OPS_BUTT] = {
"buf destroy", "buf destroy",
}; };
static MppMemPool mpp_buffer_pool = mpp_mem_pool_init(sizeof(MppBufferImpl)); static MppMemPool mpp_buffer_pool = mpp_mem_pool_init_f(MODULE_TAG, sizeof(MppBufferImpl));
static MppMemPool mpp_buf_grp_pool = mpp_mem_pool_init(sizeof(MppBufferGroupImpl)); static MppMemPool mpp_buf_grp_pool = mpp_mem_pool_init_f("mpp_buf_grp", sizeof(MppBufferGroupImpl));
RK_U32 mpp_buffer_debug = 0; RK_U32 mpp_buffer_debug = 0;

2
mpp/base/mpp_frame.cpp
View File

@@ -26,7 +26,7 @@
#include "mpp_mem_pool.h" #include "mpp_mem_pool.h"
static const char *module_name = MODULE_TAG; static const char *module_name = MODULE_TAG;
static MppMemPool mpp_frame_pool = mpp_mem_pool_init(sizeof(MppFrameImpl)); static MppMemPool mpp_frame_pool = mpp_mem_pool_init_f(module_name, sizeof(MppFrameImpl));
static void setup_mpp_frame_name(MppFrameImpl *frame) static void setup_mpp_frame_name(MppFrameImpl *frame)
{ {

2
mpp/base/mpp_packet.cpp
View File

@@ -24,7 +24,7 @@
#include "mpp_meta_impl.h" #include "mpp_meta_impl.h"
static const char *module_name = MODULE_TAG; static const char *module_name = MODULE_TAG;
static MppMemPool mpp_packet_pool = mpp_mem_pool_init(sizeof(MppPacketImpl)); static MppMemPool mpp_packet_pool = mpp_mem_pool_init_f(module_name, sizeof(MppPacketImpl));
#define setup_mpp_packet_name(packet) \ #define setup_mpp_packet_name(packet) \
((MppPacketImpl*)packet)->name = module_name; ((MppPacketImpl*)packet)->name = module_name;

8
mpp/codec/dec/m2v/m2vd_parser.c
View File

@@ -1113,8 +1113,8 @@ static MPP_RET m2vd_alloc_frame(M2VDParserContext *ctx)
if ((pts > ctx->PreGetFrameTime) && (ctx->GroupFrameCnt > 0)) { if ((pts > ctx->PreGetFrameTime) && (ctx->GroupFrameCnt > 0)) {
tmp_frame_period = (tmp_frame_period * 256) / ctx->GroupFrameCnt; tmp_frame_period = (tmp_frame_period * 256) / ctx->GroupFrameCnt;
if ((tmp_frame_period > 4200) && (tmp_frame_period < 11200) && if ((tmp_frame_period > 4200) && (tmp_frame_period < 11200) &&
(abs(ctx->frame_period - tmp_frame_period) > 128)) { (llabs(ctx->frame_period - tmp_frame_period) > 128)) {
if (abs(ctx->preframe_period - tmp_frame_period) > 128) if (llabs(ctx->preframe_period - tmp_frame_period) > 128)
ctx->preframe_period = tmp_frame_period; ctx->preframe_period = tmp_frame_period;
else else
ctx->frame_period = tmp_frame_period; ctx->frame_period = tmp_frame_period;
@@ -1458,8 +1458,8 @@ MPP_RET m2vd_parser_parse(void *ctx, HalDecTask *in_task)
mpp_frame_set_color_trc(frame, p->dxva_ctx->seq_disp_ext.transfer_characteristics); mpp_frame_set_color_trc(frame, p->dxva_ctx->seq_disp_ext.transfer_characteristics);
mpp_frame_set_colorspace(frame, p->dxva_ctx->seq_disp_ext.matrix_coefficients); mpp_frame_set_colorspace(frame, p->dxva_ctx->seq_disp_ext.matrix_coefficients);
} else { } else {
mpp_frame_set_color_primaries(frame, MPP_FRAME_SPC_UNSPECIFIED); mpp_frame_set_color_primaries(frame, MPP_FRAME_PRI_UNSPECIFIED);
mpp_frame_set_color_trc(frame, MPP_FRAME_SPC_UNSPECIFIED); mpp_frame_set_color_trc(frame, MPP_FRAME_TRC_UNSPECIFIED);
mpp_frame_set_colorspace(frame, MPP_FRAME_SPC_UNSPECIFIED); mpp_frame_set_colorspace(frame, MPP_FRAME_SPC_UNSPECIFIED);
} }

2
mpp/codec/rc/rc_model_v2_smt.c
View File

@@ -924,8 +924,6 @@ MPP_RET rc_model_v2_smt_start(void *ctx, EncRcTask *task)
delta_coef = 0.5; delta_coef = 0.5;
else if (delta_coef >= 0.3) else if (delta_coef >= 0.3)
delta_coef = 0.3; delta_coef = 0.3;
else
delta_coef = delta_coef;
if (p->qp_prev_out > (frame_low_qp + 1)) if (p->qp_prev_out > (frame_low_qp + 1))
delta_coef += 0.1; delta_coef += 0.1;

2
mpp/hal/vpu/av1d/hal_av1d_vdpu.c
View File

@@ -2321,7 +2321,7 @@ MPP_RET vdpu_av1d_control(void *hal, MpiCmd cmd_type, void *param)
RK_U32 imgheight = mpp_frame_get_height((MppFrame)param); RK_U32 imgheight = mpp_frame_get_height((MppFrame)param);
AV1D_DBG(AV1D_DBG_LOG, "control info: fmt %d, w %d, h %d\n", fmt, imgwidth, imgheight); AV1D_DBG(AV1D_DBG_LOG, "control info: fmt %d, w %d, h %d\n", fmt, imgwidth, imgheight);
if ((fmt & MPP_FRAME_FMT_COLOR_MASK) == MPP_FMT_YUV422SP) { if ((fmt & MPP_FRAME_FMT_MASK) == MPP_FMT_YUV422SP) {
mpp_slots_set_prop(p_hal->slots, SLOTS_LEN_ALIGN, rkv_len_align_422); mpp_slots_set_prop(p_hal->slots, SLOTS_LEN_ALIGN, rkv_len_align_422);
} }
break; break;

2
mpp/inc/mpp.h
View File

@@ -96,7 +96,7 @@
class Mpp class Mpp
{ {
public: public:
Mpp(MppCtx ctx); Mpp(MppCtx ctx = NULL);
~Mpp(); ~Mpp();
MPP_RET init(MppCtxType type, MppCodingType coding); MPP_RET init(MppCtxType type, MppCodingType coding);

4
mpp/inc/mpp_cfg.h
View File

@@ -33,9 +33,9 @@ typedef enum CfgType_e {
typedef struct MppCfgApi_t { typedef struct MppCfgApi_t {
const char *name; const char *name;
CfgType data_type; CfgType data_type;
RK_S32 flag_offset; RK_U32 flag_offset;
RK_U32 flag_value; RK_U32 flag_value;
RK_S32 data_offset; RK_U32 data_offset;
RK_S32 data_size; RK_S32 data_size;
} MppCfgApi; } MppCfgApi;

2
mpp/mpp.cpp
View File

@@ -73,7 +73,7 @@ static MPP_RET check_frm_task_cnt_cap(MppCodingType coding)
return MPP_OK; return MPP_OK;
} }
Mpp::Mpp(MppCtx ctx = NULL) Mpp::Mpp(MppCtx ctx)
: mPktIn(NULL), : mPktIn(NULL),
mPktOut(NULL), mPktOut(NULL),
mFrmIn(NULL), mFrmIn(NULL),

2
mpp/vproc/iep2/iep2.h
View File

@@ -33,7 +33,7 @@
#define FLOOR(v, r) (((v) / (r)) * (r)) #define FLOOR(v, r) (((v) / (r)) * (r))
#define RKCLIP(a, min, max) ((a < min) ? (min) : ((a > max) ? max : a)) #define RKCLIP(a, min, max) ((a < min) ? (min) : ((a > max) ? max : a))
#define RKABS(a) (((a) >= 0) ? (a) : -(a)) #define RKABS(a) (RK_U32)(((a) >= 0) ? (a) : -(a))
#define RKMIN(a, b) (((a) < (b)) ? (a) : (b)) #define RKMIN(a, b) (((a) < (b)) ? (a) : (b))
#define RKMAX(a, b) (((a) > (b)) ? (a) : (b)) #define RKMAX(a, b) (((a) > (b)) ? (a) : (b))

4
mpp/vproc/iep2/iep2_ff.c
View File

@@ -25,10 +25,6 @@
#include "iep2_api.h" #include "iep2_api.h"
#include "iep2_ff.h" #include "iep2_ff.h"
#define RKABS(a) (((a) >= 0) ? (a) : -(a))
#define RKMIN(a, b) (((a) < (b)) ? (a) : (b))
#define RKMAX(a, b) (((a) > (b)) ? (a) : (b))
void iep2_check_ffo(struct iep2_api_ctx *ctx) void iep2_check_ffo(struct iep2_api_ctx *ctx)
{ {
RK_U32 tdiff = ctx->output.ff_gradt_tcnt + 1; RK_U32 tdiff = ctx->output.ff_gradt_tcnt + 1;

2
osal/inc/mpp_time.h
View File

@@ -117,7 +117,7 @@ RK_S64 mpp_stopwatch_elapsed_time(MppStopwatch stopwatch);
class AutoTiming class AutoTiming
{ {
public: public:
AutoTiming(const char *name = __FUNCTION__); AutoTiming(const char *name = "AutoTiming");
~AutoTiming(); ~AutoTiming();
private: private:
const char *mName; const char *mName;

2
osal/mpp_trace.cpp
View File

@@ -88,7 +88,7 @@ void MppTraceService::trace_write(const char *fmt, ...)
len = vsnprintf(buf, sizeof(buf) - 1, fmt, ap); len = vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
va_end(ap); va_end(ap);
write(mTraceFd, buf, len); (void)!write(mTraceFd, buf, len);
} }
void MppTraceService::trace_begin(const char* name) void MppTraceService::trace_begin(const char* name)

2
test/mpi_dec_mt_test.c
View File

@@ -257,7 +257,7 @@ int mt_dec_decode(MpiDecTestCmd *cmd)
MppCodingType type = cmd->type; MppCodingType type = cmd->type;
pthread_t thd_in; pthread_t thd_in;
pthread_t thd_out; pthread_t thd_out = 0;
pthread_attr_t attr; pthread_attr_t attr;
MpiDecMtLoopData data; MpiDecMtLoopData data;

2
utils/mpi_dec_utils.c
View File

@@ -87,7 +87,7 @@ OptionInfo mpi_dec_cmd[] = {
{"s", "instance_nb", "number of instances"}, {"s", "instance_nb", "number of instances"},
{"v", "trace", "q - quiet f - show fps"}, {"v", "trace", "q - quiet f - show fps"},
{"c", "verify_file", "verify file for slt check"}, {"c", "verify_file", "verify file for slt check"},
{NULL}, {NULL, NULL, NULL},
}; };
static MPP_RET add_new_slot(FileReaderImpl* impl, FileBufSlot *slot) static MPP_RET add_new_slot(FileReaderImpl* impl, FileBufSlot *slot)