summaryrefslogtreecommitdiffstats
path: root/libavcodec/atrac1.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) doc: update libavfilter documentation tls: Use the URLContext as logging context aes: Avoid illegal read and don't generate more key than we use. mpc7: Fix memset call in mpc7_decode_frame function atrac1: use correct context for av_log() apedec: consume the whole packet when copying to the decoder buffer. apedec: do not needlessly copy s->samples to nblocks. apedec: check output buffer size after calculating actual output size apedec: remove unneeded entropy decoder normalization. truespeech: use memmove() in truespeech_update_filters() vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check vorbisdec: remove unneeded buf_size==0 check vorbisdec: return proper error codes instead of made-up ones http: Don't add a Range: bytes=0- header for POST sunrast: Check for invalid/corrupted bitstream http: Change the chunksize AVOption into chunked_post http: Add encoding/decoding flags to the AVOptions avconv: remove some codec-specific hacks crypto: add decoding flag to options. tls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCK ... Conflicts: doc/libavfilter.texi libavcodec/atrac1.c libavcodec/sunrast.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atrac1: use correct context for av_log()Justin Ruggles2011-11-101-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-301-33/+60
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (51 commits) cin audio: use sign_extend() instead of casting to int16_t cin audio: restructure decoding loop to avoid a separate counter variable cin audio: use local variable for delta value cin audio: remove unneeded cast from void* cin audio: validate the channel count cin audio: remove unneeded AVCodecContext pointer from CinAudioContext dsicin: fix several audio-related fields in the CIN demuxer flacdec: use av_get_bytes_per_sample() to get sample size dca: handle errors from dca_decode_block() dca: return error if the frame header is invalid dca: return proper error codes instead of -1 utvideo: handle empty Huffman trees binkaudio: change short to int16_t binkaudio: only decode one block at a time. binkaudio: store interleaved overlap samples in BinkAudioContext. binkaudio: pre-calculate quantization factors binkaudio: add some buffer overread checks. atrac3: support float or int16 output using request_sample_fmt atrac3: add CODEC_CAP_SUBFRAMES capability atrac3: return appropriate error codes instead of -1 ... Conflicts: libavcodec/atrac1.c libavcodec/dca.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atrac1: return appropriate error codes instead of -1Justin Ruggles2011-10-291-5/+5
| |
| * atrac1: check for ff_mdct_init() failureJustin Ruggles2011-10-291-15/+22
| |
| * atrac1: use optimized float_interleave() function for stereo interleavingJustin Ruggles2011-10-291-7/+19
| |
| * atrac1: fix a typoJustin Ruggles2011-10-291-1/+1
| |
| * atrac1: validate number of channelsJustin Ruggles2011-10-291-0/+5
| |
| * atrac1: decode mono audio directly to output bufferJustin Ruggles2011-10-291-6/+2
| | | | | | | | | | For stereo we need to use intermediate planar buffers, but mono does not need to be deinterleaved so the output buffer can be used directly.
| * atrac1: check output buffer size before decodingJustin Ruggles2011-10-291-2/+9
| |
* | atrac1: give a valid context pointer to av_log().Laurent Aimar2011-10-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-271-10/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add AVX FFT implementation.Vitor Sessak2011-04-261-10/+10
| | | | | | | | Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-211-1/+2
|\ \ | |/ | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move sine windows to a separate fileMans Rullgard2011-03-201-0/+1
| | | | | | | | | | | | | | These windows do not really belong in fft/mdct files and were easily confused with the similarly named tables used by rdft. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fft: remove inline wrappers for function pointersMans Rullgard2011-03-191-1/+1
| | | | | | | | | | | | | | This removes the rather pointless wrappers (one not even inline) for calling the fft_calc and related function pointers. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove unneeded add bias from 3 functions.Justin Ruggles2011-01-311-1/+1
| | | | | | | | | | | | | | | | DSPContext.vector_fmul_window() DCADSPContext.lfe_fir() SynthFilterContext.synth_filter_float() Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Rename sf_table in atrac.c unit to ff_atrac_sf_table.Diego Elio Pettenò2011-01-241-1/+1
| | | | | | | | | | | | | | This ensures a locally-unique name as well as marks the symbol as FFmpeg-private at least by declaration. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Remove unneeded add bias from 3 functions.Justin Ruggles2011-02-021-1/+1
| | | | | | | | | | | | | | | | | | DSPContext.vector_fmul_window() DCADSPContext.lfe_fir() SynthFilterContext.synth_filter_float() Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 80ba1ddb58b5923b9f36a6acd542affc4ca722eb)
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-281-1/+1
| | | | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)
* | Rename sf_table in atrac.c unit to ff_atrac_sf_table.Diego Elio Pettenò2011-01-261-1/+1
|/ | | | | | | | This ensures a locally-unique name as well as marks the symbol as FFmpeg-private at least by declaration. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 82e1f217f276b4b3fda1f89a836126275a97ca9b)
* Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini2010-11-121-1/+1
| | | | | | SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move clipping of audio samples (for those codecs outputting float) from decoderRonald S. Bultje2010-04-211-9/+4
| | | | | | to the audio conversion routines. Originally committed as revision 22937 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-1/+1
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make some functions staticMåns Rullgård2010-03-061-1/+1
| | | | | | | These functions are not used outside their respective files, and they lack a prototype in a header. Originally committed as revision 22259 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move FFT parts from dsputil.h to fft.hMåns Rullgård2010-03-061-0/+1
| | | | Originally committed as revision 22235 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove DECLARE_ALIGNED_{8,16} macrosMåns Rullgård2010-03-061-10/+10
| | | | | | | These macros are redundant. All uses are replaced with the generic DECLARE_ALIGNED macro instead. Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move array specifiers outside DECLARE_ALIGNED() invocationsMåns Rullgård2010-01-221-10/+10
| | | | Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for hard-coded MDCT-related ff_sine_windows tables.Reimar Döffinger2010-01-091-1/+1
| | | | Originally committed as revision 21108 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reindent code folowing previous commit (r20019)Vitor Sessak2009-09-241-18/+18
| | | | Originally committed as revision 20020 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize duplicated code in at1_imdct_block()Vitor Sessak2009-09-241-18/+17
| | | | Originally committed as revision 20019 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Mention SDDS so search engines will pick it up for when someoneBenjamin Larsson2009-09-221-1/+1
| | | | | | needs to decode the SDDS tracks found on 35 mm movies. Originally committed as revision 19968 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use ff_sine_32 in atrac1.Benjamin Larsson2009-09-221-5/+3
| | | | Originally committed as revision 19967 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add forgotten cleanup function in atrac1.Benjamin Larsson2009-09-211-1/+12
| | | | Originally committed as revision 19954 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics, indentation.Benjamin Larsson2009-09-211-1/+1
| | | | Originally committed as revision 19953 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics. Merge declaration and initialization.Benjamin Larsson2009-09-211-3/+1
| | | | Originally committed as revision 19952 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move the scale factor and word length indexes to the stack.Benjamin Larsson2009-09-211-7/+7
| | | | Originally committed as revision 19951 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Merge FFTContext and MDCTContextMåns Rullgård2009-09-201-2/+2
| | | | Originally committed as revision 19931 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix embarassing typo in last commit: Restore mistakenly removed ','.Diego Biurrun2009-09-201-1/+1
| | | | Originally committed as revision 19930 to svn://svn.ffmpeg.org/ffmpeg/trunk
* K&R coding style whitespace cosmeticsDiego Biurrun2009-09-201-47/+48
| | | | Originally committed as revision 19929 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Align sample output buffer in atrac1.Benjamin Larsson2009-09-191-1/+1
| | | | Originally committed as revision 19918 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix the short block transform for atrac1.Benjamin Larsson2009-09-191-15/+7
| | | | Originally committed as revision 19917 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Only use one mdct window size in atrac1.Benjamin Larsson2009-09-171-50/+22
| | | | Originally committed as revision 19900 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics. Renames, indentation and spacing.Benjamin Larsson2009-09-131-20/+28
| | | | Originally committed as revision 19832 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Initial commit of the atrac1 decoder, not hooked up yetBenjamin Larsson2009-09-101-0/+402
Originally committed as revision 19811 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud