Commit Graph

168 Commits

Author SHA1 Message Date
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +00:00
D Richard Felker III
762b5cd50c 10l to michael for breaking gcc 2.95 compile :)
Originally committed as revision 4760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-20 23:07:25 +00:00
Michael Niedermayer
5639729bed unfinished jpeg-ls codec (feel free to finish it ...)
Originally committed as revision 4752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-18 13:17:44 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Diego Biurrun
344b825ceb Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
Originally committed as revision 4597 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-18 21:21:01 +00:00
Michael Niedermayer
95ae72b7e0 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
Originally committed as revision 4540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-26 19:05:44 +00:00
Reimar Döffinger
4eecd5bc66 reset restart_count when restart_interval is set and fill the
MJpegDecodeContext with 0 on init.

Originally committed as revision 4464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-22 08:48:00 +00:00
Michael Niedermayer
4c1a012e9c dont pre allocate uselessly large buffer and dont ignore FF_INPUT_BUFFER_PADDING_SIZE
Originally committed as revision 4452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 12:56:56 +00:00
Michael Niedermayer
e33943728e verify len field validity in mjpeg_decode_com()
Originally committed as revision 4451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 11:27:00 +00:00
Michael Niedermayer
aa6ff39bb0 check len (should fix #1165694)
Originally committed as revision 4436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-11 23:39:47 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 19:08:50 +00:00
Michael Niedermayer
934982c4ac avoid buf_size == 0 checks in every decoder
Originally committed as revision 3872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 18:09:06 +00:00
Michael Niedermayer
dd4f8a04fe jpeg style yuv fixes
Originally committed as revision 3852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-20 00:30:20 +00:00
Michael Niedermayer
0ecca7a49f various security fixes and precautionary checks
Originally committed as revision 3822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-12 00:16:25 +00:00
Burkhard Plaum
073c2593c9 Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
Originally committed as revision 3717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-27 18:10:06 +00:00
Jeff Muizelaar
21d7e2ff40 fix some type mismatches patch by (Jeff Muizelaar <muizelaar rogers com>)
Originally committed as revision 3712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-25 19:17:27 +00:00
Michael Niedermayer
55429b5534 workaround apps which dont provided correctly padded streams
Originally committed as revision 3695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-19 20:49:12 +00:00
Roberto Togni
9287acd197 Fix mjpeg-b (padding bytes can exist between end of sos and image data)
Originally committed as revision 3653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-29 20:45:47 +00:00
Michael Niedermayer
8e6325b96b mjpeg parser
Originally committed as revision 3634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-24 22:37:29 +00:00
Michael Niedermayer
21adafec2a lowres width/height cleanup 3rd try
Originally committed as revision 3522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-27 11:50:56 +00:00
Michael Niedermayer
f1cc95f0e9 10l
Originally committed as revision 3519 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-27 03:17:26 +00:00
Michael Niedermayer
4f8a831994 set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0)
Originally committed as revision 3518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-27 02:39:55 +00:00
Michael Niedermayer
6aeb03d887 low resolution decoding fix
Originally committed as revision 3510 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-26 09:00:37 +00:00
Alex Beregszaszi
02da1f0d71 new copyrights
Originally committed as revision 3404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-21 19:18:45 +00:00
Michael Niedermayer
8a515d2d9c get_bits(32) fix
Originally committed as revision 3393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-16 01:25:52 +00:00
Michael Niedermayer
53db1cae1c data_size = 0 cleanup
Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 14:37:16 +00:00
Michael Niedermayer
eea8c08fa8 cleanup & memleak fix
Originally committed as revision 3095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-30 17:42:58 +00:00
Michael Niedermayer
96d8b5a62c hmm av_log(..., get_bits());
Originally committed as revision 2939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-28 23:10:53 +00:00
Michael Niedermayer
046bee8620 always parse APP* as it sometimes contains startcodes which confuse the decoder otherwise
Originally committed as revision 2927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-26 02:06:34 +00:00
Michael Niedermayer
3edcacde04 init cleanup
Originally committed as revision 2899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-16 16:11:29 +00:00
Michael Niedermayer
9c3d33d67f multithreaded/SMP motion estimation
multithreaded/SMP encoding for MPEG1/MPEG2/MPEG4/H263
all pthread specific code is in pthread.c
to try it, run configure --enable-pthreads and ffmpeg ... -threads <num>
the internal thread API is a simple AVCodecContext.execute() callback which executes a given function pointer with different arguments and returns after finishing all, that way no mutexes or other thread-mess is needed outside pthread.c

Originally committed as revision 2772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-13 17:54:10 +00:00
Michael Niedermayer
99683a3077 2 byte shorter userdata for mpeg4
in the past it was startcode,string,00,7F,startcode
now it is startcode,string,stratcode
both are mpeg4 compliant, as according to the standard the userdata lasts until the next 00 00 01 (startcode prefix) but some very primitive decoders which simply skip until the first 00 byte and then expect the next valid startcode might fail with the old variant, just a theory though (didnt test if quicktime can decode it now)

