Mercurial > libavcodec.hg
changeset 5789:a40edc95456d libavcodec
export convert_matrix and add ff_ prefix
| author | bcoudurier |
|---|---|
| date | Mon, 08 Oct 2007 09:14:46 +0000 |
| parents | a3a2968e16ad |
| children | c3f2a6425d2d |
| files | mpegvideo.h mpegvideo_enc.c |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegvideo.h Mon Oct 08 09:09:19 2007 +0000 +++ b/mpegvideo.h Mon Oct 08 09:14:46 2007 +0000 @@ -724,6 +724,8 @@ void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int endy, int status); int ff_dct_common_init(MpegEncContext *s); +void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64], + const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra); extern enum PixelFormat ff_yuv420p_list[2];
--- a/mpegvideo_enc.c Mon Oct 08 09:09:19 2007 +0000 +++ b/mpegvideo_enc.c Mon Oct 08 09:14:46 2007 +0000 @@ -66,7 +66,7 @@ enum PixelFormat ff_yuv420p_list[2]= {PIX_FMT_YUV420P, -1}; -static void convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64], +void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64], uint16_t (*qmat16)[2][64], const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra) { int qscale; @@ -716,9 +716,9 @@ /* precompute matrix */ /* for mjpeg, we do include qscale in the matrix */ if (s->out_format != FMT_MJPEG) { - convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, + ff_convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, s->intra_matrix, s->intra_quant_bias, avctx->qmin, 31, 1); - convert_matrix(&s->dsp, s->q_inter_matrix, s->q_inter_matrix16, + ff_convert_matrix(&s->dsp, s->q_inter_matrix, s->q_inter_matrix16, s->inter_matrix, s->inter_quant_bias, avctx->qmin, 31, 0); } @@ -2861,7 +2861,7 @@ s->intra_matrix[j] = av_clip_uint8((ff_mpeg1_default_intra_matrix[i] * s->qscale) >> 3); } - convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, + ff_convert_matrix(&s->dsp, s->q_intra_matrix, s->q_intra_matrix16, s->intra_matrix, s->intra_quant_bias, 8, 8, 1); s->qscale= 8; }