smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-21 22:26:29 +01:00
Code Issues Projects Releases Wiki Activity

Fixed memory corruption. Can open compressed audio files.

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@571 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2006-06-07 21:49:06 +00:00
parent 9d01165d3d
commit f03a1dbe0f
1 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

56
libs/ardour/coreaudio_source.cc
View file

@ -66,29 +66,34 @@ CoreAudioSource::init (const string& idstr, bool build_peak)
} }
/* note that we temporarily truncated _id at the colon */ /* note that we temporarily truncated _id at the colon */
FSRef ref; FSRef fsr;
err = FSPathMakeRef ((UInt8*)file.c_str(), &ref, 0); err = FSPathMakeRef ((UInt8*)file.c_str(), &fsr, 0);
if (err != noErr) { if (err != noErr) {
cerr << "FSPathMakeRef " << err << endl;
throw failed_constructor(); throw failed_constructor();
} }
err = ExtAudioFileOpen (&ref, &af); err = ExtAudioFileOpen (&fsr, &af);
if (err != noErr) { if (err != noErr) {
cerr << "ExtAudioFileOpen " << err << endl;
ExtAudioFileDispose (af); ExtAudioFileDispose (af);
throw failed_constructor(); throw failed_constructor();
} }
AudioStreamBasicDescription file_asbd; AudioStreamBasicDescription file_asbd;
memset(&file_asbd, 0, sizeof(file_asbd)); memset(&file_asbd, 0, sizeof(AudioStreamBasicDescription));
size_t asbd_size = sizeof(file_asbd); size_t asbd_size = sizeof(AudioStreamBasicDescription);
err = ExtAudioFileGetProperty(af, err = ExtAudioFileGetProperty(af,
kExtAudioFileProperty_FileDataFormat, &asbd_size, &file_asbd); kExtAudioFileProperty_FileDataFormat, &asbd_size, &file_asbd);
if (err != noErr) { if (err != noErr) {
cerr << "ExtAudioFileGetProperty1 " << err << endl;
ExtAudioFileDispose (af); ExtAudioFileDispose (af);
throw failed_constructor(); throw failed_constructor();
} }
n_channels = file_asbd.mChannelsPerFrame; n_channels = file_asbd.mChannelsPerFrame;
cerr << "number of channels: " << n_channels << endl;
if (channel >= n_channels) { if (channel >= n_channels) {
error << string_compose(_("CoreAudioSource: file only contains %1 channels; %2 is invalid as a channel number"), n_channels, channel) << endmsg; error << string_compose(_("CoreAudioSource: file only contains %1 channels; %2 is invalid as a channel number"), n_channels, channel) << endmsg;
ExtAudioFileDispose (af); ExtAudioFileDispose (af);
@ -96,17 +101,36 @@ CoreAudioSource::init (const string& idstr, bool build_peak)
} }
int64_t ca_frames; int64_t ca_frames;
size_t prop_size = sizeof(ca_frames); size_t prop_size = sizeof(int64_t);
err = ExtAudioFileGetProperty(af, kExtAudioFileProperty_FileLengthFrames, &prop_size, &ca_frames); err = ExtAudioFileGetProperty(af, kExtAudioFileProperty_FileLengthFrames, &prop_size, &ca_frames);
if (err != noErr) { if (err != noErr) {
cerr << "ExtAudioFileGetProperty2 " << err << endl;
ExtAudioFileDispose (af); ExtAudioFileDispose (af);
throw failed_constructor(); throw failed_constructor();
} }
_length = ca_frames;
_length = ca_frames;
_path = file; _path = file;
AudioStreamBasicDescription client_asbd;
memset(&client_asbd, 0, sizeof(AudioStreamBasicDescription));
client_asbd.mSampleRate = file_asbd.mSampleRate;
client_asbd.mFormatID = kAudioFormatLinearPCM;
client_asbd.mFormatFlags = kLinearPCMFormatFlagIsFloat;
client_asbd.mBytesPerPacket = file_asbd.mChannelsPerFrame * 4;
client_asbd.mFramesPerPacket = 1;
client_asbd.mBytesPerFrame = client_asbd.mBytesPerPacket;
client_asbd.mChannelsPerFrame = file_asbd.mChannelsPerFrame;
client_asbd.mBitsPerChannel = 32;
err = ExtAudioFileSetProperty (af, kExtAudioFileProperty_ClientDataFormat, asbd_size, &client_asbd);
if (err != noErr) {
cerr << "ExtAudioFileSetProperty3 " << err << endl;
ExtAudioFileDispose (af);
throw failed_constructor ();
}
if (build_peak) { if (build_peak) {
if (initialize_peakfile (false, file)) { if (initialize_peakfile (false, file)) {
error << "initialize peakfile failed" << endmsg; error << "initialize peakfile failed" << endmsg;
@ -114,24 +138,6 @@ CoreAudioSource::init (const string& idstr, bool build_peak)
throw failed_constructor (); throw failed_constructor ();
} }
} }
AudioStreamBasicDescription client_asbd;
memset(&client_asbd, 0, sizeof(client_asbd));
client_asbd.mFormatID = kAudioFormatLinearPCM;
client_asbd.mFormatFlags = kLinearPCMFormatFlagIsFloat;
client_asbd.mSampleRate = file_asbd.mSampleRate;
err = AudioFormatGetProperty(kAudioFormatProperty_FormatInfo, 0, NULL, &asbd_size, &client_asbd);
if (err != noErr) {
ExtAudioFileDispose (af);
throw failed_constructor ();
}
err = ExtAudioFileSetProperty (af, kExtAudioFileProperty_ClientDataFormat, asbd_size, &client_asbd);
if (err != noErr) {
ExtAudioFileDispose (af);
throw failed_constructor ();
}
} }
CoreAudioSource::~CoreAudioSource () CoreAudioSource::~CoreAudioSource ()