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>
9 years ago
Michael Niedermayer
66a7bc0010
avcodec/adpcm: Check init_get_bits8() for failure
...
Fixes CID1322317
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
Vittorio Giovara
def97856de
lavc: AV-prefix all codec capabilities
...
Express bitfields more simply.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
9 years ago
Rodger Combs
7d0a19757e
lavc/adpcm: THP: set approx_nb_samples correctly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Rodger Combs
388a6f581a
lavc+doc: adjust names to reflect ADPCM THP not being GameCube-only
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
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).
10 years ago
Rodger Combs
631d56ffc8
lavc/adpcm: THP: fix indentation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
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>
10 years ago
Rodger Combs
8e7a06aa5c
lavc/adpcm: THP: handle packets with sample counts not divisible by 14
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Rodger Combs
7e7256c3a4
lavc: add little-endian ADPCM_THP decoder
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
3c803ed9cb
avcodec/adpcm: Check for overreads
...
See: vlc ticket 14649
Reported-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
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>
10 years ago
James Almer
778bac2788
adpcm: use av_clip_intp2()
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
10 years ago
Michael Niedermayer
f848a66009
avcodec/adpcm: use av_clip_intp2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
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>
10 years ago
Paul B Mahol
6dfa70f272
Correct few "ffmpeg" typos
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
10 years ago
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>
10 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
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>
11 years ago
Diego Biurrun
b2bed9325d
cosmetics: Group .name and .long_name together in codec/format declarations
11 years ago
Luca Barbato
12576afe20
adpcm: Write the correct number of samples for ima-dk4
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years ago
Paul B Mahol
6516a25f04
ADPCM IMA WAV 2, 3 and 5 bits decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
James Almer
67fad0d221
ADPCM IMA Radical decoder
...
Signed-off-by: James Almer <jamrial@gmail.com>
12 years ago
James Almer
22c7784f60
adpcm_thp: Allow the use of extradata for the adpcm table
...
There are several containers that support adpcm_thp (Also known as Gamecube DSP)
streams, but only thp files contain the coeff table and previous sample inside
each frame.
Some don't even contain previous sample information at all.
This change will make it easier to implement demuxers for said containers
without having to create a new decoder.
Signed-off-by: James Almer <jamrial@gmail.com>
12 years ago
James Almer
e7814ed839
ADPCM DTK decoder
...
Signed-off-by: James Almer <jamrial@gmail.com>
12 years ago
Paul B Mahol
aa96439fae
lavc: remove unused put_bits.h headers
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Diego Biurrun
ac9362c5d9
Move misplaced file author information where it belongs
12 years ago
Paul B Mahol
a9b424879f
lavc & lavf: replace deprecated av_log* functions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Clément Bœsch
1ec94b0f06
lavc: factorize ff_{thread_,re,}get_buffer error messages.
...
Coccinelle profile used:
@@
expression r, ctx, f, loglevel, str, flags;
@@
-if ((r = ff_get_buffer(ctx, f, flags)) < 0) {
- av_log(ctx, loglevel, str);
- return r;
-}
+if ((r = ff_get_buffer(ctx, f, flags)) < 0)
+ return r;
@@
expression r, ctx, f, loglevel, str;
@@
-if ((r = ff_reget_buffer(ctx, f)) < 0) {
- av_log(ctx, loglevel, str);
- return r;
-}
+if ((r = ff_reget_buffer(ctx, f)) < 0)
+ return r;
@@
expression r, ctx, f, loglevel, str, flags;
@@
-if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) {
- av_log(ctx, loglevel, str);
- return r;
-}
+if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0)
+ return r;
...along with some manual patches for the remaining ones.
12 years ago
Anton Khirnov
759001c534
lavc decoders: work with refcounted frames.
12 years ago
Justin Ruggles
e57daa876b
adpcm: decode directly to the user-provided AVFrame
12 years ago
Michael Niedermayer
f18c873ab5
adpcm: fix off by 1 error and out of array access in DK4
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
594d4d5df3
lavc: add a wrapper for AVCodecContext.get_buffer().
...
It will be useful in the upcoming transition to refcounted AVFrames.
12 years ago
Paul B Mahol
d4c59f77b6
adpcm/thp: cosmetics: reindent
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
51d6879939
AFC demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
67be7fb432
adpcm: thp, afc: support multichannel decoding
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
7d2156aee8
adpcm/thp: make use of ADPCMChannelStatus to store prev samples
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
807fa714f0
adpcmdec: Fix OOM/infloop
...
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
3d8e684f05
ADPCM IMA Dialogic decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
32cd3a7c16
ADPCM AFC decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
0cbb31a264
adpcm: reindent after previous commit
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
e8a9b1a1a0
adpcm: ADPCM IMA SMJPEG stereo decoding
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
08101e62cb
adpcm: improve smjpeg decoding
...
Previous version had significant artifacts.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Justin Ruggles
4ebd74cec7
adpcmdec: use planar sample format for adpcm_thp
12 years ago
Justin Ruggles
327cdb04e3
adpcmdec: use planar sample format for adpcm_ea_xas
12 years ago
Justin Ruggles
da9620e8e5
adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3
12 years ago
Justin Ruggles
d2b6ae02aa
adpcmdec: use planar sample format for adpcm_xa
12 years ago
Justin Ruggles
8b854283c3
adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3
12 years ago