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

[mpp_frame]: add check function to MppFrame

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@911 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2016-06-14 09:04:44 +00:00
parent f5a03d1aa1
commit c394441f63
2 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mpp/base/inc/mpp_frame_impl.h
View File

@@ -108,4 +108,6 @@ MPP_RET mpp_frame_set_next(MppFrame frame, MppFrame next);
MPP_RET mpp_frame_copy(MppFrame frame, MppFrame next); MPP_RET mpp_frame_copy(MppFrame frame, MppFrame next);
MPP_RET mpp_frame_info_cmp(MppFrame frame0, MppFrame frame1); MPP_RET mpp_frame_info_cmp(MppFrame frame0, MppFrame frame1);
MPP_RET check_is_mpp_frame(void *pointer);
#endif /*__MPP_FRAME_IMPL_H__*/ #endif /*__MPP_FRAME_IMPL_H__*/

41
mpp/base/mpp_frame.cpp
View File

@@ -29,11 +29,14 @@ static void setup_mpp_frame_name(MppFrameImpl *frame)
frame->name = module_name; frame->name = module_name;
} }
static void check_mpp_frame_name(MppFrameImpl *frame) MPP_RET check_is_mpp_frame(void *frame)
{ {
mpp_assert(frame->name == module_name); if (frame && ((MppFrameImpl*)frame)->name == module_name)
if (frame->name != module_name) return MPP_OK;
abort();
mpp_err_f("pointer %p failed on check\n");
mpp_abort();
return MPP_NOK;
} }
MPP_RET mpp_frame_init(MppFrame *frame) MPP_RET mpp_frame_init(MppFrame *frame)
@@ -57,12 +60,11 @@ MPP_RET mpp_frame_init(MppFrame *frame)
MPP_RET mpp_frame_deinit(MppFrame *frame) MPP_RET mpp_frame_deinit(MppFrame *frame)
{ {
if (NULL == frame || NULL == *frame) { if (NULL == frame || check_is_mpp_frame(*frame)) {
mpp_err_f("invalid NULL pointer input\n"); mpp_err_f("invalid NULL pointer input\n");
return MPP_ERR_NULL_PTR; return MPP_ERR_NULL_PTR;
} }
check_mpp_frame_name((MppFrameImpl *)*frame);
MppBuffer buffer = mpp_frame_get_buffer(*frame); MppBuffer buffer = mpp_frame_get_buffer(*frame);
if (buffer) if (buffer)
mpp_buffer_put(buffer); mpp_buffer_put(buffer);
@@ -74,52 +76,43 @@ MPP_RET mpp_frame_deinit(MppFrame *frame)
MppFrame mpp_frame_get_next(MppFrame frame) MppFrame mpp_frame_get_next(MppFrame frame)
{ {
if (NULL == frame) { if (check_is_mpp_frame(frame))
mpp_err_f("invalid NULL pointer input\n");
return NULL; return NULL;
}
MppFrameImpl *p = (MppFrameImpl *)frame; MppFrameImpl *p = (MppFrameImpl *)frame;
check_mpp_frame_name(p);
return (MppFrame)p->next; return (MppFrame)p->next;
} }
MPP_RET mpp_frame_set_next(MppFrame frame, MppFrame next) MPP_RET mpp_frame_set_next(MppFrame frame, MppFrame next)
{ {
if (NULL == frame) { if (check_is_mpp_frame(frame))
mpp_err_f("invalid NULL pointer input\n"); return MPP_ERR_UNKNOW;
return MPP_ERR_NULL_PTR;
}
MppFrameImpl *p = (MppFrameImpl *)frame; MppFrameImpl *p = (MppFrameImpl *)frame;
check_mpp_frame_name(p);
p->next = (MppFrameImpl *)next; p->next = (MppFrameImpl *)next;
return MPP_OK; return MPP_OK;
} }
MPP_RET mpp_frame_copy(MppFrame dst, MppFrame src) MPP_RET mpp_frame_copy(MppFrame dst, MppFrame src)
{ {
if (NULL == dst || NULL == src) { if (NULL == dst || check_is_mpp_frame(src)) {
mpp_err_f("invalid NULL pointer input\n"); mpp_err_f("invalid input dst %p src %p\n", dst, src);
return MPP_ERR_NULL_PTR; return MPP_ERR_UNKNOW;
} }
check_mpp_frame_name((MppFrameImpl *)src);
memcpy(dst, src, sizeof(MppFrameImpl)); memcpy(dst, src, sizeof(MppFrameImpl));
return MPP_OK; return MPP_OK;
} }
MPP_RET mpp_frame_info_cmp(MppFrame frame0, MppFrame frame1) MPP_RET mpp_frame_info_cmp(MppFrame frame0, MppFrame frame1)
{ {
if (NULL == frame0 || NULL == frame0) { if (check_is_mpp_frame(frame0) || check_is_mpp_frame(frame0)) {
mpp_err_f("invalid NULL pointer input\n"); mpp_err_f("invalid NULL pointer input\n");
return MPP_ERR_NULL_PTR; return MPP_ERR_NULL_PTR;
} }
MppFrameImpl *f0 = (MppFrameImpl *)frame0; MppFrameImpl *f0 = (MppFrameImpl *)frame0;
MppFrameImpl *f1 = (MppFrameImpl *)frame1; MppFrameImpl *f1 = (MppFrameImpl *)frame1;
check_mpp_frame_name(f0);
check_mpp_frame_name(f1);
if ((f0->width == f1->width) && if ((f0->width == f1->width) &&
(f0->height == f1->height) && (f0->height == f1->height) &&
@@ -142,12 +135,12 @@ MPP_RET mpp_frame_info_cmp(MppFrame frame0, MppFrame frame1)
#define MPP_FRAME_ACCESSORS(type, field) \ #define MPP_FRAME_ACCESSORS(type, field) \
type mpp_frame_get_##field(const MppFrame s) \ type mpp_frame_get_##field(const MppFrame s) \
{ \ { \
check_mpp_frame_name((MppFrameImpl*)s); \ check_is_mpp_frame((MppFrameImpl*)s); \
return ((MppFrameImpl*)s)->field; \ return ((MppFrameImpl*)s)->field; \
} \ } \
void mpp_frame_set_##field(MppFrame s, type v) \ void mpp_frame_set_##field(MppFrame s, type v) \
{ \ { \
check_mpp_frame_name((MppFrameImpl*)s); \ check_is_mpp_frame((MppFrameImpl*)s); \
((MppFrameImpl*)s)->field = v; \ ((MppFrameImpl*)s)->field = v; \
} }