/[rdesktop]/sourceforge.net/trunk/rdesktop/rdpsnd_libao.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_libao.c

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

revision 986 by astrand, Wed Aug 24 11:31:58 2005 UTC revision 1254 by stargo, Sun Sep 17 10:32:18 2006 UTC
# Line 3  Line 3 
3     Sound Channel Process Functions - libao-driver     Sound Channel Process Functions - libao-driver
4     Copyright (C) Matthew Chapman 2003     Copyright (C) Matthew Chapman 2003
5     Copyright (C) GuoJunBo guojunbo@ict.ac.cn 2003     Copyright (C) GuoJunBo guojunbo@ict.ac.cn 2003
6     Copyright (C) Michael Gernoth mike@zerfleddert.de 2005     Copyright (C) Michael Gernoth mike@zerfleddert.de 2005-2006
7    
8     This program is free software; you can redistribute it and/or modify     This program is free software; you can redistribute it and/or modify
9     it under the terms of the GNU General Public License as published by     it under the terms of the GNU General Public License as published by
# Line 21  Line 21 
21  */  */
22    
23  #include "rdesktop.h"  #include "rdesktop.h"
24    #include "rdpsnd.h"
25  #include <unistd.h>  #include <unistd.h>
26  #include <fcntl.h>  #include <fcntl.h>
27  #include <errno.h>  #include <errno.h>
28  #include <ao/ao.h>  #include <ao/ao.h>
29  #include <sys/time.h>  #include <sys/time.h>
30    
31  #define MAX_QUEUE       10  #define WAVEOUTBUF      16
 #define WAVEOUTBUF      64  
32    
33  int g_dsp_fd;  static ao_device *o_device = NULL;
34  ao_device *o_device = NULL;  static int default_driver;
35  int default_driver;  static int samplerate;
36  int g_samplerate;  static int audiochannels;
37  int g_channels;  static BOOL reopened;
38  BOOL g_dsp_busy = False;  static short samplewidth;
 static BOOL g_reopened;  
 static short g_samplewidth;  
   
 static struct audio_packet  
 {  
         struct stream s;  
         uint16 tick;  
         uint8 index;  
 } packet_queue[MAX_QUEUE];  
 static unsigned int queue_hi, queue_lo;  
39    
40  BOOL  BOOL
41  wave_out_open(void)  wave_out_open(void)
# Line 57  wave_out_open(void) Line 47  wave_out_open(void)
47    
48          format.bits = 16;          format.bits = 16;
49          format.channels = 2;          format.channels = 2;
50          g_channels = 2;          audiochannels = 2;
51          format.rate = 44100;          format.rate = 44100;
52          g_samplerate = 44100;          samplerate = 44100;
53          format.byte_format = AO_FMT_LITTLE;          format.byte_format = AO_FMT_LITTLE;
54    
55          o_device = ao_open_live(default_driver, &format, NULL);          o_device = ao_open_live(default_driver, &format, NULL);
# Line 69  wave_out_open(void) Line 59  wave_out_open(void)
59          }          }
60    
61          g_dsp_fd = 0;          g_dsp_fd = 0;
62          queue_lo = queue_hi = 0;          rdpsnd_queue_init();
63    
64          g_reopened = True;          reopened = True;
65    
66          return True;          return True;
67  }  }
# Line 80  void Line 70  void
70  wave_out_close(void)  wave_out_close(void)
71  {  {
72          /* Ack all remaining packets */          /* Ack all remaining packets */
73          while (queue_lo != queue_hi)          while (!rdpsnd_queue_empty())
74          {          {
75                  rdpsnd_send_completion(packet_queue[queue_lo].tick, packet_queue[queue_lo].index);                  rdpsnd_send_completion(rdpsnd_queue_current_packet()->tick,
76                  free(packet_queue[queue_lo].s.data);                                         rdpsnd_queue_current_packet()->index);
77                  queue_lo = (queue_lo + 1) % MAX_QUEUE;                  rdpsnd_queue_next();
78          }          }
79    
80          if (o_device != NULL)          if (o_device != NULL)
# Line 117  wave_out_set_format(WAVEFORMATEX * pwfx) Line 107  wave_out_set_format(WAVEFORMATEX * pwfx)
107    
108          format.bits = pwfx->wBitsPerSample;          format.bits = pwfx->wBitsPerSample;
109          format.channels = pwfx->nChannels;          format.channels = pwfx->nChannels;
110          g_channels = pwfx->nChannels;          audiochannels = pwfx->nChannels;
111          format.rate = 44100;          format.rate = 44100;
112          g_samplerate = pwfx->nSamplesPerSec;          samplerate = pwfx->nSamplesPerSec;
113          format.byte_format = AO_FMT_LITTLE;          format.byte_format = AO_FMT_LITTLE;
114    
115          g_samplewidth = pwfx->wBitsPerSample / 8;          samplewidth = pwfx->wBitsPerSample / 8;
116    
117          if (o_device != NULL)          if (o_device != NULL)
118                  ao_close(o_device);                  ao_close(o_device);
# Line 133  wave_out_set_format(WAVEFORMATEX * pwfx) Line 123  wave_out_set_format(WAVEFORMATEX * pwfx)
123                  return False;                  return False;
124          }          }
125    
126          g_reopened = True;          reopened = True;
127    
128          return True;          return True;
129  }  }
# Line 145  wave_out_volume(uint16 left, uint16 righ Line 135  wave_out_volume(uint16 left, uint16 righ
135  }  }
136    
137  void  void
 wave_out_write(STREAM s, uint16 tick, uint8 index)  
 {  
         struct audio_packet *packet = &packet_queue[queue_hi];  
         unsigned int next_hi = (queue_hi + 1) % MAX_QUEUE;  
   
         if (next_hi == queue_lo)  
         {  
                 error("No space to queue audio packet\n");  
                 return;  
         }  
   
         queue_hi = next_hi;  
   
         packet->s = *s;  
         packet->tick = tick;  
         packet->index = index;  
         packet->s.p += 4;  
   
         /* we steal the data buffer from s, give it a new one */  
         s->data = malloc(s->size);  
   
         if (!g_dsp_busy)  
                 wave_out_play();  
 }  
   
 void  
138  wave_out_play(void)  wave_out_play(void)
139  {  {
140          struct audio_packet *packet;          struct audio_packet *packet;
141          STREAM out;          STREAM out;
142          unsigned char outbuf[WAVEOUTBUF];          char outbuf[WAVEOUTBUF];
143          int offset, len, i;          int offset, len, i;
144          static long prev_s, prev_us;          static long prev_s, prev_us;
145          unsigned int duration;          unsigned int duration;
146          struct timeval tv;          struct timeval tv;
147          int next_tick;          int next_tick;
148    
149          if (g_reopened)          if (reopened)
150          {          {
151                  g_reopened = False;                  reopened = False;
152                  gettimeofday(&tv, NULL);                  gettimeofday(&tv, NULL);
153                  prev_s = tv.tv_sec;                  prev_s = tv.tv_sec;
154                  prev_us = tv.tv_usec;                  prev_us = tv.tv_usec;
155          }          }
156    
157          if (queue_lo == queue_hi)          if (rdpsnd_queue_empty())
158          {          {
159                  g_dsp_busy = 0;                  g_dsp_busy = 0;
160                  return;                  return;
161          }          }
162    
163          packet = &packet_queue[queue_lo];          packet = rdpsnd_queue_current_packet();
164          out = &packet->s;          out = &packet->s;
165    
166          if (((queue_lo + 1) % MAX_QUEUE) != queue_hi)          next_tick = rdpsnd_queue_next_tick();
         {  
                 next_tick = packet_queue[(queue_lo + 1) % MAX_QUEUE].tick;  
         }  
         else  
         {  
                 next_tick = (packet->tick + 65535) % 65536;  
         }  
167    
168          len = 0;          len = 0;
169    
170          if (g_samplerate == 22050)          if (samplerate == 22050)
171          {          {
172                  /* Resample to 44100 */                  /* Resample to 44100 */
173                  for (i = 0; (i < ((WAVEOUTBUF / 4) * (3 - g_samplewidth))) && (out->p < out->end);                  for (i = 0; (i < ((WAVEOUTBUF / 4) * (3 - samplewidth))) && (out->p < out->end);
174                       i++)                       i++)
175                  {                  {
176                          /* On a stereo-channel we must make sure that left and right                          /* On a stereo-channel we must make sure that left and right
# Line 221  wave_out_play(void) Line 178  wave_out_play(void)
178                             data with channels in mind: 1234 -> 12123434                             data with channels in mind: 1234 -> 12123434
179                             If we have a mono-channel, we can expand the data by simply                             If we have a mono-channel, we can expand the data by simply
180                             doubling the sample-data: 1234 -> 11223344 */                             doubling the sample-data: 1234 -> 11223344 */
181                          if (g_channels == 2)                          if (audiochannels == 2)
182                                  offset = ((i * 2) - (i & 1)) * g_samplewidth;                                  offset = ((i * 2) - (i & 1)) * samplewidth;
183                          else                          else
184                                  offset = (i * 2) * g_samplewidth;                                  offset = (i * 2) * samplewidth;
185    
186                          memcpy(&outbuf[offset], out->p, g_samplewidth);                          memcpy(&outbuf[offset], out->p, samplewidth);
187                          memcpy(&outbuf[g_channels * g_samplewidth + offset], out->p, g_samplewidth);                          memcpy(&outbuf[audiochannels * samplewidth + offset], out->p, samplewidth);
188    
189                          out->p += g_samplewidth;                          out->p += samplewidth;
190                          len += 2 * g_samplewidth;                          len += 2 * samplewidth;
191                  }                  }
192          }          }
193          else          else
# Line 240  wave_out_play(void) Line 197  wave_out_play(void)
197                  out->p += len;                  out->p += len;
198          }          }
199    
200          ao_play(o_device, (char *) outbuf, len);          ao_play(o_device, outbuf, len);
201    
202          gettimeofday(&tv, NULL);          gettimeofday(&tv, NULL);
203    
# Line 261  wave_out_play(void) Line 218  wave_out_play(void)
218                                 (packet->tick + duration) % 65536, next_tick % 65536));                                 (packet->tick + duration) % 65536, next_tick % 65536));
219                  }                  }
220    
221                  /* Until all drivers are using the windows sound-ticks, we need to                  rdpsnd_send_completion(((packet->tick + duration) % 65536), packet->index);
222                     substract the 50 ticks added later by rdpsnd.c */                  rdpsnd_queue_next();
                 rdpsnd_send_completion(((packet->tick + duration) % 65536) - 50, packet->index);  
                 free(out->data);  
                 queue_lo = (queue_lo + 1) % MAX_QUEUE;  
223          }          }
224    
225          g_dsp_busy = 1;          g_dsp_busy = 1;
Legend:
Removed from v.986  
changed lines
  Added in v.1254
  ViewVC Help
Powered by ViewVC 1.1.26