Changeset 240 for trunk

Timestamp:

02/27/08 21:41:33 (4 years ago)

Author:

ath

Message:

Start implementing FmInputGstTrack?.

Location:

trunk/fm_server/src/fm_input_gst

Files:

• fm_input_gst.c (modified) (14 diffs)
• fm_input_gst.h (modified) (1 diff)
• fm_input_gst_common.c (modified) (1 diff)
• fm_input_gst_common.h (modified) (3 diffs)
• gstfmsink.c (modified) (13 diffs)
• gstfmsink.h (modified) (1 diff)

trunk/fm_server/src/fm_input_gst/fm_input_gst.c

@@ -185 +185 @@
         input_gst->seek_at_ns = -1;
 
-        if (input_gst->common)
-                input_gst->common->gst_seek_to_ns = -1;
+        if (input_gst->read_track)
+                input_gst->read_track->gst_seek_to_ns = -1;
 }
 
@@ -293 +293 @@
         gst_element_set_state (input_gst->common->pipeline, GST_STATE_PLAYING);
 
-        common->seek_waiting_for_ns = 0;
+//      common->seek_waiting_for_ns = 0;
 }
 
@@ -348 +348 @@
         reset_status(input_gst);
 
-        FmInputGstCommon *common = g_new0(FmInputGstCommon, 1);
+        FmInputGstCommon *common = g_new0 (FmInputGstCommon, 1);
         input_gst->common = common;
         common->input_gst = input_gst;
         common->sem = fm_sem_new (1);
-        common->gst_seek_to_ns = -1;
+//      common->seek_waiting_for_ns = -1;
         common->sample_rate = fm_pipeline_get_sample_rate (FM_PIPELINE (element->pipeline));
 
