/[rdesktop]/sourceforge.net/trunk/rdesktop/rdpsnd_dsp.c
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /sourceforge.net/trunk/rdesktop/rdpsnd_dsp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1277 by stargo, Sun Oct 1 12:26:01 2006 UTC revision 1285 by stargo, Sun Oct 1 18:22:05 2006 UTC
# Line 18  Line 18 
18     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19  */  */
20    
21    #include <strings.h>
22    
23  #include "rdesktop.h"  #include "rdesktop.h"
24  #include "rdpsnd.h"  #include "rdpsnd.h"
25  #include "rdpsnd_dsp.h"  #include "rdpsnd_dsp.h"
26    
27    #ifdef HAVE_LIBSAMPLERATE
28    #include <samplerate.h>
29    
30    #define SRC_CONVERTER SRC_SINC_MEDIUM_QUALITY
31    #endif
32    
33  #define MAX_VOLUME 65535  #define MAX_VOLUME 65535
34    
35  static uint16 softvol_left = MAX_VOLUME;  static uint16 softvol_left = MAX_VOLUME;
# Line 29  static uint16 softvol_right = MAX_VOLUME Line 37  static uint16 softvol_right = MAX_VOLUME
37  static uint32 resample_to_srate = 44100;  static uint32 resample_to_srate = 44100;
38  static uint16 resample_to_bitspersample = 16;  static uint16 resample_to_bitspersample = 16;
39  static uint16 resample_to_channels = 2;  static uint16 resample_to_channels = 2;
40    #ifdef HAVE_LIBSAMPLERATE
41    static SRC_STATE *src_converter = NULL;
42    #endif
43    
44  void  void
45  rdpsnd_dsp_softvol_set(uint16 left, uint16 right)  rdpsnd_dsp_softvol_set(uint16 left, uint16 right)
# Line 119  rdpsnd_dsp_swapbytes(unsigned char *buff Line 130  rdpsnd_dsp_swapbytes(unsigned char *buff
130  BOOL  BOOL
131  rdpsnd_dsp_resample_set(uint32 device_srate, uint16 device_bitspersample, uint16 device_channels)  rdpsnd_dsp_resample_set(uint32 device_srate, uint16 device_bitspersample, uint16 device_channels)
132  {  {
133          if (device_srate != 44100 && device_srate != 22050)  #ifdef HAVE_LIBSAMPLERATE
134                  return False;          int err;
135    #endif
136    
137          if (device_bitspersample != 16 && device_bitspersample != 8)          if (device_bitspersample != 16 && device_bitspersample != 8)
138                  return False;                  return False;
# Line 132  rdpsnd_dsp_resample_set(uint32 device_sr Line 144  rdpsnd_dsp_resample_set(uint32 device_sr
144          resample_to_bitspersample = device_bitspersample;          resample_to_bitspersample = device_bitspersample;
145          resample_to_channels = device_channels;          resample_to_channels = device_channels;
146    
147    #ifdef HAVE_LIBSAMPLERATE
148            if (src_converter != NULL)
149                    src_converter = src_delete(src_converter);
150    
151            if ((src_converter = src_new(SRC_CONVERTER, device_channels, &err)) == NULL)
152            {
153                    warning("src_new failed: %d!\n", err);
154                    return False;
155            }
156    #endif
157    
158          return True;          return True;
159  }  }
160    
# Line 144  rdpsnd_dsp_resample_supported(WAVEFORMAT Line 167  rdpsnd_dsp_resample_supported(WAVEFORMAT
167                  return False;                  return False;
168          if ((format->wBitsPerSample != 8) && (format->wBitsPerSample != 16))          if ((format->wBitsPerSample != 8) && (format->wBitsPerSample != 16))
169                  return False;                  return False;
         if ((format->nSamplesPerSec != 44100) && (format->nSamplesPerSec != 22050))  
                 return False;  
