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

Add missing things after rebase

Browse source
This commit is contained in:
Ari Lemmetti 2021-11-15 21:48:43 +02:00
parent 146298a0df
commit e3aadd4272
1 changed files with 50 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
src/inter.c
View file

@ -101,8 +101,8 @@ static void inter_recon_frac_luma(const encoder_state_t * const state,
ext_s,
block_width,
block_height,
lcu->rec.y + (ypos % LCU_WIDTH) * LCU_WIDTH + (xpos % LCU_WIDTH),
LCU_WIDTH,
out->y,
out_stride,
mv_frac_x,
mv_frac_y,
mv_param);
@ -115,7 +115,8 @@ static void inter_recon_frac_luma_hi(const encoder_state_t *const state,
int32_t block_width,
int32_t block_height,
const int16_t mv_param[2],
hi_prec_buf_t *hi_prec_out)
yuv_ip_t *out,
const unsigned out_stride)
{
int mv_frac_x = (mv_param[0] & 3);
int mv_frac_y = (mv_param[1] & 3);
@ -156,8 +157,8 @@ static void inter_recon_frac_luma_hi(const encoder_state_t *const state,
ext_s,
block_width,
block_height,
hi_prec_out->y + (ypos % LCU_WIDTH) * LCU_WIDTH + (xpos % LCU_WIDTH),
LCU_WIDTH,
out->y,
out_stride,
mv_frac_x,
mv_frac_y,
mv_param);
@ -165,16 +166,21 @@ static void inter_recon_frac_luma_hi(const encoder_state_t *const state,
static void inter_recon_frac_chroma(const encoder_state_t *const state,
const kvz_picture *const ref,
int32_t xpos,
int32_t ypos,
int32_t block_width,
int32_t block_height,
int32_t pu_x,
int32_t pu_y,
int32_t pu_w,
int32_t pu_h,
const int16_t mv_param[2],
lcu_t *lcu)
yuv_t *out,
const unsigned out_stride)
{
int mv_frac_x = (mv_param[0] & 7);
int mv_frac_y = (mv_param[1] & 7);
// Take into account chroma subsampling
unsigned pb_w = pu_w / 2;
unsigned pb_h = pu_h / 2;
// Space for extrapolated pixels and the part from the picture.
// Some extra for AVX2.
// The extrapolation function will set the pointers and stride.
@ -190,10 +196,10 @@ static void inter_recon_frac_chroma(const encoder_state_t *const state,
.src_w = ref->width / 2,
.src_h = ref->height / 2,
.src_s = ref->stride / 2,
.blk_x = (state->tile->offset_x + xpos) / 2 + (mv_param[0] >> 3),
.blk_y = (state->tile->offset_y + ypos) / 2 + (mv_param[1] >> 3),
.blk_w = block_width / 2,
.blk_h = block_height / 2,
.blk_x = (state->tile->offset_x + pu_x) / 2 + (mv_param[0] >> 3),
.blk_y = (state->tile->offset_y + pu_y) / 2 + (mv_param[1] >> 3),
.blk_w = pb_w,
.blk_h = pb_h,
.pad_l = KVZ_CHROMA_FILTER_OFFSET,
.pad_r = KVZ_EXT_PADDING_CHROMA - KVZ_CHROMA_FILTER_OFFSET,
.pad_t = KVZ_CHROMA_FILTER_OFFSET,
@ -212,10 +218,10 @@ static void inter_recon_frac_chroma(const encoder_state_t *const state,
kvz_sample_octpel_chroma(state->encoder_control,
ext_origin,
ext_s,
block_width / 2,
block_height / 2,
lcu->rec.u + ((ypos / 2) % LCU_WIDTH_C) * LCU_WIDTH_C + ((xpos / 2) % LCU_WIDTH_C),
LCU_WIDTH_C,
pb_w,
pb_h,
out->u,
out_stride,
mv_frac_x,
mv_frac_y,
mv_param);
@ -226,10 +232,10 @@ static void inter_recon_frac_chroma(const encoder_state_t *const state,
kvz_sample_octpel_chroma(state->encoder_control,
ext_origin,
ext_s,
block_width / 2,
block_height / 2,
lcu->rec.v + ((ypos / 2) % LCU_WIDTH_C) * LCU_WIDTH_C + ((xpos / 2) % LCU_WIDTH_C),
LCU_WIDTH_C,
pb_w,
pb_h,
out->v,
out_stride,
mv_frac_x,
mv_frac_y,
mv_param);
@ -237,16 +243,21 @@ static void inter_recon_frac_chroma(const encoder_state_t *const state,
static void inter_recon_frac_chroma_hi(const encoder_state_t *const state,
const kvz_picture *const ref,
int32_t xpos,
int32_t ypos,
int32_t block_width,
int32_t block_height,
int32_t pu_x,
int32_t pu_y,
int32_t pu_w,
int32_t pu_h,
const int16_t mv_param[2],
hi_prec_buf_t *hi_prec_out)
yuv_ip_t *out,
const unsigned out_stride)
{
int mv_frac_x = (mv_param[0] & 7);
int mv_frac_y = (mv_param[1] & 7);
// Take into account chroma subsampling
unsigned pb_w = pu_w / 2;
unsigned pb_h = pu_h / 2;
// Space for extrapolated pixels and the part from the picture.
// Some extra for AVX2.
// The extrapolation function will set the pointers and stride.
@ -262,10 +273,10 @@ static void inter_recon_frac_chroma_hi(const encoder_state_t *const state,
.src_w = ref->width / 2,
.src_h = ref->height / 2,
.src_s = ref->stride / 2,
.blk_x = (state->tile->offset_x + xpos) / 2 + (mv_param[0] >> 3),
.blk_y = (state->tile->offset_y + ypos) / 2 + (mv_param[1] >> 3),
.blk_w = block_width / 2,
.blk_h = block_height / 2,
.blk_x = (state->tile->offset_x + pu_x) / 2 + (mv_param[0] >> 3),
.blk_y = (state->tile->offset_y + pu_y) / 2 + (mv_param[1] >> 3),
.blk_w = pb_w,
.blk_h = pb_h,
.pad_l = KVZ_CHROMA_FILTER_OFFSET,
.pad_r = KVZ_EXT_PADDING_CHROMA - KVZ_CHROMA_FILTER_OFFSET,
.pad_t = KVZ_CHROMA_FILTER_OFFSET,
@ -284,10 +295,10 @@ static void inter_recon_frac_chroma_hi(const encoder_state_t *const state,
kvz_sample_octpel_chroma_hi(state->encoder_control,
ext_origin,
ext_s,
block_width / 2,
block_height / 2,
hi_prec_out->u + ((ypos / 2) % LCU_WIDTH_C) * LCU_WIDTH_C + ((xpos / 2) % LCU_WIDTH_C),
LCU_WIDTH_C,
pb_w,
pb_h,
out->u,
out_stride,
mv_frac_x,
mv_frac_y,
mv_param);
@ -298,10 +309,10 @@ static void inter_recon_frac_chroma_hi(const encoder_state_t *const state,
kvz_sample_octpel_chroma_hi(state->encoder_control,
ext_origin,
ext_s,
block_width / 2,
block_height / 2,
hi_prec_out->v + ((ypos / 2) % LCU_WIDTH_C) * LCU_WIDTH_C + ((xpos / 2) % LCU_WIDTH_C),
LCU_WIDTH_C,
pb_w,
pb_h,
out->v,
out_stride,
mv_frac_x,
mv_frac_y,
mv_param);