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

minor fixes

This commit is contained in:
darkeye 2001-09-15 11:35:08 +00:00
parent f96f12099f
commit 17ec06eb28
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
darkice/trunk/src/LameLibEncoder.cpp
View File

@ -33,12 +33,6 @@
#include "config.h"
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#else
#error need string.h
#endif
#include "Exception.h"
#include "Util.h"
@ -215,7 +209,7 @@ LameLibEncoder :: conv8 ( unsigned char * pcmBuffer,
for ( i = 0, j = 0; i < lenPcmBuffer; ) {
unsigned short int value;
value = pcmBuffer[i++];
value = pcmBuffer[i++];
leftBuffer[j] = (short int) value;
++j;
}
@ -225,9 +219,9 @@ LameLibEncoder :: conv8 ( unsigned char * pcmBuffer,
for ( i = 0, j = 0; i < lenPcmBuffer; ) {
unsigned short int value;
value = pcmBuffer[i++];
leftBuffer[j] = (short int) value;
value = pcmBuffer[i++];
value = pcmBuffer[i++];
leftBuffer[j] = (short int) value;
value = pcmBuffer[i++];
rightBuffer[j] = (short int) value;
++j;
}
@ -252,9 +246,9 @@ LameLibEncoder :: conv16 ( unsigned char * pcmBuffer,
for ( i = 0, j = 0; i < lenPcmBuffer; ) {
unsigned short int value;
value = pcmBuffer[i++];
value += pcmBuffer[i++] << 8;
leftBuffer[j] = (short int) value;
value = pcmBuffer[i++];
value |= pcmBuffer[i++] << 8;
leftBuffer[j] = (short int) value;
++j;
}
} else {
@ -263,12 +257,12 @@ LameLibEncoder :: conv16 ( unsigned char * pcmBuffer,
for ( i = 0, j = 0; i < lenPcmBuffer; ) {
unsigned short int value;
value = pcmBuffer[i++];
value += pcmBuffer[i++] << 8;
leftBuffer[j] = (short int) value;
value = pcmBuffer[i++];
value += pcmBuffer[i++] << 8;
rightBuffer[j] = (short int) value;
value = pcmBuffer[i++];
value |= pcmBuffer[i++] << 8;
leftBuffer[j] = (short int) value;
value = pcmBuffer[i++];
value |= pcmBuffer[i++] << 8;
rightBuffer[j] = (short int) value;
++j;
}
}
@ -366,6 +360,8 @@ LameLibEncoder :: flush ( void )
"couldn't write all from encoder to underlying sink",
ret - written);
}
sink->flush();
}
@ -389,6 +385,9 @@ LameLibEncoder :: close ( void ) throw ( Exception )
$Source$
$Log$
Revision 1.6 2001/09/15 11:35:08 darkeye
minor fixes
Revision 1.5 2001/09/02 09:54:12 darkeye
fixed typos in CVS substition keywords

5
darkice/trunk/src/LameLibEncoder.h
View File

@ -40,7 +40,7 @@
#include "config.h"
#endif
#ifdef HAVE_LAME_LIB
#ifdef HAVE_LAME_LAME_H
#include <lame/lame.h>
#else
#error need lame/lame.h
@ -462,6 +462,9 @@ class LameLibEncoder : public AudioEncoder, public virtual Reporter
$Source$
$Log$
Revision 1.7 2001/09/15 11:35:08 darkeye
minor fixes
Revision 1.6 2001/09/14 19:31:06 darkeye
added IceCast2 / vorbis support