1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

9847 Commits

Author SHA1 Message Date
Sascha Sommer
4d67e067e2 Fix indentation after the previous commit
Originally committed as revision 19233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 10:33:18 +00:00
Sascha Sommer
891bd2e5aa Add support for escape coded wmapro run level coefficients
Originally committed as revision 19232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 10:28:55 +00:00
Sascha Sommer
9970c61b4b Introduce WMACoef typedef for decoded coefficients
and change default type to float so that the run level
decoding functionality can be shared with wmapro

Originally committed as revision 19231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 09:05:28 +00:00
Reimar Döffinger
a4276ba2ac Add support for encoding XSUB subtitles. Muxing support is still missing.
Based on code by DivX, Inc., heavily changed by Björn Axelsson [gecko acc.umu.se] and me.

Originally committed as revision 19222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 09:56:35 +00:00
Reimar Döffinger
4bbe788ab7 Add pts field to AVSubtitle, for use by future XSUB encoder (and XSUB decoder
should use it, too).

Originally committed as revision 19221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 08:28:07 +00:00
Vladimir Voroshilov
17dbe25438 G.729 decoding routine (skeleton, including parameters decoding).
Originally committed as revision 19218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-18 18:14:38 +00:00
Måns Rullgård
2da4e5e3e1 ARM: slightly faster NEON H264 horizontal loop filter
Originally committed as revision 19216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-17 22:33:04 +00:00
Jason Garrett-Glaser
351653a51e VC-1/WMV: Remove redundant ff_init_block_index() calls.
These are only supposed to be called once per row, not once per macroblock.
~1.5% faster according to oprofile.

Originally committed as revision 19213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-17 05:54:42 +00:00
Alexander Strange
d2d5e06735 H.264: Fix memory leaks with multithreading.
The threads' contexts and rbsp_buffers were not freed at the end
of decoding.

Fixes issue 1581

Originally committed as revision 19207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 21:50:36 +00:00
Jason Garrett-Glaser
73b02e2460 SSE version of clear_blocks
Originally committed as revision 19206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 17:33:57 +00:00
Jason Garrett-Glaser
010f98f96a VC-1/WMV3 decoding: don't clear blocks unless they're actually used.
~8% faster VC-1 decoding.
Possible future optimization: clear blocks after use instead of before, and for
DC-only blocks, only clear the DC coefficient.

Originally committed as revision 19205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 09:09:03 +00:00
Jason Garrett-Glaser
4f717c69ed idct_dc for VC-1/WMV3 decoder; ~11% faster decoding overall.
Includes mmx2 asm for the various functions.
Note that the actual idct still does not have an x86 SIMD implemtation.
For wmv3 files using regular idct, the decoder just falls back to simple_idct,
since simple_idct_dc doesn't exist (yet).

Originally committed as revision 19204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 09:00:55 +00:00
Jason Garrett-Glaser
41faa87886 Fix typo in vc1.c, make capitalization in warning/error messages more consistent.
Originally committed as revision 19203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 00:48:07 +00:00
Ramiro Polla
7cc8d616aa Fix unaligned accesses by doing bytewise access until aligned, then
continuing in 32-bit quantities.
Fixes crash observed on sparc during FATE mlp test.
Patch by Ramiro.

Originally committed as revision 19200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 14:38:30 +00:00
Baptiste Coudurier
2c608fed3a print error when dv frame profile cannot be found
Originally committed as revision 19193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 22:41:30 +00:00
Baptiste Coudurier
d509c743b7 check if frame size matches old sys and assumes corrupted input, fixes #1192
Originally committed as revision 19192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 22:34:28 +00:00
Peter Ross
7d58228055 Initialise MAD decode_block_intra() loop iterator to zero.
Originally committed as revision 19189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 09:55:28 +00:00
Vladimir Voroshilov
94994d8d9a G.729 decoder initialization routine (skeleton)
Originally committed as revision 19188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 02:31:06 +00:00
Vladimir Voroshilov
730c1e4a06 Replace MAX_SUBFRAME_SIZE and ctx->subframe_size with SUBFRAME_SIZE,
since subframe length is the same in all G.729 modes.

Originally committed as revision 19187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 02:29:39 +00:00
Justin Ruggles
7ca1295985 Do not guess the channel layout when getting its string value.
Originally committed as revision 19185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 22:33:13 +00:00
Justin Ruggles
0fb6a8b339 Remove the 3-front-channel layout from the list of channel layout
aliases.  Calling this "surround" is confusing and questionable.

