Changeset 112

Timestamp:

09/04/06 20:29:59 (5 years ago)

Author:

ath

Message:

Use some decent float-integer converstion routines, and make FmPipeline more useful.

Location:

fm_server/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• fm_element.c (modified) (1 diff)
• fm_element.h (modified) (1 diff)
• fm_input_gst/fm_input_gst.c (modified) (2 diffs)
• fm_input_gst/fm_input_gst_common.h (modified) (1 diff)
• fm_output_alsa.c (modified) (3 diffs)
• fm_pipeline.c (modified) (8 diffs)
• fm_pipeline.h (modified) (3 diffs)
• main.c (modified) (3 diffs)

fm_server/trunk/src/Makefile.am

@@ -16 +16 @@
         fm_utils.c\
         fm_utils.h\
+        src_type_conv.c\
+        src_type_conv.h\
         fm_input.c\
         fm_input.h\

fm_server/trunk/src/Makefile.in

@@ -61 +61 @@
 PROGRAMS = $(bin_PROGRAMS)
 am__fm_server_SOURCES_DIST = main.c types.h fm_utils.c fm_utils.h \
-        fm_input.c fm_input.h fm_output.c fm_output.h fm_effect.c \
-        fm_effect.h fm_element.c fm_element.h fm_pipeline.c \
-        fm_pipeline.h fm_input_test.c fm_input_test.h fm_input_cdj.c \
-        fm_input_cdj.h fm_marshal.c fm_marshal.h fm_effect_gain.c \
-        fm_effect_gain.h fm_effect_rate.c fm_effect_rate.h fm_mixer.c \
-        fm_mixer.h fm_djmixer.c fm_djmixer.h fm_buffer.c fm_buffer.h \
+        src_type_conv.c src_type_conv.h fm_input.c fm_input.h \
+        fm_output.c fm_output.h fm_effect.c fm_effect.h fm_element.c \
+        fm_element.h fm_pipeline.c fm_pipeline.h fm_input_test.c \
+        fm_input_test.h fm_input_cdj.c fm_input_cdj.h fm_marshal.c \
+        fm_marshal.h fm_effect_gain.c fm_effect_gain.h \
+        fm_effect_rate.c fm_effect_rate.h fm_mixer.c fm_mixer.h \
+        fm_djmixer.c fm_djmixer.h fm_buffer.c fm_buffer.h \
         fm_effect_pan.c fm_effect_pan.h fm_output_alsa.c \
         fm_output_alsa.h fm_output_jack.c fm_output_jack.h
@@ -72 +73 @@
 @HAVE_JACK_TRUE@am__objects_2 = fm_output_jack.$(OBJEXT)
 am_fm_server_OBJECTS = main.$(OBJEXT) fm_utils.$(OBJEXT) \
-        fm_input.$(OBJEXT) fm_output.$(OBJEXT) fm_effect.$(OBJEXT) \
-        fm_element.$(OBJEXT) fm_pipeline.$(OBJEXT) \
+        src_type_conv.$(OBJEXT) fm_input.$(OBJEXT) fm_output.$(OBJEXT) \
+        fm_effect.$(OBJEXT) fm_element.$(OBJEXT) fm_pipeline.$(OBJEXT) \
         fm_input_test.$(OBJEXT) fm_input_cdj.$(OBJEXT) \
         fm_marshal.$(OBJEXT) fm_effect_gain.$(OBJEXT) \
@@ -257 +258 @@
 SUBDIRS = fm_input_gst
 INCLUDES = $(FM_SERVER_CFLAGS)
