diff options
| -rw-r--r-- | libavresample/x86/audio_convert.asm | 4 | ||||
| -rw-r--r-- | tests/fate/aac.mak | 16 | ||||
| -rw-r--r-- | tests/fate/atrac.mak | 18 |
3 files changed, 21 insertions, 17 deletions
diff --git a/libavresample/x86/audio_convert.asm b/libavresample/x86/audio_convert.asm index e7f715776c..567a916bc8 100644 --- a/libavresample/x86/audio_convert.asm +++ b/libavresample/x86/audio_convert.asm @@ -247,7 +247,7 @@ cglobal conv_s16p_to_s16_2ch, 3,4,5, dst, src0, len, src1 add src1q, lenq lea dstq, [dstq+2*lenq] neg lenq -.loop +.loop: mova m0, [src0q+lenq ] mova m1, [src1q+lenq ] mova m2, [src0q+lenq+mmsize] @@ -716,7 +716,7 @@ cglobal conv_fltp_to_flt_2ch, 3,4,5, dst, src0, len, src1 add src1q, lenq lea dstq, [dstq+2*lenq] neg lenq -.loop +.loop: mova m0, [src0q+lenq ] mova m1, [src1q+lenq ] mova m2, [src0q+lenq+mmsize] diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index b87ef761f9..2fdf74f18c 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -46,18 +46,10 @@ FATE_AAC += fate-aac-al_sbr_ps_06_ur fate-aac-al_sbr_ps_06_ur: CMD = pcm -i $(SAMPLES)/aac/al_sbr_ps_06_new.mp4 fate-aac-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16 -FATE_AAC_LATM += fate-aac-latm_000000001180bc60 -fate-aac-latm_000000001180bc60: CMD = pcm -i $(SAMPLES)/aac/latm_000000001180bc60.mpg -fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16 - FATE_AAC += fate-aac-ap05_48 fate-aac-ap05_48: CMD = pcm -i $(SAMPLES)/aac/ap05_48.mp4 fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16 -FATE_AAC_LATM += fate-aac-latm_stereo_to_51 -fate-aac-latm_stereo_to_51: CMD = pcm -i $(SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1 -fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16 - fate-aac-ct%: CMD = pcm -i $(SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%) fate-aac-ct%: REF = $(SAMPLES)/aac/CT_DecoderCheck/aacPlusv2.wav @@ -88,6 +80,14 @@ fate-aac-ln-encode: CMP_SHIFT = -4096 fate-aac-ln-encode: CMP_TARGET = 65 fate-aac-ln-encode: SIZE_TOLERANCE = 3560 +FATE_AAC_LATM += fate-aac-latm_000000001180bc60 +fate-aac-latm_000000001180bc60: CMD = pcm -i $(SAMPLES)/aac/latm_000000001180bc60.mpg +fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16 + +FATE_AAC_LATM += fate-aac-latm_stereo_to_51 +fate-aac-latm_stereo_to_51: CMD = pcm -i $(SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1 +fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16 + FATE_AAC_ALL = $(FATE_AAC) $(FATE_AAC_LATM) $(FATE_AAC_ALL): CMP = oneoff diff --git a/tests/fate/atrac.mak b/tests/fate/atrac.mak index 08a6b25bd1..39b788a1ca 100644 --- a/tests/fate/atrac.mak +++ b/tests/fate/atrac.mak @@ -1,20 +1,24 @@ -FATE_ATRAC += fate-atrac1 +FATE_ATRAC1 += fate-atrac1 fate-atrac1: CMD = pcm -i $(SAMPLES)/atrac1/test_tones_small.aea fate-atrac1: REF = $(SAMPLES)/atrac1/test_tones_small.pcm -FATE_ATRAC += fate-atrac3-1 +FATE_ATRAC3 += fate-atrac3-1 fate-atrac3-1: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_066_small.wav fate-atrac3-1: REF = $(SAMPLES)/atrac3/mc_sich_at3_066_small.pcm -FATE_ATRAC += fate-atrac3-2 +FATE_ATRAC3 += fate-atrac3-2 fate-atrac3-2: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_105_small.wav fate-atrac3-2: REF = $(SAMPLES)/atrac3/mc_sich_at3_105_small.pcm -FATE_ATRAC += fate-atrac3-3 +FATE_ATRAC3 += fate-atrac3-3 fate-atrac3-3: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_132_small.wav fate-atrac3-3: REF = $(SAMPLES)/atrac3/mc_sich_at3_132_small.pcm -$(FATE_ATRAC): CMP = oneoff +FATE_ATRAC_ALL = $(FATE_ATRAC1) $(FATE_ATRAC3) -FATE_SAMPLES_AVCONV += $(FATE_ATRAC) -fate-atrac: $(FATE_ATRAC) +$(FATE_ATRAC_ALL): CMP = oneoff + +FATE_SAMPLES_AVCONV += $(FATE_ATRAC_ALL) + +fate-atrac: $(FATE_ATRAC_ALL) +fate-atrac3: $(FATE_ATRAC3) |