Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

aiff: renamed sample_size to bits_per_sample #403

Merged
merged 1 commit into from
Oct 16, 2019
Merged

aiff: renamed sample_size to bits_per_sample #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions mutagen/aiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ class AIFFInfo(StreamInfo):
bitrate (`int`): audio bitrate, in bits per second
channels (`int`): The number of audio channels
sample_rate (`int`): audio sample rate, in Hz
sample_size (`int`): The audio sample size
bits_per_sample (`int`): The audio sample size
"""

length = 0
Expand All @@ -250,7 +250,8 @@ def __init__(self, fileobj):
channels, frame_count, sample_size, sample_rate = info

self.sample_rate = int(read_float(sample_rate))
self.sample_size = sample_size
self.bits_per_sample = sample_size
self.sample_size = sample_size # For backward compatibility
self.channels = channels
self.bitrate = channels * sample_size * self.sample_rate
self.length = frame_count / float(self.sample_rate)
Expand Down
16 changes: 11 additions & 5 deletions tests/test_aiff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,18 @@ def test_sample_rate(self):
self.failUnlessEqual(self.aiff_4.info.sample_rate, 8000)
self.failUnlessEqual(self.aiff_5.info.sample_rate, 8000)

def test_bits_per_sample(self):
self.failUnlessEqual(self.aiff_1.info.bits_per_sample, 16)
self.failUnlessEqual(self.aiff_2.info.bits_per_sample, 16)
self.failUnlessEqual(self.aiff_3.info.bits_per_sample, 16)
self.failUnlessEqual(self.aiff_4.info.bits_per_sample, 16)
self.failUnlessEqual(self.aiff_5.info.bits_per_sample, 16)

def test_sample_size(self):
self.failUnlessEqual(self.aiff_1.info.sample_size, 16)
self.failUnlessEqual(self.aiff_2.info.sample_size, 16)
self.failUnlessEqual(self.aiff_3.info.sample_size, 16)
self.failUnlessEqual(self.aiff_4.info.sample_size, 16)
self.failUnlessEqual(self.aiff_5.info.sample_size, 16)
for test in [self.aiff_1, self.aiff_2, self.aiff_3, self.aiff_4,
self.aiff_5]:
info = test.info
self.failUnlessEqual(info.sample_size, info.bits_per_sample)

def test_notaiff(self):
self.failUnlessRaises(
Expand Down