Changeset 4115:c3fb01959302 in roaraudio for libroardsp
- Timestamp:
- 08/06/10 19:26:28 (14 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroardsp/convert.c
r4114 r4115 627 627 628 628 int roar_conv_rate2 (void * out, void * in, int samples, int outsamples, int bits, int channels) { 629 ROAR_DBG("roar_conv_rate2(out=%p, in=%p, samples=%i, outsamples=%i, bits=%i, channels=%i) = ?", out, in, samples, outsamples, bits, channels); 629 630 switch (bits) { 630 631 case 16: … … 1008 1009 struct roar_audio_info cinfo; 1009 1010 int need_signed = 0; 1011 size_t outsamples; 1010 1012 1011 1013 memcpy(&cinfo, from, sizeof(cinfo)); … … 1084 1086 1085 1087 cin = out; 1088 samples = (samples * to->channels) / cinfo.channels; 1086 1089 cinfo.channels = to->channels; 1087 1090 } … … 1089 1092 //--// 1090 1093 if ( from->rate != to->rate ) { 1091 if ( roar_conv_rate2(out, cin, samples, bufsize/(cinfo.bits/8), cinfo.bits, cinfo.channels) == -1 ) 1094 outsamples = bufsize/(cinfo.bits/8); 1095 1096 if ( roar_conv_rate2(out, cin, samples, outsamples, cinfo.bits, cinfo.channels) == -1 ) 1092 1097 return -1; 1093 1098 1094 1099 cin = out; 1095 samples = bufsize/(cinfo.bits/8);1100 samples = outsamples; 1096 1101 cinfo.rate = to->rate; 1097 1102 } … … 1103 1108 1104 1109 cin = out; 1110 samples = (samples * to->channels) / cinfo.channels; 1105 1111 cinfo.channels = to->channels; 1106 1112 }
Note: See TracChangeset
for help on using the changeset viewer.