-fm_server_SOURCES = main.c types.h fm_utils.c fm_utils.h fm_input.c \
-        fm_input.h fm_output.c fm_output.h fm_effect.c fm_effect.h \
-        fm_element.c fm_element.h fm_pipeline.c fm_pipeline.h \
-        fm_input_test.c fm_input_test.h fm_input_cdj.c fm_input_cdj.h \
-        fm_marshal.c fm_marshal.h fm_effect_gain.c fm_effect_gain.h \
+fm_server_SOURCES = main.c types.h fm_utils.c fm_utils.h \
+        src_type_conv.c src_type_conv.h fm_input.c fm_input.h \
+        fm_output.c fm_output.h fm_effect.c fm_effect.h fm_element.c \
+        fm_element.h fm_pipeline.c fm_pipeline.h fm_input_test.c \
+        fm_input_test.h fm_input_cdj.c fm_input_cdj.h fm_marshal.c \
+        fm_marshal.h fm_effect_gain.c fm_effect_gain.h \
         fm_effect_rate.c fm_effect_rate.h fm_mixer.c fm_mixer.h \
         fm_djmixer.c fm_djmixer.h fm_buffer.c fm_buffer.h \
@@ -357 +359 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fm_utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/src_type_conv.Po@am__quote@
 
 .c.o:

fm_server/trunk/src/fm_element.c

@@ -135 +135 @@
 {
         element->name = NULL;
-//      element->src_pads = PAD_NONE;
         element->src_ports = NULL;
-//      element->sink_pads = PAD_NONE;
         element->sink_ports = NULL;
         
         element->active = FALSE;        
         element->dispose_has_run = FALSE;
+
+        element->pipeline = NULL;
 }
 

fm_server/trunk/src/fm_element.h

@@ -81 +81 @@
         gboolean        active;
         gboolean        dispose_has_run;
+
+        // yes, I know this is an hack
+        gpointer        pipeline;
 };
 

fm_server/trunk/src/fm_input_gst/fm_input_gst.c

@@ -11 +11 @@
 #include "../fm_element.h"
 #include "../fm_input.h"
+#include "../fm_output.h"
+#include "../fm_pipeline.h"
 
 #include "fm_input_gst_common.h"
@@ -350 +352 @@
         common->sem = fm_sem_new (1);
         common->gst_seek_to_sample = -1;
+//      common->sample_rate = fm_pipeline_get_sample_rate (FM_PIPELINE (element->pipeline));
+
 
         /* setup */

fm_server/trunk/src/fm_input_gst/fm_input_gst_common.h

@@ -31 +31 @@
 {
         gpointer        input_gst;
+        guint           sample_rate;
 
         GstElement      *pipeline;

fm_server/trunk/src/fm_output_alsa.c

@@ -7 +7 @@
 #include <alsa/asoundlib.h>
 
+#include "src_type_conv.h"
 #include "fm_buffer.h"
 #include "fm_element.h"
@@ -14 +15 @@
 
 #define ALSA_DEFAULT_DEVICE "default"
+#define ALSA_DEFAULT_SAMPLE_RATE 44100
 #define ALSA_DEFAULT_BUFFER_TIME 22000
 #define ALSA_DEFAULT_PERIOD_TIME 10000
@@ -407 +409 @@
                 fm_element_get_buffer_from_src(element, output_alsa->main_buffer);
         
-                guint i;
-                gint16 *ptr = output_alsa->buffer_int;
-                for (i = 0; i < output_alsa->buffer_size_samples; i++) {
-                        *(ptr++) = FLOAT_TO_INT (output_alsa->main_buffer->channel_data[0][i]);
-                        *(ptr++) = FLOAT_TO_INT (output_alsa->main_buffer->channel_data[1][i]);
-                }
-        
+                src_float_to_short_array_stereo (output_alsa->main_buffer->channel_data[0],
+                                                 output_alsa->main_buffer->channel_data[1],
+                                                 output_alsa->buffer_int, output_alsa->buffer_size_samples);
+
                 gint err = 0;
                 

fm_server/trunk/src/fm_pipeline.c

@@ -87 +87 @@
                              rgc_marshal_VOID__ELEMENT,
                              1, G_TYPE_STRING);
+
+        rgc_method_register ("add_element",
+                             FM_TYPE_PIPELINE,
+                             G_CALLBACK (fm_pipeline_add_element),
+                             rgc_marshal_VOID__ELEMENT,
+                             1, G_TYPE_STRING);
         
         rgc_method_register ("activate",
@@ -112 +118 @@
 fm_pipeline_class_init                  (FmPipelineClass        *klass)
 {
-        /*GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-        
-        gobject_class->set_property = fm_pipeline_set_property;
-        gobject_class->get_property = fm_pipeline_get_property;*/
+        //GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 }
 
@@ -122 +125 @@
 fm_pipeline_init                        (FmPipeline     *pipeline)
 {
-        GError *err = NULL;
-        
-        g_print ("a1");
-        
-        pipeline->start = g_mutex_new ();
-        g_mutex_lock (pipeline->start);
-
-        g_print ("a2");
-        
-        pipeline->pipe_thread = g_thread_create ((GThreadFunc) fm_pipeline_thread_entry,
-                                              (gpointer) pipeline, FALSE, &err);
-
         g_print ("new pipeline created\n");
 
         /* Start with a reasonable default, the output element will alter this if it needs to */
         pipeline->sample_rate = 48000;
-        
-        return;
 }
 
@@ -156 +145 @@
 fm_pipeline_activate                    (FmPipeline     *pipeline)
 {
-        //gint samples_per_buffer;
         g_assert (FM_IS_PIPELINE (pipeline));
         g_return_if_fail (FM_IS_ELEMENT (pipeline->sink));
@@ -164 +152 @@
         pipeline->sample_rate = fm_output_get_sample_rate(pipeline->sink);
         fm_element_activate(FM_ELEMENT(pipeline->sink));
-
-        // OSS uses 4096 samples_per_buffer
-/*      samples_per_buffer = 0fm_output_get_spb (FM_OUTPUT (pipeline->sink));
-        g_print ("output set a %d samples per buffer\n", samples_per_buffer);*/
-        
-        //g_assert_not_reached ();
-        
-/*      pipeline->buffer = fm_buffer_new (MAX_SAMPLES, FM_SAMPLES_FLOAT,
-                                          FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
-        FM_BUFFER_REQUESTED (pipeline->buffer) = samples_per_buffer;*/
-        
-        return;
 }
 
@@ -183 +159 @@
                                          FmElement      *sink)
 {
-        g_assert (FM_IS_PIPELINE (pipeline));
+        g_return_if_fail (FM_IS_PIPELINE (pipeline));
         FmOutput *out = FM_OUTPUT(sink);
-        g_assert (FM_IS_OUTPUT (out));
+        g_return_if_fail (FM_IS_OUTPUT (out));
         
         pipeline->sink = FM_OUTPUT(sink);
         
         return;
+}
+
+
+void
+fm_pipeline_add_element                 (FmPipeline     *pipeline,
+                                         FmElement      *element)
+{
+        g_return_if_fail (FM_IS_PIPELINE (pipeline));
+        g_return_if_fail (FM_IS_ELEMENT (element));
+
+        element->pipeline = pipeline;
 }
 
@@ -201 +188 @@
         g_debug("Starting pipeline...");
         fm_output_start(pipeline->sink);
-        
-        /*g_assert (pipeline);
-        
-        if (pipeline->sink == NULL)
-                g_print ("Audiodevice is not set!\n");
-        
-        pipeline->running = TRUE;
-        
-        // Let the thread start
-        g_print ("MAIN - Unlocking mutex\n");
-        g_mutex_unlock (pipeline->start);*/
-        
-        return;
 }
 
@@ -225 +199 @@
         g_debug("Stopping pipeline...");
         fm_output_stop(pipeline->sink);