Originally committed as revision 19183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 18:57:54 +00:00
Kostya Shishkov
0d5390b062 Correct reading bits in MPC SV8 base codes (when we have to read 0 or >16 bits).
Originally committed as revision 19182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 06:41:51 +00:00
Peter Ross
c63ea92bf2 Electronic Arts Madcow decoder
Originally committed as revision 19178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 02:19:41 +00:00
Alex Converse
d4eeef0c19 Cosmetics: Re-indent after last commit
Originally committed as revision 19175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 21:16:33 +00:00
Alex Converse
85e9296f41 Move TNS and swb_offset tables from aacdectab.h to aactab.c so that they can be
shared with the AAC encoder.

Originally committed as revision 19174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 21:14:45 +00:00
Jason Garrett-Glaser
fc3fc0293d Add new FOURCC (0x0003) for raw DIB video, set flip flag accordingly.
Fixes a few AVI files from what is probably a mobile phone video camera.

Originally committed as revision 19172 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 17:39:56 +00:00
Sascha Sommer
c0e9b2e84f Move run level decode functionality to ff_wma_run_level_decode
so that it can be reused for wmapro

Originally committed as revision 19171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 16:00:26 +00:00
Sascha Sommer
e8c7f81cf2 cosmetics: Add brackets between if/else
Originally committed as revision 19170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 15:48:41 +00:00
Sascha Sommer
523c09ca44 Add additional sample rates to the frame len bits calculation code
Originally committed as revision 19169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 15:38:11 +00:00
Sascha Sommer
cee4bb894d Move frame len bits calculation to ff_wma_get_frame_len_bits
so that it can be reused for wmapro

Originally committed as revision 19167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 15:21:43 +00:00
Diego Biurrun
ae1374ce10 cosmetics: Prettyprint and reformat wma.c closer to K&R style.
Originally committed as revision 19165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 13:12:13 +00:00
Jimmy Christensen
94d3d6a468 DPX (Digital Picture Exchange) image decoder
patch by Jimmy Christensen, jimmy ghost dk

Originally committed as revision 19163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12 05:29:29 +00:00
Diego Biurrun
477ffff218 The internal header libavutil/internal.h should not be used outside libavutil.
Originally committed as revision 19157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 20:18:29 +00:00
Diego Biurrun
233816820d 10l: Add vc1dec.o to the list of WMV3 objects, same as for VC-1.
Even after the split into shared and decoder-specific code, WMV3
continues to have the same dependencies as VC-1.

Originally committed as revision 19153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 09:40:24 +00:00
Diego Biurrun
b761659bef Split decoder-specific code off from vc1.c into vc1dec.c and keep code
shared between decoder and parser in vc1.c.

Originally committed as revision 19152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 09:31:31 +00:00
Baptiste Coudurier
844d17fb14 Add const in cast. Removes warning:
libavcodec/resample.c:215: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 19151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 08:16:08 +00:00
Baptiste Coudurier
89bc05d1ea give s->resample_context to avoid segfault, avclass was moved
Originally committed as revision 19150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 08:14:50 +00:00
David Conrad
77fc598d98 Disable native Vorbis encoder; quality is much worse than libvorbis and
there really isn't a reason to use it on purpose unless you're improving it.

Originally committed as revision 19149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 06:28:06 +00:00
Diego Biurrun
17492d5e40 Add code to enable and disable all VAAPI and VDPAU parts.
As a positive sideeffect, VAAPI/VDPAU objects need no longer be listed
for all VAAPI/VDPAU-related decoders.

Originally committed as revision 19145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-10 20:50:53 +00:00
Haruhiko Yamagata
b19d493f2b Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
progressive.

Patch by Haruhiko Yamagata, h D yamagata A nifty D com

Originally committed as revision 19141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 21:16:40 +00:00
Diego Biurrun
28b80940ff Express the H.264 parser dependency on the golomb code in configure instead of
in the Makefile as it is done for all other parts that depend on golomb.

Originally committed as revision 19139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 20:29:52 +00:00
Diego Biurrun
ef434a4b24 Add missing dependencies for H.264 and VC-1 parsers.
Originally committed as revision 19138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 20:07:01 +00:00
Luca Abeni
747069e254 Properly initialize AVFrames to default values in the MPEG decoder (fixes
the AVFrame pts when decoding MPEG 1 and 2 video)

