Skip to content

GitLab

Commit 4eafefe0 authored by clang-format's avatar clang-format Committed by James Zern
Browse files

apply clang-format 

Change-Id: If0b48a4ee1f7902d8c6154945ccef68a2b5aabb5
parent a3a70c38
Hide whitespace changes
Inline Side-by-side
aomenc.c
View file @ 4eafefe0
......@@ -482,8 +482,8 @@ static const struct arg_enum_list color_space_enum[] = {
};
static const arg_def_t input_color_space =
ARG_DEF_ENUM(NULL, "color-space", 1, "The color space of input content:",
color_space_enum);
ARG_DEF_ENUM(NULL, "color-space", 1,
"The color space of input content:", color_space_enum);
static const struct arg_enum_list transfer_function_enum[] = {
{ "unknown", AOM_TF_UNKNOWN },
......@@ -494,8 +494,8 @@ static const struct arg_enum_list transfer_function_enum[] = {
};
static const arg_def_t input_transfer_function = ARG_DEF_ENUM(
NULL, "transfer-function", 1, "The transfer function of input content:",
transfer_function_enum);
NULL, "transfer-function", 1,
"The transfer function of input content:", transfer_function_enum);
static const struct arg_enum_list chroma_sample_position_enum[] = {
{ "unknown", AOM_CSP_UNKNOWN },
......
av1/common/av1_loopfilter.c
View file @ 4eafefe0
......@@ -3344,8 +3344,8 @@ void av1_loop_filter_rows(YV12_BUFFER_CONFIG *frame_buffer, AV1_COMMON *cm,
MODE_INFO **mi = cm->mi_grid_visible + mi_row * cm->mi_stride;
#if CONFIG_VAR_TX
for (int i = 0; i < MAX_MB_PLANE; ++i)
memset(cm->left_txfm_context[i], TX_32X32, MAX_MIB_SIZE
<< TX_UNIT_HIGH_LOG2);
memset(cm->left_txfm_context[i], TX_32X32,
MAX_MIB_SIZE << TX_UNIT_HIGH_LOG2);
#endif // CONFIG_VAR_TX
for (mi_col = 0; mi_col < cm->mi_cols; mi_col += cm->mib_size) {
av1_setup_dst_planes(planes, cm->sb_size, frame_buffer, mi_row, mi_col);
......
av1/common/cdef.c
View file @ 4eafefe0
......@@ -394,13 +394,14 @@ void av1_cdef_frame(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
if (cm->use_highbitdepth) {
cdef_filter_fb(
#if CONFIG_CDEF_SINGLEPASS
NULL, &CONVERT_TO_SHORTPTR(xd->plane[pli].dst.buf)
NULL,
&CONVERT_TO_SHORTPTR(xd->plane[pli].dst.buf)
#else
(uint8_t *)&CONVERT_TO_SHORTPTR(xd->plane[pli].dst.buf)
#endif
[xd->plane[pli].dst.stride *
(MI_SIZE_64X64 * fbr << mi_high_l2[pli]) +
(fbc * MI_SIZE_64X64 << mi_wide_l2[pli])],
[xd->plane[pli].dst.stride *
(MI_SIZE_64X64 * fbr << mi_high_l2[pli]) +
(fbc * MI_SIZE_64X64 << mi_wide_l2[pli])],
#if CONFIG_CDEF_SINGLEPASS
xd->plane[pli].dst.stride,
#else
......
av1/common/cdef.h
View file @ 4eafefe0
......@@ -27,9 +27,9 @@ static INLINE int sign(int i) { return i < 0 ? -1 : 1; }
static INLINE int constrain(int diff, int threshold, unsigned int damping) {
return threshold
? sign(diff) *
AOMMIN(
abs(diff),
AOMMAX(0, threshold - (abs(diff) >>
AOMMIN(abs(diff),
AOMMAX(0,
threshold - (abs(diff) >>
(damping - get_msb(threshold)))))
: 0;
}
......
av1/common/cdef_block.c
View file @ 4eafefe0
......@@ -572,8 +572,9 @@ void cdef_filter_fb(uint8_t *dst8, uint16_t *dst16, int dstride, uint16_t *in,
pri_damping, sec_damping, bsize, (256 << coeff_shift) - 1);
else
cdef_filter_block(
NULL, &dst16[dirinit ? bi << (bsizex + bsizey)
: (by << bsizey) * dstride + (bx << bsizex)],
NULL,
&dst16[dirinit ? bi << (bsizex + bsizey)
: (by << bsizey) * dstride + (bx << bsizex)],
dirinit ? 1 << bsizex : dstride,
&in[(by * CDEF_BSTRIDE << bsizey) + (bx << bsizex)],
(pli ? t : adjust_strength(t, var[by][bx])), s, t ? dir[by][bx] : 0,
......
av1/common/reconinter.c
View file @ 4eafefe0
......@@ -1650,11 +1650,11 @@ static INLINE void build_inter_predictors(
if (conv_params.do_post_rounding) {
#if CONFIG_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH)
av1_highbd_convolve_rounding(tmp_dst, MAX_SB_SIZE, dst, dst_buf->stride,
w, h, FILTER_BITS * 2 + is_compound -
conv_params.round_0 -
conv_params.round_1,
xd->bd);
av1_highbd_convolve_rounding(
tmp_dst, MAX_SB_SIZE, dst, dst_buf->stride, w, h,
FILTER_BITS * 2 + is_compound - conv_params.round_0 -
conv_params.round_1,
xd->bd);
else
#endif // CONFIG_HIGHBITDEPTH
#if CONFIG_EXT_INTER && CONFIG_COMPOUND_SINGLEREF
......
av1/decoder/decodeframe.c
View file @ 4eafefe0
......@@ -341,10 +341,11 @@ static int av1_pvq_decode_helper(MACROBLOCKD *xd, tran_low_t *ref_coeff,
pvq_dc_quant = 1;
else {
if (use_activity_masking)
pvq_dc_quant = OD_MAXI(
1, (quant[0] << (OD_COEFF_SHIFT - 3) >> hbd_downshift) *
dec->state.pvq_qm_q4[pli][od_qm_get_index(bs, 0)] >>
4);
pvq_dc_quant =
OD_MAXI(1,
(quant[0] << (OD_COEFF_SHIFT - 3) >> hbd_downshift) *
dec->state.pvq_qm_q4[pli][od_qm_get_index(bs, 0)] >>
4);
else
pvq_dc_quant =
OD_MAXI(1, quant[0] << (OD_COEFF_SHIFT - 3) >> hbd_downshift);
......
av1/encoder/av1_quantize.c
View file @ 4eafefe0
......@@ -1618,15 +1618,16 @@ void av1_init_plane_quantizers(const AV1_COMP *cpi, MACROBLOCK *x,
#if CONFIG_DELTA_Q
#if CONFIG_EXT_DELTA_Q
int current_q_index = AOMMAX(
0, AOMMIN(QINDEX_RANGE - 1, cpi->oxcf.deltaq_mode != NO_DELTA_Q
? cm->base_qindex + xd->delta_qindex
: cm->base_qindex));
int current_q_index =
AOMMAX(0, AOMMIN(QINDEX_RANGE - 1,
cpi->oxcf.deltaq_mode != NO_DELTA_Q
? cm->base_qindex + xd->delta_qindex
: cm->base_qindex));
#else
int current_q_index = AOMMAX(
0, AOMMIN(QINDEX_RANGE - 1, cm->delta_q_present_flag
? cm->base_qindex + xd->delta_qindex
: cm->base_qindex));
0, AOMMIN(QINDEX_RANGE - 1,
cm->delta_q_present_flag ? cm->base_qindex + xd->delta_qindex
: cm->base_qindex));
#endif
const int qindex = av1_get_qindex(&cm->seg, segment_id, current_q_index);
#else
......
av1/encoder/bgsprite.c
View file @ 4eafefe0
......@@ -1072,7 +1072,7 @@ static void stitch_images(AV1_COMP *cpi, YV12_BUFFER_CONFIG **const frames,
build_mask(x_min[center_idx], y_min[center_idx], x_offset, y_offset,
x_block_width, y_block_height, N_1,
(const YuvPixelGaussian **)gauss,
(YV12_BUFFER_CONFIG * const)frames[center_idx], panorama, mask);
(YV12_BUFFER_CONFIG * const) frames[center_idx], panorama, mask);
YV12_BUFFER_CONFIG temporal_arf;
memset(&temporal_arf, 0, sizeof(temporal_arf));
......
av1/encoder/bitstream.c
View file @ 4eafefe0
......@@ -3122,9 +3122,10 @@ static void write_modes_sb(AV1_COMP *const cpi, const TileInfo *const tile,
width += width_step) {
if (!sb_all_skip(cm, mi_row + height, mi_col + width))
aom_write_literal(
w, cm->mi_grid_visible[(mi_row + height) * cm->mi_stride +
(mi_col + width)]
->mbmi.cdef_strength,
w,
cm->mi_grid_visible[(mi_row + height) * cm->mi_stride +
(mi_col + width)]
->mbmi.cdef_strength,
cm->cdef_bits);
}
}
......@@ -3252,8 +3253,9 @@ static void encode_restoration_mode(AV1_COMMON *cm,
int s = AOMMIN(cm->subsampling_x, cm->subsampling_y);
if (s && (cm->rst_info[1].frame_restoration_type != RESTORE_NONE ||
cm->rst_info[2].frame_restoration_type != RESTORE_NONE)) {
aom_wb_write_bit(wb, cm->rst_info[1].restoration_tilesize !=
cm->rst_info[0].restoration_tilesize);
aom_wb_write_bit(wb,
cm->rst_info[1].restoration_tilesize !=
cm->rst_info[0].restoration_tilesize);
assert(cm->rst_info[1].restoration_tilesize ==
cm->rst_info[0].restoration_tilesize ||
cm->rst_info[1].restoration_tilesize ==
......
av1/encoder/encodemb.c
View file @ 4eafefe0
......@@ -1168,10 +1168,11 @@ PVQ_SKIP_TYPE av1_pvq_encode_helper(MACROBLOCK *x, tran_low_t *const coeff,
// DC quantizer for PVQ
if (use_activity_masking)
pvq_dc_quant =
OD_MAXI(1, (quant[0] << (OD_COEFF_SHIFT - 3) >> hbd_downshift) *
daala_enc->state
.pvq_qm_q4[plane][od_qm_get_index(tx_size, 0)] >>
4);
OD_MAXI(1,
(quant[0] << (OD_COEFF_SHIFT - 3) >> hbd_downshift) *
daala_enc->state
.pvq_qm_q4[plane][od_qm_get_index(tx_size, 0)] >>
4);
else
pvq_dc_quant =
OD_MAXI(1, quant[0] << (OD_COEFF_SHIFT - 3) >> hbd_downshift);
......@@ -1205,18 +1206,19 @@ PVQ_SKIP_TYPE av1_pvq_encode_helper(MACROBLOCK *x, tran_low_t *const coeff,
out_int32[0] = OD_DIV_R0(in_int32[0] - ref_int32[0], pvq_dc_quant);
}
ac_dc_coded =
od_pvq_encode(daala_enc, ref_int32, in_int32, out_int32,
OD_MAXI(1, quant[0] << (OD_COEFF_SHIFT - 3) >>
hbd_downshift), // scale/quantizer
OD_MAXI(1, quant[1] << (OD_COEFF_SHIFT - 3) >>
hbd_downshift), // scale/quantizer
plane,
tx_size, OD_PVQ_BETA[use_activity_masking][plane][tx_size],
0, // is_keyframe,
daala_enc->state.qm + off, daala_enc->state.qm_inv + off,
speed, // speed
pvq_info);
ac_dc_coded = od_pvq_encode(
daala_enc, ref_int32, in_int32, out_int32,
OD_MAXI(1,
quant[0] << (OD_COEFF_SHIFT - 3) >>
hbd_downshift), // scale/quantizer
OD_MAXI(1,
quant[1] << (OD_COEFF_SHIFT - 3) >>
hbd_downshift), // scale/quantizer
plane, tx_size, OD_PVQ_BETA[use_activity_masking][plane][tx_size],
0, // is_keyframe,
daala_enc->state.qm + off, daala_enc->state.qm_inv + off,
speed, // speed
pvq_info);
// Encode residue of DC coeff, if required.
if (!has_dc_skip || out_int32[0]) {
......
av1/encoder/encodemv.c
View file @ 4eafefe0
......@@ -70,9 +70,10 @@ static void encode_mv_component(aom_writer *w, int comp, nmv_component *mvcomp,
if (precision > MV_SUBPEL_NONE)
#endif // CONFIG_INTRABC
{
aom_write_symbol(w, fr, mv_class == MV_CLASS_0 ? mvcomp->class0_fp_cdf[d]
: mvcomp->fp_cdf,
MV_FP_SIZE);
aom_write_symbol(
w, fr,
mv_class == MV_CLASS_0 ? mvcomp->class0_fp_cdf[d] : mvcomp->fp_cdf,
MV_FP_SIZE);
}
// High precision bit
......
av1/encoder/encoder.c
View file @ 4eafefe0
......@@ -2574,12 +2574,14 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf,
#endif
CHECK_MEM_ERROR(
cm, cpi->td.mb.above_pred_buf,
(uint8_t *)aom_memalign(16, buf_scaler * MAX_MB_PLANE * MAX_SB_SQUARE *
sizeof(*cpi->td.mb.above_pred_buf)));
(uint8_t *)aom_memalign(16,
buf_scaler * MAX_MB_PLANE * MAX_SB_SQUARE *
sizeof(*cpi->td.mb.above_pred_buf)));
CHECK_MEM_ERROR(
cm, cpi->td.mb.left_pred_buf,
(uint8_t *)aom_memalign(16, buf_scaler * MAX_MB_PLANE * MAX_SB_SQUARE *
sizeof(*cpi->td.mb.left_pred_buf)));
(uint8_t *)aom_memalign(16,
buf_scaler * MAX_MB_PLANE * MAX_SB_SQUARE *
sizeof(*cpi->td.mb.left_pred_buf)));
CHECK_MEM_ERROR(cm, cpi->td.mb.wsrc_buf,
(int32_t *)aom_memalign(
......
av1/encoder/ethread.c
View file @ 4eafefe0
......@@ -96,12 +96,14 @@ void av1_encode_tiles_mt(AV1_COMP *cpi) {
#endif
CHECK_MEM_ERROR(cm, thread_data->td->above_pred_buf,
(uint8_t *)aom_memalign(
16, buf_scaler * MAX_MB_PLANE * MAX_SB_SQUARE *
sizeof(*thread_data->td->above_pred_buf)));
16,
buf_scaler * MAX_MB_PLANE * MAX_SB_SQUARE *
sizeof(*thread_data->td->above_pred_buf)));
CHECK_MEM_ERROR(cm, thread_data->td->left_pred_buf,
(uint8_t *)aom_memalign(
16, buf_scaler * MAX_MB_PLANE * MAX_SB_SQUARE *
sizeof(*thread_data->td->left_pred_buf)));
16,
buf_scaler * MAX_MB_PLANE * MAX_SB_SQUARE *
sizeof(*thread_data->td->left_pred_buf)));
CHECK_MEM_ERROR(
cm, thread_data->td->wsrc_buf,
(int32_t *)aom_memalign(
......
av1/encoder/rdopt.c
View file @ 4eafefe0
......@@ -6240,9 +6240,9 @@ static void joint_motion_search(const AV1_COMP *cpi, MACROBLOCK *x,
assert(frame_comp_mv);
}
assert(has_second_ref(mbmi) || is_inter_singleref_comp_mode(mbmi->mode));
const int refs[2] = { mbmi->ref_frame[0], has_second_ref(mbmi)
? mbmi->ref_frame[1]
: mbmi->ref_frame[0] };
const int refs[2] = { mbmi->ref_frame[0],
has_second_ref(mbmi) ? mbmi->ref_frame[1]
: mbmi->ref_frame[0] };
#else
assert(has_second_ref(mbmi));
const int refs[2] = { mbmi->ref_frame[0], mbmi->ref_frame[1] };
......@@ -11101,10 +11101,11 @@ void av1_rd_pick_inter_mode_sb(const AV1_COMP *cpi, TileDataEnc *tile_data,
x->rdmult, rate2 + av1_cost_bit(av1_get_skip_prob(cm, xd), 0),
distortion2);
else
tmp_ref_rd = RDCOST(
x->rdmult, rate2 + av1_cost_bit(av1_get_skip_prob(cm, xd), 1) -
rate_y - rate_uv,
total_sse);
tmp_ref_rd =
RDCOST(x->rdmult,
rate2 + av1_cost_bit(av1_get_skip_prob(cm, xd), 1) -
rate_y - rate_uv,
total_sse);
}
#if CONFIG_VAR_TX
for (i = 0; i < MAX_MB_PLANE; ++i)
......@@ -11277,16 +11278,18 @@ void av1_rd_pick_inter_mode_sb(const AV1_COMP *cpi, TileDataEnc *tile_data,
if (RDCOST(x->rdmult, tmp_rd_stats_y.rate + tmp_rd_stats_uv.rate,
tmp_rd_stats.dist) <
RDCOST(x->rdmult, 0, tmp_rd_stats.sse))
tmp_alt_rd = RDCOST(
x->rdmult, tmp_rd_stats.rate +
av1_cost_bit(av1_get_skip_prob(cm, xd), 0),
tmp_rd_stats.dist);
tmp_alt_rd =
RDCOST(x->rdmult,
tmp_rd_stats.rate +
av1_cost_bit(av1_get_skip_prob(cm, xd), 0),
tmp_rd_stats.dist);
else
tmp_alt_rd = RDCOST(
x->rdmult, tmp_rd_stats.rate +
av1_cost_bit(av1_get_skip_prob(cm, xd), 1) -
tmp_rd_stats_y.rate - tmp_rd_stats_uv.rate,
tmp_rd_stats.sse);
tmp_alt_rd =
RDCOST(x->rdmult,
tmp_rd_stats.rate +
av1_cost_bit(av1_get_skip_prob(cm, xd), 1) -
tmp_rd_stats_y.rate - tmp_rd_stats_uv.rate,
tmp_rd_stats.sse);
#endif // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
}
......@@ -12573,8 +12576,9 @@ void av1_check_ncobmc_rd(const struct AV1_COMP *cpi, struct macroblock *x,
}
if (rd_causal >
RDCOST(x->rdmult, rd_stats_y.rate + rd_stats_uv.rate +
av1_cost_bit(cm->fc->motion_mode_prob[bsize][0], 1),
RDCOST(x->rdmult,
rd_stats_y.rate + rd_stats_uv.rate +
av1_cost_bit(cm->fc->motion_mode_prob[bsize][0], 1),
(rd_stats_y.dist + rd_stats_uv.dist))) {
x->skip = skip_blk;
} else {
......
av1/encoder/tokenize.c
View file @ 4eafefe0
......@@ -464,7 +464,7 @@ static void tokenize_pvq(int plane, int block, int blk_row, int blk_col,
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 // CONFIG_PVQ
......
test/av1_quantize_test.cc
View file @ 4eafefe0
......@@ -99,8 +99,8 @@ class AV1QuantizeTest : public ::testing::TestWithParam<QuantizeFuncParams> {
for (int j = 0; j < count; ++j) {
err_count += (ref_qcoeff_ptr[j] != qcoeff_ptr[j]) |
(ref_dqcoeff_ptr[j] != dqcoeff_ptr[j]);
EXPECT_EQ(ref_qcoeff_ptr[j], qcoeff_ptr[j]) << "qcoeff error: i = " << i
<< " j = " << j << "\n";
EXPECT_EQ(ref_qcoeff_ptr[j], qcoeff_ptr[j])
<< "qcoeff error: i = " << i << " j = " << j << "\n";
EXPECT_EQ(ref_dqcoeff_ptr[j], dqcoeff_ptr[j])
<< "dqcoeff error: i = " << i << " j = " << j << "\n";
}
......
test/boolcoder_test.cc
View file @ 4eafefe0
......@@ -116,8 +116,8 @@ TEST(AV1, TestTell) {
aom_read(&br, p, NULL);
uint32_t tell = aom_reader_tell(&br);
uint32_t tell_frac = aom_reader_tell_frac(&br);
GTEST_ASSERT_GE(tell, last_tell) << "tell: " << tell
<< ", last_tell: " << last_tell;
GTEST_ASSERT_GE(tell, last_tell)
<< "tell: " << tell << ", last_tell: " << last_tell;
GTEST_ASSERT_GE(tell_frac, last_tell_frac)
<< "tell_frac: " << tell_frac
<< ", last_tell_frac: " << last_tell_frac;
......
test/datarate_test.cc
View file @ 4eafefe0
......@@ -89,8 +89,8 @@ class DatarateTestLarge
duration * timebase_ * cfg_.rc_target_bitrate * 1000);
// Buffer should not go negative.
ASSERT_GE(bits_in_buffer_model_, 0) << "Buffer Underrun at frame "
<< pkt->data.frame.pts;
ASSERT_GE(bits_in_buffer_model_, 0)
<< "Buffer Underrun at frame " << pkt->data.frame.pts;
const size_t frame_size_in_bits = pkt->data.frame.sz * 8;
......
test/dct16x16_test.cc
View file @ 4eafefe0
......@@ -510,8 +510,8 @@ class Trans16x16TestBase {
const int diff = dst[j] - src[j];
#endif // CONFIG_HIGHBITDEPTH
const uint32_t error = diff * diff;
EXPECT_GE(1u, error) << "Error: 16x16 IDCT has error " << error
<< " at index " << j;
EXPECT_GE(1u, error)
<< "Error: 16x16 IDCT has error " << error << " at index " << j;
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment