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

added funcitons conv8() and conv16()

This commit is contained in:
darkeye 2001-08-31 20:09:05 +00:00
parent 7afac9500e
commit fa8530b815
2 changed files with 125 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,6 +198,82 @@ LameLibEncoder :: open ( void )
return true; return true;
} }
/*------------------------------------------------------------------------------
* Convert an unsigned char buffer holding 8 bit PCM values with channels
* interleaved to two short int buffers (one for each channel)
*----------------------------------------------------------------------------*/
void
LameLibEncoder :: conv8 ( unsigned char * pcmBuffer,
unsigned int lenPcmBuffer,
short int * leftBuffer,
short int * rightBuffer,
unsigned int channels )
{
if ( channels == 1 ) {
unsigned int i, j;
for ( i = 0, j = 0; i < lenPcmBuffer; ) {
unsigned short int value;
value = pcmBuffer[i++];
leftBuffer[j] = (short int) value;
++j;
}
} else {
unsigned int i, j;
for ( i = 0, j = 0; i < lenPcmBuffer; ) {
unsigned short int value;
value = pcmBuffer[i++];
leftBuffer[j] = (short int) value;
value = pcmBuffer[i++];
rightBuffer[j] = (short int) value;
++j;
}
}
}
/*------------------------------------------------------------------------------
* Convert an unsigned char buffer holding 16 bit PCM values with channels
* interleaved to two short int buffers (one for each channel)
*----------------------------------------------------------------------------*/
void
LameLibEncoder :: conv16 ( unsigned char * pcmBuffer,
unsigned int lenPcmBuffer,
short int * leftBuffer,
short int * rightBuffer,
unsigned int channels )
{
if ( channels == 1 ) {
unsigned int i, j;
for ( i = 0, j = 0; i < lenPcmBuffer; ) {
unsigned short int value;
value = pcmBuffer[i++];
value += pcmBuffer[i++] << 8;
leftBuffer[j] = (short int) value;
++j;
}
} else {
unsigned int i, j;
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;
++j;
}
}
}
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Write data to the encoder * Write data to the encoder
@ -213,14 +289,9 @@ LameLibEncoder :: write ( const void * buf,
unsigned int bitsPerSample = getInBitsPerSample(); unsigned int bitsPerSample = getInBitsPerSample();
unsigned int channels = getInChannel(); unsigned int channels = getInChannel();
if ( bitsPerSample != 8 && bitsPerSample != 16 ) {
throw Exception( __FILE__, __LINE__,
"unsupported number of bits per sample for the encoder",
bitsPerSample );
}
if ( channels != 1 && channels != 2 ) { if ( channels != 1 && channels != 2 ) {
throw Exception( __FILE__, __LINE__, throw Exception( __FILE__, __LINE__,
"unsupport number of channels for the encoder", "unsupported number of channels for the encoder",
channels ); channels );
} }
@ -231,52 +302,14 @@ LameLibEncoder :: write ( const void * buf,
short int leftBuffer[nSamples]; short int leftBuffer[nSamples];
short int rightBuffer[nSamples]; short int rightBuffer[nSamples];
unsigned int i, j;
if ( bitsPerSample == 8 ) { if ( bitsPerSample == 8 ) {
// TODO: spread the 8 bits on the whole 16 bit input values conv8( b, processed, leftBuffer, rightBuffer, channels);
if ( channels == 1 ) {
for ( i = 0, j = 0; i < processed; ) {
unsigned short int value;
value = b[i++];
leftBuffer[j] = (short int) value;
++j;
}
} else {
for ( i = 0, j = 0; i < processed; ) {
unsigned short int value;
value = b[i++];
leftBuffer[j] = (short int) value;
value = b[i++];
rightBuffer[j] = (short int) value;
++j;
}
}
} else if ( bitsPerSample == 16 ) { } else if ( bitsPerSample == 16 ) {
if ( channels == 1 ) { conv16( b, processed, leftBuffer, rightBuffer, channels);
for ( i = 0, j = 0; i < processed; ) {
unsigned short int value;
value = b[i++];
value += b[i++] << 8;
leftBuffer[j] = (short int) value;
++j;
}
} else { } else {
for ( i = 0, j = 0; i < processed; ) { throw Exception( __FILE__, __LINE__,
unsigned short int value; "unsupported number of bits per sample for the encoder",
bitsPerSample );
value = b[i++];
value += b[i++] << 8;
leftBuffer[j] = (short int) value;
value = b[i++];
value += b[i++] << 8;
rightBuffer[j] = (short int) value;
++j;
}
}
} }
// data chunk size estimate according to lame documentation // data chunk size estimate according to lame documentation
@ -356,6 +389,9 @@ LameLibEncoder :: close ( void ) throw ( Exception )
$Source$ $Source$
$Log$ $Log$
Revision 1.4 2001/08/31 20:09:05 darkeye
added funcitons conv8() and conv16()
Revision 1.3 2001/08/30 17:25:56 darkeye Revision 1.3 2001/08/30 17:25:56 darkeye
renamed configure.h to config.h renamed configure.h to config.h

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

@ -146,6 +146,42 @@ class LameLibEncoder : public AudioEncoder, public virtual Reporter,
{ {
} }
/**
* Convert a char buffer holding 8 bit PCM values to a short buffer
*
* @param pcmBuffer buffer holding 8 bit PCM audio values,
* channels are interleaved
* @param lenPcmBuffer length of pcmBuffer
* @param leftBuffer put the left channel here (must be big enough)
* @param rightBuffer put the right channel here (if mono, not
* touched, must be big enough)
* @param channels number of channels (1 = mono, 2 = stereo)
*/
void
conv8 ( unsigned char * pcmBuffer,
unsigned int lenPcmBuffer,
short int * leftBuffer,
short int * rightBuffer,
unsigned int channels );
/**
* Convert a char buffer holding 16 bit PCM values to a short buffer
*
* @param pcmBuffer buffer holding 16 bit PCM audio values,
* channels are interleaved
* @param lenPcmBuffer length of pcmBuffer
* @param leftBuffer put the left channel here (must be big enough)
* @param rightBuffer put the right channel here (if mono, not
* touched, must be big enough)
* @param channels number of channels (1 = mono, 2 = stereo)
*/
void
conv16 ( unsigned char * pcmBuffer,
unsigned int lenPcmBuffer,
short int * leftBuffer,
short int * rightBuffer,
unsigned int channels );
protected: protected:
@ -427,6 +463,9 @@ class LameLibEncoder : public AudioEncoder, public virtual Reporter,
$Sourc$ $Sourc$
$Log$ $Log$
Revision 1.4 2001/08/31 20:09:05 darkeye
added funcitons conv8() and conv16()
Revision 1.3 2001/08/30 17:25:56 darkeye Revision 1.3 2001/08/30 17:25:56 darkeye
renamed configure.h to config.h renamed configure.h to config.h