Changeset 3554:129c6f16409b in roaraudio

Timestamp:

02/20/10 03:57:01 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

update API

Files:

• include/libroardsp/channels.h (modified) (1 diff)
• libroardsp/channels.c (modified) (10 diffs)
• roard/streams.c (modified) (1 diff)

include/libroardsp/channels.h

@@ -140 +140 @@
 int roardsp_chanmap_calc(struct roardsp_chanmap * map, int what, int err_on_none);
 
-int roardsp_chanmap_mappcm8 (char    * out, char    * in, size_t len, size_t chans, char * map);
-int roardsp_chanmap_mappcm16(int16_t * out, int16_t * in, size_t len, size_t chans, char * map);
-int roardsp_chanmap_mappcm24(void    * out, void    * in, size_t len, size_t chans, char * map);
-int roardsp_chanmap_mappcm32(int32_t * out, int32_t * in, size_t len, size_t chans, char * map);
-int roardsp_chanmap_mappcm  (void    * out, void    * in, size_t len, size_t chans, char * map, int bits);
+int roardsp_chanmap_mappcm8 (char    * out, char    * in, size_t len, size_t chans, struct roardsp_chanmap * map);
+int roardsp_chanmap_mappcm16(int16_t * out, int16_t * in, size_t len, size_t chans, struct roardsp_chanmap * map);
+int roardsp_chanmap_mappcm24(void    * out, void    * in, size_t len, size_t chans, struct roardsp_chanmap * map);
+int roardsp_chanmap_mappcm32(int32_t * out, int32_t * in, size_t len, size_t chans, struct roardsp_chanmap * map);
+int roardsp_chanmap_mappcm  (void    * out, void    * in, size_t len, size_t chans, struct roardsp_chanmap * map, int bits);
 
 #endif

libroardsp/channels.c

@@ -394 +394 @@
 }
 
-int roardsp_chanmap_mappcm8 (char    * out, char    * in, size_t len, size_t chans, char * map) {
+int roardsp_chanmap_mappcm8 (char    * out, char    * in, size_t len, size_t chans, struct roardsp_chanmap * map) {
  char buf[ROAR_MAX_CHANNELS];
  size_t frame;
@@ -413 +413 @@
 
    for (c = 0; c < chans; c++) {
-    buf[(int)map[c]] = in[c];
+    buf[(int)map->map[c]] = in[c];
    }
 
@@ -425 +425 @@
   for (frame = 0; frame < len/(chans*_8BIT); frame++) {
    for (c = 0; c < chans; c++) {
-    out[(int)map[c]] = in[c];
+    out[(int)map->map[c]] = in[c];
    }
    in  += chans;
@@ -435 +435 @@
 }
 
-int roardsp_chanmap_mappcm16(int16_t * out, int16_t * in, size_t len, size_t chans, char * map) {
+int roardsp_chanmap_mappcm16(int16_t * out, int16_t * in, size_t len, size_t chans, struct roardsp_chanmap * map) {
  int16_t buf[ROAR_MAX_CHANNELS];
  size_t frame;
@@ -454 +454 @@
 
    for (c = 0; c < chans; c++) {
-    buf[(int)map[c]] = in[c];
+    buf[(int)map->map[c]] = in[c];
    }
 
@@ -466 +466 @@
   for (frame = 0; frame < len/(chans*_16BIT); frame++) {
    for (c = 0; c < chans; c++) {
-    out[(int)map[c]] = in[c];
+    out[(int)map->map[c]] = in[c];
    }
    in  += chans;
@@ -476 +476 @@
 }
 
-int roardsp_chanmap_mappcm24(void    * out, void    * in, size_t len, size_t chans, char * map) {
+int roardsp_chanmap_mappcm24(void    * out, void    * in, size_t len, size_t chans, struct roardsp_chanmap * map) {
  return -1;
 }
 
-int roardsp_chanmap_mappcm32(int32_t * out, int32_t * in, size_t len, size_t chans, char * map) {
+int roardsp_chanmap_mappcm32(int32_t * out, int32_t * in, size_t len, size_t chans, struct roardsp_chanmap * map) {
  int32_t buf[ROAR_MAX_CHANNELS];
  size_t frame;
@@ -499 +499 @@
 
    for (c = 0; c < chans; c++) {
-    buf[(int)map[c]] = in[c];
+    buf[(int)map->map[c]] = in[c];
    }
 
@@ -511 +511 @@
   for (frame = 0; frame < len/(chans*_32BIT); frame++) {
    for (c = 0; c < chans; c++) {
-    out[(int)map[c]] = in[c];
+    out[(int)map->map[c]] = in[c];
    }
    in  += chans;
@@ -521 +521 @@
 }
 
-int roardsp_chanmap_mappcm  (void    * out, void    * in, size_t len, size_t chans, char * map, int bits) {
+int roardsp_chanmap_mappcm  (void    * out, void    * in, size_t len, size_t chans, struct roardsp_chanmap * map, int bits) {
  if ( len == 0 )
   return 0;

roard/streams.c

@@ -1112 +1112 @@
 
  // check channel map:
- if ( roardsp_chanmap_mappcm(indata, indata, inlen, stream_info->channels, ss->chanmap.map, stream_info->bits) == -1 ) {
+ if ( roardsp_chanmap_mappcm(indata, indata, inlen, stream_info->channels, &(ss->chanmap), stream_info->bits) == -1 ) {
   if ( bufbuf != NULL )
    roar_buffer_free(bufbuf);