From 7d6d1d5536df9553f5d0238f2164759911e33701 Mon Sep 17 00:00:00 2001 From: Laurent Fasnacht Date: Fri, 2 May 2014 11:38:07 +0200 Subject: [PATCH] Remove pic->pred_* --- src/encoder.c | 9 --------- src/picture.c | 5 ----- src/picture.h | 4 ---- 3 files changed, 18 deletions(-) diff --git a/src/encoder.c b/src/encoder.c index 99f8e6eb..a840c20d 100644 --- a/src/encoder.c +++ b/src/encoder.c @@ -371,11 +371,6 @@ static int encoder_state_init_one(encoder_state * const state, const encoder_sta state->cur_pic->coeff_u = MALLOC(coefficient, (width * height) >> 2); state->cur_pic->coeff_v = MALLOC(coefficient, (width * height) >> 2); - // Init predicted data table - state->cur_pic->pred_y = MALLOC(pixel, width * height); - state->cur_pic->pred_u = MALLOC(pixel, (width * height) >> 2); - state->cur_pic->pred_v = MALLOC(pixel, (width * height) >> 2); - state->children = NULL; // Set CABAC output bitstream @@ -1396,10 +1391,6 @@ void encoder_next_frame(encoder_state *encoder_state) { MOVE_POINTER(encoder_state->cur_pic->coeff_u,encoder_state->ref->pics[0]->coeff_u); MOVE_POINTER(encoder_state->cur_pic->coeff_v,encoder_state->ref->pics[0]->coeff_v); - MOVE_POINTER(encoder_state->cur_pic->pred_y,encoder_state->ref->pics[0]->pred_y); - MOVE_POINTER(encoder_state->cur_pic->pred_u,encoder_state->ref->pics[0]->pred_u); - MOVE_POINTER(encoder_state->cur_pic->pred_v,encoder_state->ref->pics[0]->pred_v); - encoder_state->frame++; encoder_state->poc++; diff --git a/src/picture.c b/src/picture.c index 92f7e8bb..967b4651 100644 --- a/src/picture.c +++ b/src/picture.c @@ -291,7 +291,6 @@ picture *picture_alloc(const int32_t width, const int32_t height, } pic->coeff_y = NULL; pic->coeff_u = NULL; pic->coeff_v = NULL; - pic->pred_y = NULL; pic->pred_u = NULL; pic->pred_v = NULL; pic->slice_sao_luma_flag = 1; pic->slice_sao_chroma_flag = 1; @@ -326,10 +325,6 @@ int picture_free(picture * const pic) FREE_POINTER(pic->coeff_u); FREE_POINTER(pic->coeff_v); - FREE_POINTER(pic->pred_y); - FREE_POINTER(pic->pred_u); - FREE_POINTER(pic->pred_v); - FREE_POINTER(pic->sao_luma); FREE_POINTER(pic->sao_chroma); diff --git a/src/picture.h b/src/picture.h index 03d396c4..9c6cdc56 100644 --- a/src/picture.h +++ b/src/picture.h @@ -111,10 +111,6 @@ typedef struct picture_struct pixel* v_recdata; //!< \brief Pointer to reconstructed V-data. pixel *recdata[NUM_COLORS]; // \brief Alternate access method to same data. - pixel* pred_y; //!< \brief Pointer to predicted Y - pixel* pred_u; //!< \brief Pointer to predicted U - pixel* pred_v; //!< \brief Pointer to predicted V - coefficient* coeff_y; //!< \brief coefficient pointer Y coefficient* coeff_u; //!< \brief coefficient pointer U coefficient* coeff_v; //!< \brief coefficient pointer V