mpegvideo: remove some unused variables from Picture.
This commit is contained in:
@@ -1077,7 +1077,6 @@ void ff_estimate_p_frame_motion(MpegEncContext * s,
|
|||||||
vard = s->dsp.sse[0](NULL, pix, ppix, s->linesize, 16);
|
vard = s->dsp.sse[0](NULL, pix, ppix, s->linesize, 16);
|
||||||
|
|
||||||
pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8;
|
pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8;
|
||||||
// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin;
|
|
||||||
c->mc_mb_var_sum_temp += (vard+128)>>8;
|
c->mc_mb_var_sum_temp += (vard+128)>>8;
|
||||||
|
|
||||||
if(mb_type){
|
if(mb_type){
|
||||||
@@ -1156,7 +1155,6 @@ void ff_estimate_p_frame_motion(MpegEncContext * s,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin;
|
|
||||||
set_p_mv_tables(s, mx, my, mb_type!=CANDIDATE_MB_TYPE_INTER4V);
|
set_p_mv_tables(s, mx, my, mb_type!=CANDIDATE_MB_TYPE_INTER4V);
|
||||||
|
|
||||||
/* get intra luma score */
|
/* get intra luma score */
|
||||||
|
@@ -94,10 +94,6 @@ struct MpegEncContext;
|
|||||||
typedef struct Picture{
|
typedef struct Picture{
|
||||||
struct AVFrame f;
|
struct AVFrame f;
|
||||||
|
|
||||||
/**
|
|
||||||
* halfpel luma planes.
|
|
||||||
*/
|
|
||||||
uint8_t *interpolated[3];
|
|
||||||
int8_t *qscale_table_base;
|
int8_t *qscale_table_base;
|
||||||
int16_t (*motion_val_base[2])[2];
|
int16_t (*motion_val_base[2])[2];
|
||||||
uint32_t *mb_type_base;
|
uint32_t *mb_type_base;
|
||||||
@@ -143,7 +139,6 @@ typedef struct Picture{
|
|||||||
uint16_t *mb_var; ///< Table for MB variances
|
uint16_t *mb_var; ///< Table for MB variances
|
||||||
uint16_t *mc_mb_var; ///< Table for motion compensated MB variances
|
uint16_t *mc_mb_var; ///< Table for motion compensated MB variances
|
||||||
uint8_t *mb_mean; ///< Table for MB luminance
|
uint8_t *mb_mean; ///< Table for MB luminance
|
||||||
int32_t *mb_cmp_score; ///< Table for MB cmp scores, for mb decision FIXME remove
|
|
||||||
int b_frame_score; /* */
|
int b_frame_score; /* */
|
||||||
struct MpegEncContext *owner2; ///< pointer to the MpegEncContext that allocated this picture
|
struct MpegEncContext *owner2; ///< pointer to the MpegEncContext that allocated this picture
|
||||||
int needs_realloc; ///< Picture needs to be reallocated (eg due to a frame size change)
|
int needs_realloc; ///< Picture needs to be reallocated (eg due to a frame size change)
|
||||||
|
Reference in New Issue
Block a user