Changeset 16:c4585a26128b in roaraudio

Timestamp:

06/19/08 21:13:21 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

preperation to support mixing at diffrent levels

Files:

• TODO (modified) (1 diff)
• include/roaraudio/audio.h (modified) (2 diffs)
• roard/include/mixer.h (modified) (1 diff)
• roard/include/streams.h (modified) (1 diff)
• roard/mixer.c (modified) (1 diff)
• roard/streams.c (modified) (2 diffs)

TODO

@@ -5 +5 @@
  * add support for sync streams
  * add a lot other things
+ * add code to handle streams with more than ROAR_MAX_CHANNELS channels

include/roaraudio/audio.h

@@ -55 +55 @@
 #define ROAR_RATE_DEFAULT      44100
 
+#define ROAR_MAX_CHANNELS         64
+
 struct roar_audio_info {
  unsigned int rate;
@@ -65 +67 @@
  unsigned      channels;
  roar_intm16   scale;
- roar_intm16 * mixer;
+ roar_intm16   mixer[ROAR_MAX_CHANNELS];
 };
 

roard/include/mixer.h

@@ -12 +12 @@
 int mix_clients_32bit (void * output, void ** input, int samples);
 
+int change_vol       (void * output, int bits, void * input, int samples, int channels, struct roar_mixer_settings * set);
+int change_vol_8bit  (void * output, void * input, int samples, int channels, struct roar_mixer_settings * set);
+int change_vol_16bit (void * output, void * input, int samples, int channels, struct roar_mixer_settings * set);
+int change_vol_24bit (void * output, void * input, int samples, int channels, struct roar_mixer_settings * set);
+int change_vol_32bit (void * output, void * input, int samples, int channels, struct roar_mixer_settings * set);
+
 #endif
 

roard/include/streams.h

@@ -21 +21 @@
  size_t need_extra;
  void  * output;
+ struct roar_mixer_settings mixer;
 } * g_streams[ROAR_STREAMS_MAX];
 

roard/mixer.c

@@ -103 +103 @@
 }
 
+int change_vol (void * output, int bits, void * input, int samples, int channels, struct roar_mixer_settings * set) {
+ if ( bits == 8 ) {
+  return  change_vol_8bit(output, input, samples, channels, set);
+ } else if ( bits == 16 ) {
+  return  change_vol_16bit(output, input, samples, channels, set);
+ } else if ( bits == 24 ) {
+  return  change_vol_24bit(output, input, samples, channels, set);
+ } else if ( bits == 32 ) {
+  return  change_vol_32bit(output, input, samples, channels, set);
+ } else {
+  return -1;
+ }
+}
+
+int change_vol_8bit (void * output, void * input, int samples, int channels, struct roar_mixer_settings * set) {
+ char * in = input, out = output;
+ int    i;
+ int    s;
+
+ if ( !(in && out) )
+  return -1;
+
+ for (i = 0; i < samples; i++) {
+  s  = in[i];
+  s *= set->mixer[i % channels];
+  s /= set->scale;
+  out[i] = s;
+ }
+
+ return 0;
+}
+
+int change_vol_16bit (void * output, void * input, int samples, int channels, struct roar_mixer_settings * set) {
+ int16_t * in = input, out = output;
+ int       i;
+ int       s;
+
+ if ( !(in && out) )
+  return -1;
+
+ for (i = 0; i < samples; i++) {
+  s  = in[i];
+  s *= set->mixer[i % channels];
+  s /= set->scale;
+  out[i] = s;
+ }
+
+ return 0;
+}
+
+int change_vol_24bit (void * output, void * input, int samples, int channels, struct roar_mixer_settings * set) {
+ return -1;
+}
+
+int change_vol_32bit (void * output, void * input, int samples, int channels, struct roar_mixer_settings * set) {
+ return -1;
+}
+
+
 //ll

roard/streams.c

@@ -26 +26 @@
 
 int streams_new    (void) {
- int i;
+ int i, j;
  struct roar_stream * n = NULL;
 
@@ -46 +46 @@
    n->offset     = 0;
 
-   ((struct roar_stream_server*)n)->client     = -1;
-   ((struct roar_stream_server*)n)->buffer     = NULL;
-   ((struct roar_stream_server*)n)->need_extra = 0;
-   ((struct roar_stream_server*)n)->output     = NULL;
+   ((struct roar_stream_server*)n)->client      = -1;
+   ((struct roar_stream_server*)n)->buffer      = NULL;
+   ((struct roar_stream_server*)n)->need_extra  = 0;
+   ((struct roar_stream_server*)n)->output      = NULL;
+   ((struct roar_stream_server*)n)->mixer.scale = 65535;
+   for (j = 0; j < ROAR_MAX_CHANNELS; j++)
+    ((struct roar_stream_server*)n)->mixer.mixer[j] = 65535;
 
    g_streams[i] = (struct roar_stream_server*)n;