Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fate: adjust frequencies of the sine filter

Browse Source 
The filter currently uses inaccurate frequencies, this is in preparation for
fixing that, by using numbers that will map to the equivalent value in the
future code.

Signed-off-by: Marton Balint <cus@passwd.hu>
pull/391/head
Marton Balint 3 months ago
parent 59057aa807
commit 6189cb47fc
6 changed files with 78 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      tests/fate/ffmpeg.mak
  2. 2
      tests/fate/filter-video.mak
  3. 2
      tests/fate/libswresample.mak
  4. 6
      tests/filtergraphs/concat
  5. 6
      tests/filtergraphs/concat-vfr
  6. 132
      tests/filtergraphs/crazychannels

8
tests/fate/ffmpeg.mak
Unescape View File

@ -94,7 +94,7 @@ FATE_FFMPEG-$(call FILTERDEMDEC, AMIX ARESAMPLE SINE, RAWVIDEO, \
MPEG4_ENCODER AC3_FIXED_ENCODER) \
+= fate-shortest
fate-shortest: tests/data/vsynth1.yuv
fate-shortest: CMD = framecrc -auto_conversion_filters -f lavfi -i "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct fastint -qscale 10 -threads 1 -c:v mpeg4 -c:a ac3_fixed -shortest
fate-shortest: CMD = framecrc -auto_conversion_filters -f lavfi -i "sine=3000.00000013969838619232:d=10" -f lavfi -i "sine=1000.00000346917659044266:d=1" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct fastint -qscale 10 -threads 1 -c:v mpeg4 -c:a ac3_fixed -shortest
# test interleaving video with a sparse subtitle stream
FATE_SAMPLES_FFMPEG-$(call ALLYES, COLOR_FILTER, VOBSUB_DEMUXER, MATROSKA_DEMUXER,, \
@ -179,7 +179,7 @@ tests/data/audio_shorter_than_video.nut: tests/data/vsynth_lena.yuv
tests/data/audio_shorter_than_video.nut: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \
-sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv \
-f lavfi -i "sine=1000:d=1" \
-f lavfi -i "sine=1000.00000346917659044266:d=1" \
-sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct fastint -qscale 10 -c:v mpeg4 -threads 1 -c:a pcm_s16le -bitexact \
-y $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut 2>/dev/null
@ -190,8 +190,8 @@ FATE_STREAMCOPY-$(call FRAMEMD5, NUT, RAWVIDEO PCM_S16LE MPEG4, \
NUT_MUXER AC3_FIXED_ENCODER) \
+= fate-copy-shortest1 fate-copy-shortest2
fate-copy-shortest1 fate-copy-shortest2: tests/data/audio_shorter_than_video.nut
fate-copy-shortest1: CMD = framemd5 -auto_conversion_filters -fflags +bitexact -flags +bitexact -f lavfi -i "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -fflags +bitexact -flags +bitexact -c:v copy -c:a ac3_fixed -shortest
fate-copy-shortest2: CMD = framemd5 -auto_conversion_filters -fflags +bitexact -flags +bitexact -f lavfi -i "sine=3000:d=10" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 1:v:0 -map "[audio]" -fflags +bitexact -flags +bitexact -c:v copy -c:a ac3_fixed -shortest
fate-copy-shortest1: CMD = framemd5 -auto_conversion_filters -fflags +bitexact -flags +bitexact -f lavfi -i "sine=3000.00000013969838619232:d=10" -f lavfi -i "sine=1000.00000346917659044266:d=1" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -fflags +bitexact -flags +bitexact -c:v copy -c:a ac3_fixed -shortest
fate-copy-shortest2: CMD = framemd5 -auto_conversion_filters -fflags +bitexact -flags +bitexact -f lavfi -i "sine=3000.00000013969838619232:d=10" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 1:v:0 -map "[audio]" -fflags +bitexact -flags +bitexact -c:v copy -c:a ac3_fixed -shortest
fate-streamcopy: $(FATE_STREAMCOPY-yes)
FATE_SAMPLES_FFMPEG-yes += $(FATE_STREAMCOPY-yes)

2
tests/fate/filter-video.mak
Unescape View File

@ -756,7 +756,7 @@ fate-filter-metadata-readvitc-thr: CMD = run $(FILTER_METADATA_COMMAND) "movie='
AVF_PHASE_METER_DEPS = FFPROBE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER SINE_FILTER APHASEMETER_FILTER ARESAMPLE_FILTER
FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-mono
fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000:sample_rate=48000:duration=1,aphasemeter=video=0"
fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000.00000346917659044266:sample_rate=48000:duration=1,aphasemeter=video=0"
FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS) FILE_PROTOCOL) += fate-filter-metadata-avf-aphase-meter-out-of-phase
fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filter/out-of-phase-1000hz.flac

2
tests/fate/libswresample.mak
Unescape View File

