Commit Graph
100 Commits
Author SHA1 Message Date
Benjamin Larsson 6b71ed1678 Remove dead assignments found by CSA
Originally committed as revision 18733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-03 09:32:40 +00:00
Benjamin Larsson 241f5eab32 Remove dead assignments found by CSA
Originally committed as revision 18731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-02 09:12:03 +00:00
Benjamin Larsson 10c773c12f Remove dead assignments found by CSA
Originally committed as revision 18730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-02 09:08:40 +00:00
Benjamin Larsson bdb8d99613 Proper subpacket size check for cook multichannel files.
Originally committed as revision 18693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-25 20:09:34 +00:00
Benjamin Larsson bb1135c8a3 Remove parentheses
Originally committed as revision 18692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-25 19:47:18 +00:00
Benjamin Larsson fcc01e646b Set the type of size in COOKSubpacket to unsigned
Originally committed as revision 18691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-25 18:43:30 +00:00
Benjamin Larsson ec32cfd2cc Make sure we only parse max amount of subpackets (5) in the cook decoder.
Originally committed as revision 18689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-25 17:46:27 +00:00
Benjamin Larsson da75426b26 Indent
Originally committed as revision 18688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-25 17:35:21 +00:00
Benjamin Larsson 0a704b5f21 Remove redundant code
Originally committed as revision 18687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-25 17:33:36 +00:00
Benjamin Larsson 9189d7eba6 Add Changelog for Cook multi channel support
Originally committed as revision 18686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-25 10:47:24 +00:00
Benjamin Larsson 67da31826f Support cook multichannel files.
Originally committed as revision 18685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-25 10:46:07 +00:00
Benjamin Larsson 7204850ea9 Fix the COOKDEBUG code
Originally committed as revision 18684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-25 10:25:14 +00:00
Benjamin Larsson 4a291c90fe Factor out COOKSubpacket, in preparation for multichannel support.
Originally committed as revision 18683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-25 10:20:48 +00:00
Benjamin Larsson 6c73a7d06c Remove redundant code, found by CSA
Originally committed as revision 18661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-22 13:52:33 +00:00
Benjamin Larsson 39b60944a8 Get rid of av_random in cook.c
Originally committed as revision 18079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 21:32:30 +00:00
Benjamin Larsson 3b0b84797e Get rid of av_random in nellymoserdec.c
Originally committed as revision 18078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 21:15:02 +00:00
Benjamin Larsson b217024706 Add cook channel count function, part of multichannel cook
Originally committed as revision 17992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 19:36:45 +00:00
Benjamin Larsson 0eec287596 Add max allowed subpackets in multichannel cook
Originally committed as revision 17991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 19:34:52 +00:00
Benjamin Larsson d4b3d0408f save avctx in cook decoder context and use it for av_log
Originally committed as revision 17988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 14:11:11 +00:00
Benjamin Larsson 7c119ced99 memset when category is >=7, part of cook multichannel
Originally committed as revision 17987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 14:04:25 +00:00
Benjamin Larsson aa8d024ce2 Allocate trellis tables on heap only when needed.
Originally committed as revision 16945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 18:51:02 +00:00
Benjamin Larsson 673bcc3d0a I'll take care of qdm2 also
Originally committed as revision 16741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-24 10:52:26 +00:00
Benjamin Larsson 336c2ca585 Add size that is needed for the wmapro codec
Originally committed as revision 16533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 10:40:05 +00:00
Benjamin Larsson 13367a46bc channel layout support for ffmpeg.c
Originally committed as revision 15956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-29 19:32:42 +00:00
Benjamin Larsson b836fb0060 Silence warning in imc decoder
Originally committed as revision 15844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 10:16:07 +00:00
Benjamin Larsson 31d5113a15 Set channel_layout
Originally committed as revision 15843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 09:54:09 +00:00
Benjamin Larsson 92765276fb Proper channel output reordering for the dca decoder.
Originally committed as revision 15832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:31:03 +00:00
Benjamin Larsson e22192ecc3 Comment typo
Originally committed as revision 15801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-11 08:46:29 +00:00
Benjamin Larsson cd027b511e Remove channel layout table that only should be used by encoders.
Originally committed as revision 15800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-11 08:30:32 +00:00
Benjamin Larsson c6eaba62e8 Change the dca channel layout, S -> SIDE not BACK.
Originally committed as revision 15769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-02 21:51:27 +00:00
Benjamin Larsson 48dc2fb800 Guess channel layout based on the number of channels if a custom layout is specified in amode.
Originally committed as revision 15766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-01 20:49:37 +00:00
Benjamin Larsson 87c3b9bce3 Add channel layouts for dca.
Originally committed as revision 15765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-01 20:27:05 +00:00
Benjamin Larsson d5b3a86393 Fix compilation, remove stray ;
Originally committed as revision 15735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-28 15:20:52 +00:00
Benjamin Larsson 9ed73b4870 Fix selection of quant step table
Originally committed as revision 15734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-28 14:50:46 +00:00
Benjamin Larsson 6f02853d14 Fix huffman coded dca samples.
Originally committed as revision 15733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-28 14:43:06 +00:00
Benjamin Larsson ba5fc967f6 Disable codec downmix when not using simd instead of silently produce silence
Originally committed as revision 15715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 10:14:16 +00:00
Benjamin Larsson 1402ee721a Fix dca decoder with non simd float2int16 conversion
Originally committed as revision 15714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 09:54:53 +00:00
Benjamin Larsson 49c91c34b3 Fix compilation with TRACE
Originally committed as revision 15713 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 09:50:15 +00:00
Benjamin Larsson 2426bb960a add ok parts to the rm demuxer for SIPRO support
Originally committed as revision 15426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 12:12:25 +00:00
Benjamin Larsson faeedbbb06 Add support for Acelp.net fourcc and codecid, remuxing wav to avi should work
Originally committed as revision 15425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 10:59:42 +00:00
Benjamin Larsson 1b46683c80 FOURCC addition: added 3IV2, another mpeg4 id. incoming/video_3iv2/video_3iv2.avi
Originally committed as revision 14681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-10 15:34:29 +00:00
Benjamin Larsson 20455a335b Reduce the loglevel on a log message in the Nellymoser decoder. Related to Roundup 447.
Originally committed as revision 14348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-23 12:21:56 +00:00
Benjamin Larsson d11f9e1b15 Prevent the qdm2 code from overreading/overflowing. Fixes Coverity ID 112 run 2
Originally committed as revision 14309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 18:53:04 +00:00
Benjamin Larsson f7dbf86d93 Fix for possible null pointer dereferencing, closes Coverity report 68 run 2.
Originally committed as revision 14305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 15:48:53 +00:00
Benjamin Larsson 7769875db3 redundant assignment found by Clang
Originally committed as revision 14096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-07 08:29:08 +00:00
Benjamin Larsson 75d27450a1 Add support for mp3 contained in oma
Originally committed as revision 13980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:59:52 +00:00
Benjamin Larsson de8c8181a9 Rearrange parameter logic
Originally committed as revision 13979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:57:57 +00:00
Benjamin Larsson f035fe9755 Add more codec IDs and tags.
Originally committed as revision 13977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:39:38 +00:00
Benjamin Larsson f059427cf0 Forgotten oma docs stuff
Originally committed as revision 13766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-13 14:51:55 +00:00
Benjamin Larsson ea66253452 We have an Oma demuxer now
Originally committed as revision 13749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 20:11:04 +00:00
Benjamin Larsson b339f0c6be Oma demuxer
Originally committed as revision 13712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-08 17:12:25 +00:00
Benjamin Larsson 17125bd9da Sample tested and the code worked so the comment is removed
Originally committed as revision 13650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:46:38 +00:00
Benjamin Larsson d311f8f3e3 Update copyright and text
Originally committed as revision 13239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 19:42:02 +00:00
Benjamin Larsson fde8052e4e dts probe
Originally committed as revision 13040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-03 00:12:32 +00:00
Benjamin Larsson c401efdefe Long name spelling fixes
Originally committed as revision 13038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-02 22:58:16 +00:00
Benjamin Larsson 63d864434d Raw dts muxer
Originally committed as revision 12912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-20 20:28:12 +00:00
Benjamin Larsson 4a24837e07 Only set channels in the stream if previously unset, fixes resampling crash on broken dca frames
Originally committed as revision 12780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-10 06:15:17 +00:00
Benjamin Larsson ebf71dbda5 Don't use unchecked data from the bitstream.
Originally committed as revision 12351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 14:22:02 +00:00
Benjamin Larsson 40bcf4c780 Support setting the debuglevel (-g level) with --enable-debug=#
Originally committed as revision 12298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 16:59:53 +00:00
Benjamin Larsson 800b9c24b7 Add more riff IDs to support remuxing.
Originally committed as revision 12266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 20:34:44 +00:00
Benjamin Larsson 7bb8d51c1f Riff ids for wmapro and wmavoice, this adds support for stream copy of these codecs between asf,avi and wav containers.
Originally committed as revision 12182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-23 23:30:41 +00:00
Benjamin Larsson ad40b15394 silence wmaenc.c:181: warning:suggestparentheses around assignment used as truth value
Originally committed as revision 11940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 13:44:08 +00:00
Benjamin Larsson 9389e63c83 Enable proper output from the LFE channel, based on patch from Mathias Rauen dear dot madshi at net
Originally committed as revision 11407 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-04 20:02:10 +00:00
Benjamin Larsson 107b5f93dd Reindent
Originally committed as revision 11285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 11:22:39 +00:00
Benjamin Larsson 7b76c22465 Correctly handle FLV_CODECID_NELLYMOSER_8HZ_MONO files
Originally committed as revision 11284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 11:21:10 +00:00
Benjamin Larsson b529ab37ba 4 months of hard development and finally it's done. Closes issue 58. Adpcm_swf regressions tests.
Originally committed as revision 11160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 15:35:23 +00:00
Benjamin Larsson 289987e454 Use memcpy instead of for loop
Originally committed as revision 11051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-18 10:54:38 +00:00
Benjamin Larsson 2b992d0e88 Small simplification
Originally committed as revision 11026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-14 16:33:14 +00:00
Benjamin Larsson f83579b1a6 Remove unused variable
Originally committed as revision 10922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-04 10:27:32 +00:00
Benjamin Larsson ff4b050ab4 Unaligned memory access rcrash fix
Originally committed as revision 10781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 15:16:07 +00:00
Benjamin Larsson d34841f1a8 Added myself as maintainer of the Nellymoser codec
Originally committed as revision 10779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 14:32:04 +00:00
Benjamin Larsson 636b13c5fc Nellymoser ASAO decoder
Originally committed as revision 10741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-15 16:26:02 +00:00
Benjamin Larsson 622d633260 Cosmetics, indentation.
Originally committed as revision 10145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-19 20:34:27 +00:00
Benjamin Larsson 1cbe9d6a78 Trellis quantization support for adpcm_swf.
Originally committed as revision 10144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-19 20:31:53 +00:00
Benjamin Larsson 00a254b7fe Don't encode the first sample twice.
Originally committed as revision 9962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-06 19:49:18 +00:00
Benjamin Larsson 56fd7cc584 Better error reporting.
Originally committed as revision 9056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-18 10:06:07 +00:00
Benjamin LarssonandAurelien Jacobs 78a010fb00 Only compile fft and mdct when needed.
Initial patch by Benjamin Larsson.

