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

[format]: format coding style

Browse Source 
Change-Id: I3d0e081f6636ca8162df4bda68618ec0ba37e7ae
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2016-08-23 09:16:22 +08:00
parent 6c838b8037
commit 43bfdc6bdf
23 changed files with 259 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mpp/base/mpp_meta.cpp
View File

@@ -90,13 +90,11 @@ private:
RK_U32 node_count; RK_U32 node_count;
public: public:
static MppMetaService *get_instance() static MppMetaService *get_instance() {
{
static MppMetaService instance; static MppMetaService instance;
return &instance; return &instance;
} }
static Mutex *get_lock() static Mutex *get_lock() {
{
static Mutex lock; static Mutex lock;
return &lock; return &lock;
} }

6
mpp/hal/rkenc/h264e/hal_h264e_rkv.c
View File

@@ -2859,8 +2859,7 @@ MPP_RET hal_h264e_rkv_set_osd_regs(h264e_rkv_reg_set *regs, h264e_syntax *syn, M
regs->swreg67_osd_pos[7].rd_pos_x = 3 * OSD_SIZE_MBS + OSD_SIZE_MBS - 1; //OSD_r7_x_rd_pos; regs->swreg67_osd_pos[7].rd_pos_x = 3 * OSD_SIZE_MBS + OSD_SIZE_MBS - 1; //OSD_r7_x_rd_pos;
regs->swreg67_osd_pos[7].rd_pos_y = 1 * OSD_SIZE_MBS + OSD_SIZE_MBS - 1; //OSD_r7_y_rd_pos; regs->swreg67_osd_pos[7].rd_pos_y = 1 * OSD_SIZE_MBS + OSD_SIZE_MBS - 1; //OSD_r7_y_rd_pos;
for(k=0; k<8; k++) for (k = 0; k < 8; k++) {
{
if (regs->swreg65.osd_plt_type == 0) //configurable if (regs->swreg65.osd_plt_type == 0) //configurable
memset((RK_U8 *)mpp_buffer_get_ptr(osd_idx_buf) + k * osd_size_pixels, 32 * k, osd_size_pixels); memset((RK_U8 *)mpp_buffer_get_ptr(osd_idx_buf) + k * osd_size_pixels, 32 * k, osd_size_pixels);
else //fixed mode: only support idx 0~7 else //fixed mode: only support idx 0~7
@@ -2870,8 +2869,7 @@ MPP_RET hal_h264e_rkv_set_osd_regs(h264e_rkv_reg_set *regs, h264e_syntax *syn, M
mpp_log("regs->swreg68_indx_addr_i[k] 0x%08x", regs->swreg68_indx_addr_i[k]); mpp_log("regs->swreg68_indx_addr_i[k] 0x%08x", regs->swreg68_indx_addr_i[k]);
} }
#if 0 //written in kernel #if 0 //written in kernel
for(k=0; k<256; k++) for (k = 0; k < 256; k++) {
{
regs->swreg73_osd_indx_tab_i[k] = k | (0x80 << 8) | (0x80 << 16) | (k << 24); regs->swreg73_osd_indx_tab_i[k] = k | (0x80 << 8) | (0x80 << 16) | (k << 24);
} }
#endif #endif

3
mpp/legacy/vpu_api.cpp
View File

@@ -208,8 +208,7 @@ public:
VpulibDlsym() : VpulibDlsym() :
rkapi_hdl(NULL), rkapi_hdl(NULL),
rkvpu_open_cxt(NULL), rkvpu_open_cxt(NULL),
rkvpu_close_cxt(NULL) rkvpu_close_cxt(NULL) {
{
RK_U32 i; RK_U32 i;
for (i = 0; i < MPP_ARRAY_ELEMS(codec_paths); i++) { for (i = 0; i < MPP_ARRAY_ELEMS(codec_paths); i++) {