Mercurial > libavcodec.hg
changeset 370:0eca28d16cbd libavcodec
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
| author | al3x |
|---|---|
| date | Tue, 07 May 2002 17:55:02 +0000 |
| parents | c60869851bb4 |
| children | 8187bb132d85 |
| files | common.h mjpeg.c mpegvideo.c mpegvideo.h |
| diffstat | 4 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/common.h Tue May 07 17:21:38 2002 +0000 +++ b/common.h Tue May 07 17:55:02 2002 +0000 @@ -902,4 +902,6 @@ /* math */ int ff_gcd(int a, int b); +#define CLAMP_TO_8BIT(d) ((d > 0xff) ? 0xff : (d < 0) ? 0 : d) + #endif
--- a/mjpeg.c Tue May 07 17:21:38 2002 +0000 +++ b/mjpeg.c Tue May 07 17:55:02 2002 +0000 @@ -388,6 +388,8 @@ { put_marker(&s->pb, SOI); + if (!s->mjpeg_data_only_frames) + { jpeg_put_comments(s); if (s->mjpeg_write_tables) jpeg_table_header(s); @@ -425,6 +427,7 @@ #else put_bits(&s->pb, 8, 0); /* select matrix */ #endif + } /* scan header */ put_marker(&s->pb, SOS);
--- a/mpegvideo.c Tue May 07 17:21:38 2002 +0000 +++ b/mpegvideo.c Tue May 07 17:55:02 2002 +0000 @@ -427,10 +427,11 @@ s->out_format = FMT_MJPEG; s->intra_only = 1; /* force intra only for jpeg */ s->mjpeg_write_tables = 1; /* write all tables */ + s->mjpeg_data_only_frames = 0; /* write all the needed headers */ s->mjpeg_vsample[0] = 2; /* set up default sampling factors */ s->mjpeg_vsample[1] = 1; /* the only currently supported values */ s->mjpeg_vsample[2] = 1; - s->mjpeg_hsample[0] = 2; + s->mjpeg_hsample[0] = 2; s->mjpeg_hsample[1] = 1; s->mjpeg_hsample[2] = 1; if (mjpeg_init(s) < 0) @@ -1658,7 +1659,7 @@ /* for mjpeg, we do include qscale in the matrix */ s->intra_matrix[0] = default_intra_matrix[0]; for(i=1;i<64;i++) - s->intra_matrix[i] = (default_intra_matrix[i] * s->qscale) >> 3; + s->intra_matrix[i] = CLAMP_TO_8BIT((default_intra_matrix[i] * s->qscale) >> 3); convert_matrix(s->q_intra_matrix, s->q_intra_matrix16, s->q_intra_matrix16_bias, s->intra_matrix, s->intra_quant_bias); }
--- a/mpegvideo.h Tue May 07 17:21:38 2002 +0000 +++ b/mpegvideo.h Tue May 07 17:55:02 2002 +0000 @@ -332,6 +332,7 @@ int mjpeg_hsample[3]; /* horizontal sampling factors, default = {2, 1, 1} */ int mjpeg_write_tables; /* do we want to have quantisation- and huffmantables in the jpeg file ? */ + int mjpeg_data_only_frames; /* frames only with SOI, SOS and EOI markers */ /* MSMPEG4 specific */ int mv_table_index;