Changeset 245 for trunk

Timestamp:

03/26/08 22:18:28 (4 years ago)

Author:

ath

Message:

A big update of the timekeeping mechanism designed around FmEffectRubber?.

Location:

trunk/fm_server/src

Files:

• fm_buffer.c (modified) (2 diffs)
• fm_buffer.h (modified) (1 diff)
• fm_effect_rubber/fm_effect_rubber.c (modified) (7 diffs)
• fm_effect_rubber/fm_effect_rubber.h (modified) (2 diffs)
• fm_element.c (modified) (2 diffs)
• fm_element.h (modified) (1 diff)
• fm_input_cdj.c (modified) (2 diffs)
• fm_input_gst/fm_input_gst.c (modified) (3 diffs)

trunk/fm_server/src/fm_buffer.c

@@ -59 +59 @@
         buffer->requested_samples = 0;
 
-        buffer->timestamp = 0;
+        buffer->timestamp_ns = 0;
+        buffer->timestamp_samples = 0;
         buffer->duration = 0;
         
@@ -119 +120 @@
         buffer->discont = FALSE;
         buffer->silence = FALSE;
-        buffer->timestamp = 0;
+        buffer->timestamp_ns = -1;
+        buffer->timestamp_samples = -1;
         buffer->duration = 0;   
 }

trunk/fm_server/src/fm_buffer.h

@@ -50 +50 @@
         guint           requested_samples;
 
-        guint64         timestamp;              // real timestamp from start of the song
+        gint64          timestamp_ns;           // real timestamp from start of the song
+        gint64          timestamp_samples;
         guint64         duration;               // real duration of AUDIO (not silence) in the buffer 
 };

trunk/fm_server/src/fm_effect_rubber/fm_effect_rubber.c

@@ -145 +145 @@
         rubber->change_pitch_scale = -1;
         rubber->channel_ptr = NULL;
+        rubber->latency = 0;
+        rubber->temp_timestamp_ns = -1;
+        rubber->last_timestamp = 0;
 }
 
@@ -196 +199 @@
                 rubber->time_ratio = rubber->change_time_ratio;
                 rubber->change_time_ratio = -1;
+                rubber->latency = fm_rubber_wrapper_get_latency (rubber->wrap);
         }
 
@@ -202 +206 @@
                 rubber->pitch_scale = rubber->change_pitch_scale;
                 rubber->change_pitch_scale = -1;
+                rubber->latency = fm_rubber_wrapper_get_latency (rubber->wrap);
         }
 
@@ -208 +213 @@
 
         guint samples_needed = buffer->requested_samples;
-
+//      gboolean already_out_of_samples = FALSE;
+
+        guint64 start_timestamp = rubber->temp_timestamp_ns;
+        
         while (samples_needed > 0) {
                 guint samples_avail = fm_rubber_wrapper_available (rubber->wrap);
@@ -220 +228 @@
                         guint retrieved = fm_rubber_wrapper_retrieve (rubber->wrap, rubber->channel_ptr, ask_for);
                         samples_needed -= retrieved;
-                        
+
                         for (i = 0; i < FM_CHANNELS_STEREO; i++)
                                 rubber->channel_ptr[i] += retrieved;
+
+                        if (rubber->temp_timestamp_ns >= 0)
+                                rubber->temp_timestamp_ns += fm_element_samples_to_ns (element,
+                                                                                       retrieved / rubber->time_ratio);
 
                         if (retrieved != ask_for)
@@ -231 +243 @@
                         guint samples_req = fm_rubber_wrapper_get_samples_required (rubber->wrap);
 
+                        //g_print ("Requested %u samples\n", samples_req);
+
                         rubber->temp_buffer->requested_samples = samples_req;
 
                         fm_element_get_buffer_from_src (element, rubber->temp_buffer, sync);
+                        if (rubber->temp_buffer->discont == TRUE) {
+                                g_print ("***************** DISCONT!!!!\n");
+                                fm_rubber_wrapper_reset (rubber->wrap);
+                                start_timestamp = rubber->temp_buffer->timestamp_ns;
+
+                                for (i = 0; i < FM_CHANNELS_STEREO; i++)
+                                        rubber->channel_ptr[i] = buffer->channel_data[i];
+
+                                samples_needed = buffer->requested_samples;
+                        }
+
+                        rubber->temp_timestamp_ns = rubber->temp_buffer->timestamp_ns;
 
                         fm_rubber_wrapper_process (rubber->wrap, rubber->temp_buffer->channel_data, samples_req, FALSE);
@@ -239 +265 @@
 
         }