Originally committed as revision 19136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-09 10:06:25 +00:00
Michael Niedermayer
f1b99cc63b Clarify (re)get_buffer() and CODEC_CAP_DR1 relation.
Originally committed as revision 19132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-07 19:30:54 +00:00
Diego Biurrun
1e15e5366f Remove comments that refer to fixed-point AMR implementations.
Originally committed as revision 19130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-07 15:15:45 +00:00
Baptiste Coudurier
ae8d21fb45 clarify avcodec_decode_audio3 and avcodec_decode_video2 doxygen
Originally committed as revision 19128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 20:16:53 +00:00
Vladimir Voroshilov
d4a9255699 K&R formatting of already submitted G.729 code
Originally committed as revision 19127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 17:40:33 +00:00
Vladimir Voroshilov
3bbc46102b Convert structure names to FFmpeg style
Originally committed as revision 19123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 12:42:11 +00:00
Stefano Sabatini
bf7e799c9e Remove '\p', '\c' and '\e' doxygen markup from doxy, as it should
improve plain text doxy readability.

See the thread: "[RFC] Should we use doxygen markup?".

Originally committed as revision 19122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 09:35:15 +00:00
Kostya Shishkov
10ae4bb477 Get new buffer during frame decoding in VB video decoder, not only once
during decoder initialization.

Originally committed as revision 19121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 08:46:08 +00:00
Vladimir Voroshilov
e72c65f583 Internal routine should not use name of standard function.
Use g729_prng instead.

Originally committed as revision 19120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 05:38:09 +00:00
Vladimir Voroshilov
8dbd0a95ee Remove ff_g729_ and g729_ prefixes from static routines.
Originally committed as revision 19118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 17:11:46 +00:00
Diego Biurrun
0b175caac8 Add support for external OpenCORE libraries for AMR-NB/WB support.
Originally committed as revision 19117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 12:32:40 +00:00
Baptiste Coudurier
f3908a82bc vmware video decoder uses reget_buffer, set CODEC_CAP_DR1
Originally committed as revision 19113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 09:05:17 +00:00
Baptiste Coudurier
6d3530ce2b zmbv decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 09:02:14 +00:00
Baptiste Coudurier
35b2c65756 vc1 and wmv3 decoders use MPV_frame_start which uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:53:39 +00:00
Baptiste Coudurier
c0bd35c70c renderware txd image decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:48:34 +00:00
Baptiste Coudurier
fa27733cea tmv decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:47:39 +00:00
Baptiste Coudurier
a08e67e70d tiff image decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:46:04 +00:00
Baptiste Coudurier
7f57905d55 vp3 and theora decoders use get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:44:26 +00:00
Baptiste Coudurier
89978e35a2 targa image decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:42:32 +00:00
Baptiste Coudurier
da04a14889 sun rasterfile image decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:41:19 +00:00
Baptiste Coudurier
2b2b7f41de snow decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:40:31 +00:00
Baptiste Coudurier
d65c1feead smacker video decoder uses reget_buffer, set CODEC_CAP_DR1
Originally committed as revision 19103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:37:55 +00:00
Baptiste Coudurier
c7af8b4e07 kmvc decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:36:26 +00:00
Baptiste Coudurier
80e8e25ef2 ptx image decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:35:36 +00:00
Baptiste Coudurier
f4499c955a libopenjpeg wrapper uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:33:58 +00:00
Baptiste Coudurier
d0a7936710 png decoder use get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:32:41 +00:00
Baptiste Coudurier
f1cdd863a5 pcx decoder use get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:29:29 +00:00
Baptiste Coudurier
5f27348bd3 pgm, pgmyuv, ppm, pbm and pam decoders use get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:29:05 +00:00
Baptiste Coudurier
0cf0c5bfa8 dxa decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:21:54 +00:00
Baptiste Coudurier
1ea9dbbb92 bfi decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:20:51 +00:00
Baptiste Coudurier
4a89072833 bmp decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:19:33 +00:00
Baptiste Coudurier
94c014c455 amv decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:18:17 +00:00
Baptiste Coudurier
be7e793261 bethesda vid decoder uses reget_buffer, set CODEC_CAP_DR1
Originally committed as revision 19092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:17:36 +00:00
Baptiste Coudurier
53e67085b2 4xm decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:12:14 +00:00
Baptiste Coudurier
7bbf3f2ca4 indeo3 decoder uses get_buffer, set CODEC_CAP_DR1
Originally committed as revision 19090 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 08:08:49 +00:00
Ramiro Polla
74a841af8b Replace more uses of __attribute__((aligned)) by DECLARE_ALIGNED.
Originally committed as revision 19089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-04 23:25:09 +00:00
Diego Biurrun
51222d1041 cosmetics: K&R style reformatting
Originally committed as revision 19088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-04 10:37:29 +00:00
Ramiro Polla
989b7181ac Use fewer macros in x86-optimized mlpdsp.
Fixes compilation on 32-bit llvm which didn't allow a cast in an m operand.