Originally committed as revision 9046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 12:26:04 +00:00
Benjamin Larsson c17a53b71f Use FFABS instead of abs.
Originally committed as revision 9045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 11:03:43 +00:00
Benjamin Larsson 54353abef2 Remove lots of unused commented code. (Cleanup)
Originally committed as revision 9041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 07:50:08 +00:00
Benjamin Larsson 3bcb658c36 Change default 1 pass blocksize to 64x64.
Originally committed as revision 9040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-17 07:47:02 +00:00
Benjamin Larsson d2bc04738b Added support for instances where linesize[0] is negative.
Based on patch by Jason Askew, jason dot askew at gmail dot com.

Originally committed as revision 9006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-12 19:37:26 +00:00
Benjamin Larsson b8c4a51598 Deobfuscade decodeTonalComponents calling logic.
Originally committed as revision 8757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-18 19:58:20 +00:00
Benjamin Larsson 1e8391777d Version bump, atrac3 added.
Originally committed as revision 8756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-18 19:49:47 +00:00
Benjamin Larsson 0bc8590551 Let maintain things. Added myself as atrac3 maintainer.
Originally committed as revision 8755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-18 19:48:52 +00:00
Benjamin Larsson 10e26bc782 Atrac3 decoder.
Originally committed as revision 8747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-17 20:53:39 +00:00
Benjamin Larsson 940d8f7614 As usual Real actually took something existing and rebranded it.
Cook looks very much like G.722.1.

