Changeset 2180

Timestamp:

01/20/99 11:28:44 (14 years ago)

Author:

ucacoxh

Message:

- Made converter query and creation functions same format as device and codec

functions.

Location:

rat/trunk

Files:

• Makefile.in (modified) (1 diff)
• convert.c (modified) (15 diffs)
• convert.h (modified) (2 diffs)
• mix.c (modified) (1 diff)
• source.c (modified) (7 diffs)
• source.h (modified) (1 diff)

rat/trunk/Makefile.in

@@ -18 +18 @@
 TOY_OBJS   = convert.o crypt.o render_3D.o repair.o sndfile.o 
 
-CORE_OBJS  = audio.o cushion.o main.o mbus_engine.o \
+CORE_OBJS  = playout.o source.o mbus_engine.o audio.o cushion.o main.o \
              mbus_ui.o mix.o net.o parameters.o pckt_queue.o \
-             playout.o rtcp.o rtcp_db.o rtcp_pckt.o session.o \
-             source.o statistics.o tcltk.o timers.o transmit.o transcoder.o \
+             rtcp.o rtcp_db.o rtcp_pckt.o session.o \
+             statistics.o tcltk.o timers.o transmit.o transcoder.o \
              ui.o ui_audiotool.o ui_transcoder.o
 

rat/trunk/convert.c

@@ -46 +46 @@
 #include "util.h"
 #include "convert.h"
-
-typedef struct s_converter_fmt{
-        u_int16 from_channels;
-        u_int16 from_freq;
-        u_int16 to_channels;
-        u_int16 to_freq;
-} converter_fmt_t;
+#include "debug.h"
+
+typedef struct s_converter {
+        struct s_pcm_converter *pcm_conv;
+        struct s_converter_fmt *conv_fmt;
+        char                   *data;
+        int                     data_len;
+} converter_t;
+
+/* Index to converter_id_t mapping macros */
+
+#define CONVERTER_ID_TO_IDX(x) ((x+17) << 2)
+#define IDX_TO_CONVERTER_ID(x) (((x)>>2) - 17)
 
 /* Mono-Stereo Conversion ****************************************************/ 
@@ -1165 +1171 @@
 
 typedef struct s_pcm_converter{
-        u_char  id;
         char    *name;
         u_char  enabled;
@@ -1176 +1181 @@
 } pcm_converter_t;
 
-#define CONVERT_NONE     255
-#define CONVERT_PLATFORM 1
-#define CONVERT_SRF      2
-#define CONVERT_LINEAR   3
-#define CONVERT_EXTRA    4
-
 /* In this table of converters the platform specific converters should go at the
  * beginning, before the default (and worst) linear interpolation conversion.  The
@@ -1190 +1189 @@
 pcm_converter_t converter_tbl[] = {
 #ifdef WIN32
-        {CONVERT_PLATFORM, 
+        {
          "Microsoft Converter", 
          FALSE, 
@@ -1198 +1197 @@
          acm_convert,  
          acm_conv_free, 
-         sizeof(HACMSTREAM)},
+         sizeof(HACMSTREAM)
+        },
 #endif
 #ifdef SRF_GOOD
-        {CONVERT_SRF, 
+        {
          "High Quality",
          TRUE,
@@ -1209 +1209 @@
          srf_convert,
          srf_free,
-         2 * sizeof(srf_state_t)},
+         2 * sizeof(srf_state_t)
+        },
 #endif /* SRF_GOOD */
-        {CONVERT_LINEAR,
+        {
          "Intermediate Quality",
          TRUE,  
@@ -1219 +1220 @@
          linear_convert,
          linear_free,
-         2 * sizeof(li_state_t)},
-        {CONVERT_EXTRA,
+         2 * sizeof(li_state_t)
+        },
+        {
          "Low Quality",
          TRUE,
@@ -1228 +1230 @@
          extra_convert,
          extra_free,
-         2 * sizeof(extra_state_t)},
-        {CONVERT_NONE,
+         2 * sizeof(extra_state_t)
+        },
+        {
          "None",
          TRUE,
@@ -1237 +1240 @@
          NULL,
          NULL,
-         0}
+         0
+        }
 };
 
