Skip to content

V
vlc-2-2
Commit 3ce32a80 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

audioqueue: feed the decoder's sample rate to the OS and enforce FL32 instead of S16N

parent 33c292a1
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 9 deletions
modules/audio_output/audioqueue.c
View file @ 3ce32a80
/***************************************************************************** /*****************************************************************************
* audioqueue.c : AudioQueue audio output plugin for vlc * audioqueue.c : AudioQueue audio output plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2010-2012 VLC authors and VideoLAN * Copyright (C) 2010-2013 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Romain Goyet <romain.goyet@likid.org> * Authors: Romain Goyet <romain.goyet@likid.org>
...@@ -83,15 +83,14 @@ static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt) ...@@ -83,15 +83,14 @@ static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)
// Setup the audio device. // Setup the audio device.
AudioStreamBasicDescription deviceFormat; AudioStreamBasicDescription deviceFormat;
deviceFormat.mSampleRate = 44100; deviceFormat.mSampleRate = fmt->i_rate;
deviceFormat.mFormatID = kAudioFormatLinearPCM; deviceFormat.mFormatID = kAudioFormatLinearPCM;
deviceFormat.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger; // Signed integer, little endian deviceFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked; // FL32
deviceFormat.mBytesPerPacket = 4;
deviceFormat.mFramesPerPacket = 1; deviceFormat.mFramesPerPacket = 1;
deviceFormat.mBytesPerFrame = 4;
deviceFormat.mChannelsPerFrame = 2; deviceFormat.mChannelsPerFrame = 2;
deviceFormat.mBitsPerChannel = 16; deviceFormat.mBitsPerChannel = 32;
deviceFormat.mReserved = 0; deviceFormat.mBytesPerFrame = deviceFormat.mBitsPerChannel * deviceFormat.mChannelsPerFrame / 8;
deviceFormat.mBytesPerPacket = deviceFormat.mBytesPerFrame * deviceFormat.mFramesPerPacket;
// Create a new output AudioQueue for the device. // Create a new output AudioQueue for the device.
status = AudioQueueNewOutput(&deviceFormat, // Format status = AudioQueueNewOutput(&deviceFormat, // Format
...@@ -106,9 +105,8 @@ static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt) ...@@ -106,9 +105,8 @@ static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)
if (status != noErr) if (status != noErr)
return VLC_EGENERIC; return VLC_EGENERIC;
fmt->i_format = VLC_CODEC_S16N; fmt->i_format = VLC_CODEC_FL32;
fmt->i_physical_channels = AOUT_CHANS_STEREO; fmt->i_physical_channels = AOUT_CHANS_STEREO;
fmt->i_rate = 44100;
aout_FormatPrepare(fmt); aout_FormatPrepare(fmt);
p_aout->sys->b_stopped = false; p_aout->sys->b_stopped = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment