summaryrefslogtreecommitdiffstats
path: root/libavcodec/adpcm.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/adpcm: Fix undefined behavior with negative predictions in IMA OKIMichael Niedermayer2019-11-091-1/+1
| | | | | | | | Fixes: left shift of negative value -30 Fixes: 18392/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_IMA_OKI_fuzzer-5631771831435264 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/adpcm: Fix invalid shifts in ADPCM DTKMichael Niedermayer2019-10-291-1/+1
| | | | | | | | | Fixes: left shift of negative value -1 Fixes: 18397/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_DTK_fuzzer-5675653487132672 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/adpcm: Check initial predictor for ADPCM_IMA_EA_EACSMichael Niedermayer2019-10-161-1/+4
| | | | | | | | Fixes: signed integer overflow: -2147483360 - 631 cannot be represented in type 'int' Fixes: 17701/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_IMA_EA_EACS_fuzzer-5711517319692288 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/adpcm: Fix left shifts in AV_CODEC_ID_ADPCM_EAMichael Niedermayer2019-10-161-2/+2
| | | | | | | | Fixes: left shift of negative value -1 Fixes: 17683/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_EA_R2_fuzzer-5111690013704192 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/adpcm: Check number of channels for MTAFMichael Niedermayer2019-09-241-0/+4
| | | | | | | | | Fixes: out of array access Fixes: 17608/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_MTAF_fuzzer-5074936267276288 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/adpcm: reindent after last commitPaul B Mahol2019-07-261-30/+30
|
* avcodec/adpcm: add support for 5.1 ADPCM MSPaul B Mahol2019-07-261-1/+30
|
* libavcodec: Reduce the size of some arraysAndreas Rheinhardt2019-06-201-4/+4
| | | | | | | | | | This commit uses smaller types for some static const arrays to reduce their size in case the entries can be represented in the smaller type. The biggest savings came from inv_map_table in vp9.c. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec: add ADPCM AGM decoderPaul B Mahol2019-04-111-0/+58
|
* avcodec/adpcm: use assert for codec id instead or error returnMichael Niedermayer2019-01-011-1/+1
| | | | | | | A unsupported codec_id is a internal error and should not happen Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* adpcm: consume remainder after consuming XA chunksMisty De Meo2018-01-061-0/+7
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* adpcm: fix clipping for yamahaPaul B Mahol2017-02-151-1/+1
| | | | | | | According to specification max value allowed is 0x6000. Fixes #5862. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/adpcm: clip step for ADPCM MTAF decoderPaul B Mahol2016-09-151-2/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/adpcm: Fix adpcm_ima_wav paddingMichael Niedermayer2016-08-211-1/+1
| | | | | | | | Fixes out of array read Fixes: f29f134ea5f5590df554a7733294a587/asan_stack-oob_309d14e_9188_ea01743d6355aff20530f3d4cdaa841a.wav Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-211-1/+1
|\ | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-041-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec: add adpcm MTAF decoderPaul B Mahol2016-05-211-0/+41
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/adpcm: pick correct step_index for IMA AMVPaul B Mahol2016-05-191-2/+2
| | | | | | | | | | | | Fixes #5538 Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/adpcm: fix decoding of stereo non 4-bit ADPCM IMA WAVPaul B Mahol2016-05-041-3/+11
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/adpcm: replace char/short/long with int8_t/int16_t/intPaul B Mahol2016-05-041-12/+12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec: add adpcm dat4 decoderPaul B Mahol2016-04-051-0/+16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec: add ADPCM AICA decoderPaul B Mahol2015-10-291-0/+18
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec: extend long decription for adpcm psx codecPaul B Mahol2015-10-231-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/adpcm: increase max channels for ADPCM PSX to 8Paul B Mahol2015-10-181-0/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec: add ADPCM PSX decoderPaul B Mahol2015-10-161-0/+40
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ADPCM: Bump THP channel limit to 14Rodger Combs2015-09-121-3/+3
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/adpcm: Check init_get_bits8() for failureMichael Niedermayer2015-09-041-1/+3
| | | | | | | | | | | | Fixes CID1322317 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-271-1/+1
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | lavc/adpcm: THP: set approx_nb_samples correctlyRodger Combs2015-06-281-4/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc+doc: adjust names to reflect ADPCM THP not being GameCube-onlyRodger Combs2015-06-251-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/adpcm: THP: don't use the ADPC/SEEK table when not seekingRodger Combs2015-06-211-4/+17
| | | | | | | | | | | | This is almost certainly closer to how the actual Nintendo players work, and fixes some output pops in files with blank ADPC/SEEK tables (like those from brawlcustommusic).
* | lavc/adpcm: THP: fix indentationRodger Combs2015-06-211-8/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/adpcm: THP: allow channel counts up to 10Rodger Combs2015-06-201-3/+5
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/adpcm: THP: handle packets with sample counts not divisible by 14Rodger Combs2015-06-201-4/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: add little-endian ADPCM_THP decoderRodger Combs2015-06-201-6/+19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/adpcm: Check for overreadsMichael Niedermayer2015-06-041-1/+12
| | | | | | | | | | | | See: vlc ticket 14649 Reported-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: use av_mod_uintp2() where usefulJames Almer2015-04-211-1/+1
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | adpcm: use av_clip_intp2()James Almer2015-04-181-1/+1
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/adpcm: use av_clip_intp2()Michael Niedermayer2015-02-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/adpcm: Check ideltaMichael Niedermayer2014-12-181-0/+4
| | | | | | | | | | | | | | Fixes integer overflow Fixes: signal_sigsegv_1b0a4da_1865_cov_2167818389_computer_anger.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Correct few "ffmpeg" typosPaul B Mahol2014-08-241-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16pJon Morley2014-08-191-1/+1
| | | | | | | | | | | | The AVSampleFormat list of sample_fmts_s16p is missing the trailing "P" for planar formats. AV_SAMPLE_FMT_S16 vs AV_SAMPLE_FMT_S16P Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/adpcm: also squelch 'mismatch in coded sample count' warning for ↵Peter Ross2014-03-311-2/+1
| | | | | | | | | | | | | | | | | | | | AV_CODEC_ID_ADPCM_EA_R1 AV_CODEC_ID_ADPCM_EA_R1/R2/R3 all use an internal offset. For some samples there is padding between the offset table and ADPCM data. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundaryPeter Ross2014-03-151-0/+3
| | | | | | | | | | | | | | Fixes ticket #3461. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/adpcm: squelch 'mismatch in coded sample count' warning for ↵Peter Ross2014-03-141-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | AV_CODEC_ID_ADPCM_EA_R2/3 These ADPCM codecs include a per-frame flag that enables a raw 16-bit mode. Therefore the the number of samples returned by get_nb_samples() is only ever approximate. Fixes ticket #3460. Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/adpcm: fix sample count for stereo SBPRO3Michael Niedermayer2014-01-151-1/+1
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f9b9902ed90_7462_new_alaw.voc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer2013-10-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun2013-10-031-1/+1
| |
| * adpcm: Write the correct number of samples for ima-dk4Luca Barbato2013-07-091-1/+1
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
OpenPOWER on IntegriCloud