+#define NUM_CONVERTERS sizeof(converter_tbl)/sizeof(pcm_converter_t)
+#define CONVERTER_NONE (NUM_CONVERTERS - 1)
+
 converter_t *
-converter_create(pcm_converter_t *pc, int from_channels, int from_freq, int to_channels, int to_freq)
+converter_create(converter_id_t   cid, 
+                 converter_fmt_t *in_fmt)
 {
         converter_t     *c  = NULL;
         converter_fmt_t *cf = NULL;
-        
-        if (pc == NULL || pc->id == CONVERT_NONE) return NULL;
-        
+        pcm_converter_t *pc;
+        u_int32          tbl_idx;
+        
+        tbl_idx = CONVERTER_ID_TO_IDX(cid);
+
+        if (tbl_idx >= NUM_CONVERTERS) {
+                debug_msg("Converter ID invalid\n");
+                return NULL;
+        }
+
+        if (tbl_idx == CONVERTER_NONE) return NULL;
+
+        pc = converter_tbl + tbl_idx;
+        
+        assert(in_fmt != NULL);
+
         c  = (converter_t*)xmalloc(sizeof(converter_t));
 
@@ -1261 +1282 @@
         }
 
-        cf->from_channels = from_channels;
-        cf->from_freq     = from_freq;
-        cf->to_channels   = to_channels;
-        cf->to_freq       = to_freq;
+        memcpy(cf, in_fmt, sizeof(converter_fmt_t));
 
         c->pcm_conv = pc;
