Skip to content

Fixes to allow changing stream format #47

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

Closed
plietar wants to merge 2 commits into from
Closed

Fixes to allow changing stream format #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efd5e5b
Fix computation of frame size
plietar Nov 21, 2016
b1ae52c
Change stream_format to return the input format.
plietar Nov 21, 2016
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
2 changes: 1 addition & 1 deletion src/audio_unit/render_callback.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ impl AudioUnit {
// First, we'll retrieve the stream format so that we can ensure that the given callback
// format matches the audio unit's format.
let id = sys::kAudioUnitProperty_StreamFormat;
let asbd = try!(self.get_property(id, Scope::Output, Element::Output));
let asbd = try!(self.get_property(id, Scope::Input, Element::Output));
let stream_format = super::StreamFormat::from_asbd(asbd)?;

// If the stream format does not match, return an error indicating this.
Expand Down
9 changes: 5 additions & 4 deletions src/audio_unit/stream_format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ use sys;
/// Seeing as `LinearPCM` data (the `AudioFormat` used by the `AudioUnit` API) implies a single
/// frame per packet, we can infer many of the fields in an ASBD from the sample type.
///
/// `bytes_per_packet` = size_of::<S>()
/// `bytes_per_frame` = size_of::<S>()
/// `bytes_per_packet` = channels_per_frame * size_of::<S>()
/// `bytes_per_frame` = channels_per_frame * size_of::<S>()
/// `frames_per_packet` = 1
/// `bits_per_channel` = size_of::<S>() * 8
///
Expand Down Expand Up @@ -111,10 +111,11 @@ impl StreamFormat {

let flag = maybe_flag.unwrap_or(::std::u32::MAX -2147483647);

let bytes_per_frame = sample_format.size_in_bytes() as u32;
let bytes_per_frame = channels_per_frame * sample_format.size_in_bytes() as u32;
let bits_per_channel = sample_format.size_in_bytes() as u32 * 8;

const FRAMES_PER_PACKET: u32 = 1;
let bytes_per_packet = bytes_per_frame * FRAMES_PER_PACKET;
let bits_per_channel = bytes_per_frame * 8;

sys::AudioStreamBasicDescription {
mSampleRate: sample_rate,
Expand Down