Changeset 3011

Timestamp:

12/12/99 21:22:00 (14 years ago)

Author:

ucaccsp

Message:

- Assorted code cleanups.
- Add back thread priority for win32

Location:

rat/trunk

Files:

• MODS (modified) (1 diff)
• auddev_win32.c (modified) (1 diff)
• main_engine.c (modified) (10 diffs)
• session.c (modified) (1 diff)
• ui.c (modified) (3 diffs)
• ui.h (modified) (1 diff)

rat/trunk/MODS

@@ -997 +997 @@
         - Add version number to mbus config file. Should prevent crashes
           when we update the format of that file.
+        - Set thread priority of media engine to THREAD_PRIORITY_ABOVE_NORMAL 
+          on Windows.
 
 

rat/trunk/auddev_win32.c

@@ -35 +35 @@
 static int  error = 0;
 static char errorText[MAXERRORLENGTH];
-extern int  thread_pri;
 static int  nLoopGain = 100;
 #define     MAX_DEV_NAME 64

rat/trunk/main_engine.c

@@ -44 +44 @@
 #include "rtp_callback.h"
 
-int should_exit = FALSE;
-int thread_pri  = 2; /* Time Critical */
+int      should_exit = FALSE;
+char    *c_addr, *token, *token_e; /* These should be parameters of the session? */
 
 #ifndef WIN32
@@ -55 +55 @@
 }
 #endif
-
-char    *c_addr, *token, *token_e; 
 
 #define MBUS_ADDR_ENGINE "(media:audio module:engine app:rat instance:%5u)"
@@ -102 +100 @@
         uint8_t          j;
 
-#ifndef WIN32
+#ifdef WIN32
+        /* Not sure what the correct priority should be... rat-3.0.x uses  */
+        /* THREAD_PRIORITY_TIME_CRITICAL, but that's maybe too high. [csp] */
+        SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL);
+#else
         signal(SIGINT, signal_handler); 
+        debug_set_core_dir(argv[0]);
 #endif
 
-        debug_set_core_dir(argv[0]);
-
+        /* Setup things which are independent of the session. These should */
+        /* be create static data only, since it will be accessed by BOTH   */
+        /* instances when running as a transcoder.                         */
         seed = (gethostid() << 8) | (getpid() & 0xff);
         srand48(seed);
         lbl_srandom(seed);
-
+        converters_init();
+        audio_init_interfaces();
+        parse_args(argc, argv);
+
+        /* Initialize the session structure, and all session specific data */
         sp = (session_t *) xmalloc(sizeof(session_t));
         session_init(sp);
-        converters_init();
-        audio_init_interfaces();
         audio_device_get_safe_config(&sp->new_config);
         audio_device_reconfigure(sp);
-        sp->cur_ts = ts_seq32_in(&sp->decode_sequencer, 
-                                 get_freq(sp->device_clock), 0);
+        sp->cur_ts = ts_seq32_in(&sp->decode_sequencer, get_freq(sp->device_clock), 0);
         assert(audio_device_is_open(sp->audio_device));
         settings_load_early(sp);
-        parse_args(argc, argv);
 
         /* Initialise our mbus interface... once this is done we can talk to our controller */
@@ -165 +169 @@
         settings_load_late(sp);
 
-        ui_controller_init(sp);
         ui_initial_settings(sp);
         ui_update(sp);
         network_process_mbus(sp);
         
