summaryrefslogtreecommitdiffstats
path: root/libavcodec/adpcm.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-011-4/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avplay: use libavresample for sample format conversion and channel mixing Fix compilation with YASM/NASM without AVX support. WMAL: do not output last frame again if nothing was decoded in current packet WMAL: do not start decoding if frame does not end in current packet adpcm-thp: fix invalid array indexing ppc: add const where needed in scalarproduct_int16_altivec() ppc: remove shift parameter from scalarproduct_int16_altivec() ppc: dsputil: do unaligned block accesses correctly dvenc: do not call dsputil functions with stride not a multiple of 16 APIchanges: fill in some dates and commit hashes Conflicts: doc/APIchanges ffplay.c libavcodec/adpcm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcm-thp: fix invalid array indexingMans Rullgard2012-05-011-4/+6
| | | | | | | | | | | | Indexing outside array limits is invalid and breaks with gcc 4.8. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * westwood_vqa: fix SND0 chunk handlingPaul B Mahol2012-03-271-1/+1
| | | | | | | | | | | | | | | | Version from vqa header does not dictate which sound chunks may appear in file. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | westwood_vqa: fix SND0 chunk handlingPaul B Mahol2012-03-211-1/+1
| | | | | | | | | | | | | | | | Version from vqa header does not dictate which sound chunks may appear in file. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-201-318/+339
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (35 commits) fix space type in Changelog ZeroCodec Decoder RealAudio Lossless decoder rtpenc: Use AVFormatContext.packet_size instead of a private option url: Document the expected behaviour of url_read libavformat: Use AVFormatContext.probesize in init_input docs: Fix a stray reference to tags in the generic doxy on dicts cosmetics: Align some AVInput/OutputFormat declarations zmbv: check decompress result zmbv: correct indentation adpcm: convert adpcm_thp to bytestream2. adpcm: convert adpcm_yamaha to bytestream2. adpcm: convert adpcm_swf to bytestream2. adpcm: convert adpcm_sbpro to bytestream2. adpcm: convert adpcm_ct to bytestream2. adpcm: convert adpcm_ima_amv/smjpeg to bytestream2. adpcm: convert adpcm_ea_xas to bytestream2. adpcm: convert adpcm_ea_r1/2/3 to bytestream2. adpcm: convert ea_maxis_xa to bytestream2. adpcm: convert adpcm_ea to bytestream2. ... Conflicts: Changelog libavcodec/Makefile libavcodec/adpcm.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavcodec/zerocodec.c libavcodec/zmbv.c libavformat/riff.c libavformat/url.h tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcm: convert adpcm_thp to bytestream2.Ronald S. Bultje2012-03-181-19/+17
| |
| * adpcm: convert adpcm_yamaha to bytestream2.Ronald S. Bultje2012-03-181-2/+2
| |
| * adpcm: convert adpcm_swf to bytestream2.Ronald S. Bultje2012-03-181-56/+61
| |
| * adpcm: convert adpcm_sbpro to bytestream2.Ronald S. Bultje2012-03-181-14/+17
| |
| * adpcm: convert adpcm_ct to bytestream2.Ronald S. Bultje2012-03-181-2/+2
| |
| * adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.Ronald S. Bultje2012-03-181-16/+22
| |
| * adpcm: convert adpcm_ea_xas to bytestream2.Ronald S. Bultje2012-03-181-6/+10
| |
| * adpcm: convert adpcm_ea_r1/2/3 to bytestream2.Ronald S. Bultje2012-03-181-33/+28
| |
| * adpcm: convert ea_maxis_xa to bytestream2.Ronald S. Bultje2012-03-181-8/+10
| |
| * adpcm: convert adpcm_ea to bytestream2.Ronald S. Bultje2012-03-181-29/+24
| |
| * adpcm convert adpcm_ima_ea_sead to bytestream2.Ronald S. Bultje2012-03-181-3/+4
| |
| * adpcm: convert adpcm_ima_ea_eacs to bytestream2.Ronald S. Bultje2012-03-181-13/+17
| |
| * adpcm: convert adpcm_xa to bytestream2.Ronald S. Bultje2012-03-181-6/+5
| |
| * adpcm: convert ima_ws to bytestream2.Ronald S. Bultje2012-03-181-17/+18
| |
| * adpcm: convert adpcm_ima_apc to bytestream2.Ronald S. Bultje2012-03-181-2/+2
| |
| * adpcm: convert adpcm_ima_iss to bytestream2.Ronald S. Bultje2012-03-181-6/+10
| |
| * adpcm: convert adpcm_dk3 to bytestream2.Ronald S. Bultje2012-03-181-33/+26
| |
| * adpcm: convert adpcm_dk4 to bytestream2.Ronald S. Bultje2012-03-181-9/+11
| |
| * adpcm: convert adpcm_ms to bytestream2.Ronald S. Bultje2012-03-181-16/+24
| |
| * adpcm: use av_clip() in adpcm_ima_expand_nibble().Ronald S. Bultje2012-03-181-2/+1
| |
| * adpcm: convert adpcm_4xm to bytestream2.Ronald S. Bultje2012-03-181-5/+9
| |
| * adpcm: convert adpcm_ima_wav to bytestream2.Ronald S. Bultje2012-03-181-10/+7
| |
| * adpcm: convert adpcm_ima_qt to bytestream2.Ronald S. Bultje2012-03-181-13/+14
| |
| * adpcm: fix nb_samples rounding for adpcm_ima_dk3, and update reference.Ronald S. Bultje2012-03-181-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-151-6/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: stricter reference limit enforcement. h264: increase reference poc list from 16 to 32. xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns. snow: check reference frame indices. snow: reject unsupported chroma shifts. Add ffvhuff encoding and decoding regression test anm: convert to bytestream2 API bytestream: add more unchecked variants for bytestream2 API jvdec: unbreak video decoding jv demux: set video stream duration fate: add pam image regression test Conflicts: libavcodec/adpcm.c libavcodec/anm.c libavcodec/h264.c libavcodec/mpegvideo.h libavcodec/snowdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.Ronald S. Bultje2012-03-141-5/+20
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-291-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adpcm: Clip step_index values read from the bitstream at the beginning of each frame. oma: don't read beyond end of leaf_table. doxygen: Remove documentation for non-existing parameters; misc small fixes. Indeo3: fix crashes on corrupt bitstreams. msmpeg4: Replace forward declaration by proper #include. segment: implement wrap around avf: reorder AVStream and AVFormatContext aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message. Conflicts: libavcodec/indeo3.c libavformat/avformat.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcm: Clip step_index values read from the bitstream at the beginning of ↵Alex Converse2012-02-281-7/+7
| | | | | | | | | | | | each frame. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | adpcm_xa: Check filter validity.Michael Niedermayer2012-02-281-0/+8
| | | | | | | | | | | | | | Fixes out of global array read. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | adpcmdec: fix "warning: array subscript is above array bounds"Michael Niedermayer2012-02-251-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-241-3/+34
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) aacenc: Fix identification padding when the bitstream is already aligned. aacenc: Write correct length for long identification strings. aud: remove unneeded field, audio_stream_index from context aud: fix time stamp calculation for ADPCM IMA WS aud: simplify header parsing aud: set pts_wrap_bits to 64. cosmetics: indentation aud: support Westwood SND1 audio in AUD files. adpcm_ima_ws: fix stereo decoding avcodec: add a new codec_id for CRYO APC IMA ADPCM. vqa: remove unused context fields, audio_samplerate and audio_bits vqa: clean up audio header parsing vqa: set time base to frame rate as coded in the header. vqa: set packet duration. vqa: use 1/sample_rate as the audio stream time base vqa: set stream start_time to 0. lavc: postpone the removal of AVCodecContext.request_channels. lavf: postpone removing av_close_input_file(). lavc: postpone removing old audio encoding and decoding API avplay: remove the -er option. ... Conflicts: Changelog libavcodec/version.h libavdevice/v4l.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcm_ima_ws: fix stereo decodingJustin Ruggles2012-01-241-1/+29
| | | | | | | | | | Stereo ADPCM IMA WS is planar for VQA version 3 and 2-sample interleaved for VQA version 2.
| * avcodec: add a new codec_id for CRYO APC IMA ADPCM.Justin Ruggles2012-01-241-2/+5
| | | | | | | | | | The stereo layout and extradata is significantly different from that in Westwood IMA ADPCM, so a separate codec_id is warranted.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-061-1/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) ipmovie: do not read audio packets before the codec is known truemotion2: check size before GetBitContext initialisation avio: Only do implicit network initialization for network protocols avio: Add an URLProtocol flag for indicating that a protocol uses network adpcm: ADPCM Electronic Arts has always two channels matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc() fate: Add missing reference file from 9b4767e4. mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions. 4xm: Prevent buffer overreads. mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan vp3: add fate test for non-zero last coefficient vp3: fix streams with non-zero last coefficient swscale: remove unused U/V arguments from yuv2rgb_write(). timer: K&R formatting cosmetics lavf: cosmetics, reformat av_read_frame(). lavf: refactor av_read_frame() to make it easier to understand. Report an error if pitch_lag is zero in AMR-NB decoder. Revert "4xm: Prevent buffer overreads." 4xm: Prevent buffer overreads. 4xm: pass the correct remaining buffer size to decode_i2_frame(). ... Conflicts: libavcodec/4xm.c libavcodec/mjpegdec.c libavcodec/truemotion2.c libavformat/ipmovie.c libavformat/mov_chan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcm: ADPCM Electronic Arts has always two channelsJanne Grunau2012-01-051-1/+5
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-231-5/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: fix standalone compilation of OMA muxer build: fix standalone compilation of Microsoft XMV demuxer build: fix standalone compilation of Core Audio Format demuxer kvmc: fix invalid reads 4xm: Add a check in decode_i_frame to prevent buffer overreads adpcm: fix IMA SMJPEG decoding options: set minimum for "threads" to zero bsd: use number of logical CPUs as automatic thread count windows: use number of CPUs as automatic thread count linux: use number of CPUs as automatic thread count pthreads: reset active_thread_type when slice thread_init returrns early v410dec: include correct headers Drop ALT_ prefix from BITSTREAM_READER_LE name. lavfi: always build vsrc_buffer. ra144enc: zero the reflection coeffs if the filter is unstable sws: readd PAL8 to isPacked() mov: Don't stick the QuickTime field ordering atom in extradata. truespeech: fix invalid reads in truespeech_apply_twopoint_filter() Conflicts: configure libavcodec/4xm.c libavcodec/avcodec.h libavfilter/Makefile libavfilter/allfilters.c libavformat/Makefile libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcm: fix IMA SMJPEG decodingPaul B Mahol2011-12-221-5/+9
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | adpcm: Fix crashMichael Niedermayer2011-12-191-0/+3
| | | | | | | | | | | | | | Fixes half of Ticket794 Bug found by: Oana Stratulat Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-181-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: link test programs with static libraries dct-test: remove unused variable cropTbl swscale: fix overflow in gray16 vertical scaling. get_bits: remove LAST_SKIP_CACHE macro swscale: fix integer overflows in RGB pixel writing. swscale: add endian conversion for RGB555 and RGB444 pixel formats swscale: fix overflows in output of RGB48 pixels. get_bits: remove strange/obsolete comments get_bits: whitespace (mostly) cosmetics swscale: add rgb565 endianess conversion get_bits: remove unnecessary #includes mp3dec: hack: fix decoding with safe bitstream reader fate: fix eatqi test adpcm: Check for channels to be a non-zero integer swscale: fix overflows in RGB rounding constants. get_bits: introduce safe bitreading to prevent overreads. Conflicts: libswscale/swscale.c libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcm: Check for channels to be a non-zero integerShitiz Garg2011-12-171-2/+3
| | | | | | | | | | | | | | channels would be 0 sometimes and would cause floating point exception Fixes bugzilla #124 Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | adpcm: fix division by zero in fate/creative/intro-partial.wav with -s 2 and ↵Michael Niedermayer2011-12-101-0/+3
| | | | | | | | | | | | | | -r 0.001:1 Bug-Found-by: Shitiz Garg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-031-17/+25
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aac_latm: reconfigure decoder on audio specific config changes latmdec: fix audio specific config parsing Add avcodec_decode_audio4(). avcodec: change number of plane pointers from 4 to 8 at next major bump. Update developers documentation with coding conventions. svq1dec: avoid undefined get_bits(0) call ARM: h264dsp_neon cosmetics ARM: make some NEON macros reusable Do not memcpy raw video frames when using null muxer fate: update asf seektest vp8: flush buffers on size changes. doc: improve general documentation for MacOSX asf: use packet dts as approximation of pts asf: do not call av_read_frame rtsp: Initialize the media_type_mask in the rtp guessing demuxer Cleaned up alacenc.c Conflicts: doc/APIchanges doc/developer.texi libavcodec/8svx.c libavcodec/aacdec.c libavcodec/ac3dec.c libavcodec/avcodec.h libavcodec/nellymoserdec.c libavcodec/tta.c libavcodec/utils.c libavcodec/version.h libavcodec/wmadec.c libavformat/asfdec.c tests/ref/seek/lavf_asf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add avcodec_decode_audio4().Justin Ruggles2011-12-021-17/+25
| | | | | | | | | | | | Deprecate avcodec_decode_audio3(). Implement audio support in avcodec_default_get_buffer(). Implement the new audio decoder API in all audio decoders.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-241-15/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adpcm: use sign_extend() mpeg12: fix mpeg_decode_slice context parameter type Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context" Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adpcm: use sign_extend()Mans Rullgard2011-10-241-15/+15
| | | | | | | | | | | | This avoids warnings from the overflow checker and simplifies the code. Signed-off-by: Mans Rullgard <mans@mansr.com>
OpenPOWER on IntegriCloud