virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avcodec/mjpegenc: dont store DQT for LJPEG

Browse Source 
This may improve compatibility of lgpegs generated by libavcodec
also encoded ljpegs become slightly smaller

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-24 01:02:51 +02:00
parent fb45de779c
commit 15d4965239
4 changed files with 26 additions and 24 deletions

2
libavcodec/mjpegenc.c

@ -111,6 +111,7 @@ static void jpeg_table_header(MpegEncContext *s)
int i, j, size; int i, j, size;
uint8_t *ptr; uint8_t *ptr;
if (s->avctx->codec_id != AV_CODEC_ID_LJPEG) {
/* quant matrixes */ /* quant matrixes */
put_marker(p, DQT); put_marker(p, DQT);
#ifdef TWOMATRIXES #ifdef TWOMATRIXES
@ -132,6 +133,7 @@ static void jpeg_table_header(MpegEncContext *s)
put_bits(p, 8, s->chroma_intra_matrix[j]); put_bits(p, 8, s->chroma_intra_matrix[j]);
} }
#endif #endif
}
if(s->avctx->active_thread_type & FF_THREAD_SLICE){ if(s->avctx->active_thread_type & FF_THREAD_SLICE){
put_marker(p, DRI); put_marker(p, DRI);

40
tests/ref/seek/vsynth2-ljpeg

@ -1,46 +1,46 @@
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96069 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96000
ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st:-1 flags:0 ts:-1.000000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96069 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96000
ret: 0 st:-1 flags:1 ts: 1.894167 ret: 0 st:-1 flags:1 ts: 1.894167
ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:4481864 size: 94870 ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:4478624 size: 94801
ret: 0 st: 0 flags:0 ts: 0.800000 ret: 0 st: 0 flags:0 ts: 0.800000
ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:1902318 size: 95465 ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:1900940 size: 95396
ret:-1 st: 0 flags:1 ts:-0.320000 ret:-1 st: 0 flags:1 ts:-0.320000
ret:-1 st:-1 flags:0 ts: 2.576668 ret:-1 st:-1 flags:0 ts: 2.576668
ret: 0 st:-1 flags:1 ts: 1.470835 ret: 0 st:-1 flags:1 ts: 1.470835
ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:3527724 size: 95724 ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:3525172 size: 95655
ret: 0 st: 0 flags:0 ts: 0.360000 ret: 0 st: 0 flags:0 ts: 0.360000
ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 854944 size: 94635 ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 854322 size: 94566
ret:-1 st: 0 flags:1 ts:-0.760000 ret:-1 st: 0 flags:1 ts:-0.760000
ret:-1 st:-1 flags:0 ts: 2.153336 ret:-1 st:-1 flags:0 ts: 2.153336
ret: 0 st:-1 flags:1 ts: 1.047503 ret: 0 st:-1 flags:1 ts: 1.047503
ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:2475566 size: 95649 ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:2473776 size: 95580
ret: 0 st: 0 flags:0 ts:-0.040000 ret: 0 st: 0 flags:0 ts:-0.040000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96069 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96000
ret: 0 st: 0 flags:1 ts: 2.840000 ret: 0 st: 0 flags:1 ts: 2.840000
ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4671498 size: 94595 ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4668120 size: 94526
ret: 0 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:0 ts: 1.730004
ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:4101338 size: 95353 ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:4098374 size: 95284
ret: 0 st:-1 flags:1 ts: 0.624171 ret: 0 st:-1 flags:1 ts: 0.624171
ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:1520284 size: 95410 ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:1519182 size: 95341
ret: 0 st: 0 flags:0 ts:-0.480000 ret: 0 st: 0 flags:0 ts:-0.480000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96069 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96000
ret: 0 st: 0 flags:1 ts: 2.400000 ret: 0 st: 0 flags:1 ts: 2.400000
ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4671498 size: 94595 ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4668120 size: 94526
ret: 0 st:-1 flags:0 ts: 1.306672 ret: 0 st:-1 flags:0 ts: 1.306672
ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:3145114 size: 95587 ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:3142838 size: 95518
ret: 0 st:-1 flags:1 ts: 0.200839 ret: 0 st:-1 flags:1 ts: 0.200839
ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 477226 size: 94261 ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 476880 size: 94192
ret: 0 st: 0 flags:0 ts:-0.920000 ret: 0 st: 0 flags:0 ts:-0.920000
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96069 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96000
ret: 0 st: 0 flags:1 ts: 2.000000 ret: 0 st: 0 flags:1 ts: 2.000000
ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4671498 size: 94595 ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4668120 size: 94526
ret: 0 st:-1 flags:0 ts: 0.883340 ret: 0 st:-1 flags:0 ts: 0.883340
ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:2093302 size: 95528 ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:2091786 size: 95459
ret:-1 st:-1 flags:1 ts:-0.222493 ret:-1 st:-1 flags:1 ts:-0.222493
ret:-1 st: 0 flags:0 ts: 2.680000 ret:-1 st: 0 flags:0 ts: 2.680000
ret: 0 st: 0 flags:1 ts: 1.560000 ret: 0 st: 0 flags:1 ts: 1.560000
ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:3719126 size: 95615 ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:3716438 size: 95546
ret: 0 st:-1 flags:0 ts: 0.460008 ret: 0 st:-1 flags:0 ts: 0.460008
ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1139238 size: 95032 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1138408 size: 94963
ret:-1 st:-1 flags:1 ts:-0.645825 ret:-1 st:-1 flags:1 ts:-0.645825

4
tests/ref/vsynth/vsynth1-ljpeg

@ -1,4 +1,4 @@
2b1a2d5ad7f357df955d8548320d13f7 *tests/data/fate/vsynth1-ljpeg.avi ef0a38e7c24a4d7367a461ad8acac2c1 *tests/data/fate/vsynth1-ljpeg.avi
6312924 tests/data/fate/vsynth1-ljpeg.avi 6309478 tests/data/fate/vsynth1-ljpeg.avi
c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ljpeg.out.rawvideo c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ljpeg.out.rawvideo
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200

4
tests/ref/vsynth/vsynth2-ljpeg

@ -1,4 +1,4 @@
db9fd56e154b1056c9443a82a96db6f5 *tests/data/fate/vsynth2-ljpeg.avi b691d815bb7e40ac4ff8c0e51d8c08ff *tests/data/fate/vsynth2-ljpeg.avi
4766902 tests/data/fate/vsynth2-ljpeg.avi 4763454 tests/data/fate/vsynth2-ljpeg.avi
dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-ljpeg.out.rawvideo dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-ljpeg.out.rawvideo
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200