Fix clang-format issues.
Change-Id: I6cdb7e80072359fc2c485424e2130e62a796cf25
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 619b2b7..94f536d 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -383,9 +383,8 @@
od_pvq_decode(dec, ref_int32, out_int32, (int)quant[1] >> quant_shift, pli,
bs, OD_PVQ_BETA[use_activity_masking][pli][bs],
- OD_ROBUST_STREAM,
- is_keyframe, &flags, ac_dc_coded, dec->state.qm + off,
- dec->state.qm_inv + off);
+ OD_ROBUST_STREAM, is_keyframe, &flags, ac_dc_coded,
+ dec->state.qm + off, dec->state.qm_inv + off);
// copy int32 result back to int16
for (i = 0; i < blk_size * blk_size; i++) dqcoeff_pvq[i] = out_int32[i];
@@ -407,9 +406,9 @@
return eob;
}
-static int av1_pvq_decode_helper2(
- MACROBLOCKD *const xd, MB_MODE_INFO *const mbmi, int plane, int row,
- int col, TX_SIZE tx_size, TX_TYPE tx_type ) {
+static int av1_pvq_decode_helper2(MACROBLOCKD *const xd,
+ MB_MODE_INFO *const mbmi, int plane, int row,
+ int col, TX_SIZE tx_size, TX_TYPE tx_type) {
struct macroblockd_plane *const pd = &xd->plane[plane];
// transform block size in pixels
int tx_blk_size = tx_size_1d[tx_size];
@@ -464,8 +463,8 @@
for (j = 0; j < tx_blk_size; j++)
for (i = 0; i < tx_blk_size; i++) dst[j * pd->dst.stride + i] = 0;
- inverse_transform_block(xd, plane, tx_type, tx_size, dst,
- pd->dst.stride, eob);
+ inverse_transform_block(xd, plane, tx_type, tx_size, dst, pd->dst.stride,
+ eob);
}
return eob;
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index c385504..f3cb422 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -2830,8 +2830,9 @@
#if CONFIG_PVQ
// This will be dynamically increased as more pvq block is encoded.
tile_data->pvq_q.buf_len = 1000;
- CHECK_MEM_ERROR(cm, tile_data->pvq_q.buf,
- aom_malloc(tile_data->pvq_q.buf_len * sizeof(PVQ_INFO)));
+ CHECK_MEM_ERROR(
+ cm, tile_data->pvq_q.buf,
+ aom_malloc(tile_data->pvq_q.buf_len * sizeof(PVQ_INFO)));
tile_data->pvq_q.curr_pos = 0;
#endif
}
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 5dadcb6..bc75735 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -1317,8 +1317,7 @@
(int)quant[1] >> quant_shift, // scale/quantizer
// TODO(yushin): Instead of 0,
// use daala_enc->use_activity_masking for activity masking.
- plane, tx_size, OD_PVQ_BETA[0][plane][tx_size],
- OD_ROBUST_STREAM,
+ plane, tx_size, OD_PVQ_BETA[0][plane][tx_size], OD_ROBUST_STREAM,
0, // is_keyframe,
0, 0, 0, // q_scaling, bx, by,
daala_enc->state.qm + off, daala_enc->state.qm_inv + off,
diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index 1dfd0a6..9b86005 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -529,7 +529,8 @@
od_adapt_ctx *adapt;
pvq_q.buf_len = 5000;
- CHECK_MEM_ERROR(cm, pvq_q.buf, aom_malloc(pvq_q.buf_len * sizeof(PVQ_INFO)));
+ CHECK_MEM_ERROR(cm, pvq_q.buf,
+ aom_malloc(pvq_q.buf_len * sizeof(PVQ_INFO)));
pvq_q.curr_pos = 0;
x->pvq_coded = 0;
diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index 142bde8..7efeb55 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -527,9 +527,10 @@
PVQ_QUEUE *q = x->pvq_q;
if (q->curr_pos >= q->buf_len) {
q->buf_len = 2 * q->buf_len + 1;
- CHECK_MEM_ERROR(cm, q->buf, aom_realloc(q->buf, q->buf_len * sizeof(PVQ_INFO)));
+ CHECK_MEM_ERROR(cm, q->buf,
+ aom_realloc(q->buf, q->buf_len * sizeof(PVQ_INFO)));
}
- //memcpy(q->buf + q->curr_pos, pvq, sizeof(PVQ_INFO));
+ // memcpy(q->buf + q->curr_pos, pvq, sizeof(PVQ_INFO));
OD_COPY(q->buf + q->curr_pos, pvq, 1);
++q->curr_pos;
}
@@ -554,7 +555,7 @@
assert(block < MAX_PVQ_BLOCKS_IN_SB);
pvq_info = &x->pvq[block][plane];
- add_pvq_block((AV1_COMMON *const)cm, x, pvq_info);
+ add_pvq_block((AV1_COMMON * const)cm, x, pvq_info);
}
#endif
