Commit a2dc61c7 authored by clang-format's avatar clang-format Committed by James Zern

apply clang-format

.c files were missed in the previous change

Change-Id: I9d22cd83e1f87472bfb09e6a38284396b2fcd860
parent 06259581
...@@ -418,8 +418,8 @@ static void fs_calc_structure(fs_ctx *_ctx, int _l, int bit_depth) { ...@@ -418,8 +418,8 @@ static void fs_calc_structure(fs_ctx *_ctx, int _l, int bit_depth) {
We drop the finest scale and renormalize the rest to sum to 1.*/ We drop the finest scale and renormalize the rest to sum to 1.*/
static const double FS_WEIGHTS[FS_NLEVELS] = { static const double FS_WEIGHTS[FS_NLEVELS] = {
0.2989654541015625, 0.3141326904296875, 0.2473602294921875, 0.2989654541015625, 0.3141326904296875, 0.2473602294921875, 0.1395416259765625
0.1395416259765625}; };
static double fs_average(fs_ctx *_ctx, int _l) { static double fs_average(fs_ctx *_ctx, int _l) {
double *ssim; double *ssim;
......
...@@ -201,13 +201,13 @@ int64_t aom_highbd_get_y_sse(const YV12_BUFFER_CONFIG *a, ...@@ -201,13 +201,13 @@ int64_t aom_highbd_get_y_sse(const YV12_BUFFER_CONFIG *a,
void aom_calc_highbd_psnr(const YV12_BUFFER_CONFIG *a, void aom_calc_highbd_psnr(const YV12_BUFFER_CONFIG *a,
const YV12_BUFFER_CONFIG *b, PSNR_STATS *psnr, const YV12_BUFFER_CONFIG *b, PSNR_STATS *psnr,
uint32_t bit_depth, uint32_t in_bit_depth) { uint32_t bit_depth, uint32_t in_bit_depth) {
const int widths[3] = {a->y_crop_width, a->uv_crop_width, a->uv_crop_width}; const int widths[3] = { a->y_crop_width, a->uv_crop_width, a->uv_crop_width };
const int heights[3] = {a->y_crop_height, a->uv_crop_height, const int heights[3] = { a->y_crop_height, a->uv_crop_height,
a->uv_crop_height}; a->uv_crop_height };
const uint8_t *a_planes[3] = {a->y_buffer, a->u_buffer, a->v_buffer}; const uint8_t *a_planes[3] = { a->y_buffer, a->u_buffer, a->v_buffer };
const int a_strides[3] = {a->y_stride, a->uv_stride, a->uv_stride}; const int a_strides[3] = { a->y_stride, a->uv_stride, a->uv_stride };
const uint8_t *b_planes[3] = {b->y_buffer, b->u_buffer, b->v_buffer}; const uint8_t *b_planes[3] = { b->y_buffer, b->u_buffer, b->v_buffer };
const int b_strides[3] = {b->y_stride, b->uv_stride, b->uv_stride}; const int b_strides[3] = { b->y_stride, b->uv_stride, b->uv_stride };
int i; int i;
uint64_t total_sse = 0; uint64_t total_sse = 0;
uint32_t total_samples = 0; uint32_t total_samples = 0;
...@@ -249,13 +249,13 @@ void aom_calc_highbd_psnr(const YV12_BUFFER_CONFIG *a, ...@@ -249,13 +249,13 @@ void aom_calc_highbd_psnr(const YV12_BUFFER_CONFIG *a,
void aom_calc_psnr(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b, void aom_calc_psnr(const YV12_BUFFER_CONFIG *a, const YV12_BUFFER_CONFIG *b,
PSNR_STATS *psnr) { PSNR_STATS *psnr) {
static const double peak = 255.0; static const double peak = 255.0;
const int widths[3] = {a->y_crop_width, a->uv_crop_width, a->uv_crop_width}; const int widths[3] = { a->y_crop_width, a->uv_crop_width, a->uv_crop_width };
const int heights[3] = {a->y_crop_height, a->uv_crop_height, const int heights[3] = { a->y_crop_height, a->uv_crop_height,
a->uv_crop_height}; a->uv_crop_height };
const uint8_t *a_planes[3] = {a->y_buffer, a->u_buffer, a->v_buffer}; const uint8_t *a_planes[3] = { a->y_buffer, a->u_buffer, a->v_buffer };
const int a_strides[3] = {a->y_stride, a->uv_stride, a->uv_stride}; const int a_strides[3] = { a->y_stride, a->uv_stride, a->uv_stride };
const uint8_t *b_planes[3] = {b->y_buffer, b->u_buffer, b->v_buffer}; const uint8_t *b_planes[3] = { b->y_buffer, b->u_buffer, b->v_buffer };
const int b_strides[3] = {b->y_stride, b->uv_stride, b->uv_stride}; const int b_strides[3] = { b->y_stride, b->uv_stride, b->uv_stride };
int i; int i;
uint64_t total_sse = 0; uint64_t total_sse = 0;
uint32_t total_samples = 0; uint32_t total_samples = 0;
......
...@@ -54,56 +54,59 @@ static void hbd_od_bin_fdct8x8(tran_low_t *y, int ystride, const int16_t *x, ...@@ -54,56 +54,59 @@ static void hbd_od_bin_fdct8x8(tran_low_t *y, int ystride, const int16_t *x,
* transparency. This is not the JPEG based matrix from the paper, * transparency. This is not the JPEG based matrix from the paper,
this one gives a slightly higher MOS agreement.*/ this one gives a slightly higher MOS agreement.*/
static const double csf_y[8][8] = { static const double csf_y[8][8] = {
{1.6193873005, 2.2901594831, 2.08509755623, 1.48366094411, 1.00227514334, { 1.6193873005, 2.2901594831, 2.08509755623, 1.48366094411, 1.00227514334,
0.678296995242, 0.466224900598, 0.3265091542}, 0.678296995242, 0.466224900598, 0.3265091542 },
{2.2901594831, 1.94321815382, 2.04793073064, 1.68731108984, 1.2305666963, { 2.2901594831, 1.94321815382, 2.04793073064, 1.68731108984, 1.2305666963,
0.868920337363, 0.61280991668, 0.436405793551}, 0.868920337363, 0.61280991668, 0.436405793551 },
{2.08509755623, 2.04793073064, 1.34329019223, 1.09205635862, 0.875748795257, { 2.08509755623, 2.04793073064, 1.34329019223, 1.09205635862, 0.875748795257,
0.670882927016, 0.501731932449, 0.372504254596}, 0.670882927016, 0.501731932449, 0.372504254596 },
{1.48366094411, 1.68731108984, 1.09205635862, 0.772819797575, { 1.48366094411, 1.68731108984, 1.09205635862, 0.772819797575, 0.605636379554,
0.605636379554, 0.48309405692, 0.380429446972, 0.295774038565}, 0.48309405692, 0.380429446972, 0.295774038565 },
{1.00227514334, 1.2305666963, 0.875748795257, 0.605636379554, { 1.00227514334, 1.2305666963, 0.875748795257, 0.605636379554, 0.448996256676,
0.448996256676, 0.352889268808, 0.283006984131, 0.226951348204}, 0.352889268808, 0.283006984131, 0.226951348204 },
{0.678296995242, 0.868920337363, 0.670882927016, 0.48309405692, { 0.678296995242, 0.868920337363, 0.670882927016, 0.48309405692,
0.352889268808, 0.27032073436, 0.215017739696, 0.17408067321}, 0.352889268808, 0.27032073436, 0.215017739696, 0.17408067321 },
{0.466224900598, 0.61280991668, 0.501731932449, 0.380429446972, { 0.466224900598, 0.61280991668, 0.501731932449, 0.380429446972,
0.283006984131, 0.215017739696, 0.168869545842, 0.136153931001}, 0.283006984131, 0.215017739696, 0.168869545842, 0.136153931001 },
{0.3265091542, 0.436405793551, 0.372504254596, 0.295774038565, { 0.3265091542, 0.436405793551, 0.372504254596, 0.295774038565,
0.226951348204, 0.17408067321, 0.136153931001, 0.109083846276}}; 0.226951348204, 0.17408067321, 0.136153931001, 0.109083846276 }
};
static const double csf_cb420[8][8] = { static const double csf_cb420[8][8] = {
{1.91113096927, 2.46074210438, 1.18284184739, 1.14982565193, 1.05017074788, { 1.91113096927, 2.46074210438, 1.18284184739, 1.14982565193, 1.05017074788,
0.898018824055, 0.74725392039, 0.615105596242}, 0.898018824055, 0.74725392039, 0.615105596242 },
{2.46074210438, 1.58529308355, 1.21363250036, 1.38190029285, 1.33100189972, { 2.46074210438, 1.58529308355, 1.21363250036, 1.38190029285, 1.33100189972,
1.17428548929, 0.996404342439, 0.830890433625}, 1.17428548929, 0.996404342439, 0.830890433625 },
{1.18284184739, 1.21363250036, 0.978712413627, 1.02624506078, 1.03145147362, { 1.18284184739, 1.21363250036, 0.978712413627, 1.02624506078, 1.03145147362,
0.960060382087, 0.849823426169, 0.731221236837}, 0.960060382087, 0.849823426169, 0.731221236837 },
{1.14982565193, 1.38190029285, 1.02624506078, 0.861317501629, { 1.14982565193, 1.38190029285, 1.02624506078, 0.861317501629, 0.801821139099,
0.801821139099, 0.751437590932, 0.685398513368, 0.608694761374}, 0.751437590932, 0.685398513368, 0.608694761374 },
{1.05017074788, 1.33100189972, 1.03145147362, 0.801821139099, { 1.05017074788, 1.33100189972, 1.03145147362, 0.801821139099, 0.676555426187,
0.676555426187, 0.605503172737, 0.55002013668, 0.495804539034}, 0.605503172737, 0.55002013668, 0.495804539034 },
{0.898018824055, 1.17428548929, 0.960060382087, 0.751437590932, { 0.898018824055, 1.17428548929, 0.960060382087, 0.751437590932,
0.605503172737, 0.514674450957, 0.454353482512, 0.407050308965}, 0.605503172737, 0.514674450957, 0.454353482512, 0.407050308965 },
{0.74725392039, 0.996404342439, 0.849823426169, 0.685398513368, { 0.74725392039, 0.996404342439, 0.849823426169, 0.685398513368,
0.55002013668, 0.454353482512, 0.389234902883, 0.342353999733}, 0.55002013668, 0.454353482512, 0.389234902883, 0.342353999733 },
{0.615105596242, 0.830890433625, 0.731221236837, 0.608694761374, { 0.615105596242, 0.830890433625, 0.731221236837, 0.608694761374,
0.495804539034, 0.407050308965, 0.342353999733, 0.295530605237}}; 0.495804539034, 0.407050308965, 0.342353999733, 0.295530605237 }
};
static const double csf_cr420[8][8] = { static const double csf_cr420[8][8] = {
{2.03871978502, 2.62502345193, 1.26180942886, 1.11019789803, 1.01397751469, { 2.03871978502, 2.62502345193, 1.26180942886, 1.11019789803, 1.01397751469,
0.867069376285, 0.721500455585, 0.593906509971}, 0.867069376285, 0.721500455585, 0.593906509971 },
{2.62502345193, 1.69112867013, 1.17180569821, 1.3342742857, 1.28513006198, { 2.62502345193, 1.69112867013, 1.17180569821, 1.3342742857, 1.28513006198,
1.13381474809, 0.962064122248, 0.802254508198}, 1.13381474809, 0.962064122248, 0.802254508198 },
{1.26180942886, 1.17180569821, 0.944981930573, 0.990876405848, { 1.26180942886, 1.17180569821, 0.944981930573, 0.990876405848,
0.995903384143, 0.926972725286, 0.820534991409, 0.706020324706}, 0.995903384143, 0.926972725286, 0.820534991409, 0.706020324706 },
{1.11019789803, 1.3342742857, 0.990876405848, 0.831632933426, 0.77418706195, { 1.11019789803, 1.3342742857, 0.990876405848, 0.831632933426, 0.77418706195,
0.725539939514, 0.661776842059, 0.587716619023}, 0.725539939514, 0.661776842059, 0.587716619023 },
{1.01397751469, 1.28513006198, 0.995903384143, 0.77418706195, { 1.01397751469, 1.28513006198, 0.995903384143, 0.77418706195, 0.653238524286,
0.653238524286, 0.584635025748, 0.531064164893, 0.478717061273}, 0.584635025748, 0.531064164893, 0.478717061273 },
{0.867069376285, 1.13381474809, 0.926972725286, 0.725539939514, { 0.867069376285, 1.13381474809, 0.926972725286, 0.725539939514,
0.584635025748, 0.496936637883, 0.438694579826, 0.393021669543}, 0.584635025748, 0.496936637883, 0.438694579826, 0.393021669543 },
{0.721500455585, 0.962064122248, 0.820534991409, 0.661776842059, { 0.721500455585, 0.962064122248, 0.820534991409, 0.661776842059,
0.531064164893, 0.438694579826, 0.375820256136, 0.330555063063}, 0.531064164893, 0.438694579826, 0.375820256136, 0.330555063063 },
{0.593906509971, 0.802254508198, 0.706020324706, 0.587716619023, { 0.593906509971, 0.802254508198, 0.706020324706, 0.587716619023,
0.478717061273, 0.393021669543, 0.330555063063, 0.285345396658}}; 0.478717061273, 0.393021669543, 0.330555063063, 0.285345396658 }
};
static double convert_score_db(double _score, double _weight, int bit_depth) { static double convert_score_db(double _score, double _weight, int bit_depth) {
int16_t pix_max = 255; int16_t pix_max = 255;
......
...@@ -64,8 +64,8 @@ void aom_highbd_ssim_parms_8x8_c(const uint16_t *s, int sp, const uint16_t *r, ...@@ -64,8 +64,8 @@ void aom_highbd_ssim_parms_8x8_c(const uint16_t *s, int sp, const uint16_t *r,
} }
#endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
static const int64_t cc1 = 26634; // (64^2*(.01*255)^2 static const int64_t cc1 = 26634; // (64^2*(.01*255)^2
static const int64_t cc2 = 239708; // (64^2*(.03*255)^2 static const int64_t cc2 = 239708; // (64^2*(.03*255)^2
static const int64_t cc1_10 = 428658; // (64^2*(.01*1023)^2 static const int64_t cc1_10 = 428658; // (64^2*(.01*1023)^2
static const int64_t cc2_10 = 3857925; // (64^2*(.03*1023)^2 static const int64_t cc2_10 = 3857925; // (64^2*(.03*1023)^2
static const int64_t cc1_12 = 6868593; // (64^2*(.01*4095)^2 static const int64_t cc1_12 = 6868593; // (64^2*(.01*4095)^2
...@@ -187,7 +187,6 @@ double aom_calc_ssim(const YV12_BUFFER_CONFIG *source, ...@@ -187,7 +187,6 @@ double aom_calc_ssim(const YV12_BUFFER_CONFIG *source,
return ssimv; return ssimv;
} }
// traditional ssim as per: http://en.wikipedia.org/wiki/Structural_similarity // traditional ssim as per: http://en.wikipedia.org/wiki/Structural_similarity
// //
// Re working out the math -> // Re working out the math ->
......
...@@ -369,7 +369,7 @@ static const arg_def_t lossless = ...@@ -369,7 +369,7 @@ static const arg_def_t lossless =
#if CONFIG_AOM_QM #if CONFIG_AOM_QM
static const arg_def_t enable_qm = static const arg_def_t enable_qm =
ARG_DEF(NULL, "enable_qm", 1, ARG_DEF(NULL, "enable_qm", 1,
"Enable quantisation matrices (0: false (default), 1: true)"); "Enable quantisation matrices (0: false (default), 1: true)");
static const arg_def_t qm_min = ARG_DEF( static const arg_def_t qm_min = ARG_DEF(
NULL, "qm_min", 1, "Min quant matrix flatness (0..15), default is 8"); NULL, "qm_min", 1, "Min quant matrix flatness (0..15), default is 8");
static const arg_def_t qm_max = ARG_DEF( static const arg_def_t qm_max = ARG_DEF(
...@@ -1857,8 +1857,7 @@ int main(int argc, const char **argv_) { ...@@ -1857,8 +1857,7 @@ int main(int argc, const char **argv_) {
if (!input.filename) usage_exit(); if (!input.filename) usage_exit();
/* Decide if other chroma subsamplings than 4:2:0 are supported */ /* Decide if other chroma subsamplings than 4:2:0 are supported */
if (global.codec->fourcc == AV1_FOURCC) if (global.codec->fourcc == AV1_FOURCC) input.only_i420 = 0;
input.only_i420 = 0;
for (pass = global.pass ? global.pass - 1 : 0; pass < global.passes; pass++) { for (pass = global.pass ? global.pass - 1 : 0; pass < global.passes; pass++) {
int frames_in = 0, seen_frames = 0; int frames_in = 0, seen_frames = 0;
......
...@@ -651,7 +651,7 @@ static aom_codec_err_t ctrl_set_lossless(aom_codec_alg_priv_t *ctx, ...@@ -651,7 +651,7 @@ static aom_codec_err_t ctrl_set_lossless(aom_codec_alg_priv_t *ctx,
#if CONFIG_AOM_QM #if CONFIG_AOM_QM
static aom_codec_err_t ctrl_set_enable_qm(aom_codec_alg_priv_t *ctx, static aom_codec_err_t ctrl_set_enable_qm(aom_codec_alg_priv_t *ctx,
va_list args) { va_list args) {
struct av1_extracfg extra_cfg = ctx->extra_cfg; struct av1_extracfg extra_cfg = ctx->extra_cfg;
extra_cfg.enable_qm = CAST(AV1E_SET_ENABLE_QM, args); extra_cfg.enable_qm = CAST(AV1E_SET_ENABLE_QM, args);
return update_extra_cfg(ctx, &extra_cfg); return update_extra_cfg(ctx, &extra_cfg);
...@@ -972,7 +972,7 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx, ...@@ -972,7 +972,7 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx,
// Store the original flags in to the frame buffer. Will extract the // Store the original flags in to the frame buffer. Will extract the
// key frame flag when we actually encode this frame. // key frame flag when we actually encode this frame.
if (av1_receive_raw_frame(cpi, flags | ctx->next_frame_flags, &sd, if (av1_receive_raw_frame(cpi, flags | ctx->next_frame_flags, &sd,
dst_time_stamp, dst_end_time_stamp)) { dst_time_stamp, dst_end_time_stamp)) {
res = update_error_state(ctx, &cpi->common.error); res = update_error_state(ctx, &cpi->common.error);
} }
ctx->next_frame_flags = 0; ctx->next_frame_flags = 0;
...@@ -999,8 +999,8 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx, ...@@ -999,8 +999,8 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx,
while (cx_data_sz >= ctx->cx_data_sz / 2 && while (cx_data_sz >= ctx->cx_data_sz / 2 &&
-1 != av1_get_compressed_data(cpi, &lib_flags, &size, cx_data, -1 != av1_get_compressed_data(cpi, &lib_flags, &size, cx_data,
&dst_time_stamp, &dst_end_time_stamp, &dst_time_stamp, &dst_end_time_stamp,
!img)) { !img)) {
if (size) { if (size) {
aom_codec_cx_pkt_t pkt; aom_codec_cx_pkt_t pkt;
...@@ -1094,8 +1094,8 @@ static aom_codec_err_t ctrl_set_reference(aom_codec_alg_priv_t *ctx, ...@@ -1094,8 +1094,8 @@ static aom_codec_err_t ctrl_set_reference(aom_codec_alg_priv_t *ctx,
YV12_BUFFER_CONFIG sd; YV12_BUFFER_CONFIG sd;
image2yuvconfig(&frame->img, &sd); image2yuvconfig(&frame->img, &sd);
av1_set_reference_enc(ctx->cpi, av1_set_reference_enc(ctx->cpi, ref_frame_to_av1_reframe(frame->frame_type),
ref_frame_to_av1_reframe(frame->frame_type), &sd); &sd);
return AOM_CODEC_OK; return AOM_CODEC_OK;
} else { } else {
return AOM_CODEC_INVALID_PARAM; return AOM_CODEC_INVALID_PARAM;
...@@ -1111,7 +1111,7 @@ static aom_codec_err_t ctrl_copy_reference(aom_codec_alg_priv_t *ctx, ...@@ -1111,7 +1111,7 @@ static aom_codec_err_t ctrl_copy_reference(aom_codec_alg_priv_t *ctx,
image2yuvconfig(&frame->img, &sd); image2yuvconfig(&frame->img, &sd);
av1_copy_reference_enc(ctx->cpi, av1_copy_reference_enc(ctx->cpi,
ref_frame_to_av1_reframe(frame->frame_type), &sd); ref_frame_to_av1_reframe(frame->frame_type), &sd);
return AOM_CODEC_OK; return AOM_CODEC_OK;
} else { } else {
return AOM_CODEC_INVALID_PARAM; return AOM_CODEC_INVALID_PARAM;
...@@ -1166,7 +1166,7 @@ static aom_codec_err_t ctrl_set_active_map(aom_codec_alg_priv_t *ctx, ...@@ -1166,7 +1166,7 @@ static aom_codec_err_t ctrl_set_active_map(aom_codec_alg_priv_t *ctx,
if (map) { if (map) {
if (!av1_set_active_map(ctx->cpi, map->active_map, (int)map->rows, if (!av1_set_active_map(ctx->cpi, map->active_map, (int)map->rows,
(int)map->cols)) (int)map->cols))
return AOM_CODEC_OK; return AOM_CODEC_OK;
else else
return AOM_CODEC_INVALID_PARAM; return AOM_CODEC_INVALID_PARAM;
...@@ -1181,7 +1181,7 @@ static aom_codec_err_t ctrl_get_active_map(aom_codec_alg_priv_t *ctx, ...@@ -1181,7 +1181,7 @@ static aom_codec_err_t ctrl_get_active_map(aom_codec_alg_priv_t *ctx,
if (map) { if (map) {
if (!av1_get_active_map(ctx->cpi, map->active_map, (int)map->rows, if (!av1_get_active_map(ctx->cpi, map->active_map, (int)map->rows,
(int)map->cols)) (int)map->cols))
return AOM_CODEC_OK; return AOM_CODEC_OK;
else else
return AOM_CODEC_INVALID_PARAM; return AOM_CODEC_INVALID_PARAM;
...@@ -1197,7 +1197,7 @@ static aom_codec_err_t ctrl_set_scale_mode(aom_codec_alg_priv_t *ctx, ...@@ -1197,7 +1197,7 @@ static aom_codec_err_t ctrl_set_scale_mode(aom_codec_alg_priv_t *ctx,
if (mode) { if (mode) {
const int res = const int res =
av1_set_internal_size(ctx->cpi, (AOM_SCALING)mode->h_scaling_mode, av1_set_internal_size(ctx->cpi, (AOM_SCALING)mode->h_scaling_mode,
(AOM_SCALING)mode->v_scaling_mode); (AOM_SCALING)mode->v_scaling_mode);
return (res == 0) ? AOM_CODEC_OK : AOM_CODEC_INVALID_PARAM; return (res == 0) ? AOM_CODEC_OK : AOM_CODEC_INVALID_PARAM;
} else { } else {
return AOM_CODEC_INVALID_PARAM; return AOM_CODEC_INVALID_PARAM;
......
...@@ -574,7 +574,7 @@ static aom_codec_err_t decoder_decode(aom_codec_alg_priv_t *ctx, ...@@ -574,7 +574,7 @@ static aom_codec_err_t decoder_decode(aom_codec_alg_priv_t *ctx,
} }
res = av1_parse_superframe_index(data, data_sz, frame_sizes, &frame_count, res = av1_parse_superframe_index(data, data_sz, frame_sizes, &frame_count,
ctx->decrypt_cb, ctx->decrypt_state); ctx->decrypt_cb, ctx->decrypt_state);
if (res != AOM_CODEC_OK) return res; if (res != AOM_CODEC_OK) return res;
if (ctx->frame_parallel_decode) { if (ctx->frame_parallel_decode) {
...@@ -778,7 +778,7 @@ static aom_codec_err_t ctrl_set_reference(aom_codec_alg_priv_t *ctx, ...@@ -778,7 +778,7 @@ static aom_codec_err_t ctrl_set_reference(aom_codec_alg_priv_t *ctx,
FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1; FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
image2yuvconfig(&frame->img, &sd); image2yuvconfig(&frame->img, &sd);
return av1_set_reference_dec(&frame_worker_data->pbi->common, return av1_set_reference_dec(&frame_worker_data->pbi->common,
(AOM_REFFRAME)frame->frame_type, &sd); (AOM_REFFRAME)frame->frame_type, &sd);
} else { } else {
return AOM_CODEC_INVALID_PARAM; return AOM_CODEC_INVALID_PARAM;
} }
...@@ -801,7 +801,7 @@ static aom_codec_err_t ctrl_copy_reference(aom_codec_alg_priv_t *ctx, ...@@ -801,7 +801,7 @@ static aom_codec_err_t ctrl_copy_reference(aom_codec_alg_priv_t *ctx,
FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1; FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;
image2yuvconfig(&frame->img, &sd); image2yuvconfig(&frame->img, &sd);
return av1_copy_reference_dec(frame_worker_data->pbi, return av1_copy_reference_dec(frame_worker_data->pbi,
(AOM_REFFRAME)frame->frame_type, &sd); (AOM_REFFRAME)frame->frame_type, &sd);
} else { } else {
return AOM_CODEC_INVALID_PARAM; return AOM_CODEC_INVALID_PARAM;
} }
......
...@@ -141,7 +141,7 @@ static INLINE void IADST4x4_1D(int16x4_t *d3s16, int16x4_t *d4s16, ...@@ -141,7 +141,7 @@ static INLINE void IADST4x4_1D(int16x4_t *d3s16, int16x4_t *d4s16,
} }
void av1_iht4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, void av1_iht4x4_16_add_neon(const tran_low_t *input, uint8_t *dest,
int dest_stride, int tx_type) { int dest_stride, int tx_type) {
uint8x8_t d26u8, d27u8; uint8x8_t d26u8, d27u8;
int16x4_t d0s16, d1s16, d2s16, d3s16, d4s16, d5s16; int16x4_t d0s16, d1s16, d2s16, d3s16, d4s16, d5s16;
uint32x2_t d26u32, d27u32; uint32x2_t d26u32, d27u32;
......
...@@ -473,7 +473,7 @@ static INLINE void IADST8X8_1D(int16x8_t *q8s16, int16x8_t *q9s16, ...@@ -473,7 +473,7 @@ static INLINE void IADST8X8_1D(int16x8_t *q8s16, int16x8_t *q9s16,
} }
void av1_iht8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, void av1_iht8x8_64_add_neon(const tran_low_t *input, uint8_t *dest,
int dest_stride, int tx_type) { int dest_stride, int tx_type) {
int i; int i;
uint8_t *d1, *d2; uint8_t *d1, *d2;
uint8x8_t d0u8, d1u8, d2u8, d3u8; uint8x8_t d0u8, d1u8, d2u8, d3u8;
......
...@@ -87,8 +87,7 @@ void av1_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride) { ...@@ -87,8 +87,7 @@ void av1_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride) {
output[1] = 0; output[1] = 0;
} }
void av1_fdct8x8_c(const int16_t *input, tran_low_t *final_output, void av1_fdct8x8_c(const int16_t *input, tran_low_t *final_output, int stride) {
int stride) {
int i, j; int i, j;
tran_low_t intermediate[64]; tran_low_t intermediate[64];
int pass; int pass;
...@@ -773,42 +772,41 @@ void av1_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride) { ...@@ -773,42 +772,41 @@ void av1_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride) {
#if CONFIG_AOM_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
void av1_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, void av1_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output,
int stride) { int stride) {
av1_fdct4x4_c(input, output, stride); av1_fdct4x4_c(input, output, stride);
} }
void av1_highbd_fdct8x8_c(const int16_t *input, tran_low_t *final_output, void av1_highbd_fdct8x8_c(const int16_t *input, tran_low_t *final_output,
int stride) { int stride) {
av1_fdct8x8_c(input, final_output, stride); av1_fdct8x8_c(input, final_output, stride);
} }
void av1_highbd_fdct8x8_1_c(const int16_t *input, tran_low_t *final_output, void av1_highbd_fdct8x8_1_c(const int16_t *input, tran_low_t *final_output,
int stride) { int stride) {
av1_fdct8x8_1_c(input, final_output, stride); av1_fdct8x8_1_c(input, final_output, stride);
} }
void av1_highbd_fdct16x16_c(const int16_t *input, tran_low_t *output, void av1_highbd_fdct16x16_c(const int16_t *input, tran_low_t *output,
int stride) { int stride) {
av1_fdct16x16_c(input, output, stride); av1_fdct16x16_c(input, output, stride);
} }
void av1_highbd_fdct16x16_1_c(const int16_t *input, tran_low_t *output, void av1_highbd_fdct16x16_1_c(const int16_t *input, tran_low_t *output,
int stride) { int stride) {
av1_fdct16x16_1_c(input, output, stride); av1_fdct16x16_1_c(input, output, stride);
} }
void av1_highbd_fdct32x32_c(const int16_t *input, tran_low_t *out, void av1_highbd_fdct32x32_c(const int16_t *input, tran_low_t *out, int stride) {
int stride) {
av1_fdct32x32_c(input, out, stride); av1_fdct32x32_c(input, out, stride);
} }
void av1_highbd_fdct32x32_rd_c(const int16_t *input, tran_low_t *out, void av1_highbd_fdct32x32_rd_c(const int16_t *input, tran_low_t *out,
int stride) { int stride) {
av1_fdct32x32_rd_c(input, out, stride); av1_fdct32x32_rd_c(input, out, stride);
} }
void av1_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *out, void av1_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *out,
int stride) { int stride) {
av1_fdct32x32_1_c(input, out, stride); av1_fdct32x32_1_c(input, out, stride);
} }
#endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AOM_HIGHBITDEPTH
...@@ -65,8 +65,7 @@ void av1_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride) { ...@@ -65,8 +65,7 @@ void av1_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride) {
} }
} }
void av1_iwht4x4_1_add_c(const tran_low_t *in, uint8_t *dest, void av1_iwht4x4_1_add_c(const tran_low_t *in, uint8_t *dest, int dest_stride) {
int dest_stride) {
int i; int i;
tran_high_t a1, e1; tran_high_t a1, e1;
tran_low_t tmp[4]; tran_low_t tmp[4];
...@@ -137,7 +136,7 @@ void av1_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride) { ...@@ -137,7 +136,7 @@ void av1_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride) {
} }
void av1_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, void av1_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest,
int dest_stride) { int dest_stride) {
int i; int i;
tran_high_t a1; tran_high_t a1;
tran_low_t out = WRAPLOW(dct_const_round_shift(input[0] * cospi_16_64), 8); tran_low_t out = WRAPLOW(dct_const_round_shift(input[0] * cospi_16_64), 8);
...@@ -548,7 +547,7 @@ void av1_idct16_c(const tran_low_t *input, tran_low_t *output) { ...@@ -548,7 +547,7 @@ void av1_idct16_c(const tran_low_t *input, tran_low_t *output) {
} }
void av1_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, void av1_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest,
int stride) { int stride) {
tran_low_t out[16 * 16]; tran_low_t out[16 * 16];
tran_low_t *outptr = out; tran_low_t *outptr = out;
int i, j; int i, j;
...@@ -744,7 +743,7 @@ void av1_iadst16_c(const tran_low_t *input, tran_low_t *output) { ...@@ -744,7 +743,7 @@ void av1_iadst16_c(const tran_low_t *input, tran_low_t *output) {
} }
void av1_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, void av1_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest,
int stride) { int stride) {