Changeset 274 for trunk

Timestamp:

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

Author:

ath

Message:

Random bugfixes to FmBuffer handling.

Location:

trunk/fm_server/src

Files:

• fm_djmixer.c (modified) (1 diff)
• fm_input_gst/fm_input_gst.c (modified) (1 diff)
• fm_mixer.c (modified) (3 diffs)
• fm_output_alsa.c (modified) (1 diff)

trunk/fm_server/src/fm_djmixer.c

@@ -268 +268 @@
                                          gdouble        value)
 {
-        FmEffectGain *gain;
+        FmEffectGain *gain = NULL;
 
         if (port_n > -1) {

trunk/fm_server/src/fm_input_gst/fm_input_gst.c

@@ -514 +514 @@
                 chk = track->read_chunk;
 
-        fm_buffer_reset_flags (buffer);
+/*      fm_buffer_reset_flags (buffer);*/
 
         /* Check if we have a new track ready */

trunk/fm_server/src/fm_mixer.c

@@ -213 +213 @@
         peer_port->peers_n++;
 
+        mixer->buffers[mixer->buffers_n] = fm_buffer_new(MAX_BUFFER_SIZE, FM_CHANNELS_STEREO);
+//      g_print ("APPENDING PORT at %p, buffer base at %p, %d\n", our_port, mixer->buffers[mixer->buffers_n], mixer->buffers_n);
+        mixer->buffers_n++;
+
+        /* add this only at the end */
         element->sink_ports = g_list_append(element->sink_ports, our_port);
-
-        mixer->buffers[mixer->buffers_n] = fm_buffer_new(MAX_BUFFER_SIZE, FM_CHANNELS_STEREO);
-        mixer->buffers_n++;
 }
 
@@ -229 +231 @@
         /* Careful - we might not have created a sink port yet */
         if (!element->sink_ports || (mixer->buffers_n == 0)) {
-                fm_buffer_fill_with_silence(buffer);
-                FM_BUFFER_USED_SAMPLES (buffer) = FM_BUFFER_REQUESTED (buffer);
+                fm_buffer_fill_with_silence (buffer);
+                buffer->used_samples = buffer->requested_samples;
                 return;
         }
@@ -237 +239 @@
         GList *port = element->sink_ports;
         gint i = 0;
-
-//g_print("%p\n", element->sync_ref);
-
-        if (element->peer_sync_master) {
-                FM_BUFFER_REQUESTED (mixer->buffers[i]) = FM_BUFFER_REQUESTED (buffer);
-                
-                g_print ("Getting data from master port\n");
-                fm_element_get_buffer (element->peer_sync_master, mixer->buffers[i++], sync);
-        }
+        guint l, m;
+
+        gboolean first_to_mix = TRUE;
 
         while (port) {
+//              g_print ("PORT %p, buffer base %p %d\n", port->data, mixer->buffers[i], i);
+                FmBuffer *sink_buffer = mixer->buffers[i];
+
                 FmElementSinkPort *our_port = (FmElementSinkPort *) port->data;
                 FmElementSrcPort *peer_port = our_port->peer;
 
-                if (element->peer_sync_master == peer_port->owner)
-                        continue;
-
-                FM_BUFFER_REQUESTED (mixer->buffers[i]) = FM_BUFFER_REQUESTED (buffer);
-//              g_print("i %d\n", i);
-                fm_element_get_buffer (FM_ELEMENT (peer_port->owner), mixer->buffers[i++], sync);
+                gint samples_needed = buffer->requested_samples;
+                gint mixed_offset = 0;
+
+                while (samples_needed > 0) {
+                        sink_buffer->requested_samples = samples_needed;
+                        fm_element_get_buffer (FM_ELEMENT (peer_port->owner), sink_buffer, sync);
+
+/*                      if (sink_buffer->timestamp_ns >= 0)
+                                g_print ("%s: got buffer with timestamp %" G_GINT64_FORMAT "\n", 
+                                         fm_element_get_name (element), sink_buffer->timestamp_ns);*/
+
+                        if (sink_buffer->used_samples != sink_buffer->requested_samples)
+                                g_warning ("difference! %d %d", sink_buffer->used_samples, sink_buffer->requested_samples);
+
+                        for (l = 0; l < buffer->n_channels; l++) {
+                                gfloat *sink_buffer_data = sink_buffer->channel_data[l];
+                                gfloat *mixed_buffer_data = buffer->channel_data[l]/* + mixed_offset*/;
+
+                                if (first_to_mix)
+                                        memcpy (mixed_buffer_data, sink_buffer_data, sink_buffer->used_samples * sizeof (gfloat));
+                                else
+                                        for (m = 0; m < sink_buffer->used_samples; m++)
+                                                mixed_buffer_data[m] += sink_buffer_data[m];
+                        }       
+
+                        samples_needed -= sink_buffer->used_samples;
+                        mixed_offset += sink_buffer->used_samples;
+                        g_assert (samples_needed >= 0);
+                }
+
+                if (first_to_mix)
+                        first_to_mix = FALSE;
 
                 port = g_list_next (port);
-        }       
-        
-        /* Copy the first buffer's content */
-        for (i = 0; i < buffer->n_channels; i++)
-                memcpy(buffer->channel_data[i], mixer->buffers[0]->channel_data[i], FM_BUFFER_REQUESTED(buffer) * sizeof (gfloat));
-
-        if (mixer->buffers_n == 1)
-                return;
-
-        /* Then add the rest */
-        gint l, m;
-        for (l = 1; l < mixer->buffers_n; l++) {
-                for (i = 0; i < mixer->buffers[0]->n_channels; i++) {
-                        gfloat *this_buffer_data = mixer->buffers[l]->channel_data[i];
-                        gfloat *our_buffer_data = buffer->channel_data[i];
-                        for (m = 0; m < FM_BUFFER_REQUESTED(buffer); m++)
-                                our_buffer_data[m] += this_buffer_data[m];
-                }
-        }
-        
-        FM_BUFFER_USED_SAMPLES (buffer) = FM_BUFFER_REQUESTED (buffer);
-}
+                i++;
+        }
+
+        buffer->used_samples = buffer->requested_samples;
+}

trunk/fm_server/src/fm_output_alsa.c

@@ -481 +481 @@
         
         while (!output_alsa->stop_processing) {
+
+                fm_buffer_reset (output_alsa->main_buffer);
         
                 //g_print("asking for %d samples\n", output_alsa->buffer_size_samples);
-                FM_BUFFER_REQUESTED(output_alsa->main_buffer) = output_alsa->buffer_size_samples;
-                fm_element_get_buffer_from_src(element, output_alsa->main_buffer, NULL);
+                FM_BUFFER_REQUESTED (output_alsa->main_buffer) = output_alsa->buffer_size_samples;
+                fm_element_get_buffer_from_src (element, output_alsa->main_buffer, NULL);
 
 /*              FmSync *sync = fm_element_pipeline_get_sync_info (element);