From: WANG Date: Tue, 3 Sep 2013 08:29:53 +0000 (+0200) Subject: Cleaning of dsp_files, input_sounds, output_sounds. X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/commitdiff_plain/c49372ebd1adde89ca83af5e37d1441ff2c2e7d5?ds=sidebyside;hp=-c Cleaning of dsp_files, input_sounds, output_sounds. --- c49372ebd1adde89ca83af5e37d1441ff2c2e7d5 diff --git a/dsp_files/opening.dsp b/dsp_files/opening.dsp deleted file mode 100644 index 29d985c..0000000 --- a/dsp_files/opening.dsp +++ /dev/null @@ -1,40 +0,0 @@ -import("mrfaustlib/fft.lib"); -import("fft2d.dsp"); - -DILATION_MIN = 0; -EROSION_MAX = 255; - -strel_shift_dilation = DILATION_MIN : vectorize(1); -strel_shift_erosion = EROSION_MAX : vectorize(1); - -spray_by_three(n) = _ <: par(i, n, ([i], [i+1], [i+2])); - -tri_max = max, _ : max; -tri_maxs(n) = par(i, n, tri_max); -tri_min = min, _ : min; -tri_mins(n) = par(i, n, tri_min); - -dilating(n) = strel_shift_dilation, _, strel_shift_dilation : #, _ : # : spray_by_three(n) : tri_maxs(n) : nconcat(n); - -eroding(n) = strel_shift_erosion, _, strel_shift_erosion : #, _ : # : spray_by_three(n) : tri_mins(n) : nconcat(n); - -//dilation(size, iter) = seq(i, iter, dilating(size)); -//erosion(size, iter) = seq(i, iter, eroding(size)); - -dilation_square(x, y) = _ : vectorize(y) : serialize : dilating(x) : vectorize(y) : matrix_transpose(y, x) : serialize : dilating(y) : vectorize(x) : matrix_transpose(x, y) : serialize; - -dilations(x, y, iter) = seq(i, iter, dilation_square(x,y)); - -erosion_square(x, y) = _ : vectorize(y) : serialize : eroding(x) : vectorize(y) : matrix_transpose(y, x) : serialize : eroding(y) : vectorize(x) : matrix_transpose(x, y) : serialize; - -erosions(x, y, iter) = seq(i, iter, erosion_square(x,y)); - -open(x, y, iter) = erosions(x, y, iter) : dilations(x, y, iter); -close(x, y, iter) = dilations(x, y, iter) : erosions(x, y, iter); - -process = dilation(112, 3); -//process = erosion(119, 10); -//process = opening(119, 10); -//process = close(119, 123, 1); - - diff --git a/dsp_files/test.dsp b/dsp_files/test.dsp deleted file mode 100644 index 5cc6170..0000000 --- a/dsp_files/test.dsp +++ /dev/null @@ -1,27 +0,0 @@ -import("mrfaustlib/fft.lib"); - -DILATION_MIN = 0; -EROSION_MAX = 255; - -strel_shift_dilation = DILATION_MIN : vectorize(1); -strel_shift_erosion = EROSION_MAX : vectorize(1); - -spray_by_three(n) = _ <: par(i, n, ([i], [i+1], [i+2])); - -tri_max = max, _ : max; -tri_maxs(n) = par(i, n, tri_max); -tri_min = min, _ : min; -tri_mins(n) = par(i, n, tri_min); - -dilating(n) = strel_shift_dilation, _, strel_shift_dilation : #, _ : # : spray_by_three(n) : tri_maxs(n) : nconcat(n); - -eroding(n) = strel_shift_erosion, _, strel_shift_erosion : #, _ : # : spray_by_three(n) : tri_mins(n) : nconcat(n); - -dilation(size, iter) = seq(i, iter, dilating(size)); -erosion(size, iter) = seq(i, iter, eroding(size)); - -opening(size, iter) = erosion(size, iter) : dilation(size, iter); - -//process = dilation(112, 3); -//process = erosion(119, 10); -process = opening(119, 2);