Changeset 222 for trunk

Timestamp:

02/04/08 22:26:46 (4 years ago)

Author:

ath

Message:

Other cleanups for FmInputGst.

Location:

trunk/fm_server/src/fm_input_gst

Files:

• fm_input_gst.c (modified) (6 diffs)
• fm_input_gst.h (modified) (1 diff)
• fm_input_gst_common.h (modified) (2 diffs)
• gstfmsink.c (modified) (1 diff)

trunk/fm_server/src/fm_input_gst/fm_input_gst.c

@@ -515 +515 @@
         fm_buffer_reset_flags (buffer);
 
-        //guint64 current_pos_samples = ns_to_samples (common, input_gst->current_pos_nsec);
-
         /* Check if we should perform a seek */
         if ((input_gst->seek_at_ns > -1) && chk){
@@ -537 +535 @@
                                 chk->samples_behind_us += samples_to_seek;      // yes, the "+" is correct
                         }
+                        chk->samples_read += samples_to_seek;
                         FM_BUFFER_DISCONT (buffer) = TRUE;
                 } else {
@@ -579 +578 @@
                 
                 input_gst->current_pos_samples = ns_to_samples (common, chk->start_timestamp);
-                //input_gst->current_pos_ns = chk->start_timestamp;
                 g_print("skipping... new position = %llu\n", (long long unsigned int) chk->start_timestamp);
 
@@ -608 +606 @@
 //      memset((char*) input_gst->interleaved_buffer, 0, SAMPLES_TO_BYTES(STD_CHUNK_N_SAMPLES));
 
-        // bytes da scartare
+        /* Calculate how much to read */
         guint samples_from_ring = chk->samples_behind_us + FM_BUFFER_REQUESTED(buffer);
         guint bytes_from_ring = SAMPLES_TO_BYTES(samples_from_ring);
-/*      guint64 eof_samples = ns_to_samples (common, chk->eof_timestamp);*/
-    
-/*      if (eof_samples > 0) {*/
-        if (chk->eof_samples > 0) {
-//              g_print ("Get ready for EOF at chunk pos %lld\n", (long long int) chk->eof_samples);
-
-                if (chk->samples_read + FM_BUFFER_REQUESTED (buffer) > chk->eof_samples)
-                        bytes_from_ring = SAMPLES_TO_BYTES (chk->eof_samples - chk->samples_read);
-
-/*          if ((input_gst->current_pos_samples + FM_BUFFER_REQUESTED (buffer)) > eof_samples)
-                bytes_from_ring = SAMPLES_TO_BYTES (eof_samples - input_gst->current_pos_samples);*/
-        }
+
+        /* Check for EOF */
+        if ((chk->eof_samples > 0) && (chk->samples_read + FM_BUFFER_REQUESTED (buffer) > chk->eof_samples))
+                bytes_from_ring = SAMPLES_TO_BYTES (chk->eof_samples - chk->samples_read);
 
         size_t read_bytes = jack_ringbuffer_peek(chk->ring, (gchar *) input_gst->interleaved_buffer, bytes_from_ring);
@@ -650 +640 @@
 
         /* Check for EOF */
-/*      if ((eof_samples) && (input_gst->current_pos_samples >= eof_samples)) {*/
         if ((chk->eof_samples > 0) && (chk->samples_read >= chk->eof_samples)) {
                 g_print ("We're at %lld samples - end of file!\n", (long long int) input_gst->current_pos_samples);
@@ -669 +658 @@
                 chk->samples_behind_us += useful_read_samples;
         }
-//      g_print("behind us %d bytes\n", input_gst->bytes_behind_us);
 
 

trunk/fm_server/src/fm_input_gst/fm_input_gst.h

@@ -44 +44 @@
 
         gint64          current_pos_samples;
-//      gint64          current_pos_nsec;
 
         gboolean        play_when_ready;

trunk/fm_server/src/fm_input_gst/fm_input_gst_common.h

@@ -48 +48 @@
         guint           samples_behind_us;
         
-        /* FIXME: "eof" should be moved to FmInputGst */
         gboolean        eof;                            // the file ends somewhere in this chunk
-        GstClockTime    eof_timestamp;                  // where the file ends (stream timestamp)
         guint64         eof_samples;                    // where the file ends (RELATIVE TO CHUNK START!!!!)
+
         gboolean        start_of_file;                  // 1° buffer of the file
 
@@ -57 +56 @@
                                                         // if TRUE, the buffer will be freed by the GST thread in _do_cleanup()
 
-        guint64         samples_read;
+        guint64         samples_read;                   // how many samples FmInputGst has read from this chunk
 };
 

trunk/fm_server/src/fm_input_gst/gstfmsink.c

@@ -236 +236 @@
                 case GST_EVENT_EOS: {
                         g_return_val_if_fail (common->write_chunk, TRUE);
-                        common->write_chunk->eof_timestamp = sink->start_timestamp;
                         common->write_chunk->eof_samples = sink->position_samples;
-                        g_print(">   got EOF at timestamp %lld\n", (long long int) common->write_chunk->eof_timestamp);
+                        g_print(">   got EOF at timestamp %lld\n", (long long int) sink->start_timestamp);
                         sink->seek_in_progress = FALSE;
                         sink->seek_target_timestamp = -1;