-#ifdef NDEF
-        if (sp->new_config != NULL) {
-                network_process_mbus(sp);
-                audio_device_reconfigure(sp);
-                network_process_mbus(sp);
-        }
-#endif
-
-#ifdef NDEF
-        ui_final_settings(sp);
-        network_process_mbus(sp);
-#endif
         audio_drain(sp->audio_device);
         if (tx_is_sending(sp->tb)) {
@@ -222 +213 @@
                 /* Process audio */
                 elapsed_time += audio_rw_process(sp, sp, sp->ms);
-                cur_time = get_time(sp->device_clock);
-                ntp_time = ntp_time32();
-                sp->cur_ts   = ts_seq32_in(&sp->decode_sequencer, get_freq(sp->device_clock), cur_time);
+                cur_time      = get_time(sp->device_clock);
+                ntp_time      = ntp_time32();
+                sp->cur_ts    = ts_seq32_in(&sp->decode_sequencer, get_freq(sp->device_clock), cur_time);
 
                 if (tx_is_sending(sp->tb)) {
@@ -234 +225 @@
                 if (sp->playing_audio) {
                         struct s_source *s;
-                        int sidx;
-                        ts_t cush_ts;
+                        int              sidx;
+                        ts_t             cush_ts;
+
                         cush_ts = ts_map32(get_freq(sp->device_clock), cushion_get_size(sp->cushion));
                         cush_ts = ts_add(sp->cur_ts, cush_ts);
@@ -269 +261 @@
                 /* Echo Suppression - cut off transmitter when receiving     */
                 /* audio, enable when stop receiving.                        */
-
                 if (sp->echo_suppress) {
                         if (scnt > 0) {
@@ -305 +296 @@
                 }
                 if (sp->new_config != NULL) {
-                        /* wait for mbus messages - closing audio device
-                         * can timeout unprocessed messages as some drivers
-                         * pause to drain before closing.
-                         */
+                        /* wait for mbus messages - closing audio device    */
+                        /* can timeout unprocessed messages as some drivers */
+                        /* pause to drain before closing.                   */
                         network_process_mbus(sp);
                         if (audio_device_reconfigure(sp)) {
-                                /* Device reconfigured so
-                                 * decode paths of all sources
-                                 * are misconfigured.  Delete
-                                 * and incoming data will
-                                 * drive correct new path */
+                                /* Device reconfigured so decode paths of all sources */
+                                /* are misconfigured. Delete the source, and incoming */
+                                /* data will drive the correct new path.              */
                                 source_list_clear(sp->active_sources);
                         }
@@ -345 +333 @@
         } while (!mbus_sent_all(sp->mbus_engine));
         mbus_exit(sp->mbus_engine);
-        sp->mbus_engine = NULL;
 
         for (j = 0; j < sp->rtp_session_count; j++) {
@@ -354 +341 @@
 
         session_exit(sp);
-        xfree(sp);
-
         converters_free();
         audio_free_interfaces();
-
         xmemdmp();
         return 0;

rat/trunk/session.c

@@ -160 +160 @@
         channel_encoder_destroy(&sp->channel_coder);
         source_list_destroy(&sp->active_sources);
+        xfree(sp);
 }
 

rat/trunk/ui.c

@@ -1081 +1081 @@
 ui_initial_settings(session_t *sp)
 {
+        /* One off setting transfers / initialization */
         uint32_t my_ssrc = rtp_my_ssrc(sp->rtp_session[0]);
-        /* One off setting transfers / initialization */
+
+        mbus_qmsgf(sp->mbus_engine, sp->mbus_ui_addr, TRUE, "rtp.ssrc", "%08lx", my_ssrc);
+        network_process_mbus(sp);
+
         ui_sampling_modes(sp);                  network_process_mbus(sp);
         ui_converters(sp);                      network_process_mbus(sp);
@@ -1095 +1099 @@
         ui_info_update_tool(sp,  my_ssrc);      network_process_mbus(sp);
         ui_title(sp);                           network_process_mbus(sp);
-#ifdef NDEF /* This is done by load_settings() now... */
-        ui_load_settings(sp);                   network_process_mbus(sp);
-#endif
 }
 
@@ -1106 +1107 @@
 }
 
-void
-ui_controller_init(session_t *sp)
-{
-        char    my_ssrc[11];
-
-        sprintf(my_ssrc, "\"%08x\"", rtp_my_ssrc(sp->rtp_session[0]));
-        mbus_qmsg(sp->mbus_engine, sp->mbus_ui_addr, "rtp.ssrc", my_ssrc, TRUE);
-}
-

rat/trunk/ui.h

@@ -64 +64 @@
 void ui_quit                 (struct s_session *s);
 
-void ui_controller_init      (struct s_session *s);
-
 #endif