Changeset 262

Timestamp:

07/04/08 22:59:58 (4 years ago)

Author:

ath

Message:

Make seeking a lot more robust.

Location:

trunk/fm_server/src/fm_input_gst

Files:

• fm_input_gst.c (modified) (7 diffs)
• fm_input_gst.h (modified) (1 diff)
• fm_input_gst_common.c (modified) (1 diff)
• fm_input_gst_common.h (modified) (1 diff)
• gstfmsink.c (modified) (8 diffs)

trunk/fm_server/src/fm_input_gst/fm_input_gst.c

@@ -522 +522 @@
                 track = input_gst->read_track;
                 common->new_track = NULL;
-                g_print ("NEW TRACK - skipped to track %d\n", track->id);
+                g_print ("NEW TRACK - skipped to track %d, _search\n", track->id);
                 skip_to = _search_chunk (track, 0);
 
@@ -538 +538 @@
                 guint64 seek_at_sample = ns_to_samples (common, input_gst->seek_at_ns);
                 
-                if ((seek_at_sample > first_avail_sample) && (seek_at_sample < last_avail_sample)) {
+                if ((seek_at_sample >= first_avail_sample) && (seek_at_sample < last_avail_sample)) {
                         /* LOCAL seek - we have the data already ready in the ringbuffer */
                         g_print ("seek at %ld, first %ld last %ld, LOCAL\n", seek_at_sample, first_avail_sample, last_avail_sample);
@@ -554 +554 @@
                         FM_BUFFER_DISCONT (buffer) = TRUE;
                 } else {
+                        g_print ("non-LOCAL seek, _search\n");
                         skip_to = _search_chunk (track, input_gst->seek_at_ns);
                         if (skip_to) {
                                 /* CHUNK seek - the destination is in another ready chunk */
                                 g_print ("seek at %ld, first %ld last %ld, CHUNK %u\n", seek_at_sample, first_avail_sample, last_avail_sample, skip_to->id);
+
+                                /* If we're just requested a FAR seek for the same position and the new buffer has just arrived
+                                   don't wait for it any more. Prevents _search_chunk () loops */
+                                if (track->seek_waiting_for_ns == input_gst->seek_at_ns)
+                                        track->seek_waiting_for_ns = -1;
                         
                         } else {
@@ -576 +582 @@
         if ((!skip_to) && (track) && (track->seek_waiting_for_ns > -1)) {
 //              g_print ("Waiting...\n");
+                g_print ("Pending FAR seek for %llu, _search\n", (long long unsigned int) track->seek_waiting_for_ns);
                 skip_to = _search_chunk (track, track->seek_waiting_for_ns);
                 if (skip_to)
@@ -588 +595 @@
                         g_warning ("Skipping to a chunk not marked usable!");
                 
+//              input_gst->seek_at_ns = -1;     // prevent looping if we're both waiting for a local and a far seek
                 track->read_chunk = skip_to;
                 
@@ -798 +806 @@
                 seek_target = 0;
 
+/*      if ((seek_target == 0) && (input_gst->read_track->start_at > 0))
+                seek_target =input_gst->read_track->start_at;*/
+
         input_gst->seek_at_ns = seek_target;
 }
@@ -813 +824 @@
         g_return_if_fail (track->read_chunk->duration_ns > 0);
 
-        input_gst->seek_at_ns = track->read_chunk->duration_ns * pos;
+        gint64 seek_target = track->read_chunk->duration_ns * pos;
+
+/*      if ((seek_target == 0) && (input_gst->read_track->start_at > 0))
+                seek_target =input_gst->read_track->start_at;*/
+
+        input_gst->seek_at_ns = seek_target;
 }
 

trunk/fm_server/src/fm_input_gst/fm_input_gst.h

@@ -52 +52 @@
 
         guint           tick_ns_count;  // for "tick"
-        
-//      gboolean        drop_chunks;    // invalidate all the currently unused chunks   
 
         guint           rt_signal;

trunk/fm_server/src/fm_input_gst/fm_input_gst_common.c

@@ -63 +63 @@
         track->gst_seek_to_ns = -1;
         track->seek_waiting_for_ns = -1;
+        track->start_at = -1;
         return track;
 }

trunk/fm_server/src/fm_input_gst/fm_input_gst_common.h

@@ -81 +81 @@
         gint64          gst_seek_to_ns;         // only for a FAR seek, where GStreamer should seek
         gint64          seek_waiting_for_ns;    // only for a FAR seek, wait for a new chunk returned from GST which starts here
+
+        gint64          start_at;
 };
 

trunk/fm_server/src/fm_input_gst/gstfmsink.c

@@ -250 +250 @@
                 }
                 case GST_EVENT_NEWSEGMENT: {
-//                      g_print(">   new segment! creating a new chunk...\n");
+                        g_print(">   new segment! creating a new chunk...\n");
                         sink->create_new_chunk = TRUE;
                 }
@@ -317 +317 @@
 
         gboolean ret;
-        ret = gst_element_seek (common->pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
+        g_print (">   asking GStreamer to seek to %lld ns\n", (long long int) sink->seek_target_timestamp);
+        if (sink->seek_target_timestamp != 0)
+                ret = gst_element_seek (common->pipeline, 1.0, GST_FORMAT_TIME,
+                                GST_SEEK_FLAG_ACCURATE,
                                 GST_SEEK_TYPE_SET, sink->seek_target_timestamp,
                                 GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
+        else {
+                /* What the... it looks like gstreamer-0.10.18 is not able to seek reliably to "0" with
+                   a "normal" seek. But it used to work, I'm sure */
+                ret = gst_element_seek (common->pipeline, 1.0, GST_FORMAT_TIME,
+                                GST_SEEK_FLAG_KEY_UNIT | GST_SEEK_FLAG_FLUSH,
+                                GST_SEEK_TYPE_SET, 0,
+                                GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
+        }
+
         
         if (ret) {
                 sink->seek_completed = TRUE;
-                g_print(">   trying to seek to %lld ns...\n", (long long int) sink->seek_target_timestamp);
+                g_print(">   ok, now waiting for %lld ns...\n", (long long int) sink->seek_target_timestamp);
         } else {
                 sink->seek_in_progress = FALSE;
@@ -334 +346 @@
 
 
-
 static GstFlowReturn
 gst_fm_sink_render (GstBaseSink * bsink, GstBuffer * buf)
@@ -342 +353 @@
         FmInputGstTrack *track = sink->write_track;
 
+        //g_print (">   sink_render, new buffer TIMESTAMP %lld\n", (long long int) GST_BUFFER_TIMESTAMP (buf));
+
         if (common->stop_processing || (sink->seek_in_progress && !sink->seek_completed))
                 return GST_FLOW_OK;
@@ -352 +365 @@
             (sink->create_new_chunk && !sink->seek_in_progress) ||
             (sink->create_new_chunk && sink->seek_in_progress && sink->seek_completed)) {  // ehm...
-                        
+
                 sink->create_new_chunk = FALSE;
                 
@@ -361 +374 @@
 
                 chk = fm_chunk_new (SAMPLES_TO_BYTES (CHUNK_SAMPLES), track->chunk_count++);
-                track->chunks = g_slist_append (track->chunks, chk);
                 track->write_chunk = chk;
-
+                
                 gint64 timestamp = GST_BUFFER_TIMESTAMP (buf);
                 g_print (">   new chunk %d, TIMESTAMP %lld\n", chk->id, (long long int) timestamp);
@@ -369 +381 @@
                         g_warning ("This file probably starts at timestamp %llu, taking care of it", (long long int) timestamp);
                         chk->start_of_file = TRUE;
+                        track->start_at = timestamp;
                 }
                 if (!GST_BUFFER_TIMESTAMP_IS_VALID (buf))
@@ -466 +479 @@
 //                      common->chunk_skip_to = chk;
                         g_print (">   preload complete... GO!\n");
-                    
+                        track->chunks = g_slist_append (track->chunks, chk);
+                                            
                         // GStreamer has hopefully figured out the correct lenght
                         // of the stream now (useful with old MP3 VBR)