+
+        buffer->timestamp_ns = start_timestamp;
+
+        if ((rubber->last_timestamp == start_timestamp) && (start_timestamp == -1))
+                return;
+        g_print ("%s pos %ld\n", fm_element_get_name (element), buffer->timestamp_ns);
+        rubber->last_timestamp = buffer->timestamp_ns;
 }
 

trunk/fm_server/src/fm_effect_rubber/fm_effect_rubber.h

@@ -43 +43 @@
 
         FmBuffer *temp_buffer;
+        gint64 temp_timestamp_ns;
+        gint64 last_timestamp;
 
         gfloat **channel_ptr;
@@ -51 +53 @@
         gdouble change_time_ratio;
         gdouble change_pitch_scale;
+
+        size_t latency;
 };
 

trunk/fm_server/src/fm_element.c

@@ -218 +218 @@
         
         return (gchar *) g_object_get_data (G_OBJECT (element), "name");
-        //return (element->name);
 }
 
@@ -464 +463 @@
         (*klass->become_sync_master) (peer_sync_master, reference->sync_ref);
 }
+
+
+gint64
+fm_element_samples_to_ns                (FmElement      *element,
+                                         gint64         samples)
+{
+        g_return_val_if_fail (samples >= 0, -1);
+        g_return_val_if_fail (element->pipeline, -1);
+
+        FmPipeline *pipeline = FM_PIPELINE (element->pipeline);
+        g_return_val_if_fail (pipeline->sample_rate > 0, -1);
+
+        return (guint64) ((gdouble) G_USEC_PER_SEC * G_GINT64_CONSTANT (1000) / pipeline->sample_rate) * samples;
+}

trunk/fm_server/src/fm_element.h

@@ -178 +178 @@
 fm_element_sync_ref_set_peer_master     (FmElement      *reference,
                                          FmElement      *peer_sync_master);
+
+gint64
+fm_element_samples_to_ns                (FmElement      *element,
+                                         gint64         samples);

trunk/fm_server/src/fm_input_cdj.c

@@ -192 +192 @@
 fm_input_cdj_init                       (FmInputCDJ     *input_cdj)
 {
+        static gint serial = 0;
         input_cdj->input = fm_input_gst_new ();
         input_cdj->rate = fm_effect_rubber_new ();
+        g_object_set_data (G_OBJECT (input_cdj->input), "name", g_strdup_printf ("input%d", serial));
+        g_object_set_data (G_OBJECT (input_cdj->rate), "name", g_strdup_printf ("rubber%d", serial));
+        serial++;
 
         fm_element_connect_src (FM_ELEMENT (input_cdj->rate), FM_ELEMENT (input_cdj->input));
@@ -316 +320 @@
                 if (FM_BUFFER_DISCONT (buffer)) {
                         g_print ("**************************************************************************************************\n");
-                        g_print ("DISCONT buffer! new pos %llu\n", (long long unsigned int) FM_BUFFER_TIMESTAMP (buffer));
-                        fm_sync_set (sync, 0, FM_BUFFER_TIMESTAMP (buffer));
+                        g_print ("DISCONT buffer! new pos %llu\n", (long long unsigned int) buffer->timestamp_ns);
+                        fm_sync_set (sync, 0, buffer->timestamp_ns);
                         FM_BUFFER_DISCONT (buffer) = FALSE;
                 } else {

trunk/fm_server/src/fm_input_gst/fm_input_gst.c

@@ -615 +615 @@
         if ((!input_gst->play_when_ready) || (!chk) || (chk->eof)) {
                 fm_buffer_fill_with_silence (buffer);
+//              g_print ("FILL\n");
+                buffer->timestamp_ns = -1;
+                buffer->timestamp_samples = -1;
                 return;
         }
@@ -647 +650 @@
         chk->samples_read += useful_read_samples;
 
-        buffer->timestamp = samples_to_ns (common, current_pos_samples_old);
+        buffer->timestamp_samples = current_pos_samples_old;
+        buffer->timestamp_ns = samples_to_ns (common, buffer->timestamp_samples);
         buffer->used_samples = buffer->requested_samples;
         buffer->duration = samples_to_ns (common, useful_read_samples);
@@ -682 +686 @@
                 _send_position (input_gst);
         }
+
+        //g_print ("GST pos %ld\n", buffer->timestamp_ns);
 }