Originally committed as revision 19086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 23:48:28 +00:00
Michael Niedermayer
f4ebb334be Fix sei_ct_type check so it does not mistreat ct_type= unknown.
Originally committed as revision 19082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 19:24:51 +00:00
Michael Niedermayer
4d95ae1882 Print ct_type and pic_struct.
Originally committed as revision 19081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 19:23:34 +00:00
Alex Converse
ad5caf3ab7 AAC ADTS to AudioSpecificConfig bitstream filter
Originally committed as revision 19080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 18:50:46 +00:00
Reimar Döffinger
10f9ff9bf6 Set AV_PKT_FLAG_KEY in avcodec_decode_video.
This fixes decoding of MPNG, which currently is incorrectly decoded as
CorePNG delta frames.
CorePNG can not be correctly decoded via this old API either way.

Originally committed as revision 19079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 11:23:16 +00:00
Reimar Döffinger
8f3f2e0676 Add AV_PKT_FLAG_KEY and deprecate PKT_FLAG_KEY.
Originally committed as revision 19078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 11:20:35 +00:00
Michael Niedermayer
da45d5b9c6 Clarify the input AVPacket for avcodec_decode*()
Originally committed as revision 19077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 10:25:21 +00:00
Kostya Shishkov
9706d1c766 Check combined depth and number of components in TIFF decoder, thus eliminating
additional checks for each depth (like 48-bit gray vs. 48-bit RGB)

Originally committed as revision 19076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-02 15:31:51 +00:00
Reimar Döffinger
24dd21fa41 add #if CONFIG_ZLIB_DECODER around zlib_decomp function.
Fixes compilation when zlib is not available.

Originally committed as revision 19069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 19:51:21 +00:00
Reimar Döffinger
79183d3c3e mszh decompression: add a special case for an all-0 mask, i.e. 32 uncompressed
bytes in a row.
About 15% faster mszh_decomp on an Atom N270 for
http://samples.mplayerhq.hu/V-codecs/mszh-zlib/avimzsh_sample.avi

Originally committed as revision 19068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 18:17:33 +00:00
Reimar Döffinger
a7bfbe4e13 lcldec: ensure that the offset for av_memcpy_backptr is valid.
Originally committed as revision 19067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 17:44:35 +00:00
Reimar Döffinger
bbf306742c Fix memleak due to c->decomp_buf never being freed.
Originally committed as revision 19064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 11:47:52 +00:00
Reimar Döffinger
908425c758 Only call inflateEnd when we were actually using the zlib code.
Originally committed as revision 19063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 11:42:50 +00:00
Reimar Döffinger
4ad3df9da2 avctx->priv_data is initialized to 0, get rid of useless extra initialization.
Originally committed as revision 19062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 11:41:49 +00:00
Reimar Döffinger
7ffc844742 Merge variable declaration and initialization.
Originally committed as revision 19061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 11:35:20 +00:00
Reimar Döffinger
7c20421661 Use int-size types instead of char where it makes no difference.
Originally committed as revision 19060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 11:34:19 +00:00
Reimar Döffinger
7a15b25827 Take advantage of available input padding to optimize mszh_decomp
Originally committed as revision 19059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 11:32:03 +00:00
Reimar Döffinger
a5d2745d8e Change maskbit variable to contain (1 << maskbit)
Originally committed as revision 19058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:58:20 +00:00
Reimar Döffinger
e0b3af9059 Remove check that thanks to padding is no longer necessary.
Originally committed as revision 19057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:53:47 +00:00
Reimar Döffinger
0b99764459 100l, the compression field in lcl extradata must be interpreted as
int8_t, not uint8_t to allow -1 for "no compression".
The original code worked, but only when char was signed.

