From aac7fc55b12c39d3582415dc2e84dcd5dec5b258 Mon Sep 17 00:00:00 2001 From: Laurent Fasnacht Date: Mon, 12 May 2014 14:52:04 +0200 Subject: [PATCH] Remove filter_deblock function, which is not used and somewhat dangerous, since it doesn't take into account specific stuff about subencoders. --- src/filter.c | 33 --------------------------------- src/filter.h | 1 - 2 files changed, 34 deletions(-) diff --git a/src/filter.c b/src/filter.c index bee1629d..d83a33fb 100644 --- a/src/filter.c +++ b/src/filter.c @@ -427,39 +427,6 @@ void filter_deblock_cu(encoder_state * const encoder_state, int32_t x, int32_t y filter_deblock_edge_chroma(encoder_state, x*(LCU_WIDTH >> (MAX_DEPTH + 1)), y*(LCU_WIDTH >> (MAX_DEPTH + 1)), depth, edge); } -/** - * \brief Main function for Deblocking filtering - * \param encoder the encoder info structure - * - * This is the main function for deblocking filter, it will loop through all - * the Largest Coding Units (LCU) and call filter_deblock_cu with absolute - * X and Y coordinates of the LCU. - */ -void filter_deblock(encoder_state * const encoder_state) -{ - const picture * const cur_pic = encoder_state->tile->cur_pic; - int16_t x, y; - - // TODO: Optimization: add thread for each LCU - // Filter vertically. - for (y = 0; y < cur_pic->height_in_lcu; y++) - { - for (x = 0; x < cur_pic->width_in_lcu; x++) - { - filter_deblock_cu(encoder_state, x << MAX_DEPTH, y << MAX_DEPTH, 0, EDGE_VER); - } - } - - // Filter horizontally. - for (y = 0; y < cur_pic->height_in_lcu; y++) - { - for (x = 0; x < cur_pic->width_in_lcu; x++) - { - filter_deblock_cu(encoder_state, x << MAX_DEPTH, y << MAX_DEPTH, 0, EDGE_HOR); - } - } -} - /** * \brief Deblock a single LCU without using data from right or down. diff --git a/src/filter.h b/src/filter.h index b7a51fa5..61606c50 100644 --- a/src/filter.h +++ b/src/filter.h @@ -40,7 +40,6 @@ void filter_deblock_edge_luma(encoder_state *encoder_state, void filter_deblock_edge_chroma(encoder_state *encoder_state, int32_t xpos, int32_t ypos, int8_t depth, int8_t dir); -void filter_deblock(encoder_state *encoder_state); void filter_deblock_lcu(encoder_state *encoder_state, int x_px, int y_px); void filter_deblock_luma(const encoder_control * const encoder, pixel *src, int32_t offset, int32_t tc , int8_t sw, int8_t part_p_nofilter, int8_t part_q_nofilter,