Changeset 242 for trunk

Timestamp:

03/01/08 22:49:03 (4 years ago)

Author:

ath

Message:

Major cleanups and seek retry implementation for FmInputGst.

Location:

trunk/fm_server/src/fm_input_gst

Files:

• fm_input_gst.c (modified) (11 diffs)
• fm_input_gst.h (modified) (1 diff)
• fm_input_gst_common.c (modified) (2 diffs)
• fm_input_gst_common.h (modified) (5 diffs)
• gstfmsink.c (modified) (10 diffs)
• gstfmsink.h (modified) (1 diff)

trunk/fm_server/src/fm_input_gst/fm_input_gst.c

@@ -259 +259 @@
                                          const gchar    *filename)
 {
-        g_print("ohhhh- filename %s\n", filename);
+//      g_print("ohhhh- filename %s\n", filename);
 
         g_return_if_fail(filename);
         FmElement *element = FM_ELEMENT(input_gst);
-        FmInput *input = FM_INPUT(input_gst);
+//      FmInput *input = FM_INPUT(input_gst);
         FmInputGstCommon *common = input_gst->common;
 
@@ -272 +272 @@
                 return;
 
-        FmInputState prev_state = input->state;
-
-        g_print("Stopping the pipeline...\n");
-/*      if (prev_state == FM_INPUT_PAUSE) {
-                g_print("unlocking mutex\n");
-                common->stop_processing = TRUE;
-                fm_sem_increase (common->sem);
-        }*/
-        
-        input_gst->drop_chunks = TRUE;  // let fm_input_gst_get_buffer() drop all the currently unused chunks
+//      FmInputState prev_state = input->state;
+
+//      g_print("Stopping the pipeline...\n");
+//      input_gst->drop_chunks = TRUE;  // let fm_input_gst_get_buffer() drop all the currently unused chunks
         common->stop_processing = TRUE;
         fm_sem_increase (common->sem);
-        gst_element_set_state (input_gst->common->pipeline, GST_STATE_READY);
+        gst_element_set_state (input_gst->common->pipeline, GST_STATE_NULL);
         g_object_set (G_OBJECT (common->source), "location", input_gst->filename, NULL);
         common->stop_processing = FALSE;
-        g_print("Old state was %d\n", prev_state);
+//      g_print("Old state was %d\n", prev_state);
         reset_status(input_gst);
 
@@ -456 +450 @@
         g_return_val_if_fail (track, NULL);
 
-        GList *chunk = track->chunks;
+        GSList *chunk = track->chunks;
 
         while (chunk) {
                 FmChunk *c = chunk->data;
 
-                g_print ("chunk n. %d - start %llu duration %llu", c->num, (long long unsigned int) c->start_timestamp, (long long unsigned int) c->duration_ns);
+                g_print ("chunk n. %d - start %llu duration %llu", c->id, (long long unsigned int) c->start_timestamp, (long long unsigned int) c->duration_ns);
                 if (c->usable)
                         g_print (" USABLE");
@@ -472 +466 @@
                      (time < (c->start_timestamp + c->duration_ns))) || 
                     ((time == 0) && (c->start_of_file))) {      // see gstfmsink.c:333
-                        g_print ("Found target %llu at chunk %u\n", (long long unsigned int) time, c->num);
+                        g_print ("Found target %llu at chunk %u\n", (long long unsigned int) time, c->id);
                         return c;
                 }
@@ -488 +482 @@
         g_return_if_fail (track);
 
