Commit 7e4995c3 authored by Michael Niedermayer's avatar Michael Niedermayer

move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even...

move q_*_matrix out of MpegEncContext (40k ->23k) dct_quantize() is even slightly faster now, dont ask my why ...

Originally committed as revision 2411 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c4f1e443
...@@ -442,6 +442,9 @@ int MPV_common_init(MpegEncContext *s) ...@@ -442,6 +442,9 @@ int MPV_common_init(MpegEncContext *s)
CHECKED_ALLOCZ(s->mb_type , mb_array_size * sizeof(uint8_t)) //needed for encoding CHECKED_ALLOCZ(s->mb_type , mb_array_size * sizeof(uint8_t)) //needed for encoding
CHECKED_ALLOCZ(s->lambda_table, mb_array_size * sizeof(int)) CHECKED_ALLOCZ(s->lambda_table, mb_array_size * sizeof(int))
CHECKED_ALLOCZ(s->q_intra_matrix, 64*32 * sizeof(int))
CHECKED_ALLOCZ(s->q_inter_matrix, 64*32 * sizeof(int))
} }
CHECKED_ALLOCZ(s->picture, MAX_PICTURE_COUNT * sizeof(Picture)) CHECKED_ALLOCZ(s->picture, MAX_PICTURE_COUNT * sizeof(Picture))
...@@ -560,6 +563,8 @@ void MPV_common_end(MpegEncContext *s) ...@@ -560,6 +563,8 @@ void MPV_common_end(MpegEncContext *s)
av_freep(&s->error_status_table); av_freep(&s->error_status_table);
av_freep(&s->mb_index2xy); av_freep(&s->mb_index2xy);
av_freep(&s->lambda_table); av_freep(&s->lambda_table);
av_freep(&s->q_intra_matrix);
av_freep(&s->q_inter_matrix);
for(i=0; i<MAX_PICTURE_COUNT; i++){ for(i=0; i<MAX_PICTURE_COUNT; i++){
free_picture(s, &s->picture[i]); free_picture(s, &s->picture[i]);
......
...@@ -457,8 +457,8 @@ typedef struct MpegEncContext { ...@@ -457,8 +457,8 @@ typedef struct MpegEncContext {
int coded_score[6]; int coded_score[6];
/** precomputed matrix (combine qscale and DCT renorm) */ /** precomputed matrix (combine qscale and DCT renorm) */
int __align8 q_intra_matrix[32][64]; int (*q_intra_matrix)[64];
int __align8 q_inter_matrix[32][64]; int (*q_inter_matrix)[64];
/** identical to the above but for MMX & these are not permutated */ /** identical to the above but for MMX & these are not permutated */
uint16_t __align8 q_intra_matrix16[32][64]; uint16_t __align8 q_intra_matrix16[32][64];
uint16_t __align8 q_inter_matrix16[32][64]; uint16_t __align8 q_inter_matrix16[32][64];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment