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

Remove pic->pred_*

Browse source
This commit is contained in:
Laurent Fasnacht 2014-05-02 11:38:07 +02:00
parent 92e14cc80d
commit 7d6d1d5536
3 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/encoder.c
View file

@ -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_u = MALLOC(coefficient, (width * height) >> 2);
state->cur_pic->coeff_v = 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; state->children = NULL;
// Set CABAC output bitstream // 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_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->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->frame++;
encoder_state->poc++; encoder_state->poc++;

5
src/picture.c
View file

@ -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->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_luma_flag = 1;
pic->slice_sao_chroma_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_u);
FREE_POINTER(pic->coeff_v); 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_luma);
FREE_POINTER(pic->sao_chroma); FREE_POINTER(pic->sao_chroma);

4
src/picture.h
View file

@ -111,10 +111,6 @@ typedef struct picture_struct
pixel* v_recdata; //!< \brief Pointer to reconstructed V-data. pixel* v_recdata; //!< \brief Pointer to reconstructed V-data.
pixel *recdata[NUM_COLORS]; // \brief Alternate access method to same 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_y; //!< \brief coefficient pointer Y
coefficient* coeff_u; //!< \brief coefficient pointer U coefficient* coeff_u; //!< \brief coefficient pointer U
coefficient* coeff_v; //!< \brief coefficient pointer V coefficient* coeff_v; //!< \brief coefficient pointer V