-        GList *chunk_list = track->chunks;
+        GSList *chunk_list = track->chunks;
 
         while (chunk_list) {
@@ -495 +489 @@
                 
                 if ((chunk != track->read_chunk) && (chunk->usable)) {
-                        g_print ("Marking chunk %d for deletion", chunk->num);
+                        g_print ("Marking chunk %d for deletion", chunk->id);
                         chunk->usable = FALSE;
                         chunk->can_destroy = TRUE;
@@ -524 +518 @@
         /* Check if we have a new track ready */
         if (common->new_track) {
+                FmInputGstTrack *old_track = track;
                 input_gst->read_track = common->new_track;
                 track = input_gst->read_track;
@@ -529 +524 @@
                 g_print ("NEW TRACK - skipped to track %d\n", track->id);
                 skip_to = _search_chunk (track, 0);
+
+                if (old_track) {
+                        _mark_unused_chunks_for_deletion (old_track);
+                        old_track->can_destroy = TRUE;
+                }
         }
 
@@ -557 +557 @@
                         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->num);
+                                g_print ("seek at %ld, first %ld last %ld, CHUNK %u\n", seek_at_sample, first_avail_sample, last_avail_sample, skip_to->id);
                         
                         } else {
@@ -606 +606 @@
         
         /* If we are requested to drop unused chunks (ie. song change), do it now */
-        if (input_gst->drop_chunks) {
+        /*if (input_gst->drop_chunks) {
                 _mark_unused_chunks_for_deletion (track);
                 input_gst->drop_chunks = FALSE;
-        }
+        }*/
 
 
@@ -902 +902 @@
 
                 default:
-                        g_print ("Got %s message\n", GST_MESSAGE_TYPE_NAME (message));
+//                      g_print ("Got %s message\n", GST_MESSAGE_TYPE_NAME (message));
                         /* unhandled message */
                 break;

trunk/fm_server/src/fm_input_gst/fm_input_gst.h

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

trunk/fm_server/src/fm_input_gst/fm_input_gst_common.c

@@ -30 +30 @@
 
 FmChunk *
-fm_chunk_new                            (guint          samples)
+fm_chunk_new                            (guint          samples,
+                                         guint          id)
 {
         FmChunk *chk = g_new0(FmChunk, 1);
         
+        chk->id = id;
         chk->ring = jack_ringbuffer_create(samples * 2 * sizeof(gfloat));
 
@@ -53 +55 @@
         FmInputGstTrack *track = g_new0(FmInputGstTrack, 1);
         track->id = id;
+        track->writing = TRUE;
+        track->loaded = FALSE;
+        track->chunks = NULL;
+        track->chunk_count = 0;
+        track->write_chunk = NULL;
+        track->read_chunk = NULL;
         track->gst_seek_to_ns = -1;
         track->seek_waiting_for_ns = -1;

trunk/fm_server/src/fm_input_gst/fm_input_gst_common.h

@@ -35 +35 @@
 struct _FmChunk
 {
-        guint           num;
+        guint           id;
         jack_ringbuffer_t *ring;
     
@@ -43 +43 @@
         GstClockTime    start_timestamp_offset;         // where to find the REAL start of the segment requested in the seek
                                                         // (as an offset from the start of the chunk)
+        GstClockTime    asked_timestamp;
+
         gint64          duration_ns;
 
@@ -66 +68 @@
         guint           id;
 
-        gboolean        writing;                // GstFmSink can be writing to this track
-        gboolean        loaded;
+        gboolean        writing;                // GstFmSink has write access to this track
+                                                // it will be set to FALSE only when it has abandoned this track
+        gboolean        loaded; 
+        gboolean        can_destroy;            // FmInputGst has stopped reading this track and moved to the next,
+                                                // so it can be freed
 
-        GList           *chunks;
+        GSList          *chunks;
+        guint           chunk_count;
         FmChunk         *write_chunk;
         FmChunk         *read_chunk;
@@ -100 +106 @@
         gboolean        stop_processing;        // discard incoming buffers and delete chunks
 
-        GList           *tracks;
+        GSList          *tracks;
         FmInputGstTrack *new_track;
 
@@ -110 +116 @@
 
 FmChunk *
-fm_chunk_new                            (guint          samples);
+fm_chunk_new                            (guint          samples,
+                                         guint          id);
 
 void

trunk/fm_server/src/fm_input_gst/gstfmsink.c

@@ -191 +191 @@
         sink->seek_target_timestamp = -1;
 
-        sink->chunk_count = 0;
-
         sink->write_track = NULL;
         sink->track_count = 0;
@@ -234 +232 @@
 gst_fm_sink_event  (GstBaseSink *bsink, GstEvent *event)
 {
-        g_print(">   event %p (%s)\n", event, GST_EVENT_TYPE_NAME (event));
+//      g_print(">   event %p (%s)\n", event, GST_EVENT_TYPE_NAME (event));
 
         GstFmSink *sink = GST_FM_SINK (bsink);
@@ -252 +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;
                 }
@@ -266 +264 @@
 do_cleanup(FmInputGstTrack *track)
 {
-        GList *list = track->chunks;
+        GSList *list = track->chunks;
         while (list) {
                 FmChunk *chk = (FmChunk *) list->data;
                 if (chk->can_destroy) {
-                        track->chunks = g_list_remove_link(track->chunks, list);
+                        track->chunks = g_slist_remove_link(track->chunks, list);
                         
-                        g_print(">   Destroying chunk %u\n", chk->num);
+                        g_print(">   Destroying chunk %u of track %u\n", chk->id, track->id);
                         fm_chunk_destroy(chk);
-                        g_list_free(list);
+                        g_slist_free(list);
 
                         return TRUE;
                 }
-                list = g_list_next(list);
+                list = g_slist_next(list);
+        }
+
+        return FALSE;
+}
+
+
+static gboolean
+do_cleanup_tracks(FmInputGstCommon *common)
+{
+        GSList *list = common->tracks;
+        while (list) {
+                FmInputGstTrack *track = (FmInputGstTrack *) list->data;
+                if (track->can_destroy) {
+                        common->tracks = g_slist_remove_link(common->tracks, list);
+                        
+                        g_print(">   Destroying track %u\n", track->id);
+                        while (do_cleanup(track));      // destroy the remaining unused chunks
+
+                        if (g_slist_length(track->chunks) > 0)
+                                g_warning ("track not empty!");
+
+                        fm_input_gst_track_destroy(track);
+                        g_slist_free(list);
+
+                        return TRUE;
+                }
+                list = g_slist_next(list);
         }
 
@@ -302 +327 @@
                 sink->seek_in_progress = FALSE;
                 sink->seek_target_timestamp = -1;
-                g_print(">   seek to %lld ns failed!\n", (long long int) sink->seek_target_timestamp);
+                g_warning(">   seek to %lld ns failed!", (long long int) sink->seek_target_timestamp);
         }
 
@@ -335 +360 @@
                 }
 
-                chk = fm_chunk_new (SAMPLES_TO_BYTES (CHUNK_SAMPLES));
-                chk->num = sink->chunk_count++;
-                track->chunks = g_list_append (track->chunks, chk);
+                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->num, (long long int) timestamp);
+                g_print (">   new chunk %d, TIMESTAMP %lld\n", chk->id, (long long int) timestamp);
                 if ((timestamp > 0) && (timestamp < 50000000)) {
                         g_warning ("This file probably starts at timestamp %llu, taking care of it", (long long int) timestamp);
@@ -356 +380 @@
                         gint64 nsec_to_skip = sink->seek_target_timestamp - timestamp;
                         if (nsec_to_skip < 0) {
-                                g_print(">   hell, we targeted for %lld, after seeking we're at %lld!\n",
+                                g_warning(">   hell, we targeted for %lld, after seeking we're at %lld!",
                                 (long long int) sink->seek_target_timestamp, (long long int) timestamp);
+
+                                g_warning ("RRRREEEEETTTRRRRRRYYYY!!!!!!!!!!!!!!!!!!!!!!!!!!!! ********************************************************************************");
+                                chk->can_destroy = TRUE;
+                                track->gst_seek_to_ns = sink->seek_target_timestamp;
+
+                                //g_assert_not_reached ();
                         } else {
-                                g_print(">   target for seek %lld, after seeking we're at %lld, skipping %lld\n", 
+                                if (nsec_to_skip > 0)
+                                g_warning(">   target for seek %lld, after seeking we're at %lld, need to skip %lld\n", 
                                         (long long int) sink->seek_target_timestamp, (long long int) timestamp, (long long int) nsec_to_skip);
 
@@ -397 +428 @@
                         if (track->gst_seek_to_ns > -1) {
                                 if (sink->seek_in_progress) {
-                                        g_print (">   seek already in progress, we'll try later\n");
+                                        g_warning ("   seek already in progress, we'll try later");
                                         continue;
                                 }
@@ -514 +545 @@
         GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
         GstFmSink *fm_sink = GST_FM_SINK (element);
+        FmInputGstCommon *common = fm_sink->common;
 
         switch (transition) {
-                case GST_STATE_CHANGE_READY_TO_PAUSED: {
-                        g_warning ("GST_STATE_CHANGE_READY_TO_PAUSED - LOAD TRACK");
+                case GST_STATE_CHANGE_NULL_TO_READY: {
+                        g_print ("GST_STATE_CHANGE_NULL_TO_READY - LOAD TRACK\n");
+
+                        do_cleanup_tracks (common);
 
                         FmInputGstTrack *track = fm_input_gst_track_new (fm_sink->track_count++);
+                        common->tracks = g_slist_append (common->tracks, track);
                         fm_sink->write_track = track;
                         track->writing = TRUE;
@@ -534 +569 @@
 
         switch (transition) {
-                case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
-                        g_warning ("GST_STATE_CHANGE_PLAYING_TO_PAUSED - UNLOAD TRACK");
+                case GST_STATE_CHANGE_READY_TO_NULL:
+                        g_print ("GST_STATE_CHANGE_READY_TO_NULL - UNLOAD TRACK\n");
 
                         fm_sink->write_track->writing = FALSE;

trunk/fm_server/src/fm_input_gst/gstfmsink.h

@@ -92 +92 @@
         guint           bytes_behind_us;
 
-        guint           chunk_count;
         guint           track_count;