@@ -437 +437 @@
 _send_position                          (FmInputGst     *input_gst)
 {
-        FmInputGstCommon *common = input_gst->common;
-        FmChunk *chk = common->read_chunk;
+//      FmInputGstCommon *common = input_gst->common;
+        FmChunk *chk = input_gst->read_track->read_chunk;
 
         if (!chk)
@@ -451 +451 @@
 
 static FmChunk *
-_search_chunk                           (FmInputGstCommon *common,
+_search_chunk                           (FmInputGstTrack *track,
                                          GstClockTime   time)
 {
-        GList *chunk = common->chunks;
+        g_return_val_if_fail (track, NULL);
+
+        GList *chunk = track->chunks;
 
         while (chunk) {
@@ -482 +484 @@
 
 static void
-_mark_unused_chunks_for_deletion        (FmInputGstCommon *common)
-{
-        GList *chunk_list = common->chunks;
+_mark_unused_chunks_for_deletion        (FmInputGstTrack *track)
+{
+        g_return_if_fail (track);
+
+        GList *chunk_list = track->chunks;
 
         while (chunk_list) {
@@ -490 +494 @@
                 g_assert (chunk);
                 
-                if ((chunk != common->read_chunk) && (chunk->usable)) {
+                if ((chunk != track->read_chunk) && (chunk->usable)) {
                         g_print ("Marking chunk %d for deletion", chunk->num);
                         chunk->usable = FALSE;
@@ -509 +513 @@
         FmInputGst *input_gst = FM_INPUT_GST(element);
         FmInputGstCommon *common = input_gst->common;
-        FmChunk *chk = common->read_chunk;
+        FmInputGstTrack *track = input_gst->read_track;
+        FmChunk *chk = NULL;
         FmChunk *skip_to = NULL;
 
+        if (track)
+                chk = track->read_chunk;
 
         fm_buffer_reset_flags (buffer);
+
+        /* Check if we have a new track ready */
+        if (common->new_track) {
+                input_gst->read_track = common->new_track;
+                track = input_gst->read_track;
+                common->new_track = NULL;
+                g_print ("NEW TRACK - skipped to track %d\n", track->id);
+                skip_to = _search_chunk (track, 0);
+        }
 
         /* Check if we should perform a seek */
@@ -538 +554 @@
                         FM_BUFFER_DISCONT (buffer) = TRUE;
                 } else {
-                        skip_to = _search_chunk (common, input_gst->seek_at_ns);
+                        skip_to = _search_chunk (track, input_gst->seek_at_ns);
                         if (skip_to) {
                                 /* CHUNK seek - the destination is in another ready chunk */
@@ -547 +563 @@
                                 g_print ("seek at %ld, first %ld last %ld, FAR\n", seek_at_sample, first_avail_sample, last_avail_sample);
 
-                                common->gst_seek_to_ns = input_gst->seek_at_ns;
+                                track->gst_seek_to_ns = input_gst->seek_at_ns;
 //                              g_print ("              seek_at_nsec = %lld\n", (long long int) common->gst_seek_to_nsec);
-                                common->seek_waiting_for_ns = input_gst->seek_at_ns;
+                                track->seek_waiting_for_ns = input_gst->seek_at_ns;
                                 fm_sem_increase (common->sem);
                         }
@@ -558 +574 @@
 
         /* Check if a FAR seek has been completed */
-        if ((!skip_to) && (common->seek_waiting_for_ns > -1))   {
+        if ((!skip_to) && (track) && (track->seek_waiting_for_ns > -1)) {
 //              g_print ("Waiting...\n");
-                skip_to = _search_chunk (common, common->seek_waiting_for_ns);
+                skip_to = _search_chunk (track, track->seek_waiting_for_ns);
                 if (skip_to)
-                        common->seek_waiting_for_ns = -1;
+                        track->seek_waiting_for_ns = -1;
         }
 
@@ -572 +588 @@
                         g_warning ("Skipping to a chunk not marked usable!");
                 
-                common->read_chunk = skip_to;
+                track->read_chunk = skip_to;
                 
-                chk = common->read_chunk;
+                chk = track->read_chunk;
                 chk->usable = FALSE;
                 
@@ -591 +607 @@
         /* If we are requested to drop unused chunks (ie. song change), do it now */
         if (input_gst->drop_chunks) {
-                _mark_unused_chunks_for_deletion (common);
+                _mark_unused_chunks_for_deletion (track);
                 input_gst->drop_chunks = FALSE;
         }
@@ -787 +803 @@
         g_return_if_fail (pos < 1);
 
-        FmInputGstCommon *common = input_gst->common;
-        g_return_if_fail (common->read_chunk);
-        g_return_if_fail (common->read_chunk->duration_ns > 0);
-
-        input_gst->seek_at_ns = common->read_chunk->duration_ns * pos;
+        FmInputGstTrack *track = input_gst->read_track;
+        g_return_if_fail (track->read_chunk);
+        g_return_if_fail (track->read_chunk->duration_ns > 0);
+
+        input_gst->seek_at_ns = track->read_chunk->duration_ns * pos;
 }
 

trunk/fm_server/src/fm_input_gst/fm_input_gst.h

@@ -58 +58 @@
         GValue          *val1;
         GValue          *val2;
+
+        FmInputGstTrack *read_track;
 };
 

trunk/fm_server/src/fm_input_gst/fm_input_gst_common.c

@@ -44 +44 @@
 {
         jack_ringbuffer_free(chk->ring);
-        free(chk);
+        g_free(chk);
+}
+
+
+FmInputGstTrack *
+fm_input_gst_track_new                  (guint          id)
+{
+        FmInputGstTrack *track = g_new0(FmInputGstTrack, 1);
+        track->id = id;
+        track->gst_seek_to_ns = -1;
+        track->seek_waiting_for_ns = -1;
+        return track;
+}
+
+
+void
+fm_input_gst_track_destroy              (FmInputGstTrack *track)
+{
+        g_free (track);
 }
 

trunk/fm_server/src/fm_input_gst/fm_input_gst_common.h

@@ -60 +60 @@
 
 
+
+typedef struct _FmInputGstTrack FmInputGstTrack;
+
+struct _FmInputGstTrack {
+        guint           id;
+
+        gboolean        writing;                // GstFmSink can be writing to this track
+        gboolean        loaded;
+
+        GList           *chunks;
+        FmChunk         *write_chunk;
+        FmChunk         *read_chunk;
+
+        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
+};
+
+
+
 typedef struct _FmInputGstCommon FmInputGstCommon;
 
@@ -77 +96 @@
         GstPad          *output_pad;
 
-        GList           *chunks;
-        FmChunk         *write_chunk;
-        FmChunk         *read_chunk;
-
         FmSemaphore     *sem;
 
         gboolean        stop_processing;        // discard incoming buffers and delete chunks
 
-        gint64          seek_waiting_for_ns;    // only for a FAR seek, wait for a new chunk returned from GST which starts here
-        gint64          gst_seek_to_ns;         // only for a FAR seek, where GStreamer should seek
+        GList           *tracks;
+        FmInputGstTrack *new_track;
 
         gdouble         ns_for_sample;
@@ -100 +115 @@
 fm_chunk_destroy                        (FmChunk        *chk);
 
+FmInputGstTrack *
+fm_input_gst_track_new                  (guint          id);
+
+void
+fm_input_gst_track_destroy              (FmInputGstTrack *track);
+
 guint64
 ns_to_samples                           (FmInputGstCommon *common,

trunk/fm_server/src/fm_input_gst/gstfmsink.c

@@ -102 +102 @@
 static GstCaps *gst_fm_sink_getcaps     (GstBaseSink    *bsink);
 gboolean seek_helper                    (gpointer       data);
+static GstStateChangeReturn
+gst_fm_sink_change_state (GstElement *element, GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
@@ -167 +169 @@
 
         gstbase_sink_class->get_caps = GST_DEBUG_FUNCPTR (gst_fm_sink_getcaps);
+
+        gstelement_class->change_state = gst_fm_sink_change_state;
 }
 
@@ -188 +192 @@
 
         sink->chunk_count = 0;
+
+        sink->write_track = NULL;
+        sink->track_count = 0;
 }
 
@@ -230 +237 @@
 
         GstFmSink *sink = GST_FM_SINK (bsink);
-        FmInputGstCommon *common = sink->common;
+//      FmInputGstCommon *common = sink->common;
+        FmInputGstTrack *track = sink->write_track;
 
         switch (GST_EVENT_TYPE (event)) {
 
                 case GST_EVENT_EOS: {
-                        g_return_val_if_fail (common->write_chunk, TRUE);
-                        common->write_chunk->eof_samples = sink->position_samples;
+                        g_return_val_if_fail (track->write_chunk, TRUE);
+                        track->write_chunk->eof_samples = sink->position_samples;
                         g_print(">   got EOF at timestamp %lld\n", (long long int) sink->start_timestamp);
                         sink->seek_in_progress = FALSE;
@@ -256 +264 @@
 
 static gboolean
-do_cleanup(FmInputGstCommon *common)
-{
-        GList *list = common->chunks;
+do_cleanup(FmInputGstTrack *track)
+{
+        GList *list = track->chunks;
         while (list) {
                 FmChunk *chk = (FmChunk *) list->data;
                 if (chk->can_destroy) {
-                        common->chunks = g_list_remove_link(common->chunks, list);
+                        track->chunks = g_list_remove_link(track->chunks, list);
                         
                         g_print(">   Destroying chunk %u\n", chk->num);
@@ -307 +315 @@
         GstFmSink *sink = GST_FM_SINK (bsink);
         FmInputGstCommon *common = sink->common;
+        FmInputGstTrack *track = sink->write_track;
 
         if (common->stop_processing || (sink->seek_in_progress && !sink->seek_completed))
@@ -313 +322 @@
         guint buffer_pos_bytes = 0;
 
-        FmChunk *chk = common->write_chunk;
+        FmChunk *chk = track->write_chunk;
 
         if ((!chk) ||
@@ -328 +337 @@
                 chk = fm_chunk_new (SAMPLES_TO_BYTES (CHUNK_SAMPLES));
                 chk->num = sink->chunk_count++;
-                common->chunks = g_list_append (common->chunks, chk);
-                common->write_chunk = chk;
+                track->chunks = g_list_append (track->chunks, chk);
+                track->write_chunk = chk;
 
                 gint64 timestamp = GST_BUFFER_TIMESTAMP (buf);
@@ -376 +385 @@
 
                 if (bytes_space == 0) {
-                        if (do_cleanup(common))
+                        if (do_cleanup(track))
                                 /*g_print (">   cleanup complete\n")*/;
 
@@ -386 +395 @@
                                 return GST_FLOW_OK;
     
-                        if (common->gst_seek_to_ns > -1) {
+                        if (track->gst_seek_to_ns > -1) {
                                 if (sink->seek_in_progress) {
                                         g_print (">   seek already in progress, we'll try later\n");
@@ -392 +401 @@
                                 }
                                 
-                                g_print(">   requested seek to %lld\n", (long long int) common->gst_seek_to_ns);
-
-                                sink->seek_target_timestamp = common->gst_seek_to_ns;
-                                common->gst_seek_to_ns = -1;
+                                g_print(">   requested seek to %lld\n", (long long int) track->gst_seek_to_ns);
+
+                                sink->seek_target_timestamp = track->gst_seek_to_ns;
+                                track->gst_seek_to_ns = -1;
                                 sink->seek_in_progress = TRUE;
 
@@ -440 +449 @@
                                 common->loaded = TRUE;
                         }
+
+                        if (!track->loaded) {
+                                track->loaded = TRUE;
+                                common->new_track = track;
+                        }
                 } else
                         chk->bytes_preloaded += written_bytes;
@@ -493 +507 @@
 }
 
+
+static GstStateChangeReturn
+gst_fm_sink_change_state                (GstElement     *element,
+                                         GstStateChange transition)
+{
+        GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
+        GstFmSink *fm_sink = GST_FM_SINK (element);
+
+        switch (transition) {
+                case GST_STATE_CHANGE_READY_TO_PAUSED: {
+                        g_warning ("GST_STATE_CHANGE_READY_TO_PAUSED - LOAD TRACK");
+
+                        FmInputGstTrack *track = fm_input_gst_track_new (fm_sink->track_count++);
+                        fm_sink->write_track = track;
+                        track->writing = TRUE;
+
+                        break;
+                }
+                default:
+                        break;
+        }
+
+        ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+        if (ret == GST_STATE_CHANGE_FAILURE)
+                return ret;
+
+        switch (transition) {
+                case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+                        g_warning ("GST_STATE_CHANGE_PLAYING_TO_PAUSED - UNLOAD TRACK");
+
+                        fm_sink->write_track->writing = FALSE;
+
+                        break;
+                default:
+                        break;
+        }
+
+        return ret;
+}

trunk/fm_server/src/fm_input_gst/gstfmsink.h

@@ -93 +93 @@
 
         guint           chunk_count;
+        guint           track_count;
+
+
+        FmInputGstTrack *write_track;
 };