-        /*g_mutex_unlock (pipeline->start);
-        g_print ("MAIN - Locking again mutex\n");
-        g_mutex_lock (pipeline->start);
-        g_print ("MAIN - Locked mutex\n");
-        pipeline->running = FALSE;*/
-        
-        return;
-}
-
-
-GThreadFunc
-fm_pipeline_thread_entry                (gpointer       data)
-{
-        /*g_print ("in new thread\n");
-        
-        FmPipeline *pipeline = FM_PIPELINE (data);
-    
-        fm_pipeline_loop (pipeline);*/
-    
-        return (NULL);
-}
-
-
-void
-fm_pipeline_loop                        (FmPipeline     *pipeline)
-{
-        /*g_print ("Waiting...\n");
-        g_mutex_lock (pipeline->start);
-        g_print ("Go!\n");
-        fm_output_start(pipeline->sink);*/
-        
-        /*buffer_elems = samples_per_buffer;
-        buffer_int_size = (sizeof (int16_t) * buffer_elems);
-        buffer_fp_size = (sizeof (gfloat) * buffer_elems);*/
-        
-//      guint samples_per_buffer = fm_output_get_spb (FM_OUTPUT (pipeline->sink));
-        
-        /*while (TRUE) {
-                if (pipeline->running == FALSE) {
-                        g_print ("ENGINE - Locking mutex\n");
-                        fm_output_stop(pipeline->sink);
-                        g_mutex_lock (pipeline->start);
-                        g_print ("ENGINE - Mutex was unlocked\n");
-                        fm_output_start(pipeline->sink);
-                }
-                g_thread_yield();*/
-/*              fm_element_get_buffer (pipeline->sink, pipeline->buffer);
-                fm_output_play (FM_OUTPUT (pipeline->sink), pipeline->buffer);
-                g_print ("iterating...\n");*/
-        /*}*/
 }
 

fm_server/trunk/src/fm_pipeline.h

@@ -45 +45 @@
         FmOutput        *sink;
         
-        FmBuffer        *buffer;
-        
-        GMutex          *start;
-        GThread         *pipe_thread;
-        
-        gboolean        running;
-        gboolean        working;
-
         guint           sample_rate;
 };
@@ -79 +71 @@
 
 void
+fm_pipeline_add_element                 (FmPipeline     *pipeline,
+                                         FmElement      *element);
+
+void
 fm_pipeline_run                         (FmPipeline     *pipeline);
 
@@ -84 +80 @@
 fm_pipeline_stop                        (FmPipeline     *pipeline);
 
-GThreadFunc
-fm_pipeline_thread_entry                (gpointer       data);
-
-void
-fm_pipeline_loop                        (FmPipeline     *pipeline);
+guint
+fm_pipeline_get_sample_rate             (FmPipeline     *pipeline);
 
 

fm_server/trunk/src/main.c

