hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 11:24:05 +00:00
Code Issues Actions Projects Releases Wiki Activity

Rename some bipred functions

Browse source
This commit is contained in:
Ari Lemmetti 2020-04-05 15:39:35 +03:00
parent b52a930bed
commit f47bd5d86f
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/inter.c
View file

@ -540,10 +540,10 @@ void kvz_inter_recon_bipred(const encoder_state_t *const state,
&px_L1, &ip_L1, predict_luma, predict_chroma);
// After reconstruction, merge the predictors by taking an average of each pixel
kvz_inter_recon_bipred_blend(lcu, &px_L0, &px_L1, &ip_L0, &ip_L1,
pu_x, pu_y, pu_w, pu_h,
ip_flags_L0, ip_flags_L1,
predict_luma, predict_chroma);
kvz_bipred_average(lcu, &px_L0, &px_L1, &ip_L0, &ip_L1,
pu_x, pu_y, pu_w, pu_h,
ip_flags_L0, ip_flags_L1,
predict_luma, predict_chroma);
}

2
src/strategies/avx2/picture-avx2.c
View file

@ -1043,7 +1043,7 @@ int kvz_strategy_register_picture_avx2(void* opaque, uint8_t bitdepth)
success &= kvz_strategyselector_register(opaque, "satd_any_size_quad", "avx2", 40, &satd_any_size_quad_avx2);
success &= kvz_strategyselector_register(opaque, "pixels_calc_ssd", "avx2", 40, &pixels_calc_ssd_avx2);
//success &= kvz_strategyselector_register(opaque, "inter_recon_bipred", "avx2", 40, &inter_recon_bipred_avx2);
//success &= kvz_strategyselector_register(opaque, "bipred_average", "avx2", 40, &bipred_average_avx2);
success &= kvz_strategyselector_register(opaque, "get_optimized_sad", "avx2", 40, &get_optimized_sad_avx2);
success &= kvz_strategyselector_register(opaque, "ver_sad", "avx2", 40, &ver_sad_avx2);
success &= kvz_strategyselector_register(opaque, "hor_sad", "avx2", 40, &hor_sad_avx2);

4
src/strategies/generic/picture-generic.c
View file

@ -547,7 +547,7 @@ static unsigned pixels_calc_ssd_generic(const kvz_pixel *const ref, const kvz_pi
return ssd >> (2*(KVZ_BIT_DEPTH-8));
}
static void inter_recon_bipred_generic(lcu_t *const lcu,
static void bipred_average_generic(lcu_t *const lcu,
const yuv_t *const px_L0,
const yuv_t *const px_L1,
const yuv_ip_t *const ip_L0,
@ -743,7 +743,7 @@ int kvz_strategy_register_picture_generic(void* opaque, uint8_t bitdepth)
success &= kvz_strategyselector_register(opaque, "satd_any_size_quad", "generic", 0, &satd_any_size_quad_generic);
success &= kvz_strategyselector_register(opaque, "pixels_calc_ssd", "generic", 0, &pixels_calc_ssd_generic);
success &= kvz_strategyselector_register(opaque, "inter_recon_bipred", "generic", 0, &inter_recon_bipred_generic);
success &= kvz_strategyselector_register(opaque, "bipred_average", "generic", 0, &bipred_average_generic);
success &= kvz_strategyselector_register(opaque, "get_optimized_sad", "generic", 0, &get_optimized_sad_generic);
success &= kvz_strategyselector_register(opaque, "ver_sad", "generic", 0, &ver_sad_generic);

2
src/strategies/strategies-picture.c
View file

@ -73,7 +73,7 @@ cost_pixel_any_size_multi_func * kvz_satd_any_size_quad = 0;
pixels_calc_ssd_func * kvz_pixels_calc_ssd = 0;
inter_recon_bipred_func * kvz_inter_recon_bipred_blend = 0;
inter_recon_bipred_func * kvz_bipred_average = 0;
get_optimized_sad_func *kvz_get_optimized_sad = 0;
ver_sad_func *kvz_ver_sad = 0;

4
src/strategies/strategies-picture.h
View file

@ -181,7 +181,7 @@ extern cost_pixel_any_size_multi_func *kvz_satd_any_size_quad;
extern pixels_calc_ssd_func *kvz_pixels_calc_ssd;
extern inter_recon_bipred_func * kvz_inter_recon_bipred_blend;
extern inter_recon_bipred_func * kvz_bipred_average;
extern get_optimized_sad_func *kvz_get_optimized_sad;
extern ver_sad_func *kvz_ver_sad;
@ -220,7 +220,7 @@ cost_pixel_nxn_multi_func * kvz_pixels_get_sad_dual_func(unsigned n);
{"satd_64x64_dual", (void**) &kvz_satd_64x64_dual}, \
{"satd_any_size_quad", (void**) &kvz_satd_any_size_quad}, \
{"pixels_calc_ssd", (void**) &kvz_pixels_calc_ssd}, \
{"inter_recon_bipred", (void**) &kvz_inter_recon_bipred_blend}, \
{"bipred_average", (void**) &kvz_bipred_average}, \
{"get_optimized_sad", (void**) &kvz_get_optimized_sad}, \
{"ver_sad", (void**) &kvz_ver_sad}, \
{"hor_sad", (void**) &kvz_hor_sad}, \