shithub: aubio

Info  •  Files  •  Log  •  Branches

Merge branch 'master' into feature/sink_vorbis

--- a/tests/src/io/base-sink_custom.h

+++ b/tests/src/io/base-sink_custom.h

@@ -116,9 +116,14 @@

   if (aubio_sink_custom_preset_channels(s, channels)) return 1;

   if (aubio_sink_custom_preset_samplerate(s, samplerate)) return 1;

+  if (aubio_sink_custom_get_samplerate(s) != samplerate) return 1;

+  if (aubio_sink_custom_get_channels(s) != channels) return 1;

+

   mat = new_fmat(channels, hop_size);

   // check writing a vector with valid length

   aubio_sink_custom_do_multi(s, mat, hop_size);

+  // check writing 0 frames

+  aubio_sink_custom_do_multi(s, mat, 0);

   // check writing more than in the input

   aubio_sink_custom_do_multi(s, mat, hop_size+1);

   del_fmat(mat);

--- a/tests/src/io/test-sink.c

+++ b/tests/src/io/test-sink.c

@@ -112,9 +112,14 @@

   if (aubio_sink_preset_channels(s, channels)) return 1;

   if (aubio_sink_preset_samplerate(s, samplerate)) return 1;

+  if (aubio_sink_get_samplerate(s) != samplerate) return 1;

+  if (aubio_sink_get_channels(s) != channels) return 1;

+

   mat = new_fmat(channels, hop_size);

   // check writing a vector with valid length

   aubio_sink_do_multi(s, mat, hop_size);

+  // check writing 0 frames

+  aubio_sink_do_multi(s, mat, 0);

   // check writing more than in the input

   aubio_sink_do_multi(s, mat, hop_size+1);

   del_fmat(mat);

--- a/tests/src/io/test-sink_apple_audio.c

+++ b/tests/src/io/test-sink_apple_audio.c

@@ -14,6 +14,8 @@

 #define aubio_sink_custom_close aubio_sink_apple_audio_close

 #define aubio_sink_custom_preset_samplerate aubio_sink_apple_audio_preset_samplerate

 #define aubio_sink_custom_preset_channels aubio_sink_apple_audio_preset_channels

+#define aubio_sink_custom_get_samplerate aubio_sink_apple_audio_get_samplerate

+#define aubio_sink_custom_get_channels aubio_sink_apple_audio_get_channels

 #endif /* HAVE_SINK_APPLE_AUDIO */

 #include "base-sink_custom.h"

--- a/tests/src/io/test-sink_sndfile.c

+++ b/tests/src/io/test-sink_sndfile.c

@@ -14,6 +14,8 @@

 #define aubio_sink_custom_close aubio_sink_sndfile_close

 #define aubio_sink_custom_preset_samplerate aubio_sink_sndfile_preset_samplerate

 #define aubio_sink_custom_preset_channels aubio_sink_sndfile_preset_channels

+#define aubio_sink_custom_get_samplerate aubio_sink_sndfile_get_samplerate

+#define aubio_sink_custom_get_channels aubio_sink_sndfile_get_channels

 #endif /* HAVE_SNDFILE */

 #include "base-sink_custom.h"

--- a/tests/src/io/test-sink_wavwrite.c

+++ b/tests/src/io/test-sink_wavwrite.c

@@ -14,6 +14,8 @@

 #define aubio_sink_custom_close aubio_sink_wavwrite_close

 #define aubio_sink_custom_preset_samplerate aubio_sink_wavwrite_preset_samplerate

 #define aubio_sink_custom_preset_channels aubio_sink_wavwrite_preset_channels

+#define aubio_sink_custom_get_samplerate aubio_sink_wavwrite_get_samplerate

+#define aubio_sink_custom_get_channels aubio_sink_wavwrite_get_channels

 #endif /* HAVE_WAVWRITE */

 #include "base-sink_custom.h"