xaymar/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,837 Commits 35 Branches 386 Tags
07388eee457e3a91c1944966ec6556de7bc296a3
Commit Graph

328 Commits

Author SHA1 Message Date
Michael Niedermayer 614fc179d6 avcodec/adpcm: Fix invalid shift in AV_CODEC_ID_ADPCM_PSX 
Fixes: left shift of negative value -1
Fixes: 20859/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_PSX_fuzzer-5720391507247104

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 0a11ef68f0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-05-19 17:17:36 +02:00
Michael Niedermayer a641bd4ad7 avcodec/adpcm: Fix overflow in FFABS() IMA_EA_EACS 
Fixes: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself
Fixes: 19235/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_IMA_EA_EACS_fuzzer-5680878952382464

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 794352ae9d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2020-05-19 17:17:35 +02:00
Michael Niedermayer 9511cfe07f avcodec/adpcm: Clip predictor for APC 
Fixes: signed integer overflow: -2147483648 - 13 cannot be represented in type 'int'
Fixes: 18893/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_IMA_APC_fuzzer-5630760442920960

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9fe07908c3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2019-12-31 19:51:57 +01:00
Michael Niedermayer 090d10ce60 avcodec/adpcm: Fix invalid shift in xa_decode() 
Fixes: left shift of negative value -1
Fixes: 18859/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_XA_fuzzer-5748474213040128

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 50db30b47d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2019-12-31 19:51:57 +01:00
Michael Niedermayer 88d97044cb avcodec/adpcm: Fix undefined behavior with negative predictions in IMA OKI 
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>
(cherry picked from commit 7786f6c30e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2019-12-31 19:51:56 +01:00
Michael Niedermayer b55ec3f327 avcodec/adpcm: Fix invalid shifts in ADPCM DTK 
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>
(cherry picked from commit 34e701ff93)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2019-12-31 19:51:56 +01:00
Michael Niedermayer f20ca5d729 avcodec/adpcm: Check initial predictor for ADPCM_IMA_EA_EACS 
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>
(cherry picked from commit 2f66e8436d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2019-12-31 19:51:56 +01:00
Michael Niedermayer 3f919ef19c avcodec/adpcm: Fix left shifts in AV_CODEC_ID_ADPCM_EA 
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>
(cherry picked from commit 8695fbec57)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2019-12-31 19:51:56 +01:00
Michael Niedermayer daa398e80e avcodec/adpcm: Check number of channels for MTAF 
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>
(cherry picked from commit 74bbf9bc82)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2019-12-31 19:51:55 +01:00
Andreas Rheinhardt a1a8815220 libavcodec: Reduce the size of some arrays 
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>
 2019-06-20 14:47:46 -03:00
Paul B Mahol d0f24df648 avcodec: add ADPCM AGM decoder 2019-04-11 11:58:34 +02:00
Michael Niedermayer 2d9fe6321e avcodec/adpcm: use assert for codec id instead or error return 
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>
 2019-01-01 21:11:47 +01:00
Misty De Meo 94e6b5ac39 adpcm: consume remainder after consuming XA chunks 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-01-06 03:14:38 +01:00
Paul B Mahol ee4aa388b2 adpcm: fix clipping for yamaha 
According to specification max value allowed is 0x6000.
Fixes #5862.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-02-15 12:46:01 +01:00
Paul B Mahol b82c1a377a avcodec/adpcm: clip step for ADPCM MTAF decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-09-15 17:24:40 +02:00
Michael Niedermayer f2a9a30fd6 avcodec/adpcm: Fix adpcm_ima_wav padding 
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>
 2016-08-21 02:44:15 +02:00
Clément Bœsch 8ef57a0d61 Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 21:55:34 +02:00
Paul B Mahol 8c17eea46f avcodec: add adpcm MTAF decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-05-21 18:49:45 +02:00
Paul B Mahol 14992421df avcodec/adpcm: pick correct step_index for IMA AMV 
Fixes #5538

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-05-19 23:48:25 +02:00
Vittorio Giovara 41ed7ab45f cosmetics: Fix spelling mistakes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-05-04 18:16:21 +02:00
Paul B Mahol 66eb5b809a avcodec/adpcm: fix decoding of stereo non 4-bit ADPCM IMA WAV 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-05-04 11:33:34 +02:00
Paul B Mahol 3395ad48fa avcodec/adpcm: replace char/short/long with int8_t/int16_t/int 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-05-04 00:36:02 +02:00
Paul B Mahol 8a4c3f5258 avcodec: add adpcm dat4 decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-05 10:48:59 +02:00
Paul B Mahol af3f793f60 avcodec: add ADPCM AICA decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-10-29 21:26:43 +01:00
Paul B Mahol 8dea76180c avcodec: extend long decription for adpcm psx codec 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-10-23 19:07:37 +02:00
Paul B Mahol 7bbd060324 avcodec/adpcm: increase max channels for ADPCM PSX to 8 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-10-18 14:17:15 +02:00
Paul B Mahol 8b11e43799 avcodec: add ADPCM PSX decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-10-16 16:37:40 +02:00
Rodger Combs 3f9fa2d0b5 ADPCM: Bump THP channel limit to 14 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-12 22:09:35 +02:00
Michael Niedermayer 66a7bc0010 avcodec/adpcm: Check init_get_bits8() for failure 
Fixes CID1322317

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-04 12:03:37 +02:00
Michael Niedermayer 444e9874a7 Merge commit 'def97856de6021965db86c25a732d78689bd6bb0' 
* 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>
 2015-07-27 22:50:18 +02:00
Vittorio Giovara def97856de lavc: AV-prefix all codec capabilities 
Express bitfields more simply.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-27 15:24:58 +01:00
Rodger Combs 7d0a19757e lavc/adpcm: THP: set approx_nb_samples correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-28 16:42:25 +02:00
Rodger Combs 388a6f581a lavc+doc: adjust names to reflect ADPCM THP not being GameCube-only 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-25 19:29:02 +02:00
Rodger Combs 0f67351944 lavc/adpcm: THP: don't use the ADPC/SEEK table when not seeking 
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).
 2015-06-21 10:32:13 +00:00
Rodger Combs 631d56ffc8 lavc/adpcm: THP: fix indentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-21 00:34:21 +02:00
Rodger Combs 6b547180b9 lavc/adpcm: THP: allow channel counts up to 10 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-20 19:21:53 +02:00
Rodger Combs 8e7a06aa5c lavc/adpcm: THP: handle packets with sample counts not divisible by 14 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-20 16:33:57 +02:00
Rodger Combs 7e7256c3a4 lavc: add little-endian ADPCM_THP decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-20 16:33:39 +02:00
Michael Niedermayer 3c803ed9cb avcodec/adpcm: Check for overreads 
See: vlc ticket 14649
Reported-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-04 22:37:01 +02:00
James Almer ba625dd8a1 avcodec: use av_mod_uintp2() where useful 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-21 22:41:20 -03:00
James Almer 778bac2788 adpcm: use av_clip_intp2() 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-04-18 14:15:07 -03:00
Michael Niedermayer f848a66009 avcodec/adpcm: use av_clip_intp2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-21 20:41:36 +01:00
Michael Niedermayer e59c28b166 avcodec/adpcm: Check idelta 
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>
 2014-12-18 16:10:23 +01:00
Paul B Mahol 6dfa70f272 Correct few "ffmpeg" typos 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-08-24 11:05:42 +00:00
Jon Morley 18e70006e7 avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p 
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>
 2014-08-19 23:09:16 +02:00
Peter Ross bf7d93e157 avcodec/adpcm: also squelch 'mismatch in coded sample count' warning for 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>
 2014-03-31 13:18:19 +02:00
Peter Ross d1bb17940d avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundary 
Fixes ticket #3461.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-15 01:34:42 +01:00
Peter Ross 7380201451 avcodec/adpcm: squelch 'mismatch in coded sample count' warning for 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>
 2014-03-14 17:21:59 +01:00
Michael Niedermayer 785dc14654 avcodec/adpcm: fix sample count for stereo SBPRO3 
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>
 2014-01-15 01:30:38 +01:00
Michael Niedermayer ee77140afa Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2' 
* 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>
 2013-10-04 12:34:23 +02:00