virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-11-05 23:00:23 +01:00
parent 7d26be63c2 8a58894fc6
commit 6493842900
5 changed files with 276 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/fate/flac.mak
View File

@@ -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