ref: c5bcf24778a2de34d369e7d95de1d85d3f2b73e1
parent: 2bc0f84e01dfb29b9253d7b7313a0f0bd619f5a1
author: menno <menno>
date: Sat Apr 26 09:25:13 EDT 2003
foobar plugin: some warning/error changes libfaad: removed clipping for float and double
--- a/libfaad/output.c
+++ b/libfaad/output.c
@@ -16,7 +16,7 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
-** $Id: output.c,v 1.15 2003/04/02 20:07:46 menno Exp $
+** $Id: output.c,v 1.16 2003/04/26 13:25:13 menno Exp $
**/
#include "common.h"
@@ -140,10 +140,12 @@
{for(i = 0; i < frame_len; i++)
{+/*
if (input[ch][i] > (1<<15)-1)
input[ch][i] = (1<<15)-1;
else if (input[ch][i] < -(1<<15))
input[ch][i] = -(1<<15);
+*/
float_sample_buffer[(i*channels)+ch] = input[ch][i]*FLOAT_SCALE;
}
}
@@ -153,10 +155,12 @@
{for(i = 0; i < frame_len; i++)
{+/*
if (input[ch][i] > (1<<15)-1)
input[ch][i] = (1<<15)-1;
else if (input[ch][i] < -(1<<15))
input[ch][i] = -(1<<15);
+*/
double_sample_buffer[(i*channels)+ch] = (double)input[ch][i]*FLOAT_SCALE;
}
}
--- a/plugins/foo_mp4/foo_mp4.cpp
+++ b/plugins/foo_mp4/foo_mp4.cpp
@@ -16,7 +16,7 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
-** $Id: foo_mp4.cpp,v 1.19 2003/04/26 12:25:23 menno Exp $
+** $Id: foo_mp4.cpp,v 1.20 2003/04/26 13:25:13 menno Exp $
**/
#include <mp4.h>
@@ -34,7 +34,7 @@
}
DECLARE_COMPONENT_VERSION ("MPEG-4 AAC decoder",- STRIP_REVISION("$Revision: 1.19 $"),+ STRIP_REVISION("$Revision: 1.20 $"),"Based on FAAD2 v" FAAD2_VERSION "\nCopyright (C) 2002-2003 http://www.audiocoding.com" );
class input_mp4 : public input
@@ -357,7 +357,9 @@
if (frameInfo.error || (m_aac_bytes_into_buffer == 0))
{- if (frameInfo.error)
+ if (frameInfo.error == 5)
+ console::warning(faacDecGetErrorMessage(frameInfo.error), "foo_mp4");
+ else if (frameInfo.error)
console::error(faacDecGetErrorMessage(frameInfo.error), "foo_mp4");
return 0;
}