smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 21:55:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix invalid assertions in AudioGrapher SampleFormatConverter

Browse source 
This fixes an export crash with e.g. 8-bit export
This commit is contained in:
Sakari Bergen 2013-11-23 18:42:14 +02:00
parent af9ac37b60
commit 52309c0c4f
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libs/audiographer/src/general/sample_format_converter.cc
View file

@ -52,25 +52,24 @@ SampleFormatConverter<float>::init (framecnt_t max_frames, int /* type */, int d
template <>
void
SampleFormatConverter<int32_t>::init (framecnt_t max_frames, int /*type*/, int data_width)
SampleFormatConverter<int32_t>::init (framecnt_t max_frames, int type, int data_width)
{
if(throw_level (ThrowObject) && data_width < 24) {
throw Exception (*this, "Trying to use SampleFormatConverter<int32_t> for data widths < 24");
// GDither is broken with GDither32bit if the dither depth is bigger than 24
if(throw_level (ThrowObject) && data_width > 24) {
throw Exception (*this, "Trying to use SampleFormatConverter<int32_t> a data width > 24");
}
init_common (max_frames);
// GDither is broken with GDither32bit if the dither depth
// is bigger than 24, so lets just use that...
dither = gdither_new (GDitherNone, channels, GDither32bit, 24);
dither = gdither_new ((GDitherType) type, channels, GDither32bit, data_width);
}
template <>
void
SampleFormatConverter<int16_t>::init (framecnt_t max_frames, int type, int data_width)
{
if (throw_level (ThrowObject) && data_width != 16) {
throw Exception (*this, "Unsupported data width");
if (throw_level (ThrowObject) && data_width > 16) {
throw Exception (*this, boost::str(boost::format
("Data width (%1) too large for int16_t")
% data_width));
}
init_common (max_frames);
dither = gdither_new ((GDitherType) type, channels, GDither16bit, data_width);
@ -80,8 +79,10 @@ template <>
void
SampleFormatConverter<uint8_t>::init (framecnt_t max_frames, int type, int data_width)
{
if (throw_level (ThrowObject) && data_width != 8) {
throw Exception (*this, "Unsupported data width");
if (throw_level (ThrowObject) && data_width > 8) {
throw Exception (*this, boost::str(boost::format
("Data width (%1) too large for uint8_t")
% data_width));
}
init_common (max_frames);
dither = gdither_new ((GDitherType) type, channels, GDither8bit, data_width);