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

Fixed and enabled Intra NxN

Browse source 
NxN block needs reference border from previous NxN blocks and to do this, the structure was changed a bit.
This commit is contained in:
Marko Viitanen 2014-02-11 18:31:12 +02:00
parent 9b993de79b
commit 5c4c47b07a
2 changed files with 40 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/encoder.c
View file

@ -2571,33 +2571,14 @@ void encode_block_residual(encoder_control *encoder,
intra_set_block_mode(encoder->in.cur_pic, x_ctb, y_ctb, depth,
cur_cu->intra[0].mode, cur_cu->part_size);
for (i = 0; i < num_pu; ++i) {
// Build reconstructed block to use in prediction with extrapolated borders
int x_pos = (x_ctb << MIN_SIZE) + offsets[i].x * width;
int y_pos = (y_ctb << MIN_SIZE) + offsets[i].y * width;
recbase_y = &encoder->in.cur_pic->y_recdata[x_pos + y_pos * encoder->in.width];
rec_shift = &rec[width * 2 + 8 + 1];
intra_build_reference_border(encoder->in.cur_pic, encoder->in.cur_pic->y_recdata,
x_pos, y_pos,
width * 2 + 8, rec, width * 2 + 8, 0);
intra_recon(rec_shift, width * 2 + 8,
x_pos, y_pos,
width, recbase_y, rec_stride, cur_cu->intra[i].mode, 0);
// Filter DC-prediction
if (cur_cu->intra[i].mode == 1 && width < 32) {
intra_dc_pred_filtering(rec_shift, width * 2 + 8, recbase_y,
rec_stride, width, width);
}
}
// TODO : chroma intra prediction
if (cur_cu->intra[0].mode_chroma != 36
&& cur_cu->intra[0].mode_chroma == cur_cu->intra[0].mode) {
cur_cu->intra[0].mode_chroma = 36;
}
// Reconstruct chroma
rec_shift = &rec[width_c * 2 + 8 + 1];
intra_build_reference_border(encoder->in.cur_pic, encoder->in.cur_pic->u_recdata,
x_ctb << MIN_SIZE, y_ctb << MIN_SIZE,
@ -2629,6 +2610,43 @@ void encode_block_residual(encoder_control *encoder,
cur_cu->intra[0].mode_chroma != 36 ? cur_cu->intra[0].mode_chroma : cur_cu->intra[0].mode,
1);
picture_set_block_coded(encoder->in.cur_pic, x_ctb, y_ctb, depth, 1);
for (i = 0; i < num_pu; ++i) {
// Build reconstructed block to use in prediction with extrapolated borders
int x_pos = (x_ctb << MIN_SIZE) + offsets[i].x * width;
int y_pos = (y_ctb << MIN_SIZE) + offsets[i].y * width;
recbase_y = &encoder->in.cur_pic->y_recdata[x_pos + y_pos * encoder->in.width];
rec_shift = &rec[width * 2 + 8 + 1];
intra_build_reference_border(encoder->in.cur_pic, encoder->in.cur_pic->y_recdata,
x_pos, y_pos,
width * 2 + 8, rec, width * 2 + 8, 0);
intra_recon(rec_shift, width * 2 + 8,
x_pos, y_pos,
width, recbase_y, rec_stride, cur_cu->intra[i].mode, 0);
// Filter DC-prediction
if (cur_cu->intra[i].mode == 1 && width < 32) {
intra_dc_pred_filtering(rec_shift, width * 2 + 8, recbase_y,
rec_stride, width, width);
}
// Handle NxN mode by doing quant/transform and inverses for the next NxN block
if (cur_cu->part_size == SIZE_NxN) {
encode_transform_tree(encoder, x_pos>>2, y_pos>>2, depth+1);
}
}
// If we coded NxN block, fetch the coded block flags to this level
if (cur_cu->part_size == SIZE_NxN) {
cur_cu->coeff_top_y[depth] = cur_cu->coeff_top_y[depth+1] | cur_cu->coeff_top_y[depth+2] | cur_cu->coeff_top_y[depth+3] | cur_cu->coeff_top_y[depth+4];
cur_cu->coeff_top_u[depth] = cur_cu->coeff_top_u[depth+1];
cur_cu->coeff_top_v[depth] = cur_cu->coeff_top_v[depth+1];
return;
}
} else {
int16_t mv_cand[2][2];

5
src/search.c
View file

@ -329,9 +329,7 @@ void search_intra(encoder_control *encoder, uint16_t x_ctb, uint16_t y_ctb, uint
cur_cu->part_size = SIZE_2Nx2N;
// Do search for NxN split.
// This feature doesn't work yet so it is disabled.
#ifdef ENABLE_INTRA_NXN
if (depth == MAX_DEPTH) { // Disabled because coding NxN doesn't work yet.
if (depth == MAX_DEPTH) {
// Save 2Nx2N information to compare with NxN.
int nn_cost = cur_cu->intra[0].cost;
int8_t nn_mode = cur_cu->intra[0].mode;
@ -362,7 +360,6 @@ void search_intra(encoder_control *encoder, uint16_t x_ctb, uint16_t y_ctb, uint
cur_cu->part_size = SIZE_NxN;
}
}
#endif
}
/**