summaryrefslogtreecommitdiffstats
path: root/libavcodec/aacenc.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-291-8/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) swscale: Add Doxygen for hyscale_fast/hScale. fate: enable lavfi-pixmt tests on big endian systems PPC: swscale: disable altivec functions for unsupported formats fate: merge identical pixdesc_be/le tests swscale: Add Doxygen for yuv2planar*/yuv2packed* functions. build: call texi2pod.pl with full path instead of symlink build: include sub-makefiles using full path instead of symlinks swscale: update big endian reference values after dff5a835. wavpack: skip blocks with no samples cosmetics: remove outdated comment that is no longer true build: replace some addprefix/addsuffix with substitution refs avutil: Remove unused arbitrary precision integer code. configure: Drop check for availability of ten assembler operands. aacenc: Save channel configuration for later use. aacenc: Fix codebook trellising for zeroed bands. swscale: change prototypes of scaled YUV output functions. swscale: re-add support for non-native endianness. swscale: disentangle yuv2rgbX_c_full() into small functions. swscale: split yuv2packed[12X]_c() remainders into small functions. swscale: split yuv2packedX_altivec in smaller functions. ... Conflicts: Makefile configure libavcodec/x86/dsputil_mmx.c libavfilter/Makefile libavformat/Makefile libavutil/integer.c libavutil/integer.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc_le tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacenc: Save channel configuration for later use.Nathan Caldwell2011-06-271-8/+8
| |
* | Reindent after last commit.Carl Eugen Hoyos2011-06-151-2/+2
| |
* | Fix multi-channel AAC encoding.Carl Eugen Hoyos2011-06-151-1/+19
| | | | | | | | Fixes ticket 55.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-031-3/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacenc: Add stereo_mode option.Nathan Caldwell2011-06-021-3/+29
| | | | | | | | | | | | ms_off is the default, until Mid/Side is no longer buggy. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-091-25/+24
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: log: Fix an oob array read. cosmetics: trim trailing whitespace in postproc Ban strncpy() it's too easy to misuse. psymodel: Remove wrapper functions. aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'. regtest: remove redundant flags in jpg test regtest: use run_ffmpeg in do_image_formats regtest: simplify encoding functions ffmpeg.c: check for interlaced flag in the correct place. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * psymodel: Remove wrapper functions.Nathan Caldwell2011-05-081-3/+3
| | | | | | | | Instead use the function pointers directly.
| * aacenc: Replace loop counters in aac_encode_frame() with more descriptive ↵Nathan Caldwell2011-05-081-26/+25
| | | | | | | | 'ch' and 'w'.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-241-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Handle unicode file names on windows rtp: Rename the open/close functions to alloc/free Lowercase all ff* program names. Refer to ff* tools by their lowercase names. NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg. Replace `` by $() syntax in shell scripts. patcheck: Allow overiding grep program(s) through environment variables. NOT Pulled Remove stray libavcore and _g binary references. vorbis: Rename decoder/encoder files to follow general file naming scheme. aacenc: Fix whitespace after last commit. cook: Fix small typo in av_log_ask_for_sample message. aacenc: Finish 3GPP psymodel analysis for non mid/side cases. Remove RDFT dependency from AAC decoder. Add some debug log messages to AAC extradata Fix mov debug (u)int64_t format strings. bswap: use native types for av_bwap16(). doc: FLV muxing is supported. applehttp: Handle AES-128 encrypted streams Add a protocol handler for AES CBC decryption with PKCS7 padding doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Conflicts: ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacenc: Finish 3GPP psymodel analysis for non mid/side cases.Nathan Caldwell2011-04-231-1/+3
| | | | | | | | | | | | | | | | | | There is still are still a few sections missing relating to TNS (not present) and mid/side (contains other bugs). Overall this improves quality, and vastly improves rate-control. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-211-2/+4
|\ \ | |/ | | | | 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>
| * Move ff_kbd_window_init() to a separate fileMans Rullgard2011-03-191-0/+1
| | | | | | | | | | | | | | This function is not tightly coupled to mdct, and it's in the way of making a fixed-point mdct implementation. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fft: remove inline wrappers for function pointersMans Rullgard2011-03-191-2/+2
| | | | | | | | | | | | | | 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>
| * aacenc: Fix a segfault in search_for_quantizersNathan Caldwell2011-03-081-1/+0
| | | | | | | | | | | | | | | | This reverts the removal of scoefs from AACEncContext. It resulted in scoefs being a NULL pointer when search_for_quantizers() is called. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * aacenc: remove the data arraysYoung Han Lee2011-03-071-13/+15
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.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>
| * aacenc: fix typo in sync extension constant in 8ae0fa2Janne Grunau2011-01-231-1/+1
| |
| * Change DSPContext.vector_fmul() from dst=dst*src to dest=src0*src1.Justin Ruggles2011-01-221-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * aacenc: mark SBR absentAlex Converse2011-01-221-2/+7
| | | | | | | | | | | | | | Use backwards compatible explicit signalling to denote the absence of SBR. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* | aacenc: Fix a segfault in search_for_quantizersNathan Caldwell2011-03-081-1/+0
| | | | | | | | | | | | | | | | This reverts the removal of scoefs from AACEncContext. It resulted in scoefs being a NULL pointer when search_for_quantizers() is called. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacenc: remove the data arraysYoung Han Lee2011-03-081-13/+15
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 2790d7a9ffbd51f33e5367a31ace5c44c30401a1)
* | 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)
* | aacenc: fix typo in sync extension constant in 8ae0fa2Janne Grunau2011-01-261-1/+1
| | | | | | | | (cherry picked from commit 2fd9035ddc4f6b9313023891a16b6e9820d958ed)
* | Change DSPContext.vector_fmul() from dst=dst*src to dest=src0*src1.Justin Ruggles2011-01-231-1/+1
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 6eabb0d3ad42b91c1b4c298718c29961f7c1653a)
* | aacenc: mark SBR absentAlex Converse2011-01-231-2/+7
|/ | | | | | | | Use backwards compatible explicit signalling to denote the absence of SBR. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 8ae0fa243e1f7a03cb5f23e2d9a32d3cc88b4def)
* 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
* aacenc: Remove an unused variable from adjust_frame_information().Alex Converse2010-08-311-2/+1
| | | | Originally committed as revision 25002 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: Don't set s->cur_channel before apply_window_and_mdct().Alex Converse2010-08-311-1/+0
| | | | | | In general s->cur_channel should be phased out. Originally committed as revision 25001 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: Write tag.elem_id early.Alex Converse2010-08-301-2/+2
| | | | Originally committed as revision 25000 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: Only apply M/S if common_window is set.Alex Converse2010-08-301-1/+1
| | | | Originally committed as revision 24998 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: Adjust array offsets for the current channel before calling ↵Nathan Caldwell2010-07-191-7/+8
| | | | | | | | ff_psy_suggest_window(). Patch by Nathan Caldwell <saintdev@gmail.com> Originally committed as revision 24332 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: Refactor apply_window_and_mdct() so it no longer takes an offset ↵Nathan Caldwell2010-07-191-15/+16
| | | | | | | | channel. Patch by Nathan Caldwell <saintdev@gmail.com> Originally committed as revision 24331 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: whitespaceAlex Converse2010-07-071-1/+2
| | | | Originally committed as revision 24100 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: Enforce LFE bitstream restrictions.Alex Converse2010-07-071-5/+8
| | | | Originally committed as revision 24099 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: replace VLA with fixed sizeMåns Rullgård2010-07-061-2/+4
| | | | | | | Number of channels is restricted to 6 so the size is acceptable for the stack. Originally committed as revision 24068 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: Start the lookahead pointer 1/4 of the way into the first short window.Alex Converse2010-06-281-1/+1
| | | | | | Short windows are of length 256 and begin at sample 448. Originally committed as revision 23871 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: Properly pad extradata.Alex Converse2010-06-281-1/+1
| | | | | | This fixes a valgrind error when encoding to ADTS. Originally committed as revision 23866 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aactab: Tablegenify ff_aac_pow2sf_tab.Alex Converse2010-06-231-4/+2
| | | | Originally committed as revision 23740 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cleanup apply_window_and_mdct().Alex Converse2010-06-051-10/+5
| | | | Originally committed as revision 23495 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Mark AAC encoder as experimental.Alex Converse2010-05-271-1/+1
| | | | Originally committed as revision 23350 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: Select the TLS (two-loop search) as the default scalefactor coder.Alex Converse2010-05-141-1/+1
| | | | Originally committed as revision 23133 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacenc: Fix psy logic.Alex Converse2010-05-141-1/+1
| | | | | | | Set band info before determining scalefactors. Use the look ahead for windowing decision. Originally committed as revision 23132 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Set cur_channel in the AAC encoder context where needed.Alex Converse2010-05-111-0/+2
| | | | | | | Most coder functions read it. Carting this around in the context may be suboptimal; a refactor should be considered. Originally committed as revision 23094 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Error out when too many bits per frame are requested.Alex Converse2010-05-061-0/+4
| | | | Originally committed as revision 23036 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
* aacenc: Error when an unsupported profile is requestedAlex Converse2010-04-021-0/+4
| | | | Originally committed as revision 22784 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
OpenPOWER on IntegriCloud