oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

some debug code

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@978 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-05-10 20:49:35 +00:00
parent 76af5b2f90
commit 33d112499d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ogg_decode.c
View File

@ -181,7 +181,7 @@ int ogg_decode(OutputBuffer * cb, DecoderControl * dc)
int current_section; int current_section;
int eof = 0; int eof = 0;
long ret; long ret;
#define OGG_CHUNK_SIZE 2048 #define OGG_CHUNK_SIZE 64
char chunk[OGG_CHUNK_SIZE]; char chunk[OGG_CHUNK_SIZE];
int chunkpos = 0; int chunkpos = 0;
long bitRate = 0; long bitRate = 0;

11
src/pcm_utils.c
View File

@ -220,6 +220,7 @@ void pcm_convertAudioFormat(AudioFormat * inFormat, char * inBuffer, size_t
/* only works if outFormat is 16-bit stereo! */ /* only works if outFormat is 16-bit stereo! */
/* resampling code blatantly ripped from XMMS */ /* resampling code blatantly ripped from XMMS */
const int shift = sizeof(mpd_sint16); const int shift = sizeof(mpd_sint16);
int x1 = 0, frac;
mpd_sint32 i, in_samples, out_samples, x, delta; mpd_sint32 i, in_samples, out_samples, x, delta;
mpd_sint16 * inptr = (mpd_sint16 *)dataChannelConv; mpd_sint16 * inptr = (mpd_sint16 *)dataChannelConv;
mpd_sint16 * outptr = (mpd_sint16 *)outBuffer; mpd_sint16 * outptr = (mpd_sint16 *)outBuffer;
@ -229,11 +230,17 @@ void pcm_convertAudioFormat(AudioFormat * inFormat, char * inBuffer, size_t
nlen <<= shift; nlen <<= shift;
in_samples = dataChannelLen >> shift; in_samples = dataChannelLen >> shift;
out_samples = nlen >> shift; out_samples = nlen >> shift;
delta = (in_samples << 12) / out_samples; //printf("in_samples=%i out_samples=%i\n",in_samples,out_samples);
delta = ((in_samples-1) << 12) / (out_samples-1);
for(x = 0, i = 0; i < out_samples; i++) { for(x = 0, i = 0; i < out_samples; i++) {
int x1, frac; //int i1,i2,i3,i4;
x1 = (x >> 12) << 12; x1 = (x >> 12) << 12;
frac = x - x1; frac = x - x1;
/* i1 = (x1 >> 12) << 1;
i2 = ((x1 >> 12) + 1) << 1;
i3 = ((x1 >> 12) << 1) + 1;
i4 = (((x1 >> 12) + 1) << 1) + 1;
printf("%i,%i,%i,%i\n",i1,i2,i3,i4);*/
*outptr++ = *outptr++ =
((inptr[(x1 >> 12) << 1] * ((inptr[(x1 >> 12) << 1] *
((1<<12) - frac) + ((1<<12) - frac) +