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

Created function inter_recon_lcu_bipred() and moved bipred recon there

Browse source
This commit is contained in:
Marko Viitanen 2015-04-21 12:05:21 +03:00
parent 50fce975d9
commit e12ba7c80f
3 changed files with 53 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/inter.c
View file

@ -55,16 +55,8 @@ void inter_set_block(videoframe_t* frame, uint32_t x_cu, uint32_t y_cu, uint8_t
cu->depth = depth; cu->depth = depth;
cu->type = CU_INTER; cu->type = CU_INTER;
cu->part_size = SIZE_2Nx2N; cu->part_size = SIZE_2Nx2N;
cu->inter.mode = cur_cu->inter.mode; memcpy(&cu->inter, &cur_cu->inter, sizeof(cur_cu->inter));
cu->inter.mv[0][0] = cur_cu->inter.mv[0][0];
cu->inter.mv[0][1] = cur_cu->inter.mv[0][1];
cu->inter.mv[1][0] = cur_cu->inter.mv[1][0];
cu->inter.mv[1][1] = cur_cu->inter.mv[1][1];
cu->inter.mv_dir = cur_cu->inter.mv_dir;
cu->inter.mv_ref[0] = cur_cu->inter.mv_ref[0];
cu->inter.mv_ref[1] = cur_cu->inter.mv_ref[1];
cu->inter.mv_ref_coded[0] = cur_cu->inter.mv_ref_coded[0];
cu->inter.mv_ref_coded[1] = cur_cu->inter.mv_ref_coded[1];
cu->tr_depth = tr_depth; cu->tr_depth = tr_depth;
} }
} }
@ -334,6 +326,55 @@ void inter_recon_lcu(const encoder_state_t * const state, const image_t * const
} }
} }
/**
* \brief Reconstruct bi-pred inter block
* \param ref1 reference picture to copy the data from
* \param ref2 other reference picture to copy the data from
* \param xpos block x position
* \param ypos block y position
* \param width block width
* \param mv[2][2] motion vectors
* \param lcu destination lcu
* \returns Void
*/
void inter_recon_lcu_bipred(const encoder_state_t * const state, const image_t * ref1, const image_t * ref2, int32_t xpos, int32_t ypos, int32_t width, const int16_t mv_param[2][2], lcu_t* lcu) {
pixel_t *temp_lcu_y = MALLOC(pixel_t, 64 * 64);
pixel_t *temp_lcu_u = MALLOC(pixel_t, 32 * 32);
pixel_t *temp_lcu_v = MALLOC(pixel_t, 32 * 32);
int temp_x, temp_y;
// TODO: interpolated values require 14-bit accuracy for bi-prediction, current implementation of ipol filters round the value to 8bits
inter_recon_lcu(state, ref1, xpos, ypos, width, mv_param[0], lcu);
memcpy(temp_lcu_y, lcu->rec.y, sizeof(pixel_t) * 64 * 64);
memcpy(temp_lcu_u, lcu->rec.u, sizeof(pixel_t) * 32 * 32);
memcpy(temp_lcu_v, lcu->rec.v, sizeof(pixel_t) * 32 * 32);
inter_recon_lcu(state, ref2, xpos, ypos, width, mv_param[1], lcu);
for (temp_y = 0; temp_y < width; ++temp_y) {
int y_in_lcu = ((ypos + temp_y) & ((LCU_WIDTH)-1));
for (temp_x = 0; temp_x < width; ++temp_x) {
int x_in_lcu = ((xpos + temp_x) & ((LCU_WIDTH)-1));
lcu->rec.y[y_in_lcu * LCU_WIDTH + x_in_lcu] = (pixel_t)(((int)lcu->rec.y[y_in_lcu * LCU_WIDTH + x_in_lcu] +
(int)temp_lcu_y[y_in_lcu * LCU_WIDTH + x_in_lcu] + 1) >> 1);
}
}
for (temp_y = 0; temp_y < width>>1; ++temp_y) {
int y_in_lcu = (((ypos >> 1) + temp_y) & (LCU_WIDTH_C - 1));
for (temp_x = 0; temp_x < width>>1; ++temp_x) {
int x_in_lcu = (((xpos >> 1) + temp_x) & (LCU_WIDTH_C - 1));
lcu->rec.u[y_in_lcu * LCU_WIDTH_C + x_in_lcu] = (pixel_t)(((int)lcu->rec.u[y_in_lcu * LCU_WIDTH_C + x_in_lcu] +
(int)temp_lcu_u[y_in_lcu * LCU_WIDTH_C + x_in_lcu] + 1) >> 1);
lcu->rec.v[y_in_lcu * LCU_WIDTH_C + x_in_lcu] = (pixel_t)(((int)lcu->rec.v[y_in_lcu * LCU_WIDTH_C + x_in_lcu] +
(int)temp_lcu_v[y_in_lcu * LCU_WIDTH_C + x_in_lcu] + 1) >> 1);
}
}
FREE_POINTER(temp_lcu_y);
FREE_POINTER(temp_lcu_u);
FREE_POINTER(temp_lcu_v);
}
/** /**
* \brief Get merge candidates for current block * \brief Get merge candidates for current block
* \param encoder encoder control struct to use * \param encoder encoder control struct to use

1
src/inter.h
View file

@ -41,6 +41,7 @@ typedef struct {
//void inter_set_block(image* im,uint32_t x_cu, uint32_t y_cu, uint8_t depth, cu_info *cur_cu); //void inter_set_block(image* im,uint32_t x_cu, uint32_t y_cu, uint8_t depth, cu_info *cur_cu);
void inter_recon_lcu(const encoder_state_t * const state, const image_t * ref, int32_t xpos, int32_t ypos, int32_t width, const int16_t mv_param[2], lcu_t* lcu); void inter_recon_lcu(const encoder_state_t * const state, const image_t * ref, int32_t xpos, int32_t ypos, int32_t width, const int16_t mv_param[2], lcu_t* lcu);
void inter_recon_lcu_bipred(const encoder_state_t * const state, const image_t * ref1, const image_t * ref2, int32_t xpos, int32_t ypos, int32_t width, const int16_t mv_param[2][2], lcu_t* lcu);
void inter_get_spatial_merge_candidates(int32_t x, int32_t y, int8_t depth, cu_info_t **b0, cu_info_t **b1, void inter_get_spatial_merge_candidates(int32_t x, int32_t y, int8_t depth, cu_info_t **b0, cu_info_t **b1,
cu_info_t **b2, cu_info_t **a0, cu_info_t **a1, lcu_t *lcu); cu_info_t **b2, cu_info_t **a0, cu_info_t **a1, lcu_t *lcu);

32
src/search.c
View file

@ -2472,37 +2472,7 @@ static double search_cu(encoder_state_t * const state, int x, int y, int depth,
lcu_set_trdepth(&work_tree[depth], x, y, depth, tr_depth); lcu_set_trdepth(&work_tree[depth], x, y, depth, tr_depth);
if (cur_cu->inter.mv_dir == 3) { if (cur_cu->inter.mv_dir == 3) {
pixel_t *temp_lcu_y = MALLOC(pixel_t, 64 * 64); inter_recon_lcu_bipred(state, state->global->ref->images[cur_cu->inter.mv_ref[0]], state->global->ref->images[cur_cu->inter.mv_ref[1]], x, y, LCU_WIDTH >> depth, cur_cu->inter.mv, &work_tree[depth]);
pixel_t *temp_lcu_u = MALLOC(pixel_t, 32 * 32);
pixel_t *temp_lcu_v = MALLOC(pixel_t, 32 * 32);
int temp_x, temp_y;
inter_recon_lcu(state, state->global->ref->images[cur_cu->inter.mv_ref[0]], x, y, LCU_WIDTH >> depth, cur_cu->inter.mv[0], &work_tree[depth]);
memcpy(temp_lcu_y, lcu->rec.y, sizeof(pixel_t) * 64 * 64);
memcpy(temp_lcu_u, lcu->rec.u, sizeof(pixel_t) * 32 * 32);
memcpy(temp_lcu_v, lcu->rec.v, sizeof(pixel_t) * 32 * 32);
inter_recon_lcu(state, state->global->ref->images[cur_cu->inter.mv_ref[1]], x, y, LCU_WIDTH >> depth, cur_cu->inter.mv[1], &work_tree[depth]);
for (temp_y = 0; temp_y < LCU_WIDTH >> depth; ++temp_y) {
int y_in_lcu = ((y + temp_y) & ((LCU_WIDTH)-1));
for (temp_x = 0; temp_x < LCU_WIDTH >> depth; ++temp_x) {
int x_in_lcu = ((x + temp_x) & ((LCU_WIDTH)-1));
lcu->rec.y[y_in_lcu * LCU_WIDTH + x_in_lcu] = (pixel_t)(((int)lcu->rec.y[y_in_lcu * LCU_WIDTH + x_in_lcu] +
(int)temp_lcu_y[y_in_lcu * LCU_WIDTH + x_in_lcu] + 1) >> 1);
}
}
for (temp_y = 0; temp_y < LCU_WIDTH >> (depth+1); ++temp_y) {
int y_in_lcu = (((y >> 1) + temp_y) & (LCU_WIDTH_C - 1));
for (temp_x = 0; temp_x < LCU_WIDTH >> (depth+1); ++temp_x) {
int x_in_lcu = (((x >> 1) + temp_x) & (LCU_WIDTH_C - 1));
lcu->rec.u[y_in_lcu * LCU_WIDTH_C + x_in_lcu] = (pixel_t)(((int)lcu->rec.u[y_in_lcu * LCU_WIDTH_C + x_in_lcu] +
(int)temp_lcu_u[y_in_lcu * LCU_WIDTH_C + x_in_lcu] + 1) >> 1);
lcu->rec.v[y_in_lcu * LCU_WIDTH_C + x_in_lcu] = (pixel_t)(((int)lcu->rec.v[y_in_lcu * LCU_WIDTH_C + x_in_lcu] +
(int)temp_lcu_v[y_in_lcu * LCU_WIDTH_C + x_in_lcu] + 1) >> 1);
}
}
FREE_POINTER(temp_lcu_y);
FREE_POINTER(temp_lcu_u);
FREE_POINTER(temp_lcu_v);
} else { } else {
inter_recon_lcu(state, state->global->ref->images[cur_cu->inter.mv_ref[cur_cu->inter.mv_dir - 1]], x, y, LCU_WIDTH >> depth, cur_cu->inter.mv[cur_cu->inter.mv_dir - 1], &work_tree[depth]); inter_recon_lcu(state, state->global->ref->images[cur_cu->inter.mv_ref[cur_cu->inter.mv_dir - 1]], x, y, LCU_WIDTH >> depth, cur_cu->inter.mv[cur_cu->inter.mv_dir - 1], &work_tree[depth]);
} }