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

Fix compilation for rebase.

Browse source 
Conflicts:
	src/search.c
This commit is contained in:
Ari Koivula 2014-02-26 16:05:38 +02:00
parent b4181dd398
commit e651078e78
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/picture.h
View file

@ -147,7 +147,7 @@ typedef struct
#define SUB_SCU_BIT_MASK (64 - 1); #define SUB_SCU_BIT_MASK (64 - 1)
#define SUB_SCU(xy) (xy & SUB_SCU_BIT_MASK) #define SUB_SCU(xy) (xy & SUB_SCU_BIT_MASK)
#define LCU_CU_WIDTH 8 #define LCU_CU_WIDTH 8
#define LCU_T_CU_WIDTH 9 #define LCU_T_CU_WIDTH 9

7
src/search.c
View file

@ -319,7 +319,6 @@ static void search_inter(encoder_control *encoder, uint16_t x_ctb,
} }
/** /**
* Copy all non-reference CU data from depth+1 to depth. * Copy all non-reference CU data from depth+1 to depth.
*/ */
@ -858,9 +857,8 @@ uint32_t search_best_mode(encoder_control *encoder,
*/ */
void search_slice_data(encoder_control *encoder) void search_slice_data(encoder_control *encoder)
{ {
#ifdef USE_NEW_SEARCH
search_frame(encoder); search_frame(encoder);
#else /*
int16_t x_lcu, y_lcu; int16_t x_lcu, y_lcu;
// Initialize the costs in the cu-array used for searching. // Initialize the costs in the cu-array used for searching.
@ -878,7 +876,7 @@ void search_slice_data(encoder_control *encoder)
} }
} }
} }
/*
// Loop through every LCU in the slice // Loop through every LCU in the slice
for (y_lcu = 0; y_lcu < encoder->in.height_in_lcu; y_lcu++) { for (y_lcu = 0; y_lcu < encoder->in.height_in_lcu; y_lcu++) {
for (x_lcu = 0; x_lcu < encoder->in.width_in_lcu; x_lcu++) { for (x_lcu = 0; x_lcu < encoder->in.width_in_lcu; x_lcu++) {
@ -895,5 +893,4 @@ void search_slice_data(encoder_control *encoder)
} }
} }
*/ */
#endif
} }