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

[astyle]: coding style formating

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@438 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-11-01 20:10:35 +00:00
parent 9a59c44dd4
commit 107e40bf82
6 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mpp/codec/dec/h265/h265d_refs.c
View File

@@ -94,7 +94,7 @@ static HEVCFrame *alloc_frame(HEVCContext *s)
mpp_frame_set_hor_stride(frame->frame, s->h265dctx->coded_width);
mpp_frame_set_ver_stride(frame->frame, s->h265dctx->coded_height);
h265d_dbg(H265D_DBG_GLOBAL,"w_stride %d h_stride %d\n", s->h265dctx->coded_width, s->h265dctx->coded_height);
h265d_dbg(H265D_DBG_GLOBAL, "w_stride %d h_stride %d\n", s->h265dctx->coded_width, s->h265dctx->coded_height);
// frame->frame->color_type = s->h265dctx->pix_fmt;
// if (!frame->frame->sample_aspect_ratio.num)

3
mpp/legacy/vpu_mem_legacy.c
View File

@@ -95,8 +95,6 @@ static RK_S32 get_free_memory_num(vpu_display_mem_pool *p)
static RK_S32 reset_vpu_mem_pool(vpu_display_mem_pool *p)
{
vpu_display_mem_pool_impl *p_mempool = (vpu_display_mem_pool_impl *)p;
mpp_buffer_group_clear(p_mempool->group);
return 0;
@@ -263,7 +261,6 @@ RK_S32 VPUMemGetFD(VPUMemLinear_t *p)
MppBuffer buffer = (MppBuffer)p->offset;
fd = mpp_buffer_get_fd(buffer);
return fd;
}
RK_S32 vpu_mem_judge_used_heaps_type()

12
mpp/mpp_buffer_impl.cpp
View File

@@ -92,7 +92,7 @@ MPP_RET deinit_buffer_no_lock(MppBufferImpl *buffer)
func(group->allocator, &buffer->info);
group->usage -= buffer->info.size;
group->count--;
if(!buffer->discard)
if (!buffer->discard)
group->count_unused--;
} else {
group = SEARCH_GROUP_ORPHAN(buffer->group_id);
@@ -225,11 +225,11 @@ MPP_RET mpp_buffer_ref_dec(MppBufferImpl *buffer)
if (group == service.mLegacyGroup) {
deinit_buffer_no_lock(buffer);
} else {
if(buffer->discard){
if (buffer->discard) {
deinit_buffer_no_lock(buffer);
}else{
list_add_tail(&buffer->list_status, &group->list_unused);
group->count_unused++;
} else {
list_add_tail(&buffer->list_status, &group->list_unused);
group->count_unused++;
}
}
group->count_used--;
@@ -354,7 +354,7 @@ MPP_RET mpp_buffer_group_reset(MppBufferGroupImpl *p)
if (!list_empty(&p->list_used)) {
MppBufferImpl *pos, *n;
list_for_each_entry_safe(pos, n, &p->list_used, MppBufferImpl, list_status) {
// mpp_buffer_ref_dec(pos);
// mpp_buffer_ref_dec(pos);
pos->discard = 1;
}
}

2
mpp/mpp_buffer_impl.h
View File

@@ -46,7 +46,7 @@ struct MppBufferImpl_t {
/* used for buf on group reset mode
set disard value to 1 when frame refcount no zero ,
we will delay relesase buffer after refcount to zero,
not put this buf to unused list
not put this buf to unused list
*/
RK_S32 discard;
// used flag is for used/unused list detection

3
osal/inc/mpp_thread.h
View File

@@ -153,7 +153,8 @@ inline void Condition::signal()
pthread_cond_signal(&mCond);
}
class MppMutexCond {
class MppMutexCond
{
public:
MppMutexCond() {};
~MppMutexCond() {};

4
osal/mpp_allocator.cpp
View File

@@ -85,7 +85,7 @@ MPP_RET mpp_allocator_release(MppAllocator allocator, MppBufferInfo *info)
{
if (NULL == allocator || NULL == info) {
mpp_err_f("invalid input: allocator %p info %p\n",
allocator, info);
allocator, info);
return MPP_ERR_UNKNOW;
}
@@ -113,7 +113,7 @@ MPP_RET mpp_alloctor_get(MppAllocator *allocator, MppAllocatorApi **api, MppBuff
{
if (NULL == allocator || NULL == api || type >= MPP_BUFFER_TYPE_BUTT) {
mpp_err_f("invalid input: allocator %p api %p type %d\n",
allocator, api, type);
allocator, api, type);
return MPP_ERR_UNKNOW;
}