@ -1083,7 +1083,7 @@ $(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_LIN_ASYNC,fltp,f32le,s16)
$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_LIN_ASYNC,dblp,f64le,s16)
FATE_SWR_RESAMPLE-$(call FILTERDEMDEC, ARESAMPLE ASETPTS ATRIM SINE, , PCM_S16LE, LAVFI_INDEV) += fate-swr-async-firstpts
fate-swr-async-firstpts: CMD = framecrc -auto_conversion_filters -copyts -f lavfi -i "sine=r=1000:samples_per_frame=100,asetpts=PTS+S+S*floor(ld(1)/4)+st(1\,ld(1)+1)*0,atrim=end=2" -filter:a aresample=async=300:first_pts=0
fate-swr-async-firstpts: CMD = framecrc -auto_conversion_filters -copyts -f lavfi -i "sine=r=1000:f=439.99999994412064552:samples_per_frame=100,asetpts=PTS+S+S*floor(ld(1)/4)+st(1\,ld(1)+1)*0,atrim=end=2" -filter:a aresample=async=300:first_pts=0
FATE_SWR_RESAMPLE-$(call FILTERDEMDECENCMUX, ARESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_SWR_RESAMPLE)
fate-swr-resample: $(FATE_SWR_RESAMPLE-yes)

6
tests/filtergraphs/concat
Unescape View File

@ -1,8 +1,8 @@
testsrc=r=5:n=1:d=2 [v1];
sine=440:b=2:d=1 [a1];
sine=439.999995776452124118805:b=2.00000002333598070336507:d=1 [a1];
testsrc=r=5:n=1:d=1 [v2];
sine=622:b=2:d=2 [a2];
sine=621.999997249804437160492:b=2.00000001650776759731798:d=2 [a2];
testsrc=r=5:n=1:d=1 [v3];
sine=880:b=2:d=1 [a3];
sine=880.00000182073563337326:b=2:d=1 [a3];
[v1][a1][v2][a2][v3][a3] concat=v=1:a=1:n=3

6
tests/filtergraphs/concat-vfr
Unescape View File

@ -1,8 +1,8 @@
testsrc=r=5:n=1:d=2 [v1];
sine=440:b=2:d=1 [a1];
sine=439.999995776452124118805:b=2.00000002333598070336507:d=1 [a1];
testsrc=r=15:n=1:d=1 [v2];
sine=622:b=2:d=2 [a2];
sine=621.999997249804437160492:b=2.00000001650776759731798:d=2 [a2];
testsrc=r=8:n=1:d=1 [v3];
sine=880:b=2:d=1 [a3];
sine=880.00000182073563337326:b=2:d=1 [a3];
[v1][a1][v2][a2][v3][a3] concat=v=1:a=1:n=3

132
tests/filtergraphs/crazychannels
Unescape View File

