Changeset 273

Timestamp:

01/08/09 22:02:28 (3 years ago)

Author:

ath

Message:

Reimplement FmEffectRubber? in a more decent way.

Location:

trunk/fm_server/src/fm_effect_rubber

Files:

• fm_effect_rubber.c (modified) (10 diffs)
• fm_effect_rubber.h (modified) (1 diff)

trunk/fm_server/src/fm_effect_rubber/fm_effect_rubber.c

@@ -35 +35 @@
 #include "../fm_input.h"
 #include "../fm_effect.h"
+#include "../fm_output.h"
+#include "../fm_sync.h"
+#include "../fm_pipeline.h"
 #include "fm_effect_rubber.h"
 
 
 enum {
-  PROP_0,
-  PROP_TIME_RATIO,
-  PROP_PITCH_SCALE
+        PROP_0,
+        PROP_TIME_RATIO,
+        PROP_PITCH_SCALE
 };
 
@@ -147 +150 @@
         rubber->channel_ptr = NULL;
         rubber->latency = 0;
-        rubber->temp_timestamp_ns = -1;
-        rubber->last_timestamp = 0;
+        rubber->timestamp_ns = -1;
 }
 
@@ -167 +169 @@
                 return FALSE;
 
-        rubber->state = rubberband_new (44100, 2, RubberBandOptionProcessRealTime, 1.0, 1.0);   /* FIXME: 44100 */
+        guint samplerate = fm_pipeline_get_sample_rate (FM_PIPELINE (element->pipeline));
+        g_assert (samplerate > 0);
+//      g_print ("FmEffectRubber: pipeline sample rate is %d\n", samplerate);
+
+        rubber->state = rubberband_new (samplerate, 2, RubberBandOptionProcessRealTime, 1.0, 1.0);
         rubber->temp_buffer = fm_buffer_new (16384, FM_CHANNELS_STEREO);
         rubber->channel_ptr = g_new (gfloat *, FM_CHANNELS_STEREO);
@@ -195 +201 @@
         FmEffectRubber *rubber = FM_EFFECT_RUBBER (element);
         int i;
+
+#if 0
+        /* ****** */
+        fm_element_get_buffer_from_src (element, buffer, sync);
+        buffer->used_samples = buffer->requested_samples; 
+        return;
+        /* ****** */
+#endif
 
         if (rubber->change_time_ratio > -1) {
@@ -201 +215 @@
                 rubber->change_time_ratio = -1;
                 rubber->latency = rubberband_get_latency (rubber->state);
+                g_print ("Rubber latency: %zd\n", rubber->latency);
         }
 
@@ -208 +223 @@
                 rubber->change_pitch_scale = -1;
                 rubber->latency = rubberband_get_latency (rubber->state);
+                g_print ("Rubber latency: %zd\n", rubber->latency);
         }
 
@@ -214 +230 @@
 
         guint samples_needed = buffer->requested_samples;
-//      gboolean already_out_of_samples = FALSE;
-
-        guint64 start_timestamp = rubber->temp_timestamp_ns;
+
+        guint64 start_timestamp_ns = rubber->timestamp_ns;
         
         while (samples_needed > 0) {
@@ -233 +248 @@
                                 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 (rubber->timestamp_ns >= 0)
+                                rubber->timestamp_ns += fm_element_samples_to_ns (element, retrieved / rubber->time_ratio);
+                        else
+                                rubber->timestamp_ns = -1;
 
                         if (retrieved != ask_for)
@@ -244 +260 @@
                         guint samples_req = rubberband_get_samples_required (rubber->state);
 
-                        //g_print ("Requested %u samples\n", samples_req);
+//                      g_print ("IN %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");
                                 rubberband_reset (rubber->state);
-                                start_timestamp = rubber->temp_buffer->timestamp_ns;
+                                start_timestamp_ns = rubber->temp_buffer->timestamp_ns;
+                                rubber->timestamp_ns =  rubber->temp_buffer->timestamp_ns;
 
                                 for (i = 0; i < FM_CHANNELS_STEREO; i++)
@@ -260 +277 @@
                         }
 
-                        rubber->temp_timestamp_ns = rubber->temp_buffer->timestamp_ns;
+/*                      if (rubber->temp_buffer->timestamp_ns >= 0)
+                                g_print ("%s: got buffer with timestamp %" G_GINT64_FORMAT "\n", 
+                                         fm_element_get_name (element), rubber->temp_buffer->timestamp_ns);*/
 
                         rubberband_process (rubber->state, (const float *const *) rubber->temp_buffer->channel_data, samples_req, FALSE);
                 }
-
-        }
-
-        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;
+        }
+
+//      g_print ("OUT %u samples\n", buffer->requested_samples);
+
+        buffer->timestamp_ns = start_timestamp_ns;
+        buffer->used_samples = buffer->requested_samples - samples_needed; 
 }
 

trunk/fm_server/src/fm_effect_rubber/fm_effect_rubber.h

@@ -48 +48 @@
 
         FmBuffer *temp_buffer;
-        gint64 temp_timestamp_ns;
-        gint64 last_timestamp;
+        gint64 timestamp_ns;
 
         gfloat **channel_ptr;