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

Tweak implementation of SAO reconstruction to be a bit more clear.

Browse source
This commit is contained in:
Ari Koivula 2013-11-08 15:04:06 +02:00
parent ef8a984d4f
commit 43ae719ddb
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/encoder.c
View file

@ -865,8 +865,6 @@ void encode_slice_data(encoder_control* encoder)
{
uint16_t x_ctb, y_ctb;
picture *pic = encoder->in.cur_pic;
pixel *new_y_data = MALLOC(pixel, pic->width * pic->height);
//memcpy(new_y_data, pic->y_recdata, sizeof(pixel) * pic->width * pic->height);
// Filtering
if(encoder->deblock_enable) {
@ -874,6 +872,9 @@ void encode_slice_data(encoder_control* encoder)
}
if (encoder->sao_enable) {
pixel *new_y_data = MALLOC(pixel, pic->width * pic->height);
memcpy(new_y_data, pic->y_recdata, sizeof(pixel) * pic->width * pic->height);
for (y_ctb = 0; y_ctb < encoder->in.height_in_lcu; y_ctb++) {
for (x_ctb = 0; x_ctb < encoder->in.width_in_lcu; x_ctb++) {
unsigned stride = encoder->in.width_in_lcu;
@ -888,10 +889,9 @@ void encode_slice_data(encoder_control* encoder)
sao_reconstruct(encoder->in.cur_pic, new_y_data, x_ctb, y_ctb, sao_luma, sao_chroma);
}
}
}
memcpy(pic->y_recdata, new_y_data, sizeof(pixel) * pic->width * pic->height);
free(new_y_data);
free(new_y_data);
}
init_contexts(encoder,encoder->in.cur_pic->slicetype);

20
src/sao.c
View file

@ -96,7 +96,7 @@ void sao_reconstruct_color(const pixel *rec_data, pixel *new_rec_data, const sao
* Vector block is the area affected by sao. Vectors tr and br are top-left
* margin and bottom-right margin, which contain pixels that are not modified
* by the reconstruction of this LCU but are needed by the reconstruction.
* Vector rec is the coordinate of the area required by sao reconstruction.
* Vector rec is the offset from the CU to the required pixel area.
*
* The margins are always either 0 or 1, depending on the direction of the
* edge offset class.
@ -104,7 +104,7 @@ void sao_reconstruct_color(const pixel *rec_data, pixel *new_rec_data, const sao
* This also takes into account borders of the picture and non-LCU sized
* CU's at the bottom and right of the picture.
*
* \ rec
* \ CU + rec
* +------+
* |\ tl |
* | +--+ |
@ -162,12 +162,8 @@ void sao_calc_block_dims(const picture *pic, const sao_info *sao, vector2d *rec,
}
}
if (rec->y != 0) {
rec->y -= 1;
}
if (rec->x != 0) {
rec->x -= 1;
}
rec->y = (rec->y == 0 ? 0 : -1);
rec->x = (rec->x == 0 ? 0 : -1);
}
void sao_reconstruct(picture *pic, pixel *new_y_data, unsigned x_ctb, unsigned y_ctb,
@ -191,7 +187,7 @@ void sao_reconstruct(picture *pic, pixel *new_y_data, unsigned x_ctb, unsigned y
sao_calc_block_dims(pic, sao_luma, &rec, &tl, &br, &block);
// Data to tmp buffer.
picture_blit_pixels(&pic->y_recdata[rec.y * pic->width + rec.x], rec_y,
picture_blit_pixels(&new_y_data[(y + rec.y) * pic->width + x + rec.x], rec_y,
tl.x + block.x + br.x,
tl.y + block.y + br.y,
pic->width, LCU_WIDTH + 2);
@ -199,7 +195,7 @@ void sao_reconstruct(picture *pic, pixel *new_y_data, unsigned x_ctb, unsigned y
//picture_blit_pixels(y_recdata, new_rec_y, LCU_WIDTH, LCU_WIDTH, pic->width, LCU_WIDTH);
sao_reconstruct_color(&rec_y[tl.y * (LCU_WIDTH + 2) + tl.x],
&new_rec_y,
&new_rec_y[(rec.y + tl.y) * LCU_WIDTH + rec.x + tl.x],
sao_luma,
LCU_WIDTH + 2, LCU_WIDTH,
block.x, block.y);
@ -208,8 +204,8 @@ void sao_reconstruct(picture *pic, pixel *new_y_data, unsigned x_ctb, unsigned y
// Copy reconstructed block from tmp buffer to rec image.
//
picture_blit_pixels(new_rec_y,
&new_y_recdata[(tl.y + rec.y - y) * (pic->width) + (tl.x + rec.x - x)],
picture_blit_pixels(&new_rec_y[(tl.y + rec.y) * LCU_WIDTH + (tl.x + rec.x)],
&y_recdata[(tl.y + rec.y) * (pic->width) + (tl.x + rec.x)],
block.x, block.y, LCU_WIDTH, pic->width);
}