@ -1,73 +1,73 @@
sine=frequency=400 * 0x0 [s0];
sine=frequency=400 * 0x1 [s1];
sine=frequency=400 * 0x2 [s2];
sine=frequency=400 * 0x3 [s3];
sine=frequency=400 * 0x4 [s4];
sine=frequency=400 * 0x5 [s5];
sine=frequency=400 * 0x6 [s6];
sine=frequency=400 * 0x7 [s7];
sine=frequency=400 * 0x8 [s8];
sine=frequency=400 * 0x9 [s9];
sine=frequency=400 * 0xa [sa];
sine=frequency=400 * 0xb [sb];
sine=frequency=400 * 0xc [sc];
sine=frequency=400 * 0xd [sd];
sine=frequency=400 * 0xe [se];
sine=frequency=400 * 0xf [sf];
sine=frequency=0.00000000000000000000[s0];
sine=frequency=399.999995226971805095[s1];
sine=frequency=800.000000721774995327[s2];
sine=frequency=1199.99999594874680042[s3];
sine=frequency=1600.00000144354999065[s4];
sine=frequency=1999.99999667052179574[s5];
sine=frequency=2400.00000216532498598[s6];
sine=frequency=2799.99999739229679107[s7];
sine=frequency=3200.00000288709998130[s8];
sine=frequency=3599.99999811407178640[s9];
sine=frequency=4000.00000360887497663[sa];
sine=frequency=4399.99999883584678173[sb];
sine=frequency=4800.00000433064997196[sc];
sine=frequency=5199.99999955762177705[sd];
sine=frequency=5600.00000505242496728[se];
sine=frequency=6000.00000027939677238[sf];
sine=frequency=6399.99999550636857748[s10];
sine=frequency=400 * 0x10 [s10];
sine=frequency=400 * 0x11 [s11];
sine=frequency=400 * 0x12 [s12];
sine=frequency=400 * 0x13 [s13];
sine=frequency=400 * 0x14 [s14];
sine=frequency=400 * 0x15 [s15];
sine=frequency=400 * 0x16 [s16];
sine=frequency=400 * 0x17 [s17];
sine=frequency=400 * 0x18 [s18];
sine=frequency=400 * 0x19 [s19];
sine=frequency=400 * 0x1a [s1a];
sine=frequency=400 * 0x1b [s1b];
sine=frequency=400 * 0x1c [s1c];
sine=frequency=400 * 0x1d [s1d];
sine=frequency=400 * 0x1e [s1e];
sine=frequency=400 * 0x1f [s1f];
sine=frequency=6800.00000100117176771[s11];
sine=frequency=7199.99999622814357280[s12];
sine=frequency=7600.00000172294676303[s13];
sine=frequency=7999.99999694991856813[s14];
sine=frequency=8400.00000244472175836[s15];
sine=frequency=8799.99999767169356346[s16];
sine=frequency=9200.00000316649675369[s17];
sine=frequency=9599.99999839346855878[s18];
sine=frequency=10000.0000038882717490[s19];
sine=frequency=10399.9999991152435541[s1a];
sine=frequency=10800.0000046100467443[s1b];
sine=frequency=11199.9999998370185494[s1c];
sine=frequency=11599.9999950639903545[s1d];
sine=frequency=12000.0000005587935447[s1e];
sine=frequency=12399.9999957857653498[s1f];
sine=frequency=12800.0000012805685400[s20];
sine=frequency=400 * 0x20 [s20];
sine=frequency=400 * 0x21 [s21];
sine=frequency=400 * 0x22 [s22];
sine=frequency=400 * 0x23 [s23];
sine=frequency=400 * 0x24 [s24];
sine=frequency=400 * 0x25 [s25];
sine=frequency=400 * 0x26 [s26];
sine=frequency=400 * 0x27 [s27];
sine=frequency=400 * 0x28 [s28];
sine=frequency=400 * 0x29 [s29];
sine=frequency=400 * 0x2a [s2a];
sine=frequency=400 * 0x2b [s2b];
sine=frequency=400 * 0x2c [s2c];
sine=frequency=400 * 0x2d [s2d];
sine=frequency=400 * 0x2e [s2e];
sine=frequency=400 * 0x2f [s2f];
sine=frequency=13199.9999965075403451[s21];
sine=frequency=13600.0000020023435354[s22];
sine=frequency=13999.9999972293153405[s23];
sine=frequency=14400.0000027241185307[s24];
sine=frequency=14799.9999979510903358[s25];
sine=frequency=15200.0000034458935260[s26];
sine=frequency=15599.9999986728653311[s27];
sine=frequency=16000.0000041676685214[s28];
sine=frequency=16399.9999993946403264[s29];
sine=frequency=16800.0000048894435167[s2a];
sine=frequency=17200.0000001164153218[s2b];
sine=frequency=17599.9999953433871269[s2c];
sine=frequency=18000.0000008381903171[s2d];
sine=frequency=18399.9999960651621222[s2e];
sine=frequency=18800.0000015599653124[s2f];
sine=frequency=19199.9999967869371175[s30];
sine=frequency=400 * 0x30 [s30];
sine=frequency=400 * 0x31 [s31];
sine=frequency=400 * 0x32 [s32];
sine=frequency=400 * 0x33 [s33];
sine=frequency=400 * 0x34 [s34];
sine=frequency=400 * 0x35 [s35];
sine=frequency=400 * 0x36 [s36];
sine=frequency=400 * 0x37 [s37];
sine=frequency=400 * 0x38 [s38];
sine=frequency=400 * 0x39 [s39];
sine=frequency=400 * 0x3a [s3a];
sine=frequency=400 * 0x3b [s3b];
sine=frequency=400 * 0x3c [s3c];
sine=frequency=400 * 0x3d [s3d];
sine=frequency=400 * 0x3e [s3e];
sine=frequency=400 * 0x3f [s3f];
sine=frequency=19600.0000022817403078[s31];
sine=frequency=19999.9999975087121129[s32];
sine=frequency=20400.0000030035153031[s33];
sine=frequency=20799.9999982304871082[s34];
sine=frequency=21200.0000037252902984[s35];
sine=frequency=21599.9999989522621035[s36];
sine=frequency=22000.0000044470652937[s37];
sine=frequency=22399.9999996740370988[s38];
sine=frequency=22799.9999949010089039[s39];
sine=frequency=23200.0000003958120942[s3a];
sine=frequency=23599.9999956227838993[s3b];
sine=frequency=24000.0000011175870895[s3c];
sine=frequency=24399.9999963445588946[s3d];
sine=frequency=24800.0000018393620848[s3e];
sine=frequency=25199.9999970663338899[s3f];
sine=frequency=400 * 0x40 [s40];
sine=frequency=400 * 0x41 [s41];
sine=frequency=25600.0000025611370801[s40];
sine=frequency=25999.9999977881088852[s41];
[s0] [s1] [s2] [s3] [s4] [s5] [s6] [s7] [s8] [s9] [sa] [sb] [sc] [sd] [se] [sf]
[s10][s11][s12][s13][s14][s15][s16][s17] [s18][s19][s1a][s1b][s1c][s1d][s1e][s1f]

Write Preview
Loading…
Cancel
Save