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

CC ALF now works properly.

Browse source
This commit is contained in:
Arttu Makinen 2020-11-13 16:15:12 +02:00
parent fc39b311bd
commit 0e74bfb2a8
2 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/alf.c
View file

@ -1802,34 +1802,21 @@ void kvz_alf_enc_process(encoder_state_t *const state)
const kvz_picture *org_yuv = state->tile->frame->source; const kvz_picture *org_yuv = state->tile->frame->source;
const kvz_picture *rec_yuv = state->tile->frame->rec; const kvz_picture *rec_yuv = state->tile->frame->rec;
const kvz_picture rec_yuv_buf;
//Some of these are not needed. const int luma_stride = state->tile->frame->rec->stride;
adjust_pixels_chroma(org_yuv->y, const int chroma_stride = luma_stride >> chroma_scale_x;
0, const int chroma_height = luma_height >> chroma_scale_y;
org_yuv->width, const int chroma_padding = MAX_ALF_PADDING_SIZE >> chroma_scale_x;
0,
org_yuv->height, const int index_chroma = -(chroma_stride * chroma_padding + chroma_padding);
org_yuv->stride,
org_yuv->width, //Copy reconstructed samples to a buffer.
org_yuv->height); memcpy(&alf_tmp_u[index_chroma], &state->tile->frame->rec->u[index_chroma],
adjust_pixels_chroma(org_yuv->u, sizeof(kvz_pixel) * chroma_stride * (chroma_height + chroma_padding * 2));
0, memcpy(&alf_tmp_v[index_chroma], &state->tile->frame->rec->v[index_chroma],
org_yuv->width >> chroma_scale_x, sizeof(kvz_pixel) * chroma_stride * (chroma_height + chroma_padding * 2));
0,
org_yuv->height >> chroma_scale_y, adjust_pixels_chroma(alf_tmp_y,
org_yuv->stride >> chroma_scale_x,
org_yuv->width >> chroma_scale_x,
org_yuv->height >> chroma_scale_y);
adjust_pixels_chroma(org_yuv->v,
0,
org_yuv->width >> chroma_scale_x,
0,
org_yuv->height >> chroma_scale_y,
org_yuv->stride >> chroma_scale_x,
org_yuv->width >> chroma_scale_x,
org_yuv->height >> chroma_scale_y);
adjust_pixels_chroma(rec_yuv->y,
0, 0,
rec_yuv->width, rec_yuv->width,
0, 0,
@ -1837,7 +1824,7 @@ void kvz_alf_enc_process(encoder_state_t *const state)
rec_yuv->stride, rec_yuv->stride,
rec_yuv->width, rec_yuv->width,
rec_yuv->height); rec_yuv->height);
adjust_pixels_chroma(rec_yuv->u, adjust_pixels_chroma(alf_tmp_u,
0, 0,
rec_yuv->width >> chroma_scale_x, rec_yuv->width >> chroma_scale_x,
0, 0,
@ -1845,7 +1832,7 @@ void kvz_alf_enc_process(encoder_state_t *const state)
rec_yuv->stride >> chroma_scale_x, rec_yuv->stride >> chroma_scale_x,
rec_yuv->width >> chroma_scale_x, rec_yuv->width >> chroma_scale_x,
rec_yuv->height >> chroma_scale_y); rec_yuv->height >> chroma_scale_y);
adjust_pixels_chroma(rec_yuv->v, adjust_pixels_chroma(alf_tmp_v,
0, 0,
rec_yuv->width >> chroma_scale_x, rec_yuv->width >> chroma_scale_x,
0, 0,
@ -1854,6 +1841,11 @@ void kvz_alf_enc_process(encoder_state_t *const state)
rec_yuv->width >> chroma_scale_x, rec_yuv->width >> chroma_scale_x,
rec_yuv->height >> chroma_scale_y); rec_yuv->height >> chroma_scale_y);
const kvz_picture rec_yuv_buf;
memcpy(&rec_yuv_buf, state->tile->frame->rec, sizeof(rec_yuv_buf)); memcpy(&rec_yuv_buf, state->tile->frame->rec, sizeof(rec_yuv_buf));
const int num_ctus_in_width = state->tile->frame->width_in_lcu; const int num_ctus_in_width = state->tile->frame->width_in_lcu;
@ -1874,7 +1866,7 @@ void kvz_alf_enc_process(encoder_state_t *const state)
{ {
const kvz_pixel* rec_uv = comp_idx == COMPONENT_Cb ? rec_yuv->u : rec_yuv->v; const kvz_pixel* rec_uv = comp_idx == COMPONENT_Cb ? rec_yuv->u : rec_yuv->v;
const int luma_stride = rec_yuv->stride; const int luma_stride = rec_yuv->stride;
apply_cc_alf_filter(state, comp_idx, rec_uv, rec_yuv_buf.y, luma_stride, g_cc_alf_filter_control[comp_idx - 1], apply_cc_alf_filter(state, comp_idx, rec_uv, alf_tmp_y, luma_stride, g_cc_alf_filter_control[comp_idx - 1],
g_cc_alf_filter_param.cc_alf_coeff[comp_idx - 1], -1); g_cc_alf_filter_param.cc_alf_coeff[comp_idx - 1], -1);
} }
} }
@ -8250,16 +8242,16 @@ void get_blk_stats_cc_alf(encoder_state_t * const state,
const int number_of_components = (chroma_format == KVZ_CSP_400) ? 1 : MAX_NUM_COMPONENT;; const int number_of_components = (chroma_format == KVZ_CSP_400) ? 1 : MAX_NUM_COMPONENT;;
int rec_stride[MAX_NUM_COMPONENT]; int rec_stride[MAX_NUM_COMPONENT];
int rec_pixel_idx[MAX_NUM_COMPONENT]; int rec_pixel_idx[MAX_NUM_COMPONENT];
const int luma_rec_pos = y_pos * rec_yuv->stride + x_pos; const int luma_rec_pos = y_pos * state->tile->frame->rec->stride + x_pos;
const int chroma_rec_pos = y_pos_c * (rec_yuv->stride >> chroma_scale_x) + x_pos_c; const int chroma_rec_pos = y_pos_c * (state->tile->frame->rec->stride >> chroma_scale_x) + x_pos_c;
kvz_pixel *rec_y = &rec_yuv->y[luma_rec_pos]; kvz_pixel *rec_y = &alf_tmp_y[luma_rec_pos];
kvz_pixel *rec_u = &rec_yuv->u[chroma_rec_pos]; kvz_pixel *rec_u = &alf_tmp_u[chroma_rec_pos];
kvz_pixel *rec_v = &rec_yuv->v[chroma_rec_pos]; kvz_pixel *rec_v = &alf_tmp_v[chroma_rec_pos];
for (int c_idx = 0; c_idx < number_of_components; c_idx++) for (int c_idx = 0; c_idx < number_of_components; c_idx++)
{ {
bool is_luma = c_idx == COMPONENT_Y; bool is_luma = c_idx == COMPONENT_Y;
rec_stride[c_idx] = rec_yuv->stride >> (is_luma ? 0 : chroma_scale_x); rec_stride[c_idx] = state->tile->frame->rec->stride >> (is_luma ? 0 : chroma_scale_x);
rec_pixel_idx[c_idx] = 0; rec_pixel_idx[c_idx] = 0;
} }

3
src/alf.h
View file

@ -622,7 +622,8 @@ void derive_cc_alf_filter(encoder_state_t * const state,
const kvz_picture *dst_yuv); const kvz_picture *dst_yuv);
void derive_stats_for_cc_alf_filtering(encoder_state_t * const state, void derive_stats_for_cc_alf_filtering(encoder_state_t * const state,
const kvz_picture *org_yuv, const kvz_picture *rec_yuv, const kvz_picture *org_yuv,
const kvz_picture *rec_yuv,
const int comp_idx, const int mask_stride, const int comp_idx, const int mask_stride,
const uint8_t filter_idc); const uint8_t filter_idc);