Originally committed as revision 8723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-12 15:37:23 +00:00
Benjamin Larsson d64b88d440 Per reference swf/flv adpcm encoder.
Originally committed as revision 8713 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-11 13:10:13 +00:00
Benjamin Larsson 8736d68a80 Respect the gop size (-g) for marking I frames. Use -g 0 gives the old behaviour.
Originally committed as revision 8326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 21:01:33 +00:00
Benjamin Larsson 64472fcff1 Simplify, use avctx->frame_number.
Originally committed as revision 8309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-10 09:20:07 +00:00
Benjamin Larsson e9509536a9 Set FLV_SAMPLESSIZE_16BIT for ADPCM.
Originally committed as revision 8201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 09:16:38 +00:00
Benjamin Larsson 34cee63432 Complete the video format enum.
Originally committed as revision 8100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-23 21:09:50 +00:00
Benjamin Larsson a0536d22b3 Cosmetics.
Originally committed as revision 8099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-23 21:08:43 +00:00
Benjamin Larsson 0564528eff Clairyfication of the gain tool struct.
Originally committed as revision 8023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-18 20:35:22 +00:00
Benjamin Larsson dd462087fd Don't use byte swaps and use the more portable way
of declaring aligned buffers.

Originally committed as revision 8021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-18 19:12:20 +00:00
Benjamin Larsson 753c9d3260 Check that js_vlc_bits from the extradata is in a valid range.
Originally committed as revision 7756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-29 10:42:36 +00:00
Benjamin Larsson 862be28b19 Get rid of the COOKextradata struct. And use valid C to parse the extradata.
Originally committed as revision 7755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-29 10:32:14 +00:00
Benjamin Larsson 6e584be16c Kill a warning and don't use modulus.
Originally committed as revision 7754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-29 08:58:03 +00:00
Benjamin Larsson a5b8a69c70 decode_subpacket cleanup by Ian Braithwaite ian braithwaite dot dk.
Originally committed as revision 7753 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-29 08:37:22 +00:00
Benjamin Larsson d7973906de Sort out the diffrent cook versions.
Originally committed as revision 7739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-28 10:17:48 +00:00
Benjamin Larsson 70ab75eb6a Cook stereo (MONO_COOK2) bugfix, by Ian Braithwaite.
ian at braithwaite dot dk.

Originally committed as revision 7738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-28 10:05:21 +00:00