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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/fate/flac.mak | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/tests/fate/flac.mak b/tests/fate/flac.mak index dc4992827d..92eb7430db 100644 --- a/tests/fate/flac.mak +++ b/tests/fate/flac.mak @@ -1,17 +1,24 @@ -FATE_FLAC += fate-flac-chmode-indep \ - fate-flac-chmode-left_side \ - fate-flac-chmode-mid_side \ - fate-flac-chmode-right_side \ - fate-flac-fixed \ - fate-flac-lpc-cholesky \ - fate-flac-lpc-levinson \ +FATE_FLAC += fate-flac-16-chmode-indep \ + fate-flac-16-chmode-left_side \ + fate-flac-16-chmode-mid_side \ + fate-flac-16-chmode-right_side \ + fate-flac-16-fixed \ + fate-flac-16-lpc-cholesky \ + fate-flac-16-lpc-levinson \ + fate-flac-24-comp-8 \ -fate-flac-chmode-%: OPTS = -ch_mode $(@:fate-flac-chmode-%=%) -fate-flac-fixed: OPTS = -lpc_type fixed -fate-flac-lpc-%: OPTS = -lpc_type $(@:fate-flac-lpc-%=%) +fate-flac-16-chmode-%: OPTS = -ch_mode $(@:fate-flac-16-chmode-%=%) +fate-flac-16-fixed: OPTS = -lpc_type fixed +fate-flac-16-lpc-%: OPTS = -lpc_type $(@:fate-flac-16-lpc-%=%) + +fate-flac-16-%: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav +fate-flac-16-%: CMD = enc_dec_pcm flac wav s16le $(REF) -c flac $(OPTS) + +fate-flac-24-comp-%: OPTS = -compression_level $(@:fate-flac-24-comp-%=%) + +fate-flac-24-%: REF = $(SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav +fate-flac-24-%: CMD = enc_dec_pcm flac wav s24le $(REF) -c flac $(OPTS) -fate-flac-%: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -fate-flac-%: CMD = enc_dec_pcm flac wav s16le $(REF) -c flac $(OPTS) fate-flac-%: CMP = oneoff fate-flac-%: FUZZ = 0 |