From 6a937de9b2c72f800822825f2435409df1b188bc Mon Sep 17 00:00:00 2001 From: Laurent Fasnacht Date: Mon, 11 Aug 2014 11:46:21 +0200 Subject: [PATCH] Fix search_cu log --- src/global.h | 4 ++-- src/search.c | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/global.h b/src/global.h index b18e2527..d669b694 100644 --- a/src/global.h +++ b/src/global.h @@ -191,8 +191,8 @@ typedef int16_t coefficient; #define _DEBUG_PERF_ENCODE_LCU 0x0004 #define _DEBUG_PERF_SAO_RECONSTRUCT_FRAME 0x0008 #define _DEBUG_PERF_WRITE_BITSTREAM_LEAF 0x0010 -#define _DEBUG_PERF_SEARCH_PIXELS 0x0020 -#define _DEBUG_PERF_SEARCH_CU 0x0040 +#define _DEBUG_PERF_SEARCH_CU 0x0020 +#define _DEBUG_PERF_SEARCH_PIXELS 0x0040 //Constants typedef enum { COLOR_Y = 0, COLOR_U, COLOR_V, NUM_COLORS } color_index; diff --git a/src/search.c b/src/search.c index cdcdc807..26fb94d8 100644 --- a/src/search.c +++ b/src/search.c @@ -1258,7 +1258,12 @@ static int search_cu(encoder_state * const encoder_state, int x, int y, int dept } } - PERFORMANCE_MEASURE_END(_DEBUG_PERF_SEARCH_CU, encoder_state->encoder_control->threadqueue, "type=search_cu,frame=%d,tile=%d,slice=%d,x=%d,y=%d,depth=%d,split=%d,cur_cu_is_intra=%d", encoder_state->global->frame, encoder_state->tile->id, encoder_state->slice->id, x, y, depth, debug_split, (cur_cu->type==CU_INTRA)?1:0); + PERFORMANCE_MEASURE_END(_DEBUG_PERF_SEARCH_CU, encoder_state->encoder_control->threadqueue, "type=search_cu,frame=%d,tile=%d,slice=%d,px_x=%d-%d,px_y=%d-%d,depth=%d,split=%d,cur_cu_is_intra=%d", encoder_state->global->frame, encoder_state->tile->id, encoder_state->slice->id, + (encoder_state->tile->lcu_offset_x * LCU_WIDTH) + x, + (encoder_state->tile->lcu_offset_x * LCU_WIDTH) + x + (LCU_WIDTH >> depth), + (encoder_state->tile->lcu_offset_y * LCU_WIDTH) + y, + (encoder_state->tile->lcu_offset_y * LCU_WIDTH) + y + (LCU_WIDTH >> depth), + depth, debug_split, (cur_cu->type==CU_INTRA)?1:0); return cost; }