170    
171          return True;          return True;
172  }  }
173    
174  uint32  uint32
175  rdpsnd_dsp_resample(unsigned char **out, unsigned char *in, unsigned int size,  rdpsnd_dsp_resample(unsigned char **out, unsigned char *in, unsigned int size,
176                      WAVEFORMATEX * format)                      WAVEFORMATEX * format, BOOL stream_be)
177  {  {
178    #ifdef HAVE_LIBSAMPLERATE
179            SRC_DATA resample_data;
180            float *infloat, *outfloat;
181            int err;
182    #else
183            int ratio1k = (resample_to_srate * 1000) / format->nSamplesPerSec;
184    #endif
185            int innum, outnum;
186          static BOOL warned = False;          static BOOL warned = False;
187          int outsize, offset;          unsigned char *tmpdata = NULL;
188          int samplewidth = format->wBitsPerSample / 8;          int samplewidth = format->wBitsPerSample / 8;
189            int outsize = 0;
190          int i;          int i;
191    
192          if ((resample_to_bitspersample == format->wBitsPerSample) &&          if ((resample_to_bitspersample == format->wBitsPerSample) &&
# Line 164  rdpsnd_dsp_resample(unsigned char **out, Line 194  rdpsnd_dsp_resample(unsigned char **out,
194              (resample_to_srate == format->nSamplesPerSec))              (resample_to_srate == format->nSamplesPerSec))
195                  return 0;                  return 0;
196    
197          if ((resample_to_bitspersample != format->wBitsPerSample) ||  #ifdef B_ENDIAN
198              (resample_to_channels != format->nChannels) || (format->nSamplesPerSec != 22050))          if (!stream_be)
199                    rdpsnd_dsp_swapbytes(in, size, format);
200    #endif
201    
202            /* Expand 8bit input-samples to 16bit */
203    #ifndef HAVE_LIBSAMPLERATE      /* libsamplerate needs 16bit samples */
204            if (format->wBitsPerSample != resample_to_bitspersample)
205    #endif
206          {          {
207                  if (!warned)                  /* source: 8 bit, dest: 16bit */
208                    if (format->wBitsPerSample == 8)
209                  {                  {
210                          warning("unsupported resample-settings (%u/%u/%u), not resampling!\n",                          tmpdata = xmalloc(size * 2);
211                                  format->nSamplesPerSec, format->wBitsPerSample, format->nChannels);                          for (i = 0; i < size; i++)
212                          warned = True;                          {
213                                    tmpdata[i * 2] = in[i];
214                                    tmpdata[(i * 2) + 1] = 0x00;
215                            }
216                            in = tmpdata;
217                            samplewidth = 16 / 2;
218                            size *= 2;
219                  }                  }
220            }
221    
222            if (resample_to_channels != format->nChannels)
223            {
224                    warning("unsupported resample-settings (%u -> %u/%u -> %u/%u -> %u), not resampling!\n", format->nSamplesPerSec, resample_to_srate, format->wBitsPerSample, resample_to_bitspersample, format->nChannels, resample_to_channels);
225                    warned = True;
226            }
227    
228            innum = size / samplewidth;
229    
230            /* Do the resampling */
231    #ifdef HAVE_LIBSAMPLERATE
232            if (src_converter == NULL)
233            {
234                    warning("no samplerate converter available!!\n");
235                    return 0;
236            }
237    
238            outnum = ((float) innum * ((float) resample_to_srate / (float) format->nSamplesPerSec)) + 1;
239    
240            infloat = xmalloc(sizeof(float) * innum);
241            outfloat = xmalloc(sizeof(float) * outnum);
242    
243            src_short_to_float_array((short *) in, infloat, innum);
244    
245            bzero(&resample_data, sizeof(resample_data));
246            resample_data.data_in = infloat;
247            resample_data.data_out = outfloat;
248            resample_data.input_frames = innum / resample_to_channels;
249            resample_data.output_frames = outnum / resample_to_channels;
250            resample_data.src_ratio = (double) resample_to_srate / (double) format->nSamplesPerSec;
251            resample_data.end_of_input = 0;
252    
253            if ((err = src_process(src_converter, &resample_data)) != 0)
254                    error("src_process: %s", src_strerror(err));
255    
256            xfree(infloat);
257    
258            outsize = resample_data.output_frames_gen * resample_to_channels * samplewidth;
259            *out = xmalloc(outsize);
260            src_float_to_short_array(outfloat, (short *) *out,
261                                     resample_data.output_frames_gen * resample_to_channels);
262            xfree(outfloat);
263    
264    #else
265            /* Michaels simple linear resampler */
266            if (resample_to_srate < format->nSamplesPerSec)
267            {
268                    warning("downsampling currently not supported!\n");
269                  return 0;                  return 0;
270          }          }
271    
272          outsize = size * 2;          outnum = (innum * ratio1k) / 1000;
273    
274            outsize = outnum * samplewidth;
275          *out = xmalloc(outsize);          *out = xmalloc(outsize);
276            bzero(*out, outsize);
277    
278          /* Resample from 22050 to 44100 */          for (i = 0; i < outsize / (resample_to_channels * samplewidth); i++)
         for (i = 0; i < (size / samplewidth); i++)  
279          {          {
280                  /* On a stereo-channel we must make sure that left and right                  int source = ((i * 1000) + ratio1k - 1000) / (ratio1k + 1);
281                     does not get mixed up, so we need to expand the sample-  
282                     data with channels in mind: 1234 -> 12123434                  if (source * resample_to_channels + samplewidth > size)
283                     If we have a mono-channel, we can expand the data by simply                          break;
284                     doubling the sample-data: 1234 -> 11223344 */  
285                  if (resample_to_channels == 2)                  if (resample_to_channels == 2)
286                          offset = ((i * 2) - (i & 1)) * samplewidth;                  {
287                            memcpy(*out + (i * resample_to_channels * samplewidth),
288                                   in + (source * resample_to_channels * samplewidth), samplewidth);
289                            memcpy(*out + (i * resample_to_channels * samplewidth) + samplewidth,
290                                   in + (source * resample_to_channels * samplewidth) + samplewidth,
291                                   samplewidth);
292                    }
293                  else                  else
294                          offset = (i * 2) * samplewidth;                  {
295                            memcpy(*out + (i * samplewidth), in + (source * samplewidth), samplewidth);
296                    }
297            }
298            outsize = i * resample_to_channels * samplewidth;
299    #endif
300    
301                  memcpy(*out + offset, in + (i * samplewidth), samplewidth);          if (tmpdata != NULL)
302                  memcpy(*out + (resample_to_channels * samplewidth + offset),                  xfree(tmpdata);
                        in + (i * samplewidth), samplewidth);  
303    
304            /* Shrink 16bit output-samples to 8bit */
305    #ifndef HAVE_LIBSAMPLERATE      /* libsamplerate produces 16bit samples */
306            if (format->wBitsPerSample != resample_to_bitspersample)
307    #endif
308            {
309                    /* source: 16 bit, dest: 8 bit */
310                    if (resample_to_bitspersample == 8)
311                    {
312                            for (i = 0; i < outsize; i++)
313                            {
314                                    *out[i] = *out[i * 2];
315                            }
316                            outsize /= 2;
317                    }
318          }          }
319    
320    #ifdef B_ENDIAN
321            if (!stream_be)
322                    rdpsnd_dsp_swapbytes(*out, outsize, format);
323    #endif
324          return outsize;          return outsize;
325  }  }
326    
# Line 205  STREAM Line 328  STREAM
328  rdpsnd_dsp_process(STREAM s, struct audio_driver * current_driver, WAVEFORMATEX * format)  rdpsnd_dsp_process(STREAM s, struct audio_driver * current_driver, WAVEFORMATEX * format)
329  {  {
330          static struct stream out;          static struct stream out;
331            BOOL stream_be = False;
332    
333          /* softvol and byteswap do not change the amount of data they          /* softvol and byteswap do not change the amount of data they
334             return, so they can operate on the input-stream */             return, so they can operate on the input-stream */
# Line 213  rdpsnd_dsp_process(STREAM s, struct audi Line 337  rdpsnd_dsp_process(STREAM s, struct audi
337    
338  #ifdef B_ENDIAN  #ifdef B_ENDIAN
339          if (current_driver->need_byteswap_on_be)          if (current_driver->need_byteswap_on_be)
340            {
341                  rdpsnd_dsp_swapbytes(s->data, s->size, format);                  rdpsnd_dsp_swapbytes(s->data, s->size, format);
342                    stream_be = True;
343            }
344  #endif  #endif
345    
346          out.data = NULL;          out.data = NULL;
347    
348          if (current_driver->wave_out_format_supported == rdpsnd_dsp_resample_supported)          if (current_driver->need_resampling)
349                  out.size = rdpsnd_dsp_resample(&out.data, s->data, s->size, format);                  out.size = rdpsnd_dsp_resample(&out.data, s->data, s->size, format, stream_be);
350    
351          if (out.data == NULL)          if (out.data == NULL)
352          {          {
Legend:
Removed from v.1277  
changed lines
  Added in v.1285
  ViewVC Help
Powered by ViewVC 1.1.26