adam
/
darkice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed unused vars for aac+ encoder, re #2

This commit is contained in:
tipok 2008-11-05 12:33:35 +00:00
parent 2a98f1f03b
commit c8260ff827
2 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
darkice/branches/darkice-aacp/src/aacPlusEncoder.cpp
View File

@ -5,9 +5,9 @@
Tyrell DarkIce Tyrell DarkIce
File : aacPlusEncoder.cpp File : aacPlusEncoder.cpp
Version : $Revision: 0.2 $ Version : $Revision$
Author : $Author: tipok $ Author : $Author$
Location : $Source: /darkice-aacplus/src/aacPlusEncoder.cpp,v $ Location : $HeadURL$
Copyright notice: Copyright notice:
@ -51,7 +51,7 @@
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* File identity * File identity
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
static const char fileid[] = "$Id: aacPlusEncoder.cpp,v 0.2 2005/04/16 22:19:20 klaus Exp $"; static const char fileid[] = "$Id$";
/* =============================================== local function prototypes */ /* =============================================== local function prototypes */
@ -132,7 +132,7 @@ aacPlusEncoder :: open ( void )
/* set up AAC encoder, now that samling rate is known */ /* set up AAC encoder, now that samling rate is known */
config.sampleRate = sampleRateAAC; config.sampleRate = sampleRateAAC;
if ((error = AacEncOpen(&aacEnc, config)) != 0){ if (AacEncOpen(&aacEnc, config) != 0){
AacEncClose(aacEnc); AacEncClose(aacEnc);
throw Exception(__FILE__, __LINE__, "Initialisation of AAC failed !"); throw Exception(__FILE__, __LINE__, "Initialisation of AAC failed !");
} }
@ -171,12 +171,12 @@ aacPlusEncoder :: write ( const void * buf,
unsigned int sampleSize = (bitsPerSample / 8) * channels; unsigned int sampleSize = (bitsPerSample / 8) * channels;
unsigned int processed = len - (len % sampleSize); unsigned int processed = len - (len % sampleSize);
unsigned int nSamples = processed / sampleSize; unsigned int nSamples = processed / sampleSize;
int samples = (int) nSamples * channels; unsigned int samples = (unsigned int) nSamples * channels;
int i; unsigned int i;
int ch, outSamples, numOutBytes; int ch, outSamples, numOutBytes;
@ -293,17 +293,3 @@ aacPlusEncoder :: close ( void ) throw ( Exception )
#endif // HAVE_AACPLUS_LIB #endif // HAVE_AACPLUS_LIB
/*------------------------------------------------------------------------------
$Source: /cvsroot/darkice/darkice/src/aacPlusEncoder.cpp,v $
$Log: aacPlusEncoder.cpp,v $
Revision 0.1 2005/04/16 21:57:34 klaus
added AAC support through the aacplus codec, http://www.audiocoding.com/
------------------------------------------------------------------------------*/

9
darkice/branches/darkice-aacp/src/aacPlusEncoder.h
View File

@ -5,8 +5,8 @@
Tyrell DarkIce Tyrell DarkIce
File : aacPlusEncoder.h File : aacPlusEncoder.h
Version : $Revision: 0.2 $ Version : $Revision$
Author : $Author: tipok $ Author : $Author$
Location : $HeadURL$ Location : $HeadURL$
Copyright notice: Copyright notice:
@ -107,17 +107,16 @@ class aacPlusEncoder : public AudioEncoder, public virtual Reporter
AACENC_CONFIG config; AACENC_CONFIG config;
int error;
int nChannelsAAC, nChannelsSBR; int nChannelsAAC, nChannelsSBR;
unsigned int sampleRateAAC; unsigned int sampleRateAAC;
int bitrate; int bitrate;
int bandwidth; int bandwidth;
unsigned int numAncDataBytes; unsigned int numAncDataBytes;
unsigned char ancDataBytes[MAX_PAYLOAD_SIZE]; unsigned char ancDataBytes[MAX_PAYLOAD_SIZE];
int numSamplesRead; bool useParametricStereo;
int useParametricStereo;
int coreWriteOffset; int coreWriteOffset;
int coreReadOffset; int coreReadOffset;
int envReadOffset; int envReadOffset;