Commit Graph

140 Commits

Author SHA1 Message Date
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 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
Stefano Sabatini 9106a698e7 Rename bitstream.h to get_bits.h.
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
Thilo Borgmann 7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +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
Ramiro Polla e05c8d0682 use intptr_t to cast pointers to int in codecs maintained by benjamin larsson
Originally committed as revision 18027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-17 20:47:31 +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
Daniel Verkamp 5ef251e504 Add missing av_cold in static init/close functions.
Patch by Daniel Verkamp daniel at drv dot nu.

Originally committed as revision 17526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 13:48:55 +00:00
Diego Biurrun 4b81366b07 Add av_cold attribute to init function.
Originally committed as revision 17082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 23:25:56 +00:00
Diego Biurrun bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Stefano Sabatini 9c868219e9 Replace calls to the deprecated function av_init_random() with
corresponding calls to av_random_init().

Originally committed as revision 16682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 23:04:33 +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
Loren Merritt d46ac5bfde mdct wrapper function to match fft
Originally committed as revision 14703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:38:30 +00:00
Loren Merritt 0a570e826d remove mdct tmp buffer
Originally committed as revision 14702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:36:36 +00:00
Peter Ross fd76c37fd9 Modify all codecs to report their supported input and output sample format(s).
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 10:47:31 +00:00
Robert Swain f5048aaf69 Remove now unused variable
Originally committed as revision 13889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:26:00 +00:00
Robert Swain 9146e4d61c Add generic ff_sine_window_init function and implement in codecs appropriately
Originally committed as revision 13888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:12:27 +00:00
Stefano Sabatini fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:50:13 +00:00
Diego Biurrun f4433de9ef consistency cosmetics: indices --> indexes
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 23:14:25 +00:00
Michael Niedermayer 0c5421585a Move const *pow2tab out of context.
Originally committed as revision 13366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 22:31:44 +00:00
Michael Niedermayer 158bf33e36 simplify init_pow2table
Originally committed as revision 13365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 22:28:33 +00:00
Michael Niedermayer 40756c172c Merge init_rootpow2table and init_pow2table.
Originally committed as revision 13364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 22:23:16 +00:00
Diego Biurrun 245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Stefano Sabatini d5202e4fda Add long names to many AVCodec declarations.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 10:52:44 +00:00
Michael Niedermayer 21cc343d85 const
Originally committed as revision 11722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 04:07:48 +00:00
Baptiste Coudurier 29e15adc34 add const, fix warning: cook.c:276: warning: passing argument 2 of 'maybe_reformat_buffer32' discards qualifiers from pointer target type
Originally committed as revision 11674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-30 23:58:44 +00:00
Aurelien Jacobs aee481cebe use av_clip_int16() where it makes sense
Originally committed as revision 10078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-11 22:48:55 +00:00
Carl Eugen Hoyos af7d793c00 kill warning
patch by Carl Eugen Hoyos [cehoyos * ag or at]

Originally committed as revision 9981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-08 07:04:23 +00:00
Diego Biurrun 319919734d Remove unused variable.
Originally committed as revision 9868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-02 07:42:06 +00:00
Diego Biurrun df3a80b50a cosmetics: misc typo fixes
Originally committed as revision 9815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-28 12:46:26 +00:00
Marc Hoffman b5f3f2b846 fixpoint: renaming all lowlevel arithmetic routines to xxx_float
Originally committed as revision 9714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-17 11:06:12 +00:00
Marc Hoffman f1639f69b4 cosmetics: adding some white space to align the arguments of a couple of functions
Originally committed as revision 9709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-17 00:36:47 +00:00
Marc Hoffman f999b63c77 float_t was a typo that compiled on macosx
Originally committed as revision 9703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 14:45:54 +00:00
Marc Hoffman dae92b62a3 fixpoint: move cplscales to context structure and provide hook for data format conversion
Originally committed as revision 9702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 13:24:43 +00:00
Marc Hoffman 28d997f932 fixpoint: lowlevel functional abstraction for all buffer arithmetics
Originally committed as revision 9701 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 12:32:41 +00:00
Marc Hoffman e66442f4e3 fixpoint: separate windowing arithmetic imlt_window_float
Originally committed as revision 9700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 11:52:46 +00:00
Marc Hoffman dc0c20f99b separate the actual math for recovering stereo from a signal channel, this is to allow fixpoint implementation
Originally committed as revision 9698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 11:25:56 +00:00
Marc Hoffman 29b4b8351b separating saturation codes so that we can support other data formats
Originally committed as revision 9693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 01:28:58 +00:00
Marc Hoffman 8c9d2954f7 moving automatic allocation of joint_decode/decode_buffer
to a statically allocated buffer decode_buffer_0 in cook instance.

Originally committed as revision 9692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-15 22:06:08 +00:00
Marc Hoffman 2843a452c9 cosmetic changing hardwired 20 to SUBBAND_SIZE
Originally committed as revision 9691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-15 21:48:17 +00:00
Diego Biurrun e5a389a1b7 license header consistency cosmetics
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:40:25 +00:00
Diego Biurrun 2029f312e8 Remove redundant #inclusion of common.h, avcodec.h already #includes it.
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 09:00:44 +00:00
Ramiro Polla de8e2c1d22 Use 1 array with double the size instead of 2 arrays with normal size
Eliminates need for concatenation and adds proper fix for FIXME

