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

resampling bugs fixed for vorbis streams

This commit is contained in:
darkeye 2002-08-03 10:30:46 +00:00
parent 374763d680
commit 8e7e0dfdbb
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
darkice/trunk/ChangeLog
View File

@ -1,3 +1,7 @@
DarkIce next version
o bug fix: resampling audio for vorbis streams bugs fixed
02-08-2002: DarkIce 0.10.1 released 02-08-2002: DarkIce 0.10.1 released
o bug fix: when the last server dropped connection, darkice crashed o bug fix: when the last server dropped connection, darkice crashed

14
darkice/trunk/src/VorbisLibEncoder.cpp
View File

@ -205,7 +205,7 @@ VorbisLibEncoder :: write ( const void * buf,
if ( converter ) { if ( converter ) {
// resample if needed // resample if needed
int inCount = totalSamples; int inCount = nSamples;
int outCount = (int) (inCount * resampleRatio); int outCount = (int) (inCount * resampleRatio);
short int * resampledBuffer = new short int[outCount * channels]; short int * resampledBuffer = new short int[outCount * channels];
int converted; int converted;
@ -216,11 +216,14 @@ VorbisLibEncoder :: write ( const void * buf,
resampledBuffer ); resampledBuffer );
vorbisBuffer = vorbis_analysis_buffer( &vorbisDspState, vorbisBuffer = vorbis_analysis_buffer( &vorbisDspState,
converted / channels); converted);
Util::conv( resampledBuffer, converted, vorbisBuffer, channels); Util::conv( resampledBuffer,
converted * channels,
vorbisBuffer,
channels);
delete[] resampledBuffer; delete[] resampledBuffer;
vorbis_analysis_wrote( &vorbisDspState, converted / channels); vorbis_analysis_wrote( &vorbisDspState, converted);
} else { } else {
@ -316,6 +319,9 @@ VorbisLibEncoder :: close ( void ) throw ( Exception )
$Source$ $Source$
$Log$ $Log$
Revision 1.12 2002/08/03 10:30:46 darkeye
resampling bugs fixed for vorbis streams
Revision 1.11 2002/07/20 16:37:06 darkeye Revision 1.11 2002/07/20 16:37:06 darkeye
added fault tolerance in case a server connection is dropped added fault tolerance in case a server connection is dropped