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

Improved SAO merge decisions

Browse source
This commit is contained in:
Marko Viitanen 2014-09-15 16:01:25 +03:00
parent 21df11ba4e
commit 6f65a9cbbd
3 changed files with 98 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/encoderstate.c
View file

@ -230,26 +230,46 @@ static void encoder_state_worker_encode_lcu(void * opaque) {
if (encoder->sao_enable) { if (encoder->sao_enable) {
const int stride = frame->width_in_lcu; const int stride = frame->width_in_lcu;
int32_t merge_cost_luma[3] = { INT32_MAX };
int32_t merge_cost_chroma[3] = { INT32_MAX };
sao_info *sao_luma = &frame->sao_luma[lcu->position.y * stride + lcu->position.x]; sao_info *sao_luma = &frame->sao_luma[lcu->position.y * stride + lcu->position.x];
sao_info *sao_chroma = &frame->sao_chroma[lcu->position.y * stride + lcu->position.x]; sao_info *sao_chroma = &frame->sao_chroma[lcu->position.y * stride + lcu->position.x];
// Merge candidates
sao_info *sao_top_luma = lcu->position.y != 0 ? &frame->sao_luma[(lcu->position.y - 1) * stride + lcu->position.x] : NULL;
sao_info *sao_left_luma = lcu->position.x != 0 ? &frame->sao_luma[lcu->position.y * stride + lcu->position.x - 1] : NULL;
sao_info *sao_top_chroma = lcu->position.y != 0 ? &frame->sao_chroma[(lcu->position.y - 1) * stride + lcu->position.x] : NULL;
sao_info *sao_left_chroma = lcu->position.x != 0 ? &frame->sao_chroma[lcu->position.y * stride + lcu->position.x - 1] : NULL;
init_sao_info(sao_luma); init_sao_info(sao_luma);
init_sao_info(sao_chroma); init_sao_info(sao_chroma);
{ sao_search_luma(encoder_state, frame, lcu->position.x, lcu->position.y, sao_luma, sao_top_luma, sao_left_luma, merge_cost_luma);
sao_info *sao_top = lcu->position.y != 0 ? &frame->sao_luma[(lcu->position.y - 1) * stride + lcu->position.x] : NULL; sao_search_chroma(encoder_state, frame, lcu->position.x, lcu->position.y, sao_chroma, sao_top_chroma, sao_left_chroma, merge_cost_chroma);
sao_info *sao_left = lcu->position.x != 0 ? &frame->sao_luma[lcu->position.y * stride + lcu->position.x -1] : NULL;
sao_search_luma(encoder_state, frame, lcu->position.x, lcu->position.y, sao_luma, sao_top, sao_left);
}
{ sao_luma->merge_up_flag = sao_luma->merge_left_flag = 0;
sao_info *sao_top = lcu->position.y != 0 ? &frame->sao_chroma[(lcu->position.y - 1) * stride + lcu->position.x] : NULL; // Check merge costs
sao_info *sao_left = lcu->position.x != 0 ? &frame->sao_chroma[lcu->position.y * stride + lcu->position.x - 1] : NULL; if (sao_top_luma) {
sao_search_chroma(encoder_state, frame, lcu->position.x, lcu->position.y, sao_chroma, sao_top, sao_left); // Merge up if cost is equal or smaller to the searched mode cost
if (merge_cost_luma[2] + merge_cost_chroma[2] <= merge_cost_luma[0] + merge_cost_chroma[0]) {
*sao_luma = *sao_top_luma;
*sao_chroma = *sao_top_chroma;
sao_luma->merge_up_flag = 1;
sao_luma->merge_left_flag = 0;
}
}
if (sao_left_luma) {
// Merge left if cost is equal or smaller to the searched mode cost
// AND smaller than merge up cost, if merge up was already chosen
if (merge_cost_luma[1] + merge_cost_chroma[1] <= merge_cost_luma[0] + merge_cost_chroma[0]) {
if (!sao_luma->merge_up_flag || merge_cost_luma[1] + merge_cost_chroma[1] < merge_cost_luma[2] + merge_cost_chroma[2]) {
*sao_luma = *sao_left_luma;
*sao_chroma = *sao_left_chroma;
sao_luma->merge_left_flag = 1;
sao_luma->merge_up_flag = 0;
}
}
} }
// Merge only if both luma and chroma can be merged
sao_luma->merge_left_flag = sao_luma->merge_left_flag & sao_chroma->merge_left_flag;
sao_luma->merge_up_flag = sao_luma->merge_up_flag & sao_chroma->merge_up_flag;
assert(sao_luma->eo_class < SAO_NUM_EO); assert(sao_luma->eo_class < SAO_NUM_EO);
assert(sao_chroma->eo_class < SAO_NUM_EO); assert(sao_chroma->eo_class < SAO_NUM_EO);

107
src/sao.c
View file

@ -155,19 +155,11 @@ static float sao_mode_bits_none(const encoder_state * const encoder_state, sao_i
// FL coded merges. // FL coded merges.
if (sao_left != NULL) { if (sao_left != NULL) {
ctx = &(cabac->ctx_sao_merge_flag_model); ctx = &(cabac->ctx_sao_merge_flag_model);
merge_left = sao_check_merge(sao_left, SAO_TYPE_NONE, 0, 0, 0, 0); mode_bits += CTX_ENTROPY_FBITS(ctx, 0);
mode_bits += CTX_ENTROPY_FBITS(ctx, merge_left);
if (merge_left) {
return mode_bits;
}
} }
if (sao_top != NULL) { if (sao_top != NULL) {
ctx = &(cabac->ctx_sao_merge_flag_model); ctx = &(cabac->ctx_sao_merge_flag_model);
merge_top = sao_check_merge(sao_top, SAO_TYPE_NONE, 0, 0, 0, 0); mode_bits += CTX_ENTROPY_FBITS(ctx, 0);
mode_bits += CTX_ENTROPY_FBITS(ctx, merge_top);
if (merge_top) {
return mode_bits;
}
} }
// TR coded type_idx_, none = 0 // TR coded type_idx_, none = 0
@ -177,6 +169,20 @@ static float sao_mode_bits_none(const encoder_state * const encoder_state, sao_i
return mode_bits; return mode_bits;
} }
static float sao_mode_bits_merge(const encoder_state * const encoder_state,
int8_t merge_cand) {
float mode_bits = 0.0;
cabac_data * const cabac = &encoder_state->cabac;
const cabac_ctx *ctx = NULL;
// FL coded merges.
ctx = &(cabac->ctx_sao_merge_flag_model);
mode_bits += CTX_ENTROPY_FBITS(ctx, merge_cand == 1);
if (merge_cand == 1) return mode_bits;
mode_bits += CTX_ENTROPY_FBITS(ctx, merge_cand == 2);
return mode_bits;
}
static float sao_mode_bits_edge(const encoder_state * const encoder_state, static float sao_mode_bits_edge(const encoder_state * const encoder_state,
int edge_class, int offsets[NUM_SAO_EDGE_CATEGORIES], int edge_class, int offsets[NUM_SAO_EDGE_CATEGORIES],
@ -190,19 +196,11 @@ static float sao_mode_bits_edge(const encoder_state * const encoder_state,
// FL coded merges. // FL coded merges.
if (sao_left != NULL) { if (sao_left != NULL) {
ctx = &(cabac->ctx_sao_merge_flag_model); ctx = &(cabac->ctx_sao_merge_flag_model);
merge_left = sao_check_merge(sao_left, SAO_TYPE_EDGE, offsets, 0, edge_class, 0); mode_bits += CTX_ENTROPY_FBITS(ctx, 0);
mode_bits += CTX_ENTROPY_FBITS(ctx, merge_left);
if (merge_left) {
return mode_bits;
}
} }
if (sao_top != NULL) { if (sao_top != NULL) {
ctx = &(cabac->ctx_sao_merge_flag_model); ctx = &(cabac->ctx_sao_merge_flag_model);
merge_top = sao_check_merge(sao_top, SAO_TYPE_EDGE, offsets, 0, edge_class, 0); mode_bits += CTX_ENTROPY_FBITS(ctx, 0);
mode_bits += CTX_ENTROPY_FBITS(ctx, merge_top);
if (merge_top) {
return mode_bits;
}
} }
// TR coded type_idx_, edge = 2 = cMax // TR coded type_idx_, edge = 2 = cMax
@ -240,19 +238,11 @@ static float sao_mode_bits_band(const encoder_state * const encoder_state,
// FL coded merges. // FL coded merges.
if (sao_left != NULL) { if (sao_left != NULL) {
ctx = &(cabac->ctx_sao_merge_flag_model); ctx = &(cabac->ctx_sao_merge_flag_model);
merge_left = sao_check_merge(sao_left, SAO_TYPE_BAND, offsets, band_position[0], 0, 0); mode_bits += CTX_ENTROPY_FBITS(ctx, 0);
mode_bits += CTX_ENTROPY_FBITS(ctx, merge_left);
if (merge_left) {
return mode_bits;
}
} }
if (sao_top != NULL) { if (sao_top != NULL) {
ctx = &(cabac->ctx_sao_merge_flag_model); ctx = &(cabac->ctx_sao_merge_flag_model);
merge_top = sao_check_merge(sao_top, SAO_TYPE_BAND, offsets, band_position[0], 0, 0); mode_bits += CTX_ENTROPY_FBITS(ctx, 0);
mode_bits += CTX_ENTROPY_FBITS(ctx, merge_top);
if (merge_top) {
return mode_bits;
}
} }
// TR coded sao_type_idx_, band = 1 // TR coded sao_type_idx_, band = 1
@ -765,7 +755,7 @@ static void sao_search_best_mode(const encoder_state * const encoder_state, cons
int block_width, int block_height, int block_width, int block_height,
unsigned buf_cnt, unsigned buf_cnt,
sao_info *sao_out, sao_info *sao_top, sao_info *sao_out, sao_info *sao_top,
sao_info *sao_left) sao_info *sao_left, int32_t merge_cost[3])
{ {
sao_info edge_sao; sao_info edge_sao;
sao_info band_sao; sao_info band_sao;
@ -812,8 +802,10 @@ static void sao_search_best_mode(const encoder_state * const encoder_state, cons
if (edge_sao.ddistortion <= band_sao.ddistortion) { if (edge_sao.ddistortion <= band_sao.ddistortion) {
*sao_out = edge_sao; *sao_out = edge_sao;
merge_cost[0] = edge_sao.ddistortion;
} else { } else {
*sao_out = band_sao; *sao_out = band_sao;
merge_cost[0] = band_sao.ddistortion;
} }
// Choose between SAO and doing nothing, taking into account the // Choose between SAO and doing nothing, taking into account the
@ -822,24 +814,51 @@ static void sao_search_best_mode(const encoder_state * const encoder_state, cons
int cost_of_nothing = (int)(sao_mode_bits_none(encoder_state, sao_top, sao_left) * encoder_state->global->cur_lambda_cost + 0.5); int cost_of_nothing = (int)(sao_mode_bits_none(encoder_state, sao_top, sao_left) * encoder_state->global->cur_lambda_cost + 0.5);
if (sao_out->ddistortion >= cost_of_nothing) { if (sao_out->ddistortion >= cost_of_nothing) {
sao_out->type = SAO_TYPE_NONE; sao_out->type = SAO_TYPE_NONE;
merge_cost[0] = cost_of_nothing;
} }
} }
sao_out->merge_up_flag = sao_check_merge(sao_top, sao_out->type, sao_out->offsets, // Calculate merge costs
sao_out->band_position[0], sao_out->eo_class, 0); if (sao_top || sao_left) {
sao_out->merge_left_flag = sao_check_merge(sao_left, sao_out->type, sao_out->offsets, sao_info* merge_sao[2] = { sao_left, sao_top};
sao_out->band_position[0], sao_out->eo_class, 0); int i;
if (buf_cnt == 2) { for (i = 0; i < 2; i++) {
sao_out->merge_up_flag &= sao_check_merge(sao_top, sao_out->type, sao_out->offsets, sao_info* merge_cand = merge_sao[i];
sao_out->band_position[1], sao_out->eo_class, 1);
sao_out->merge_left_flag &= sao_check_merge(sao_left, sao_out->type, sao_out->offsets, if (merge_cand) {
sao_out->band_position[1], sao_out->eo_class, 1); unsigned buf_i;
float mode_bits = sao_mode_bits_merge(encoder_state, i + 1);
int ddistortion = (int)(mode_bits * encoder_state->global->cur_lambda_cost + 0.5);
switch (merge_cand->type) {
case SAO_TYPE_EDGE:
for (buf_i = 0; buf_i < buf_cnt; ++buf_i) {
ddistortion += sao_edge_ddistortion(data[buf_i], recdata[buf_i],
block_width, block_height,
merge_cand->eo_class, &merge_cand->offsets[5 * buf_i]);
}
merge_cost[i + 1] = ddistortion;
break;
case SAO_TYPE_BAND:
for (buf_i = 0; buf_i < buf_cnt; ++buf_i) {
ddistortion += sao_band_ddistortion(encoder_state, data[buf_i], recdata[buf_i],
block_width, block_height,
merge_cand->band_position[buf_i], &merge_cand->offsets[1 + 5 * buf_i]);
}
merge_cost[i + 1] = ddistortion;
break;
case SAO_TYPE_NONE:
merge_cost[i + 1] = ddistortion;
break;
}
}
}
} }
return; return;
} }
void sao_search_chroma(const encoder_state * const encoder_state, const videoframe *frame, unsigned x_ctb, unsigned y_ctb, sao_info *sao, sao_info *sao_top, sao_info *sao_left) void sao_search_chroma(const encoder_state * const encoder_state, const videoframe *frame, unsigned x_ctb, unsigned y_ctb, sao_info *sao, sao_info *sao_top, sao_info *sao_left, int32_t merge_cost[3])
{ {
int block_width = (LCU_WIDTH / 2); int block_width = (LCU_WIDTH / 2);
int block_height = (LCU_WIDTH / 2); int block_height = (LCU_WIDTH / 2);
@ -872,10 +891,10 @@ static void sao_search_best_mode(const encoder_state * const encoder_state, cons
} }
// Calculate // Calculate
sao_search_best_mode(encoder_state, orig_list, rec_list, block_width, block_height, 2, sao, sao_top, sao_left); sao_search_best_mode(encoder_state, orig_list, rec_list, block_width, block_height, 2, sao, sao_top, sao_left, merge_cost);
} }
void sao_search_luma(const encoder_state * const encoder_state, const videoframe *frame, unsigned x_ctb, unsigned y_ctb, sao_info *sao, sao_info *sao_top, sao_info *sao_left) void sao_search_luma(const encoder_state * const encoder_state, const videoframe *frame, unsigned x_ctb, unsigned y_ctb, sao_info *sao, sao_info *sao_top, sao_info *sao_left, int32_t merge_cost[3])
{ {
pixel orig[LCU_LUMA_SIZE]; pixel orig[LCU_LUMA_SIZE];
pixel rec[LCU_LUMA_SIZE]; pixel rec[LCU_LUMA_SIZE];
@ -902,7 +921,7 @@ void sao_search_luma(const encoder_state * const encoder_state, const videoframe
orig_list[0] = orig; orig_list[0] = orig;
rec_list[0] = rec; rec_list[0] = rec;
sao_search_best_mode(encoder_state, orig_list, rec_list, block_width, block_height, 1, sao, sao_top, sao_left); sao_search_best_mode(encoder_state, orig_list, rec_list, block_width, block_height, 1, sao, sao_top, sao_left, merge_cost);
} }
void sao_reconstruct_frame(encoder_state * const encoder_state) void sao_reconstruct_frame(encoder_state * const encoder_state)

4
src/sao.h
View file

@ -55,8 +55,8 @@ typedef struct sao_info_struct {
void init_sao_info(sao_info *sao); void init_sao_info(sao_info *sao);
void sao_search_chroma(const encoder_state * encoder_state, const videoframe *frame, unsigned x_ctb, unsigned y_ctb, sao_info *sao, sao_info *sao_top, sao_info *sao_left); void sao_search_chroma(const encoder_state * encoder_state, const videoframe *frame, unsigned x_ctb, unsigned y_ctb, sao_info *sao, sao_info *sao_top, sao_info *sao_left, int32_t merge_cost[3]);
void sao_search_luma(const encoder_state * encoder_state, const videoframe *frame, unsigned x_ctb, unsigned y_ctb, sao_info *sao, sao_info *sao_top, sao_info *sao_left); void sao_search_luma(const encoder_state * encoder_state, const videoframe *frame, unsigned x_ctb, unsigned y_ctb, sao_info *sao, sao_info *sao_top, sao_info *sao_left, int32_t merge_cost[3]);
void sao_reconstruct(const encoder_control * encoder, videoframe *frame, const pixel *old_rec, void sao_reconstruct(const encoder_control * encoder, videoframe *frame, const pixel *old_rec,
unsigned x_ctb, unsigned y_ctb, unsigned x_ctb, unsigned y_ctb,
const sao_info *sao, color_index color_i); const sao_info *sao, color_index color_i);