Changeset 109 for fm_server/trunk/src/fm_input_gst/fm_input_gst.c

Timestamp:

09/02/06 23:16:15 (6 years ago)

Author:

ath

Message:

End-of-file and misc fixes.

Files:

• fm_server/trunk/src/fm_input_gst/fm_input_gst.c (modified) (5 diffs)

fm_server/trunk/src/fm_input_gst/fm_input_gst.c

@@ -15 +15 @@
 #include "gstfmsink.h"
 #include "fm_input_gst.h"
+
+//#define USE_AUDIORESAMPLE
 
 extern int temp_fd;
@@ -369 +371 @@
 
         common->converter = gst_element_factory_make ("audioconvert", "converter");
-//      common->resampler = gst_element_factory_make ("audioresample", "resampler");
+#ifdef USE_AUDIORESAMPLE
+        common->resampler = gst_element_factory_make ("audioresample", "resampler");
+#endif
         common->output_pad = gst_element_get_pad (common->converter, "sink");
         common->sink = gst_element_factory_make ("fm_sink", "sink");
 
         gst_bin_add_many (GST_BIN (common->output_bin), common->converter,
-                          /*common->resampler,*/ common->sink, NULL);
-
-        gst_element_link_many (common->converter, /*common->resampler,*/ common->sink, NULL);
+#ifdef USE_AUDIORESAMPLE
+                          common->resampler,
+#endif
+                          common->sink, NULL);
+
+        gst_element_link_many (common->converter,
+#ifdef USE_AUDIORESAMPLE
+                               common->resampler,
+#endif
+                               common->sink, NULL);
 
         gst_element_add_pad (common->output_bin, gst_ghost_pad_new ("sink", common->output_pad));
@@ -450 +461 @@
         }
 
-        if (input_gst->seek_at_sample > -1) {
+        if ((input_gst->seek_at_sample > -1) && chk){
+                
                 glong first_avail_sample = input_gst->current_pos_samples - BYTES_TO_SAMPLES(chk->bytes_behind_us);
                 glong last_avail_sample = input_gst->current_pos_samples + BYTES_TO_SAMPLES(jack_ringbuffer_read_space(chk->ring));  // we need an offset
@@ -485 +497 @@
         // bytes da scartare
         guint bytes_from_ring = chk->bytes_behind_us + SAMPLES_TO_BYTES(FM_BUFFER_REQUESTED(buffer));
+        if ((chk->eos_offset_samples > 0) &&
+            ((input_gst->current_pos_samples + FM_BUFFER_REQUESTED (buffer)) > chk->eos_offset_samples))
+                bytes_from_ring = SAMPLES_TO_BYTES (chk->eos_offset_samples - input_gst->current_pos_samples);
+
         size_t read_bytes = jack_ringbuffer_peek(chk->ring, (gchar *) input_gst->interleaved_buffer, bytes_from_ring);
 
@@ -503 +519 @@
 
         if ((chk->eos_offset_samples) && (input_gst->current_pos_samples >= chk->eos_offset_samples)) {
-                g_print ("We're at %d samples - end of file!\n", input_gst->current_pos_samples);
+                g_print ("We're at %lld samples - end of file!\n", input_gst->current_pos_samples);
                 common->read_chunk = NULL;
         }