Originally committed as revision 19056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:50:54 +00:00
Reimar Döffinger
e4f141ad60 One more use for FFMIN.
Originally committed as revision 19055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:44:42 +00:00
Reimar Döffinger
0d48e6ec7f Pad the decompression buffer and use av_memcpy_backptr for the mszh decompression.
Originally committed as revision 19054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:42:26 +00:00
Reimar Döffinger
974ce78544 Mark srcptr as const in mszh_decomp
Originally committed as revision 19053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:38:17 +00:00
Reimar Döffinger
6065dcea37 Remove unnecessary put_bits/get_bits includes.
Originally committed as revision 19052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:37:05 +00:00
Reimar Döffinger
2bee59083d Use bytestream_get_le16 to simplify offset/count calculation for mszh decompression.
Originally committed as revision 19051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:35:39 +00:00
Reimar Döffinger
5a18221ba8 Remove useless & 0x1f
Originally committed as revision 19050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:31:37 +00:00
Reimar Döffinger
7b151a98b0 Document padding requirements of mszh_decomp srcptr buffer
Originally committed as revision 19049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:28:40 +00:00
Reimar Döffinger
5e5fe7dab5 Use srcptr_end variable to avoid having to update both srcptr and srclen.
Originally committed as revision 19048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:26:58 +00:00
Reimar Döffinger
dbc53ffc7c Change buffer size checks to avoid the undefined overflow case.
Originally committed as revision 19047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:23:38 +00:00
Reimar Döffinger
2fddb91e94 Simply use memcpy instead of AV_RN32/AV_WN32 combination.
Originally committed as revision 19046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:16:28 +00:00
Reimar Döffinger
661cb0d4a9 Fix decoding of multithread-encoded lcl files on big-endian.
Originally committed as revision 19045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:14:27 +00:00
Reimar Döffinger
ce22c7d075 Remove another useless ()
Originally committed as revision 19044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:05:21 +00:00
Reimar Döffinger
21bf2f51d7 Correct calculation of compressed input length.
Originally committed as revision 19043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 10:01:26 +00:00
Reimar Döffinger
46adcc27a2 Add sanity check for mthread_inlen, avoids crashes due to invalid reads.
Originally committed as revision 19042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 09:59:46 +00:00
Reimar Döffinger
1207c84adb Use FFMIN
Originally committed as revision 19041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 09:57:42 +00:00
Reimar Döffinger
c2c0c1c023 Factor out zlib decompression code to avoid massive code duplication,
particularly due to error checks.

Originally committed as revision 19040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 09:51:46 +00:00
Reimar Döffinger
f005808bf2 Use FFALIGN
Originally committed as revision 19039 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 09:28:29 +00:00
Reimar Döffinger
46c02b1b50 Move variable into block where it is used, avoiding a unused variable
warning if the zlib decoder is disabled.

Originally committed as revision 19038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 09:27:07 +00:00
Reimar Döffinger
2b550f816a Make lcldec less annoyingly verbose, move messages from AV_LOG_INFO to AV_LOG_DEBUG.
Originally committed as revision 19037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 09:23:54 +00:00
Reimar Döffinger
75f6d6c7e6 Get rid of unreachable code: avctx->codec_id == CODEC_ID_ZLIB is not possible
here when the zlib decoder is disabled and libavcodec is used correctly.

Originally committed as revision 19036 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 09:19:21 +00:00
Reimar Döffinger
56b44694bd lcldec.c: change #if CONFIG_ZLIB to #if CONFIG_ZLIB_DECODER.
The zlib related code should not be compiled in when the decoder is disabled
and it thus will never be used, even if we have zlib available.

Originally committed as revision 19035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 09:16:06 +00:00
Reimar Döffinger
445e0ab539 Get rid of extradata casts, it already has the right uint8_t * type
Originally committed as revision 19034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 09:12:17 +00:00
Reimar Döffinger
8c18e490c4 Make lcldec produce YUV output when the input file is coded like that, instead
of having it do its own inefficient fixed-point YUV to RGB conversion.

Originally committed as revision 19033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 09:09:32 +00:00
Reimar Döffinger
55619690e8 Remove now unused elements from LclEncContext
Originally committed as revision 19032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 08:54:41 +00:00
Reimar Döffinger
3b855101b4 Remove useless casts, extradata is already "uint8_t *"
Originally committed as revision 19031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 08:51:30 +00:00
Reimar Döffinger
e786d3cf80 lclenc.c: compress directly into output buffer instead of using a pointless
temporary buffer and then using put_bits to copy the data over.

