summaryrefslogtreecommitdiff
path: root/libavcodec/wmaenc.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-221-17/+31
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (26 commits) adxenc: use AVCodec.encode2() adxenc: Use the AVFrame in ADXContext for coded_frame indeo4: fix out-of-bounds function call. configure: Restructure help output. configure: Internal-only components should not be command-line selectable. vorbisenc: use AVCodec.encode2() libvorbis: use AVCodec.encode2() libopencore-amrnbenc: use AVCodec.encode2() ra144enc: use AVCodec.encode2() nellymoserenc: use AVCodec.encode2() roqaudioenc: use AVCodec.encode2() libspeex: use AVCodec.encode2() libvo_amrwbenc: use AVCodec.encode2() libvo_aacenc: use AVCodec.encode2() wmaenc: use AVCodec.encode2() mpegaudioenc: use AVCodec.encode2() libmp3lame: use AVCodec.encode2() libgsmenc: use AVCodec.encode2() libfaac: use AVCodec.encode2() g726enc: use AVCodec.encode2() ... Conflicts: configure libavcodec/Makefile libavcodec/ac3enc.c libavcodec/adxenc.c libavcodec/libgsm.c libavcodec/libvorbis.c libavcodec/vorbisenc.c libavcodec/wmaenc.c tests/ref/acodec/g722 tests/ref/lavf/asf tests/ref/lavf/ffm tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/seek/lavf_asf tests/ref/seek/lavf_ffm tests/ref/seek/lavf_mkv tests/ref/seek/lavf_mpg tests/ref/seek/lavf_rm tests/ref/seek/lavf_ts Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmaenc: use AVCodec.encode2()Justin Ruggles2012-03-211-17/+31
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-171-4/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: resample: allocate a large enough output buffer fate: fix enc_dec_pcm tests with remote target wmaenc: remove bit-exact hack FATE: remove WMA acodec tests FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison qtrle: Use bytestream2 functions to prevent buffer overreads. vqavideo: check malloc return values x11grab: fix a memory leak exposed by valgrind threads: fix old frames returned after avcodec_flush_buffers() MPV: always mark dummy frames as reference h264: fix deadlocks on incomplete reference frame decoding. mpeg4: report frame decoding completion at ff_MPV_frame_end(). mimic: don't use self as reference, and report completion at end of decode(). Conflicts: libavcodec/h264.c libavcodec/qtrle.c libavcodec/resample.c libavcodec/vqavideo.c libavdevice/x11grab.c tests/ref/seek/wmav1_asf tests/ref/seek/wmav2_asf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmaenc: remove bit-exact hackJustin Ruggles2012-03-171-4/+0
| | | | | | | | | | | | It may have improved cross-platform stability, but wasn't the only place in the encoder with bitexact issues. It is no longer needed because we have FATE tests for float encoders using fuzzy comparison.
* | wmaenc: change some asserts to av_assert0.Michael Niedermayer2012-03-051-2/+2
| | | | | | | | | | | | This ensures they are always checked Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmaenc: add assert to check encode_superframe() return.Michael Niedermayer2012-03-051-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "wmaenc: check final frame size against output packet size"Michael Niedermayer2012-03-051-6/+4
| | | | | | | | | | | | | | | | This condition cannot happen, if it can it is a bug that MUST be fixed. And i very happily volunteer to fix it if someone reports a case to me that fails. This reverts commit 5d652e063bd3a180f9de8915e5137aa4f938846d.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-051-8/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) cmdutils: use new avcodec_is_decoder/encoder() functions. lavc: make codec_is_decoder/encoder() public. lavc: deprecate AVCodecContext.sub_id. libcdio: add a forgotten AVClass to the private context. swscale: remove "cpu flags" from -sws_flags description. proresenc: give user a possibility to alter some encoding parameters vorbisenc: add output buffer overwrite protection libopencore-amrnbenc: fix end-of-stream handling ra144enc: fix end-of-stream handling nellymoserenc: zero any leftover packet bytes nellymoserenc: use proper MDCT overlap delay qpeg: Use bytestream2 functions to prevent buffer overreads. swscale: make %rep unconditional. vp8: convert simple loopfilter x86 assembly to use named arguments. vp8: convert idct x86 assembly to use named arguments. vp8: convert mc x86 assembly to use named arguments. vp8: convert loopfilter x86 assembly to use cpuflags(). vp8: convert idct/mc x86 assembly to use cpuflags(). swscale: remove now unnecessary hack. x86inc: don't "bake" stack_offset in named arguments. ... Conflicts: cmdutils.c doc/APIchanges libavcodec/mpeg12.c libavcodec/options.c libavcodec/qpeg.c libavcodec/utils.c libavcodec/version.h libavdevice/libcdio.c tests/lavf-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmaenc: fix m/s stereo encoding for the first frameJustin Ruggles2012-03-031-1/+3
| | | | | | | | | | | | | | | | We need to set ms_stereo in encode_init() in order to avoid incorrectly encoding the first frame as non-m/s while flagging it as m/s. Fixes an uncomfortable pop in the left channel at the start of playback. CC:libav-stable@libav.org
| * wmaenc: return s->block_align instead of recalculating itJustin Ruggles2012-03-031-1/+1
| |
| * wmaenc: check final frame size against output packet sizeJustin Ruggles2012-03-031-4/+6
| | | | | | | | | | | | | | Currently we have an assert() that prevents the frame from being too large, but it is more user-friendly to give an error message instead of aborting on assert(). This condition is quite unlikely due to the minimum bit rate check in encode_init(), but it is still worth having.
| * wmaenc: require a large enough output buffer to prevent overwritesJustin Ruggles2012-03-031-0/+5
| | | | | | | | | | | | | | | | The maximum theoretical frame size is around 17000 bytes. Although in practice it will generally be much smaller, we require a larger buffer just to be safe. CC: libav-stable@libav.org
| * wmaenc: limit allowed sample rate to 48kHzJustin Ruggles2012-03-031-0/+6
| | | | | | | | | | | | | | | | | | ff_wma_init() allows up to 50kHz, but this generates an exponent band size table that requires 65 bands. The code assumes 25 bands in many places, and using sample rates higher than 48kHz will lead to buffer overwrites. CC:libav-stable@libav.org
| * wmaenc: limit block_align to MAX_CODED_SUPERFRAME_SIZEJustin Ruggles2012-03-031-2/+6
| | | | | | | | | | | | | | | | | | | | This is near the theoretical limit for wma frame size and is the most that our decoder can handle. Allowing higher bit rates will just end up padding each frame with empty bytes. Fixes invalid writes for avconv when using very high bit rates. CC:libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-211-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (47 commits) lavc: hide private symbols. lavc: deprecate img_get_alpha_info(). lavc: use avpriv_ prefix for ff_toupper4. lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits. lavc: use avpriv_ prefix for ff_ac3_parse_header. lavc: use avpriv_ prefix for ff_frame_rate_tab. lavc: rename ff_find_start_code to avpriv_mpv_find_start_code lavc: use avpriv_ prefix for ff_split_xiph_headers. lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header. lavc: use avpriv_ prefix for some dv symbols used in lavf. lavc: use avpriv_ prefix for some flac symbols used in lavf. lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf. lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf. lavc: use avpriv_ prefix for ff_aac_parse_header(). lavf: hide private symbols. lavf: use avpriv_ prefix for some dv functions. lavf: use avpriv_ prefix for ff_new_chapter(). avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2() avcodec: clarify documentation of CODEC_CAP_DELAY ... Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dv.c libavcodec/dvdata.c libavcodec/dvdata.h libavcodec/libspeexenc.c libavcodec/mpegvideo.c libavcodec/version.h libavformat/avidec.c libavformat/dv.c libavformat/dv.h libavformat/flvenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/oggparsespeex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.Anton Khirnov2011-10-201-2/+2
| | | | | | | | They are used in lavf.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-241-22/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: flvdec: Fix invalid pointer deferences when parsing index configure: disable hardware capabilities ELF section with suncc on Solaris x86 Use explicit struct initializers for AVCodec declarations. Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations. adpcmenc: Set bits_per_coded_sample adpcmenc: fix QT IMA ADPCM encoder adpcmdec: Fix QT IMA ADPCM decoder permit decoding of multichannel ADPCM_EA_XAS Fix input buffer size check in adpcm_ea decoder. fft: avoid a signed overflow mpegps: Handle buffer exhaustion when reading packets. Conflicts: libavcodec/adpcm.c libavcodec/adpcmenc.c libavdevice/alsa-audio-enc.c libavformat/flvdec.c libavformat/mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use explicit struct initializers for AVCodec declarations.Diego Biurrun2011-09-241-22/+20
| |
| * wmaenc: improve channel count and bitrate error handling in encode_init()Tomas Härdin2011-05-121-4/+10
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Improve channel count and bitrate error handling in wmav* encode_init()Tomas Härdin2011-03-241-4/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-211-1/+2
|\ \ | |/ | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fft: remove inline wrappers for function pointersMans Rullgard2011-03-191-1/+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>
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-2/+2
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. 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-281-2/+2
|/ | | | | | | | 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)
* Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini2010-11-121-2/+2
| | | | | | SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use "const" qualifier for pointers that point to input data ofReimar Döffinger2010-07-241-2/+2
| | | | | | | audio encoders. This is purely for clarity/documentation purposes. Originally committed as revision 24481 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-2/+2
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove a Huffman table from WMA which also exists in AACStefan Gehrer2010-02-191-1/+1
| | | | Originally committed as revision 21902 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make sample_fmts and channel_layouts compound literals const to reduce size ofReimar Döffinger2009-09-061-2/+2
| | | | | | .data section. Originally committed as revision 19787 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Introduce WMACoef typedef for decoded coefficientsSascha Sommer2009-06-201-2/+2
| | | | | | | and change default type to float so that the run level decoding functionality can be shared with wmapro Originally committed as revision 19231 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support for getting (i)MDCT output multiplied by a constant scaling factor.Siarhei Siamashka2009-05-161-1/+1
| | | | | | | | Scaling (i)MDCT output has no runtime overhead and can be used to improve performance of audio codecs. All the changes are only needed in 'ff_mdct_init' function and slow down initialization a bit. Originally committed as revision 18855 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename pbBufPtr() to put_bits_ptr().Stefano Sabatini2009-04-131-1/+1
| | | | | | | The new name is more readable and consistent with the FFmpeg naming style. Originally committed as revision 18497 to svn://svn.ffmpeg.org/ffmpeg/trunk
* A try to fix the regressions.Michael Niedermayer2009-02-191-0/+4
| | | | Originally committed as revision 17459 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Intel C compiler warns on this assignment in this if(), probablyDiego Pettenò2008-10-021-1/+2
| | | | | | | | | because it's being assigned as a constant. To avoid a spurious warning, split it into two instructions, which should also make it more logical once the FIXME is resolved. patch by Diego 'Flameeyes' Pettenò %flameeyes A gmail P com% Originally committed as revision 15525 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove mdct tmp bufferLoren Merritt2008-08-121-1/+1
| | | | Originally committed as revision 14702 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Modify all codecs to report their supported input and output sample format(s).Peter Ross2008-07-311-0/+2
| | | | Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make AVCodec long_names definition conditional depending on CONFIG_SMALL.Stefano Sabatini2008-06-121-2/+2
| | | | Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add long names to many AVCodec declarations.Stefano Sabatini2008-04-271-0/+2
| | | | | | patch by Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
* silence wmaenc.c:181: warning:suggestparentheses around assignment used as ↵Benjamin Larsson2008-02-151-1/+1
| | | | | | truth value Originally committed as revision 11940 to svn://svn.ffmpeg.org/ffmpeg/trunk
* clarify FIXMEMichael Niedermayer2007-12-171-1/+1
| | | | Originally committed as revision 11251 to svn://svn.ffmpeg.org/ffmpeg/trunk
* trivial warning fixesMåns Rullgård2007-07-081-2/+2
| | | | Originally committed as revision 9551 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use AV_xx throughout libavcodecRamiro Polla2007-06-021-10/+4
| | | | Originally committed as revision 9169 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Optimize by building the mdct window and multipying/adding at the same time.Ian Braithwaite2007-03-261-2/+2
| | | | | | | | Patch by Ian Braithwaite ian .. braithwaite . dk [Ffmpeg-devel] WMA decoder speedup 2007-03-22 22:56 Originally committed as revision 8526 to svn://svn.ffmpeg.org/ffmpeg/trunk
* bitrate sanity check (fixes assertion failure)Michael Niedermayer2007-03-081-0/+3
| | | | Originally committed as revision 8293 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename WMADecodeContext to WMACodecContextMichel Bardiaux2007-02-271-9/+9
| | | | Originally committed as revision 8143 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Supply context to tprintfMichel Bardiaux2007-02-271-0/+2
| | | | Originally committed as revision 8142 to svn://svn.ffmpeg.org/ffmpeg/trunk
* workaround sign bugMichael Niedermayer2007-02-061-1/+1
| | | | Originally committed as revision 7864 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l use of uninitalized varMichael Niedermayer2007-02-061-2/+2
| | | | Originally committed as revision 7863 to svn://svn.ffmpeg.org/ffmpeg/trunk
* wma encoderMichael Niedermayer2007-02-061-0/+402
Originally committed as revision 7855 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status