Merge pull request #457 from illesguy/fix-fill-value-ignored-when-blocksize-longer-than-file

creating blocksize length output array in blocks reading if fill_value is set regardless of frames in file

Author: bastibe

soundfile.py

@@ -1155,7 +1155,7 @@ def blocks(self, blocksize=None, overlap=0, frames=-1, dtype='float64',
         if out is None:
             if blocksize is None:
                 raise TypeError("One of {blocksize, out} must be specified")
-            out_size = min(blocksize, frames)
+            out_size = blocksize if fill_value is not None else min(blocksize, frames)
             out = self._create_empty_array(out_size, always_2d, dtype)
             copy_out = True
         else:

tests/test_soundfile.py

@@ -461,17 +461,40 @@ def test_blocks_inplace_modification(file_stereo_r):
 
 
 def test_blocks_mono():
+    blocks = list(sf.blocks(filename_mono, blocksize=3, dtype='int16'))
+    assert_equal_list_of_arrays(blocks, [[0, 1, 2], [-2, -1]])
+
+
+def test_blocks_with_fill_value_mono():
     blocks = list(sf.blocks(filename_mono, blocksize=3, dtype='int16',
                             fill_value=0))
     assert_equal_list_of_arrays(blocks, [[0, 1, 2], [-2, -1, 0]])
 
 
+def test_blocks_with_overlap_and_fill_value_mono():
+    blocks = list(sf.blocks(filename_mono, blocksize=4, dtype='int16',
+                            overlap=2, fill_value=0))
+    assert_equal_list_of_arrays(blocks, [[0, 1, 2, -2], [2, -2, -1, 0]])
+
+
 def test_block_longer_than_file_with_overlap_mono():
     blocks = list(sf.blocks(filename_mono, blocksize=20, dtype='int16',
                             overlap=2))
     assert_equal_list_of_arrays(blocks, [[0, 1, 2, -2, -1]])
 
 
+def test_block_longer_than_file_with_fill_value_mono():
+    blocks = list(sf.blocks(filename_mono, blocksize=10, dtype='int16',
+                            fill_value=0))
+    assert_equal_list_of_arrays(blocks, [[0, 1, 2, -2, -1, 0, 0, 0, 0, 0]])
+
+
+def test_block_longer_than_file_with_overlap_and_fill_value_mono():
+    blocks = list(sf.blocks(filename_mono, blocksize=10, dtype='int16',
+                            overlap=2, fill_value=0))
+    assert_equal_list_of_arrays(blocks, [[0, 1, 2, -2, -1, 0, 0, 0, 0, 0]])
+
+
 def test_blocks_rplus(sf_stereo_rplus):
     blocks = list(sf_stereo_rplus.blocks(blocksize=2))
     assert_equal_list_of_arrays(blocks, [data_stereo[0:2], data_stereo[2:4]])