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

[astyle]: format code

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@297 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-09-24 14:18:29 +00:00
parent 71234c6a16
commit 24ab3a135c
18 changed files with 260 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mpp/codec/dec/h264/h264d_slice.c
View File

@@ -531,9 +531,8 @@ MPP_RET process_slice(H264_SLICE_t *currSlice)
if (currSlice->nal_reference_idc) {
FUN_CHECK(ret = dec_ref_pic_marking(currSlice));
}
if (g_max_bytes < (p_bitctx->used_bits>>3))
{
g_max_bytes = (p_bitctx->used_bits>>3);
if (g_max_bytes < (p_bitctx->used_bits >> 3)) {
g_max_bytes = (p_bitctx->used_bits >> 3);
}
currSlice->is_new_picture_flag = 1;
}

2
mpp/codec/mpp_buf_slot.cpp
View File

@@ -211,7 +211,7 @@ static void slot_ops_with_log(mpp_list *logs, MppBufSlotEntry *slot, MppBufSlotO
mpp_err("found invalid operation code %d\n", op);
} break;
}
mpp_assert((RK_S16)(status&MPP_SLOT_HW_REF_MASK) >= 0);
mpp_assert((RK_S16)(status & MPP_SLOT_HW_REF_MASK) >= 0);
slot->status = status;
buf_slot_dbg(BUF_SLOT_DBG_OPS_RUNTIME, "index %2d op: %s status in %08x out %08x",
index, op_string[op], before, status);

6
mpp/hal/rkdec/h264d/hal_h264d_packet.c
View File

@@ -477,12 +477,10 @@ void fprint_fifo_data(FILE *fp, FifoCtx_t *pkt)
if (fp) {
pkt_size = pkt->index * sizeof(RK_U64);
fprintf(fp, "------ Header=%08x, size=%d ------ \n", pkt->header, pkt_size);
for (i = 0; i < pkt_size;)
{
for (i = 0; i < pkt_size;) {
fprintf(fp, "0x%02x, ", ptr[i]);
i++;
if ((i % 16) == 0)
{
if ((i % 16) == 0) {
fprintf(fp, "\n");
}
}

6
mpp/test/h264d_rwfile.c
View File

@@ -499,8 +499,7 @@ static MPP_RET read_next_nalu(InputParams *p_in)
ASSERT(forbidden_bit == 0);
read_bits( pStrmData, 2, &nal_reference_idc);
read_bits( pStrmData, 5, &nal_unit_type);
if (g_nalu_cnt2 == 344)
{
if (g_nalu_cnt2 == 344) {
g_nalu_cnt2 = g_nalu_cnt2;
}
//if (g_debug_file0 == NULL)
@@ -765,8 +764,7 @@ MPP_RET h264d_read_one_frame(InputParams *p_in, MppPacket pkt)
//-- set code input context
((MppPacketImpl *)pkt)->pos = p_in->strm.pbuf;
((MppPacketImpl *)pkt)->size = p_in->strm.strmbytes;
if (g_max_slice_data < p_in->strm.strmbytes)
{
if (g_max_slice_data < p_in->strm.strmbytes) {
g_max_slice_data = p_in->strm.strmbytes;
}
if (p_in->is_eof) {