@@ -1299 +1317 @@
 converters_init()
 {
-        pcm_converter_t *pc = converter_tbl;
-        while(pc->id != CONVERT_NONE) {
+        pcm_converter_t *pc, *end;
+
+        pc  = converter_tbl;
+        end = converter_tbl + NUM_CONVERTERS;
+        while(pc != end) {
                 if (pc->cf_start) pc->enabled = pc->cf_start();
                 pc++;
@@ -1309 +1330 @@
 converters_free()
 {
-        pcm_converter_t *pc = converter_tbl;
-        while(pc->id != CONVERT_NONE) {
+        pcm_converter_t *pc, *end;
+
+        pc  = converter_tbl;
+        end = converter_tbl + NUM_CONVERTERS;
+        while(pc != end) {
                 if (pc->cf_clean) pc->cf_clean();
                 pc++;
@@ -1316 +1340 @@
 }
 
-pcm_converter_t *
-converter_get_byname(char *name)
-{
-        pcm_converter_t *pc;
-
-        pc = converter_tbl;
-        while(strcmp(name, pc->name) && pc->id != CONVERT_NONE) pc++;
-        return pc;
-}
-
-int 
+int
+converter_get_details(u_int32 idx, converter_details_t *cd)
+{
+        if (idx < NUM_CONVERTERS) {
+                cd->id   = IDX_TO_CONVERTER_ID(idx);
+                cd->name = converter_tbl[idx].name;
+                return TRUE;
+        }
+        debug_msg("Getting invalid converter details\n");
+        return FALSE;
+}
+
+u_int32 
 converter_get_count()
 {
-        int count = 1; /* convert_none always there */
-        pcm_converter_t *pc = converter_tbl;
-
-        do {
-                if (pc->enabled) count ++;
-                pc++;
-        } while (pc->id != CONVERT_NONE);
-
-        return count;
-}
-
-const char *
-converter_get_name(int idx)
-{
-       pcm_converter_t *pc = converter_tbl;
-       int count = 0;
-
-       do {
-               if (pc->enabled) {
-                       if (count == idx) break;
-                       count ++;
-               }
-               pc++;
-       } while (pc->id != CONVERT_NONE);
-       
-       return pc->name;
+        return NUM_CONVERTERS;
 }
 
@@ -1361 +1362 @@
 
 int
-converter_format (converter_t *c, coded_unit *in, coded_unit *out)
+converter_process (converter_t *c, coded_unit *in, coded_unit *out)
 {
         converter_fmt_t *cf;
@@ -1393 +1394 @@
 }
 
-#ifdef DEBUG_CONVERT
-
-#define SRC_LEN 160
-
-/* a.out <converter idx> <input rate> <input channels> <output rate> <output channels> */
-static pcm_converter_t *
-converter_get_by_idx(int idx)
-{
-        char buf[255], *pb;
-        converter_get_names(buf, 255);
-        pb = strtok(buf, "/");
-        while(idx > 0) {
-                pb = strtok(NULL, "/");
-                idx--;
-        }
-        assert(pb);
-        return converter_get_byname(pb);
-}
-
-static void 
-fill_data(sample *buf, int buf_len, int channels) 
-{
-        register int i, j, r;
-        for(i = 0; i < buf_len; i ++) {
-                r = (32767.0 * sin(2* M_PI * i / SRC_LEN));
-                for(j = 0; j < channels; j++) {
-                        *buf++ = r;
-                }
-        }
-}
-
-void 
-display_data(sample *buf, int buf_len, int channels) 
-{
-        int i;
-
-        switch(channels) {
-        case 1:
-                for(i = 0; i < buf_len; i++) {
-                        printf("% 3d % 5d             \n", i, buf[i]);
-                }
-                break;
-        case 2:
-                buf_len /= channels;
-                for(i = 0; i < buf_len; i++) {
-                        printf("% 3d % 5d % 5d\n", i, buf[2*i], buf[2*i + 1]);
-                }
-                break;
-        }
-        printf("\n");
-}
-
-void 
-display_time_diff(struct timeval *t1, struct timeval *t2)
-{
-        float diff = (t2->tv_sec  - t1->tv_sec)*1.0 + (t2->tv_usec - t1->tv_usec)*1e-6;
-        printf("Took %f seconds\n", diff);
-}
-
-
-int 
-main(int argc, char **argv)
-{
-        rx_queue_element_struct *rx = NULL;
-        pcm_converter_t *pc = NULL;
-        converter_t     *c = NULL;
-        struct rusage r1, r2;
-
-        int idx, in_rate, in_channels, out_rate, out_channels;
-
-        assert(argc == 6);
-        idx          = atoi(argv[1]);
-        in_rate      = atoi(argv[2]);
-        in_channels  = atoi(argv[3]);
-        out_rate     = atoi(argv[4]);
-        out_channels = atoi(argv[5]);
-        assert(in_rate  % 8000 == 0);
-        assert(out_rate % 8000 == 0);
-        assert(in_channels  == 1 || in_channels  == 2);
-        assert(out_channels == 1 || out_channels == 2);
-
-        converters_init();
-
-        pc = converter_get_by_idx(idx);
-        
-        assert(pc);
-        printf("# Converter %s\n", pc->name);
-        c = converter_create(pc, in_channels, in_rate, out_channels, out_rate);
-
-        rx = (rx_queue_element_struct*)xmalloc(sizeof(rx_queue_element_struct));
-        memset(rx,0,sizeof(rx_queue_element_struct));
-
-        rx->native_data[0] = (sample*)block_alloc(sizeof(sample) * in_channels * SRC_LEN);
-        rx->native_size[0] = in_channels * SRC_LEN * sizeof(sample);
-        rx->native_count   = 1;
-        fill_data(rx->native_data[0], SRC_LEN,in_channels);
-        getrusage(RUSAGE_SELF,&r1);
-        converter_format(c, rx);
-        getrusage(RUSAGE_SELF,&r2);
-        printf("#");display_time_diff(&r1.ru_utime, &r2.ru_utime);
-
-        display_data(rx->native_data[0], rx->native_size[0] / sizeof(sample), in_channels);
-        display_data(rx->native_data[1], rx->native_size[1] / sizeof(sample), out_channels);
-        
-        block_free(rx->native_data[0], rx->native_size[0]);
-        block_free(rx->native_data[1], rx->native_size[1]);
-        xfree(rx);
-
-        converter_destroy(&c);
-        converters_free();
-
-        return 1;
-}
-
-#endif /* DEBUG_CONVERT */
-
-
+const converter_fmt_t*
+converter_get_format (converter_t *c)
+{
+        assert(c != NULL);
+        return c->conv_fmt;
+}

rat/trunk/convert.h

@@ -46 +46 @@
 struct s_coded_unit;
 
-typedef struct s_converter {
-        struct s_pcm_converter *pcm_conv;
-        struct s_converter_fmt *conv_fmt;
-        char                   *data;
-        int                     data_len;
-} converter_t;
+typedef struct s_converter_fmt {
+        u_int16 from_channels;
+        u_int16 from_freq;
+        u_int16 to_channels;
+        u_int16 to_freq;
+} converter_fmt_t;
+
+typedef u_int32 converter_id_t;
+
+typedef struct {
+        converter_id_t id;
+        const char*    name;
+} converter_details_t;
+
+struct  s_converter;
 
 /* Application pcm conversion functions */
@@ -58 +67 @@
 
 /* Participant specific pcm conversion functions */
-converter_t* converter_create  (struct s_pcm_converter *pc, 
-                                int                     from_channels, 
-                                int                     from_freq, 
-                                int                     to_channels, 
-                                int                     to_freq);
+struct s_converter* converter_create  (converter_id_t   id, 
+                                       converter_fmt_t *cf);
 
-int           converter_format  (converter_t *c, 
-                                 struct s_coded_unit *in, 
-                                 struct s_coded_unit *out);
-void          converter_destroy (converter_t **c);
+const converter_fmt_t*          
+             converter_get_format(struct s_converter  *c);
+
+int          converter_process   (struct s_converter  *c, 
+                                  struct s_coded_unit *in, 
+                                  struct s_coded_unit *out);
+void         converter_destroy   (struct s_converter **c);
 
 /* Converter selection functions */
-struct s_pcm_converter* converter_get_byname(char *name);
-int                     converter_get_count(void);
-const char*             converter_get_name(int idx);
+u_int32 converter_get_count(void);
+int     converter_get_details(u_int32              idx, 
+                              converter_details_t *cd);
 
 #endif /* _convert_h_ */

rat/trunk/mix.c

@@ -414 +414 @@
 }
 
-
 #define POWER_METER_SAMPLES 160
 

rat/trunk/source.c

@@ -48 +48 @@
 #include "codec.h"
 #include "codec_state.h"
+#include "convert.h"
 #include "timers.h"
 
@@ -56 +57 @@
         struct s_source            *next;
         struct s_source            *prev;
+        u_int32                     age;
+        u_int32                     last_played;
         struct s_rtcp_dbentry      *dbe;
         struct s_channel_state     *channel_state;
@@ -242 +245 @@
         assert(data_start != NULL);
 
+        if (src->age != 0 &&
+            ts_gt(src->last_played, playout)) {
+                debug_msg("Packet late (%u > %u)- discarding\n", 
+                          src->last_played,
+                          playout);
+                /* Up src->dbe jitter toged */
+                return FALSE;
+        }
+
         if (channel_data_create(&cd, 1) == 0) {
                 return FALSE;
@@ -277 +289 @@
 
 int
-source_process(source *src, u_int32 render_3d, u_int32 now)
+source_process(source *src, u_int32 now)
 {
         media_data  *md;
@@ -295 +307 @@
                 assert(md_len == sizeof(media_data));
 
-                if (src->age != 0 && playout != src->last_playout + src->last_unit_dur) {
+                if (src->age != 0 && playout != src->last_played + src->last_unit_dur) {
                         /* Repair necessary 
                          * - create unit at src->last_playout + src->last_unit_dur;
@@ -351 +363 @@
                 }
 
-                if () {
+                if (src->converter) {
                         /* convert frame */
                         
@@ -359 +371 @@
 
         }
+
+        src->age++;
+        src->last_played = now;
         
         return TRUE;

rat/trunk/source.h

@@ -71 +71 @@
 int              source_process        (struct s_source *src,
                                         u_int32          now);
-                                        
 
 u_int32          source_buffer_length_ms (struct s_source *src);