Originally committed as revision 2767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-08 22:52:35 +00:00
Alex Beregszaszi
fe455f3328 get_bit_count -> put_bits_count
Originally committed as revision 2752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-06 15:27:31 +00:00
Michael Niedermayer
303e50e65b closed gop support & flags2 as all bits in flags are used
and a few minor things i forgot to commit ...

Originally committed as revision 2718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-22 19:48:28 +00:00
Michael Niedermayer
909678c707 grayscale mjpeg decoding support based upon a patch by (Leon Bottou (leonb))
Originally committed as revision 2687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-10 19:54:12 +00:00
Michael Niedermayer
5814beaa87 set AVCodecContext.width/height before get_buffer()
Originally committed as revision 2596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-11 11:17:54 +00:00
Michael Niedermayer
9515c0c107 better fix
Originally committed as revision 2513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-12 22:06:15 +00:00
Michael Niedermayer
7d58735942 small mjpeg fix by (James Stembridge <jstembridge at users dot sourceforge dot net>)
Originally committed as revision 2512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-12 22:01:13 +00:00
Michel Bardiaux
9b87956678 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
Originally committed as revision 2469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-03 13:26:22 +00:00
Alex Beregszaszi
369e2d5024 10l
Originally committed as revision 2418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-22 22:12:25 +00:00
Michael Niedermayer
5ff85f1d8b AVRational
sample_aspect_ratio
aspect ratio in JPEG JFIF is SAR not DAR !
removed nonsense SAR guessing code
various related cleanups
bugs?

Originally committed as revision 2403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-20 20:23:46 +00:00
Mike Melanson
764ef40015 disable encoders where appropriate (patch courtesy of BERO
<bero -at- geocities.co.jp>)

Originally committed as revision 2375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-14 04:15:53 +00:00
Alex Beregszaszi
ed7debda14 removed the obsolete and unused parameters of init_put_bits
Originally committed as revision 2366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-12 21:25:00 +00:00
Alex Beregszaszi
5e83dec46a Sunplus JPEG codec (SP5X) support
Originally committed as revision 2362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-11 21:49:10 +00:00
Michael Niedermayer
688cbabe2c recommit of
direct rendering support

Originally committed as revision 2356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-11 08:29:05 +00:00
Michael Niedermayer
158c7f059c use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
quality which was 1..31 float is now a 1..FF_LAMBDA_MAX int, and FF_QP2LAMBDA * qp can be used to convert to the new range

Originally committed as revision 2348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-07 11:32:40 +00:00
Fabrice Bellard
b160941221 removed warnings
Originally committed as revision 2248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-09 22:59:16 +00:00
Michael Niedermayer
68a4889157 10l
Originally committed as revision 2042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-14 21:07:50 +00:00
Michael Niedermayer
7e9e2b55c5 cleanup
Originally committed as revision 2038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-12 20:21:34 +00:00
Michael Niedermayer
ec0eeaa212 postprocessing support
fix duplicate frames bug?

Originally committed as revision 2031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-10 19:09:24 +00:00
Michael Niedermayer
0273ceebbd few more error checks
Originally committed as revision 2021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-08 22:12:17 +00:00
Michael Niedermayer
2a250222e6 CONFIG_ENCODERS cleanup
Originally committed as revision 1984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-22 11:08:22 +00:00
Alex Beregszaszi
eb60dddc2e some warning fixes
Originally committed as revision 1977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-20 15:21:25 +00:00
Michael Niedermayer
b1e6b355f7 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
Originally committed as revision 1968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-17 22:48:51 +00:00
Alex Beregszaszi
971eb237b7 10l
Originally committed as revision 1965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-16 15:06:31 +00:00
Michael Niedermayer
63efe9a7e6 cleanup
pegasus "pseudo yuv" (=RCT) lossless decoding support
bigendian fix?

Originally committed as revision 1963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-16 13:19:30 +00:00
Michael Niedermayer
e4d2b1f39a lossless jpeg decoding support
Originally committed as revision 1959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-15 00:15:57 +00:00
Michael Niedermayer
9fe690c88f optimize
Originally committed as revision 1900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-23 16:04:24 +00:00
Michael Niedermayer
6d50b2e673 cleanup
Originally committed as revision 1893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-20 01:03:40 +00:00
Falk Hüffner
3db320ea0c Warning fixes.
Originally committed as revision 1884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-15 01:34:47 +00:00
Michael Niedermayer
1984f6359e user setable quantizer bias
Originally committed as revision 1701 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-22 12:09:02 +00:00
Alex Beregszaszi
ce2749d2c4 simplified
Originally committed as revision 1655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-09 16:07:19 +00:00
Michael Niedermayer
983e3246b7 per file doxy
Originally committed as revision 1634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-06 11:32:04 +00:00
Michael Niedermayer
b0368839ac MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
bitexact cleanup