@@ -86 +86 @@
 
 
-
-//gint buffer_elems = 0;                // element = 1 * channels_n
-//gint buffer_int_size = 0;     // buffer_int_size = sizeof (int16_t) * buffer_elems
-//gint buffer_fp_size = 0;      // buffer_int_size = sizeof (gfloat) * buffer_elems
-
-gboolean
-timeout                                 (gpointer       user_data)
-{
-        /*g_print ("Timeout!\n");
-        
-        FmEngine *data = (FmEngine *) user_data;
-        
-        if (fm_engine_is_running (data))
-                fm_engine_stop (data);
-        else
-                fm_engine_start (data);
-        */
-        
-        exit (0);
-        return (TRUE);
-}
-
-
 gint
 main                                    (gint           argc,
@@ -152 +129 @@
         fm_mixer_class_register ();
         fm_djmixer_class_register ();
-/*      fm_effect_pan_class_register ();
-
-        fm_mixer_dj_class_register ();*/
+        fm_effect_pan_class_register ();
 #if HAVE_ALSA_ASOUNDLIB_H
         fm_output_alsa_class_register ();
 #endif
-        //fm_output_oss_class_register ();
 
-//      test_case ();
-        
-        /*RgcMessageNew *mess1;
-        mess1 = rgc_message_new_create ("cdj1", "FmInputCDJ");
-        rgc_message_execute_new (mess1)*/
-        
         GMainLoop *main_loop;
         main_loop = g_main_loop_new (NULL, FALSE);      
 
         /*unlink ("/tmp/fmraw.raw");
-        temp_fd = open ("/tmp/fmraw.raw", (O_WRONLY && O_SYNC));*/
-        g_assert (temp_fd != -1);
+        temp_fd = open ("/tmp/fmraw.raw", (O_WRONLY && O_SYNC));
+        g_assert (temp_fd != -1);*/
 
-        /*main_conn = fm_connection_unix_new ("/tmp/fm");
-        main_connection = FM_CONNECTION (main_conn);
-        g_idle_add ((GSourceFunc) fm_connection_start, main_conn);*/
-                
-        //g_timeout_add (100000, timeout, NULL);
-        
         g_main_loop_run (main_loop);
         
@@ -195 +157 @@
 
 
-/*void
-test_case                               (void)
-{
-        FmPipeline *pipeline;
-        FmElement *input;
-        FmElement *output;
-        
-        pipeline = fm_pipeline_new ();
-        input = FM_ELEMENT (fm_input_cdj_new ());
-        output = FM_ELEMENT (fm_output_oss_new ());
-        
-        fm_element_connect_src (output, input);
-        
-        fm_pipeline_set_sink (pipeline, output);
-        
-        fm_pipeline_activate (pipeline);
-        
-        fm_pipeline_run (pipeline);
-        
-        g_object_set (G_OBJECT (input), "filename", "/tmp/b.mp3", NULL);
-        
-        fm_input_cdj_load (FM_INPUT_CDJ (input));
-}*/
-
-
-/*void
-test_case                               (void)
-{
-        FmElement *input;
-        
-        input = FM_ELEMENT (fm_input_cdj_new ());
-        
-        fm_element_activate (input);
-        
-        g_object_set (G_OBJECT (input), "filename", "/tmp/b.mp3", NULL);
-        fm_input_cdj_load (FM_INPUT_CDJ (input));
-        
-        FmBuffer *buffer = fm_buffer_new (MAX_SAMPLES, FM_SAMPLES_FLOAT,
-                                          FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
-        FM_BUFFER_REQUESTED (buffer) = 32;
-        
-        FmBuffer *out_buffer = fm_buffer_new (MAX_SAMPLES, FM_SAMPLES_INT16,
-                                    FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
-        
-        while (TRUE) {
-                fm_element_get_buffer (input, buffer);
-
-                fm_buffer_convert (buffer, out_buffer);
-                                
-                fm_buffer_dump_to_file (out_buffer, temp_fd);
-        }
-        
-        fm_buffer_destroy (buffer);
-        fm_buffer_destroy (out_buffer);
-}*/
-
-#define SEGMENT_SIZE 64
-
-/*void
-test_case                               (void)
-{
-        FmGstThread *thread;
-        
-        thread = fm_gst_thread_new ();
-        
-        fm_gst_thread_load (thread, "/tmp/b.mp3");
-        
-                
-        FmBuffer *buffer = NULL;
-        buffer = fm_buffer_new (SEGMENT_SIZE, FM_SAMPLES_INT16,
-                                FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
-
-        FmBuffer *float_buffer = NULL;
-        float_buffer = fm_buffer_new (SEGMENT_SIZE, FM_SAMPLES_FLOAT,
-                                      FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
-
-        FmBuffer *out_buffer = NULL;//g_print ("%d\n", BUF_READ);
-        out_buffer = fm_buffer_new (SEGMENT_SIZE, FM_SAMPLES_INT16,
-                                    FM_INTERLEAVING_NORMAL, FM_CHANNELS_STEREO);
-        
-        while (TRUE) {
-                fm_gst_thread_get_buffer (thread, buffer);
-                
-                fm_buffer_convert (buffer, float_buffer);
-                fm_buffer_convert (float_buffer, out_buffer);
-                                
-                fm_buffer_dump_to_file (out_buffer, temp_fd);
-        }
-        
-        fm_buffer_destroy (buffer);
-        fm_buffer_destroy (float_buffer);
-        fm_buffer_destroy (out_buffer);
-}*/