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

Added few warnings to Makefile

Browse source 
Cleaned fme code a bit
This commit is contained in:
Tapio Katajisto 2014-05-14 01:49:34 +00:00
parent efc43c8b3a
commit cc92cfee18
3 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile
View file

@ -45,7 +45,7 @@ else
endif endif
CC = gcc -fopenmp CC = gcc -fopenmp
CCFLAGS = $(DFLAGS) -I. -Wall -Wtype-limits CCFLAGS = $(DFLAGS) -I. -Wall -Wtype-limits -Wvla -Wdeclaration-after-statement
LDFLAGS += -lm LDFLAGS += -lm
LD = gcc -fopenmp LD = gcc -fopenmp
YASM = yasm YASM = yasm

22
src/inter.c
View file

@ -70,12 +70,9 @@ void extend_borders(int xpos, int ypos, int mv_x, int mv_y, int off_x, int off_y
int16_t mv[2] = {mv_x, mv_y}; int16_t mv[2] = {mv_x, mv_y};
int halfFilterSize = filterSize>>1; int halfFilterSize = filterSize>>1;
int dst_y; int y; int dst_x; int x; int coord_x; int coord_y; int ref_width_c; int dst_y; int y; int dst_x; int x; int coord_x; int coord_y;
int8_t overflow_neg_y_temp,overflow_pos_y_temp,overflow_neg_x_temp,overflow_pos_x_temp; int8_t overflow_neg_y_temp,overflow_pos_y_temp,overflow_neg_x_temp,overflow_pos_x_temp;
ref_width_c = ref_width;
//width = LCU_WIDTH>>depth;
for (dst_y = 0, y = ypos - halfFilterSize; y < ((ypos + height)) + halfFilterSize; dst_y++, y++) { for (dst_y = 0, y = ypos - halfFilterSize; y < ((ypos + height)) + halfFilterSize; dst_y++, y++) {
// calculate y-pixel offset // calculate y-pixel offset
@ -86,16 +83,16 @@ void extend_borders(int xpos, int ypos, int mv_x, int mv_y, int off_x, int off_y
overflow_pos_y_temp = (coord_y >= ref_height) ? 1 : 0; overflow_pos_y_temp = (coord_y >= ref_height) ? 1 : 0;
if (overflow_neg_y_temp) coord_y = 0; if (overflow_neg_y_temp) coord_y = 0;
else if (overflow_pos_y_temp) coord_y = (ref_height) - 1; else if (overflow_pos_y_temp) coord_y = (ref_height) - 1;
coord_y *= ref_width_c; coord_y *= ref_width;
for (dst_x = 0, x = (xpos) - halfFilterSize; x < ((xpos + width)) + halfFilterSize; dst_x++, x++) { for (dst_x = 0, x = (xpos) - halfFilterSize; x < ((xpos + width)) + halfFilterSize; dst_x++, x++) {
coord_x = x + off_x + mv[0]; coord_x = x + off_x + mv[0];
// On x-overflow set coord_x accordingly // On x-overflow set coord_x accordingly
overflow_neg_x_temp = (coord_x < 0) ? 1 : 0; overflow_neg_x_temp = (coord_x < 0) ? 1 : 0;
overflow_pos_x_temp = (coord_x >= ref_width_c) ? 1 : 0; overflow_pos_x_temp = (coord_x >= ref_width) ? 1 : 0;
if (overflow_neg_x_temp) coord_x = 0; if (overflow_neg_x_temp) coord_x = 0;
else if (overflow_pos_x_temp) coord_x = ref_width_c - 1; else if (overflow_pos_x_temp) coord_x = ref_width - 1;
// Store source block data (with extended borders) // Store source block data (with extended borders)
dst[dst_y*(width+filterSize) + dst_x] = ref[coord_y + coord_x]; dst[dst_y*(width+filterSize) + dst_x] = ref[coord_y + coord_x];
@ -140,7 +137,7 @@ void inter_recon_lcu(const encoder_state * const encoder_state, const picture *
int16_t halfpel_v[LCU_WIDTH * LCU_WIDTH]; //!< interpolated 2W x 2H block (v) int16_t halfpel_v[LCU_WIDTH * LCU_WIDTH]; //!< interpolated 2W x 2H block (v)
// Luma quarter-pel // Luma quarter-pel
int8_t fractional_mv = (mv[0]&1) || (mv[1]&1) || (mv[0]&2) || (mv[1]&2); // 2 lowest bits of mv set -> mv is fractional int8_t fractional_mv = (mv[0]&1) || (mv[1]&1) || (mv[0]&2) || (mv[1]&2); // either of 2 lowest bits of mv set -> mv is fractional
if(fractional_mv) { if(fractional_mv) {
int y_off_x = (mv[0]&3); int y_off_x = (mv[0]&3);
@ -151,11 +148,8 @@ void inter_recon_lcu(const encoder_state * const encoder_state, const picture *
int y,x; int y,x;
#define FILTER_SIZE_Y 8 #define FILTER_SIZE_Y 8 //Luma filter size
#define FILTER_SIZE_C 4 #define FILTER_SIZE_C 4 //Chroma filter size
//vector2d orig = {xpos, ypos};
//vector2d orig_c = {xpos>>1, ypos>>1};
// Fractional luma 1/4-pel // Fractional luma 1/4-pel
int16_t qpel_src_y[(LCU_WIDTH+FILTER_SIZE_Y) * (LCU_WIDTH+FILTER_SIZE_Y)]; int16_t qpel_src_y[(LCU_WIDTH+FILTER_SIZE_Y) * (LCU_WIDTH+FILTER_SIZE_Y)];
@ -200,9 +194,7 @@ void inter_recon_lcu(const encoder_state * const encoder_state, const picture *
for(x = 0; x < width; ++x) { for(x = 0; x < width; ++x) {
int x_in_lcu = ((x+xpos) & ((LCU_WIDTH)-1)); int x_in_lcu = ((x+xpos) & ((LCU_WIDTH)-1));
int qpel_x = x*4+y_off_x; int qpel_x = x*4+y_off_x;
//printf("x: %d, y: %d\n", off_x, off_y);
lcu->rec.y[y_in_lcu * LCU_WIDTH + x_in_lcu] = (uint8_t)qpel_dst_y[qpel_y*(width*4)+qpel_x]; lcu->rec.y[y_in_lcu * LCU_WIDTH + x_in_lcu] = (uint8_t)qpel_dst_y[qpel_y*(width*4)+qpel_x];
//printf("i: %d", qpel_y*(width*4)+qpel_x);
} }
} }
//Chroma //Chroma

14
src/search.c
View file

@ -379,6 +379,20 @@ static unsigned search_mv_full(unsigned depth,
} }
#endif #endif
/**
* \brief Do fractional motion estimation
*
* \param depth log2 depth of the search
* \param pic Picture motion vector is searched for.
* \param ref Picture motion vector is searched from.
* \param orig Top left corner of the searched for block.
* \param mv_in_out Predicted mv in and best out. Quarter pixel precision.
*
* \returns Cost of the motion vector.
*
* Algoritm first searches 1/2-pel positions around integer mv and after best match is found,
* refines the search by searching best 1/4-pel postion around best 1/2-pel position.
*/
static unsigned search_frac( const encoder_state * const encoder_state, static unsigned search_frac( const encoder_state * const encoder_state,
unsigned depth, unsigned depth,
const picture *pic, const picture *ref, const picture *pic, const picture *ref,