Originally committed as revision 1617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-03 14:54:00 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 16:35:48 +00:00
Zdenek Kabelac
dce778e0ea * check for potentialy problematic field len
Originally committed as revision 1572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-10 10:45:41 +00:00
Zdenek Kabelac
5c91a6755b * static,const,compiler warning cleanup
Originally committed as revision 1567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-10 09:35:32 +00:00
Michael Niedermayer
68f593b484 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
Originally committed as revision 1486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-21 17:34:12 +00:00
bubu
ccfddafbd9 warnings patch by (bubu <bubu at bubu dot net>)
Originally committed as revision 1386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-01 15:10:45 +00:00
Alex Beregszaszi
a46a7052bc disabled aspect code due to it is extra buggy
Originally committed as revision 1359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-22 22:34:42 +00:00
Michael Niedermayer
706fc4dea6 fixing aspect (hopefully, i couldnt reproduce the bug)
Originally committed as revision 1317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-06 15:01:48 +00:00
Michael Niedermayer
1e491e29c2 cleanup
adding AVVideoFrame
 moving quality, pict_type, key_frame, qscale_table, ... to AVVideoFrame
 removing obsolete variables in AVCodecContext
 skiping of MBs in b frames
 correctly initalizing AVCodecContext
 picture buffer cleanup

Originally committed as revision 1302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-04 10:04:03 +00:00
Alex Beregszaszi
1730832639 10l fix
Originally committed as revision 1300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-03 15:42:17 +00:00
Alex Beregszaszi
b135d9fb96 mjpegb support (need more samples)
Originally committed as revision 1258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-20 15:18:11 +00:00
Michael Niedermayer
218baf10f8 cleanup
Originally committed as revision 1173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-06 11:59:17 +00:00
Michael Niedermayer
81ada1ce9d cleanup
Originally committed as revision 1172 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-06 09:30:47 +00:00
Alex Beregszaszi
145956deee fixed some bugs in app parser - some jfif and adobe jpgs fixed
Originally committed as revision 1153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-02 22:49:13 +00:00
Alex Beregszaszi
f9745d55e6 fixed 10l
Originally committed as revision 1124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-31 09:24:25 +00:00
Alex Beregszaszi
f3a3444721 FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
Originally committed as revision 1094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-28 16:29:40 +00:00
Michael Niedermayer
1c0a593ac8 get_vlc2()
Originally committed as revision 1084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-27 21:02:47 +00:00
Arpi
055317a74c 3rd 10l - don't let it read data beyond the end of frame
Originally committed as revision 1083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-27 19:20:02 +00:00
Alex Beregszaszi
9d3748bed3 2nd 10l (noticed by arpi)
Originally committed as revision 1082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-27 19:11:06 +00:00
Alex Beregszaszi
7b5c80f6bb minor speedup noticed by arpi
Originally committed as revision 1081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-27 19:01:00 +00:00
Alex Beregszaszi
97d4469a74 10l
Originally committed as revision 1080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-27 18:03:42 +00:00
Alex Beregszaszi
109362cbf4 reworked decode_frame marker searching, fixes many non-working samples
Originally committed as revision 1079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-10-27 17:59:35 +00:00
Michael Niedermayer
2ad1516a6c idct permutation cleanup, idct can be selected per context now
fixing some threadunsafe code

Originally committed as revision 980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-29 22:44:22 +00:00
Michael Niedermayer
5596c60cce dont store version for bit-exact tests
Originally committed as revision 948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-14 22:07:35 +00:00
Alex Beregszaszi
85bf478ed9 complete aspect support
Originally committed as revision 944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-09-14 12:30:48 +00:00
Leon van Stuivenberg
d6afa9c671 handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
Originally committed as revision 826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-07-27 08:27:02 +00:00
Falk Hüffner
6b765cd276 Warning fix.
Originally committed as revision 747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-07-12 12:41:32 +00:00
Arpi
d85c5979d0 don't exit decoder after decoding first field -> fixes angels.avi interlacing
Originally committed as revision 746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-07-11 23:34:06 +00:00
Zdenek Kabelac
f197d19a21 * clean compiler warning
Originally committed as revision 733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-07-10 14:34:06 +00:00
Zdenek Kabelac
d859228038 * turned into debug message - it's annoying when watching mjpeg files
Originally committed as revision 707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-06-27 13:21:16 +00:00
Fabrice Bellard
ee4b748b7f use ff_idct_put()
Originally committed as revision 669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-06-05 18:35:28 +00:00
Zdenek Kabelac
cd4af68ad5 * started to cleanup name clashes for onetime compilation
Originally committed as revision 617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-27 16:42:14 +00:00
Fabrice Bellard
3093185ea6 fixed incorrect buffer handling
Originally committed as revision 597 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-25 22:39:29 +00:00
Fabrice Bellard
6000abfa89 removed useless header includes - use av memory functions
Originally committed as revision 522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-18 23:03:29 +00:00
Juanjo
564ef23d49 - Warning fix.
Originally committed as revision 476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-09 05:42:27 +00:00
Alex Beregszaszi
a69b930cd3 clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
Originally committed as revision 451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-07 17:55:02 +00:00
Alex Beregszaszi
723106b279 added support for various app headers, and writin FFmpeg comment
Originally committed as revision 450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-07 17:21:38 +00:00