Originally committed as revision 19030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 08:49:27 +00:00
Reimar Döffinger
32b3ab9b60 Remove superfluous () from lclenc.c
Originally committed as revision 19028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 08:41:11 +00:00
Reimar Döffinger
8f033e3e03 Cosmetics: fix indentation in lclenc.c
Originally committed as revision 19027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 08:38:51 +00:00
Reimar Döffinger
7ff7ac60e1 Remove "#if CONFIG_ZLIB" checks from lclenc.c, the file is never compiled
if zlib is not available.

Originally committed as revision 19026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 08:36:44 +00:00
Andreas Öman
f988ce6cad Add a lock manager API to libavcodec.
Allows an application to register a callback that manages mutexes
on behalf of FFmpeg.
With this callback registered FFmpeg is fully thread safe.

Originally committed as revision 19025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 06:51:18 +00:00
Baptiste Coudurier
b8df8d0d1c remove cast and use put_sbits, fix assertion in put_bits
Originally committed as revision 19024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 06:33:58 +00:00
Baptiste Coudurier
19c0563ac2 fix compilation with DEBUG defined
Originally committed as revision 19015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:26:22 +00:00
Alexander Strange
2b9969a945 H264: Fix out of bounds reads in SSSE3 MC
Reading above src[-2] isn't safe, so move loads and palignr ahead
3 pixels to load starting at the first pixel actually used.

Fixes issue941.

Originally committed as revision 18999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 22:19:14 +00:00
Reimar Döffinger
bb79016851 Use memcpy instead of per-pixel copy loop for rgb lcl format
Originally committed as revision 18997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 11:20:07 +00:00
Michael Niedermayer
ff8c65f482 Make sure offsets of mjpeg b are within the buffer.
Fixes issue1132

Originally committed as revision 18996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 10:04:09 +00:00
Reimar Döffinger
c40f366372 Remove useless () from lcldec for more consistency with "normal" FFmpeg coding style.
Originally committed as revision 18995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 09:07:10 +00:00
Reimar Döffinger
b157e3e56b Add casts to v210x decoder to avoid warnings.
Originally committed as revision 18994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 09:05:24 +00:00
Baptiste Coudurier
3bbcd0bb8a The GIF decoder uses get_buffer, so set DR1.
Originally committed as revision 18990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 04:07:14 +00:00
Baptiste Coudurier
87e302bfd8 remove unused hack which set AVCodecContext frame_number to pic timestamp
Originally committed as revision 18988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 00:24:20 +00:00
Baptiste Coudurier
2d05bc8641 set pict_type in VC-1 parser, fix some timestamps problems
Originally committed as revision 18987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 00:09:00 +00:00
David Conrad
f2264fa531 Support block-level quantization in Theora
Originally committed as revision 18986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-29 21:43:22 +00:00
Reimar Döffinger
abeee5ccb8 Use av_clip_uint8 instead of equivalent but unoptimzed code,
Originally committed as revision 18985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-29 20:15:38 +00:00
Måns Rullgård
9d48e28f00 MIPS: add MIPS64 and Loongson asm for MAC64/MLS64
Originally committed as revision 18979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-28 23:19:32 +00:00
Måns Rullgård
b716a79215 blackfin: disable broken dsputil functions
Originally committed as revision 18977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-28 22:36:06 +00:00
Måns Rullgård
2ba73ce8c6 blackfin: add missing const in function prototypes
Originally committed as revision 18976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-28 22:36:02 +00:00
Måns Rullgård
b195a73d47 blackfin: use optimised (I)DCT only when ctx->(i)dct_algo is auto
Originally committed as revision 18975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-28 22:35:58 +00:00
Måns Rullgård
08ec1397f6 blackfin: use DCT function pointer in dct_quantize_bfin()
Originally committed as revision 18974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-28 22:35:56 +00:00
Måns Rullgård
c9311a12d5 ARM: add some PLD in NEON IDCT
Originally committed as revision 18972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-28 17:19:28 +00:00
Baptiste Coudurier
2ed16f308a msrle uncompressed decoding, fix #1074 and many other samples under /RLE
Originally committed as revision 18970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-27 21:45:25 +00:00
Baptiste Coudurier
c0601d705c remove apparently unused real_pict_num from AVCodecContext
Originally committed as revision 18969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-27 21:40:10 +00:00
Baptiste Coudurier
a4a750d3b2 Rename alloc_picture to ff_alloc_picture and move its definition
in mpegvideo.h to avoid including mpegvideo_common.h in mpeg12.c,
because it contains motion code.

Originally committed as revision 18968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-27 19:55:35 +00:00