summaryrefslogtreecommitdiff
path: root/libavcodec/aacsbr.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) rv34: frame-level multi-threading mpegvideo: claim ownership of referenced pictures aacsbr: prevent out of bounds memcpy(). ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM sierravmd: fix audio pts bethsoftvideo: Use bytestream2 functions to prevent buffer overreads. bmpenc: support for PIX_FMT_RGB444 swscale: fix crash in fast_bilinear code when compiled with -mred-zone. swscale: specify register type. rv34: use get_bits_left() avconv: reinitialize the filtergraph on resolution change. vsrc_buffer: error on changing frame parameters. avconv: fix -copyinkf. fate: Update file checksums after the mov muxer change in a78dbada55d6 movenc: Don't store a nonzero creation time if nothing was set by the caller bmpdec: support for rgb444 with bitfields compression rgb2rgb: allow conversion for <15 bpp doc: fix stray reference to FFmpeg v4l2: use C99 struct initializer v4l2: poll the file descriptor ... Conflicts: avconv.c libavcodec/aacsbr.c libavcodec/bethsoftvideo.c libavcodec/kmvc.c libavdevice/v4l2.c libavfilter/vsrc_buffer.c libswscale/swscale_unscaled.c libswscale/x86/input.asm tests/ref/acodec/alac tests/ref/acodec/pcm_s16be tests/ref/acodec/pcm_s24be tests/ref/acodec/pcm_s32be tests/ref/acodec/pcm_s8 tests/ref/lavf/mov tests/ref/vsynth1/dnxhd_1080i tests/ref/vsynth1/mpeg4 tests/ref/vsynth1/qtrle tests/ref/vsynth1/svq1 tests/ref/vsynth2/dnxhd_1080i tests/ref/vsynth2/mpeg4 tests/ref/vsynth2/qtrle tests/ref/vsynth2/svq1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacsbr: prevent out of bounds memcpy().Alex Converse2012-01-10
| | | | | | | | | | | | | | | | | | | | | | Fixes Libav Bug 195. This doesn't make the code handle sample rate or upsample/downsample change properly but this is still a good sanity check. Based on change by Michael Niedermayer. Signed-off-by: Alex Converse <alex.converse@gmail.com>
* | aacsbr: Fix memory corruption.Michael Niedermayer2011-12-15
| | | | | | | | | | | | | | Fixes Ticket760 and Ticket761 Bug Found by: Diana Elena Muscalu Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: prevent multiple ff_aac_sbr_ctx_init()Michael Niedermayer2011-09-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: add a assert0 to check for a inconsistency thatMichael Niedermayer2011-09-23
| | | | | | | | | | | | | | occurd during debug. I dont know if this can happen normally but if so it would be quite bad. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIchanges: fill in date and commit for request_sample_fmt Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders. Add support for request_sample_format in ffmpeg and ffplay. Add APIchanges entry for request_sample_fmt. Add request_sample_fmt field to AVCodecContext. Add float_interleave() to FmtConvertContext with x86-optimized versions. Remove unused make variable SEEK_REFFILE fate: remove redundant aref and vref references fate: remove do_ffmpeg_nocheck function fate: do not collect -benchmark output mpegaudiodec: remove decode_end() function fate: run aref and vref as regular tests mpegaudio: sanitise compute_antialias_* names mpeg12: add slice-threading checks to slice-threading initializers. h264: copy pixel_shift between slice threading contexts. mdec: enable frame-level multithreading. mdec.c: fix overread. Conflicts: libavcodec/aacdec.c libavcodec/ac3dec.c libavcodec/avcodec.h libavcodec/dca.c libavcodec/h264.c libavcodec/mdec.c libavcodec/mpeg12.c libavcodec/options.c libavcodec/version.h libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbisJustin Ruggles2011-05-18
| | | | | | | | | | | | decoders. Based on patches by clsid2 in ffdshow-tryout.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * aac: add headers needed for log2f()Michael Niedermayer2011-04-26
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | aac: add math.h needed for log2f()Michael Niedermayer2011-04-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-21
|\| | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fft: remove inline wrappers for function pointersMans Rullgard2011-03-19
| | | | | | | | | | | | | | 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-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * aac: remove dead SBR input scalingAlex Converse2011-02-14
| | | | | | | | | | | | It has been unused since 9d06d7bce3babb82ed650c13ed13a57f6f626a71 Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove the add bias hack for the C version of DSPContext.float_to_int16_*().Justin Ruggles2011-01-28
| |
* | aac: remove dead SBR input scalingAlex Converse2011-02-14
| | | | | | | | | | | | | | It has been unused since 9d06d7bce3babb82ed650c13ed13a57f6f626a71 Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 916dee9f45dab85cfc20b6bf63ce8722746e6508)
* | Remove the add bias hack for the C version of DSPContext.float_to_int16_*().Justin Ruggles2011-01-28
|/ | | | (cherry picked from commit 9d06d7bce3babb82ed650c13ed13a57f6f626a71)
* aacsbr: Eliminate double precision arithmetic.Alex Converse2010-07-13
| | | | Originally committed as revision 24227 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move Parametric Stereo related ps* files to aacps*.Alex Converse2010-06-22
| | | | Originally committed as revision 23720 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Make dk signed. There is no point in it being unsigned.Alex Converse2010-06-20
| | | | Originally committed as revision 23671 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l: aacsbr: Fix f_master[2] calculation when k2diff == -1.Alex Converse2010-06-20
| | | | Originally committed as revision 23660 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add HE-AAC v2 support to the AAC decoder.Alex Converse2010-06-19
| | | | Originally committed as revision 23647 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: Fold constants and re-indent after last commit.Alex Converse2010-06-08
| | | | Originally committed as revision 23520 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Base downsampled SBR synthesis filterbank on a single IMDCT.Alex Converse2010-06-08
| | | | | | | Based on Han-Wen Hsu, et al. "Fast Complex Quadrature Mirror Filterbanks for MPEG-4 HE-AAC" Originally committed as revision 23519 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l: Fix types and now unused variables after last commit.Alex Converse2010-06-07
| | | | Originally committed as revision 23517 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rewrite the SBR decoder QMF analysis filter on top of the IMDCT instead of ↵Alex Converse2010-06-07
| | | | | | | | | | the RDFT. This is based on a procedure to implement the filterbank on the DCT-IV described in Hsu, H.W. et al. "A Complex Quadrature Mirror Filterbanks for MPEG-4 HE-AAC" http://sites.google.com/site/wenchiehlee1020/Papers/ComplexFB_AES_121paper144.pdf Originally committed as revision 23516 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacdec: Rename avccontext to avctx.Alex Converse2010-06-05
| | | | Originally committed as revision 23488 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l: The SBR refactor requires the use of 2 independent output X buffers.Alex Converse2010-05-03
| | | | Originally committed as revision 23014 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Enforce time border monotonicity.Alex Converse2010-04-30
| | | | | | Thanks to Chromium. Originally committed as revision 23000 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move the SBR patch count check to prevent overwrites.Alex Converse2010-04-30
| | | | | | Thanks to Chromium. Originally committed as revision 22999 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Increase size of patch_borders[].Alex Converse2010-04-30
| | | | | | 6 patches means there can be 7 borders. Found by Chromium. Originally committed as revision 22998 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ReindentAlex Converse2010-04-30
| | | | Originally committed as revision 22996 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rewrite ff_sbr_apply in a manner more friendly to PS.Alex Converse2010-04-30
| | | | | | This includes merging ff_sbr_dequant into ff_sbr_apply. Originally committed as revision 22995 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-20
| | | | | | | | 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
* Reindent read_sbr_extension.Alex Converse2010-04-08
| | | | Originally committed as revision 22820 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Print an error and skip PS when PS is found but explicitly found butAlex Converse2010-04-08
| | | | | | signaled to be absent. Originally committed as revision 22819 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: DSPUtilize analysis input scaling.Alex Converse2010-03-13
| | | | Originally committed as revision 22516 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aac: Don't bias output during the IMDCT if SBR will be used.Alex Converse2010-03-13
| | | | Originally committed as revision 22515 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Check that bs_num_env is valid before writing arrays with it as an ↵Alex Converse2010-03-09
| | | | | | offset. Originally committed as revision 22413 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Cleanup read_sbr_grid and copy_sbr_grid after the recent overhaul of ↵Alex Converse2010-03-09
| | | | | | those functions. Originally committed as revision 22412 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Factor out the common end border case from t_q setup.Alex Converse2010-03-09
| | | | Originally committed as revision 22411 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: read bs_rel_bord directly into t_env.Alex Converse2010-03-09
| | | | Originally committed as revision 22410 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Make the previous value of bs_num_env local to read_sbr_data().Alex Converse2010-03-09
| | | | Originally committed as revision 22409 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Initialize e_a[1] to -1.Alex Converse2010-03-09
| | | | | | | | This triggers lAPrev (e_a[0]) on the first SBR frame to be -1. The spec is somewhat ambiguous to what this value should be but this increases the accuracy of al_sbr_e_44_1 and similar streams from 14 bits to 15 bits. Originally committed as revision 22408 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Dead code removal.Alex Converse2010-03-09
| | | | Originally committed as revision 22387 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Remove a slightly incorrect comment.Alex Converse2010-03-09
| | | | | | The two conditions are equivalent. Originally committed as revision 22386 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Cleanup the newly merged read_sbr_grid, eliminating several contextAlex Converse2010-03-09
| | | | | | and some duplicate local variables. Originally committed as revision 22384 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Move the e_a calculation from sbr_mapping() to read_sbr_grid().Alex Converse2010-03-09
| | | | Originally committed as revision 22383 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Merge sbr_time_freq_grid into read_sbr_grid (and into copy_sbr_grid).Alex Converse2010-03-09
| | | | Originally committed as revision 22382 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacsbr: Fail early on illegal envelope counts.Alex Converse2010-03-09
| | | | Originally committed as revision 22381 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 06:42:46 +0000