Originally committed as revision 8958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 22:24:23 +00:00
Ramiro Polla a5cb1f13ba Add bias instead of -32 or 0, as is done in g.722.1
Originally committed as revision 8957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 22:00:08 +00:00
Ramiro Polla 39938968e8 Indentation for previous patch
Originally committed as revision 8956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 21:57:50 +00:00
Ramiro Polla 6b01997012 Add another tmpbias variable, as bias' value will be used later
Originally committed as revision 8955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 21:56:22 +00:00
Ramiro Polla cdb59552df Fix logic for return value of init_vlc
Originally committed as revision 8954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 21:50:01 +00:00
Diego Biurrun 5a6a6cc7dc Fix multiple "‘inline/static’ is not at beginning of declaration" warnings.
Originally committed as revision 8894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-05 12:18:14 +00:00
Ramiro Polla a31978e97c Simplify, patch by Ramiro Polla.
ramiro ta lisha tod ufsc tod br

Originally committed as revision 8754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-18 19:47:22 +00:00
Ramiro Polla 4620ce8bb8 Remove unused vars, patch by Ramiro Polla.
ramiro ta lisha tod ufsc tod br

Originally committed as revision 8753 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-18 19:46:42 +00:00
Ramiro Polla d9fd5461aa Remove unused vars, patch by Ramiro Polla.
ramiro ta lisha tod ufsc tod br

Originally committed as revision 8752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-18 19:44:54 +00:00
Ramiro Polla b707cbb3e8 Cosmetics, patch by Ramiro Polla.
ramiro ta lisha tod ufsc tod br

Originally committed as revision 8751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-18 19:44:04 +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
Ian Braithwaite 058ee0cf95 Small simplifications to subband coefficient handling and use av_random().
Patch by Ian Braithwaite ian .. braithwaite ... dk

Originally committed as revision 8456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-20 18:08:51 +00:00
Ian Braithwaite baab295750 subband_coef_noise -> subband_coef_sign
Cosmetics patch by Ian Braithwaite ian .. braithwaite dot dk

Originally committed as revision 8417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 21:22:10 +00:00
Ian Braithwaite 85e7386ae0 Combine the window and overlap loops,
and get rid of the data swapping.

Patch by Ian Braithwaite <dk dot braithwaite at ian>

Originally committed as revision 8387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 19:44:02 +00:00
Ian Braithwaite e7485bf378 Replace custom modified discrete cosine transform with ffmpeg's own.
This does alter the decoded output, but not by much.
The new output is closer to that produced by Real's "official" decoder,
and the decoder runs slightly faster.

Patch by Ian Braithwaite ian at braithwaite dot dk

Originally committed as revision 8325 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 20:30:06 +00:00
Ian Braithwaite d0429b4ff5 Simplify gain block handling.
Patch by Ian Braithwaite <ian at braithwaite dot dk>

Originally committed as revision 8298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-08 20:43:51 +00:00
Ian Braithwaite 4ff5e6563e Don't output the first two frames, since they don't contain valid audio.
This also eases comparison of decoded output with Real's binary decoder.

Patch by Ian Braithwaite <ian at braithwaite dot dk>

Originally committed as revision 8297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-08 19:47:03 +00:00
Reimar Döffinger f66e4f5f9e Add av_ prefix to clip functions
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-25 10:27:12 +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
Benjamin Larsson b3203b64c6 Get rid of one warning.
Originally committed as revision 7735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-27 17:30:54 +00:00
Benjamin Larsson 162b983598 av_log(NULL,... -> av_log(avctx,.. where appropriate.
Originally committed as revision 7319 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-14 17:58:25 +00:00
Diego Biurrun b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Aurelien Jacobs 5902bdd8d4 cook shouldn't try to enforce the bitstream reader type
Originally committed as revision 6080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 21:59:20 +00:00
Michael Niedermayer 3a1a7e32ac sanity checks, some might have been exploitable ...
Originally committed as revision 5369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 10:45:26 +00:00
Alexander Strasser 5c4b1b2538 Don't use pow/powf functions where we just need integer arithmetic.
approved by Benjamin

Originally committed as revision 4973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-10 11:59:38 +00:00
Benjamin Larsson 2e9c78d354 Fix broken cosmetics commit and add a check for valid headers.
Originally committed as revision 4945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-06 11:21:10 +00:00
Benjamin Larsson 7f129a33b1 Small cosmetics and better variable names.
Originally committed as revision 4944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-06 11:03:37 +00:00
Diego Biurrun 5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Benjamin Larsson 51bb91cb24 Incorrect check removed.
Originally committed as revision 4823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-07 23:38:17 +00:00
Benjamin Larsson 560b10a6c3 Dual mono stereo strems sound ok now, added sanity checks and removed
some unused variables and redundant memsets.
Patch by Benjamin Larsson

Originally committed as revision 4816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-06 12:41:57 +00:00
Benjamin Larsson 7022003581 Fix an out of array access and some minor cleanup of the code.
All available cook samples decode correctly now.
patch by Benjamin Larsson < banan ** at ** student ** dot ** ltu ** dot ** se >

Originally committed as revision 4810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-04 12:48:10 +00:00
Benjamin Larsson b7c24ff668 This patch adds some support for non-joint stereo streams. It also
removes some fixmes.
Patch by Benjamin Larsson

Originally committed as revision 4733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-11 00:56:39 +00:00
Benjamin Larsson e0f7e32970 Cook compatibe decoder, patch by Benjamin Larsson
Add cook demucing, change rm demuxer so that it reorders audio packets
before sending them to the decoder, and send minimum decodeable sized
packets; pass only real codec extradata fo the decoder
Fix 28_8 decoder for the new demuxer strategy

Originally committed as revision 4726 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-09 16:08:18 +00:00