Changeset d81e16d for tests

Timestamp:

Dec 17, 2018, 3:44:16 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master

Children:

0440778, 0e6ad10

Parents:

7e2eef4 (diff), 05774ba3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feature/sink_vorbis

Location:

tests/src/io

Files:

• base-sink_custom.h (modified) (1 diff)
• test-sink.c (modified) (1 diff)
• test-sink_apple_audio.c (modified) (1 diff)
• test-sink_sndfile.c (modified) (1 diff)
• test-sink_wavwrite.c (modified) (1 diff)

tests/src/io/base-sink_custom.h

@@ -117 +117 @@
   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);

tests/src/io/test-sink.c

@@ -113 +113 @@
   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);

tests/src/io/test-sink_apple_audio.c

@@ -15 +15 @@
 #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 */
 

tests/src/io/test-sink_sndfile.c

@@ -15 +15 @@
 #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 */
 

tests/src/io/test-sink_wavwrite.c

@@ -15 +15 @@
 #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 */