diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 00:47:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 21:52:55 +0100 |
| commit | 7cac568b39703934b6ee62411dfe949816f7f840 (patch) | |
| tree | 2a15a4943e17cc24a4ed64149e7de3d642d0109f /libavcodec/mpegvideo_enc.c | |
| parent | 7366bb38f10e5955be4280e11b7dbe15d2c0edb8 (diff) | |
| download | ffmpeg-7cac568b39703934b6ee62411dfe949816f7f840.tar.gz | |
avcodec/mjpegenc: support trellis quantization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index f17c6b33b2..811fbe870f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3811,8 +3811,9 @@ static int dct_quantize_trellis_c(MpegEncContext *s, start_i = 1; last_non_zero = 0; qmat = n < 4 ? s->q_intra_matrix[qscale] : s->q_chroma_intra_matrix[qscale]; - if(s->mpeg_quant || s->out_format == FMT_MPEG1) + if(s->mpeg_quant || s->out_format == FMT_MPEG1 || s->out_format == FMT_MJPEG) bias= 1<<(QMAT_SHIFT-1); + if (n > 3 && s->intra_chroma_ac_vlc_length) { length = s->intra_chroma_ac_vlc_length; last_length= s->intra_chroma_ac_vlc_last_length; @@ -3899,6 +3900,9 @@ static int dct_quantize_trellis_c(MpegEncContext *s, if(s->out_format == FMT_H263 || s->out_format == FMT_H261){ unquant_coeff= alevel*qmul + qadd; + } else if(s->out_format == FMT_MJPEG) { + j = s->idsp.idct_permutation[scantable[i]]; + unquant_coeff = alevel * s->intra_matrix[j] * 8; }else{ //MPEG1 j = s->idsp.idct_permutation[scantable[i]]; // FIXME: optimize if(s->mb_intra){ |