diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 23:00:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 23:01:34 +0100 |
| commit | 649384290089ff6ede80aceb050803707be72bb5 (patch) | |
| tree | 58c24137ba2576fe102b1677194e8d4e2c3f5362 /libavcodec/flacdsp.c | |
| parent | 7d26be63c25e715f008e8923654bdf318419dd39 (diff) | |
| parent | 8a58894fc63c9d367c4cd6a17e277d1a8608c2c0 (diff) | |
| download | ffmpeg-649384290089ff6ede80aceb050803707be72bb5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a 24-bit FLAC encoding test
FATE: rename FLAC tests from flac-* to flac-16-*
flacenc: use RICE2 entropy coding mode for 24-bit
flacenc: add 24-bit encoding
flacdsp: move lpc encoding from FLAC encoder to FLACDSPContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacdsp.c')
| -rw-r--r-- | libavcodec/flacdsp.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/flacdsp.c b/libavcodec/flacdsp.c index e51a91a07c..02eba3ea8a 100644 --- a/libavcodec/flacdsp.c +++ b/libavcodec/flacdsp.c @@ -26,6 +26,7 @@ #define SAMPLE_SIZE 16 #define PLANAR 0 #include "flacdsp_template.c" +#include "flacdsp_lpc_template.c" #undef PLANAR #define PLANAR 1 @@ -36,6 +37,7 @@ #define SAMPLE_SIZE 32 #define PLANAR 0 #include "flacdsp_template.c" +#include "flacdsp_lpc_template.c" #undef PLANAR #define PLANAR 1 @@ -86,10 +88,13 @@ static void flac_lpc_32_c(int32_t *decoded, const int coeffs[32], av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int bps) { - if (bps > 16) + if (bps > 16) { c->lpc = flac_lpc_32_c; - else + c->lpc_encode = flac_lpc_encode_c_32; + } else { c->lpc = flac_lpc_16_c; + c->lpc_encode = flac_lpc_encode_c_16; + } switch (fmt) { case AV_SAMPLE_FMT_S32: |