diff --git a/mpp/codec/mpp_buf_slot.cpp b/mpp/codec/mpp_buf_slot.cpp index 2e8a3e60..eb2a7cb1 100644 --- a/mpp/codec/mpp_buf_slot.cpp +++ b/mpp/codec/mpp_buf_slot.cpp @@ -66,7 +66,7 @@ static void check_entry_unused(MppBufSlotEntry *entry) MPP_RET mpp_buf_slot_init(MppBufSlots *slots) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } MppBufSlotsImpl *impl = mpp_malloc(MppBufSlotsImpl, 1); @@ -87,7 +87,7 @@ MPP_RET mpp_buf_slot_init(MppBufSlots *slots) MPP_RET mpp_buf_slot_deinit(MppBufSlots slots) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } @@ -102,7 +102,7 @@ MPP_RET mpp_buf_slot_deinit(MppBufSlots slots) MPP_RET mpp_buf_slot_setup(MppBufSlots slots, RK_U32 count, RK_U32 size, RK_U32 changed) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } @@ -137,7 +137,7 @@ MPP_RET mpp_buf_slot_setup(MppBufSlots slots, RK_U32 count, RK_U32 size, RK_U32 RK_U32 mpp_buf_slot_is_changed(MppBufSlots slots) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return 0; } @@ -149,7 +149,7 @@ RK_U32 mpp_buf_slot_is_changed(MppBufSlots slots) MPP_RET mpp_buf_slot_ready(MppBufSlots slots) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } @@ -174,7 +174,7 @@ MPP_RET mpp_buf_slot_ready(MppBufSlots slots) MPP_RET mpp_buf_slot_get_unused(MppBufSlots slots, RK_U32 *index) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } @@ -199,7 +199,7 @@ MPP_RET mpp_buf_slot_get_unused(MppBufSlots slots, RK_U32 *index) MPP_RET mpp_buf_slot_set_ref(MppBufSlots slots, RK_U32 index) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } @@ -214,7 +214,7 @@ MPP_RET mpp_buf_slot_set_ref(MppBufSlots slots, RK_U32 index) MPP_RET mpp_buf_slot_clr_ref(MppBufSlots slots, RK_U32 index) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } @@ -230,7 +230,7 @@ MPP_RET mpp_buf_slot_clr_ref(MppBufSlots slots, RK_U32 index) MPP_RET mpp_buf_slot_set_decoding(MppBufSlots slots, RK_U32 index) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } @@ -245,7 +245,7 @@ MPP_RET mpp_buf_slot_set_decoding(MppBufSlots slots, RK_U32 index) MPP_RET mpp_buf_slot_clr_decoding(MppBufSlots slots, RK_U32 index) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } @@ -262,7 +262,7 @@ MPP_RET mpp_buf_slot_clr_decoding(MppBufSlots slots, RK_U32 index) MPP_RET mpp_buf_slot_set_display(MppBufSlots slots, RK_U32 index) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } @@ -277,7 +277,7 @@ MPP_RET mpp_buf_slot_set_display(MppBufSlots slots, RK_U32 index) MPP_RET mpp_buf_slot_clr_display(MppBufSlots slots, RK_U32 index) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } @@ -294,7 +294,7 @@ MPP_RET mpp_buf_slot_clr_display(MppBufSlots slots, RK_U32 index) MPP_RET mpp_buf_slot_set_buffer(MppBufSlots slots, RK_U32 index, MppBuffer buffer) { if (NULL == slots || NULL == buffer) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } @@ -310,7 +310,7 @@ MPP_RET mpp_buf_slot_set_buffer(MppBufSlots slots, RK_U32 index, MppBuffer buffe MppBuffer mpp_buf_slot_get_buffer(const MppBufSlots slots, RK_U32 index) { if (NULL == slots) { - mpp_err("%s found NULL input\n\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return NULL; } diff --git a/mpp/codec/mpp_dec.cpp b/mpp/codec/mpp_dec.cpp index 2deb9339..964dd28f 100644 --- a/mpp/codec/mpp_dec.cpp +++ b/mpp/codec/mpp_dec.cpp @@ -116,7 +116,7 @@ MPP_RET mpp_dec_init(MppDecCtx **ctx, MppCodingType coding) { MppDecCtx *p = mpp_malloc(MppDecCtx, 1); if (NULL == p) { - mpp_err("%s failed to malloc context\n", __FUNCTION__); + mpp_err_f("failed to malloc context\n"); return MPP_ERR_NULL_PTR; } RK_U32 i; @@ -128,7 +128,7 @@ MPP_RET mpp_dec_init(MppDecCtx **ctx, MppCodingType coding) return MPP_OK; } } - mpp_err("%s could not found coding type %d\n", __FUNCTION__, coding); + mpp_err_f("could not found coding type %d\n", coding); *ctx = NULL; mpp_free(p); return MPP_NOK; @@ -137,7 +137,7 @@ MPP_RET mpp_dec_init(MppDecCtx **ctx, MppCodingType coding) MPP_RET mpp_dec_deinit(MppDecCtx *ctx) { if (NULL == ctx) { - mpp_err("%s found NULL input\n", __FUNCTION__); + mpp_err_f("found NULL input\n"); return MPP_ERR_NULL_PTR; } mpp_free(ctx); @@ -147,8 +147,7 @@ MPP_RET mpp_dec_deinit(MppDecCtx *ctx) MPP_RET mpp_dec_parse(MppDecCtx *ctx, MppPacket pkt, MppSyntax **syn) { if (NULL == ctx || NULL == pkt || NULL == syn) { - mpp_err("%s found NULL input ctx %p pkt %p syn %p\n", - __FUNCTION__, ctx, pkt, syn); + mpp_err_f("found NULL input ctx %p pkt %p syn %p\n", ctx, pkt, syn); return MPP_ERR_NULL_PTR; } @@ -158,8 +157,7 @@ MPP_RET mpp_dec_parse(MppDecCtx *ctx, MppPacket pkt, MppSyntax **syn) MPP_RET mpp_dec_reset(MppDecCtx *ctx) { if (NULL == ctx) { - mpp_err("%s found NULL input ctx %p\n", - __FUNCTION__, ctx); + mpp_err_f("found NULL input ctx %p\n", ctx); return MPP_ERR_NULL_PTR; } @@ -169,8 +167,7 @@ MPP_RET mpp_dec_reset(MppDecCtx *ctx) MPP_RET mpp_dec_flush(MppDecCtx *ctx) { if (NULL == ctx) { - mpp_err("%s found NULL input ctx %p\n", - __FUNCTION__, ctx); + mpp_err_f("found NULL input ctx %p\n", ctx); return MPP_ERR_NULL_PTR; } @@ -180,8 +177,7 @@ MPP_RET mpp_dec_flush(MppDecCtx *ctx) MPP_RET mpp_dec_control(MppDecCtx *ctx, RK_S32 cmd, void *param) { if (NULL == ctx) { - mpp_err("%s found NULL input ctx %p\n", - __FUNCTION__, ctx); + mpp_err_f("found NULL input ctx %p\n", ctx); return MPP_ERR_NULL_PTR; } diff --git a/mpp/legacy/vpu_api_legacy.cpp b/mpp/legacy/vpu_api_legacy.cpp index d5e81f7d..9f33fb85 100644 --- a/mpp/legacy/vpu_api_legacy.cpp +++ b/mpp/legacy/vpu_api_legacy.cpp @@ -22,125 +22,125 @@ VpuApi::VpuApi() { - mpp_log("%s in\n", __FUNCTION__); - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("in\n"); + mpp_log_f("ok\n"); } VpuApi::~VpuApi() { - mpp_log("%s in\n", __FUNCTION__); - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("in\n"); + mpp_log_f("ok\n"); } RK_S32 VpuApi::init(VpuCodecContext *ctx, RK_U8 *extraData, RK_U32 extra_size) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)ctx; (void)extraData; (void)extra_size; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } RK_S32 VpuApi::send_stream(RK_U8* buf, RK_U32 size, RK_S64 timestamp, RK_S32 usePts) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)buf; (void)size; (void)timestamp; (void)usePts; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } RK_S32 VpuApi::get_frame(DecoderOut_t *aDecOut) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)aDecOut; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } RK_S32 VpuApi::flush(VpuCodecContext *ctx) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)ctx; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } RK_S32 VpuApi::decode(VpuCodecContext *ctx, VideoPacket_t *pkt, DecoderOut_t *aDecOut) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)ctx; (void)pkt; (void)aDecOut; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } RK_S32 VpuApi::decode_sendstream(VpuCodecContext *ctx, VideoPacket_t *pkt) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)ctx; (void)pkt; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } RK_S32 VpuApi:: decode_getoutframe(VpuCodecContext *ctx, DecoderOut_t *aDecOut) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)ctx; (void)aDecOut; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } RK_S32 VpuApi::encode(VpuCodecContext *ctx, EncInputStream_t *aEncInStrm, EncoderOut_t *aEncOut) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)ctx; (void)aEncInStrm; (void)aEncOut; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } RK_S32 VpuApi::encoder_sendframe(VpuCodecContext *ctx, EncInputStream_t *aEncInStrm) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)ctx; (void)aEncInStrm; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } RK_S32 VpuApi::encoder_getstream(VpuCodecContext *ctx, EncoderOut_t *aEncOut) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)ctx; (void)aEncOut; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } RK_S32 VpuApi::perform(RK_U32 cmd, RK_U32 *data) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)cmd; (void)data; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } RK_S32 VpuApi::control(VpuCodecContext *ctx, VPU_API_CMD cmd, void *param) { - mpp_log("%s in\n", __FUNCTION__); + mpp_log_f("in\n"); (void)ctx; (void)cmd; (void)param; - mpp_log("%s ok\n", __FUNCTION__); + mpp_log_f("ok\n"); return 0; } diff --git a/mpp/mpp_buffer.cpp b/mpp/mpp_buffer.cpp index 692949f9..94ddbabc 100644 --- a/mpp/mpp_buffer.cpp +++ b/mpp/mpp_buffer.cpp @@ -91,7 +91,7 @@ MPP_RET mpp_buffer_inc_ref(MppBuffer buffer) MPP_RET mpp_buffer_read(MppBuffer buffer, size_t offset, void *data, size_t size) { if (NULL == buffer || NULL == data) { - mpp_err("%s invalid input: buffer %p data %p\n", __FUNCTION__, buffer, data); + mpp_err_f("invalid input: buffer %p data %p\n", buffer, data); return MPP_ERR_UNKNOW; } @@ -108,7 +108,7 @@ MPP_RET mpp_buffer_read(MppBuffer buffer, size_t offset, void *data, size_t size MPP_RET mpp_buffer_write(MppBuffer buffer, size_t offset, void *data, size_t size) { if (NULL == buffer || NULL == data) { - mpp_err("%s invalid input: buffer %p data %p\n", __FUNCTION__, buffer, data); + mpp_err_f("invalid input: buffer %p data %p\n", buffer, data); return MPP_ERR_UNKNOW; } @@ -125,7 +125,7 @@ MPP_RET mpp_buffer_write(MppBuffer buffer, size_t offset, void *data, size_t siz void *mpp_buffer_get_ptr(MppBuffer buffer) { if (NULL == buffer) { - mpp_err("%s invalid input: buffer %p data %p\n", __FUNCTION__, buffer); + mpp_err_f("invalid input: buffer %p data %p\n", buffer); return NULL; } @@ -138,7 +138,7 @@ void *mpp_buffer_get_ptr(MppBuffer buffer) int mpp_buffer_get_fd(MppBuffer buffer) { if (NULL == buffer) { - mpp_err("%s invalid input: buffer %p data %p\n", __FUNCTION__, buffer); + mpp_err_f("invalid input: buffer %p data %p\n", buffer); return -1; } @@ -151,7 +151,7 @@ int mpp_buffer_get_fd(MppBuffer buffer) MPP_RET mpp_buffer_info_get(MppBuffer buffer, MppBufferInfo *info) { if (NULL == buffer || NULL == info) { - mpp_err("mpp_buffer_info_get invalid input: buffer %p info %p\n", buffer, info); + mpp_err_f("invalid input: buffer %p info %p\n", buffer, info); return MPP_ERR_UNKNOW; } @@ -165,7 +165,7 @@ MPP_RET mpp_buffer_group_get(const char *tag, MppBufferMode mode, if (NULL == group || mode >= MPP_BUFFER_MODE_BUTT || type >= MPP_BUFFER_TYPE_BUTT) { - mpp_err("mpp_buffer_group_get input invalid group %p mode %d type %d\n", + mpp_err_f("input invalid group %p mode %d type %d\n", group, mode, type); return MPP_ERR_UNKNOW; } @@ -176,7 +176,7 @@ MPP_RET mpp_buffer_group_get(const char *tag, MppBufferMode mode, MPP_RET mpp_buffer_group_put(MppBufferGroup group) { if (NULL == group) { - mpp_err("mpp_buffer_group_put input invalid group %p\n", group); + mpp_err_f("input invalid group %p\n", group); return MPP_NOK; } @@ -186,7 +186,7 @@ MPP_RET mpp_buffer_group_put(MppBufferGroup group) MPP_RET mpp_buffer_group_limit_config(MppBufferGroup group, size_t size, RK_S32 count) { if (NULL == group || 0 == size || count <= 0) { - mpp_err("mpp_buffer_group_limit_config input invalid group %p size %d count %d\n", + mpp_err_f("input invalid group %p size %d count %d\n", group, size, count); return MPP_NOK; }