Changeset 30600

Timestamp:

10/18/14 16:03:50 (9 years ago)

Author:

obi

Message:

[tithek] mipsel add 10mb gst prefillbuffer without infos

Location:

titan

Files:

• plugins/tithek/tithek.h (modified) (2 diffs)
• titan/player.h (modified) (39 diffs)

titan/plugins/tithek/tithek.h

@@ -1354 +1354 @@
                         else if(!ostrncmp("http://", tmpstr1, 7))
                         {
-#ifdef EPLAYER3
+//#ifdef EPLAYER3
                                 if(checkbox("UFS910") == 1 && !file_exist("/var/swapdir/swapfile"))
                                         addmenulist(&mlist, "Streaming Playback Caching (5MB)", _("Streaming Playback Caching (5MB)"), NULL, 0, 0);
@@ -1361 +1361 @@
                                         addmenulist(&mlist, "Streaming Playback Caching (10MB)", _("Streaming Playback Caching (10MB)"), NULL, 0, 0);
                                 }
-#endif
+//#endif
                                 if(file_exist(getconfig("rec_streampath", NULL)) && (file_exist("/mnt/swapextensions/etc/.codecpack") || file_exist("/var/swap/etc/.codecpack") || file_exist("/var/etc/.codecpack")))
                                 {

titan/titan/player.h

@@ -29 +29 @@
 
 #ifdef EPLAYER4
-GstElement *m_gst_playbin = NULL;
+GstElement *pipeline = NULL;
 unsigned long long m_gst_startpts = 0;
 #endif
@@ -590 +590 @@
 }
 
+typedef struct _CustomData {
+  gboolean is_live;
+  GstElement *pipeline;
+  GMainLoop *loop;
+} CustomData;
+
+CustomData data;
+
 //extern player
-
 int playerstart(char* file)
 {
@@ -695 +702 @@
 
 #ifdef EPLAYER4
-                status.prefillbuffer = 1;
-
                 int flags = 0x47; //(GST_PLAY_FLAG_VIDEO | GST_PLAY_FLAG_AUDIO | GST_PLAY_FLAG_NATIVE_VIDEO | GST_PLAY_FLAG_TEXT);
                 
-                if(m_gst_playbin != NULL)
+                if(pipeline != NULL)
                 {
                         debug(150, "eplayer allready running");
@@ -713 +718 @@
                 {
                         err("no mem");
-                        free(m_gst_playbin); m_gst_playbin = NULL;
+                        free(pipeline); pipeline = NULL;
                         return 1;
                 }
@@ -721 +726 @@
                 else
                         status.playercan = 0x7E7F;
-                
-                m_gst_playbin = gst_element_factory_make("playbin2", "playbin");
+        
+                pipeline = gst_element_factory_make("playbin2", "playbin");
 
 // enable buffersize start
-                g_object_set(G_OBJECT(m_gst_playbin), "buffer-duration", 5LL * GST_SECOND, NULL);
-                g_object_set(G_OBJECT(m_gst_playbin), "buffer-size", 5*1024*1024, NULL);
+                int size = getconfigint("playerbuffersize", NULL);
+                printf("size: %d\n",size);
+                
+                if(size > 0)
+                        status.prefillbuffer = 1;
+
+                g_object_set(G_OBJECT(pipeline), "buffer-duration", size * GST_SECOND, NULL);
+                g_object_set(G_OBJECT(pipeline), "buffer-size", size, NULL);
 // enable buffersizeend
 
-                g_object_set(G_OBJECT (m_gst_playbin), "uri", tmpfile, NULL);
-                g_object_set(G_OBJECT (m_gst_playbin), "flags", flags, NULL);
+                g_object_set(G_OBJECT(pipeline), "uri", tmpfile, NULL);
+                g_object_set(G_OBJECT(pipeline), "flags", flags, NULL);
                 free(tmpfile); tmpfile = NULL;
 
+///////////////////
 // srt subs start
                 const char *filename = file;
@@ -746 +758 @@
 //                      m_subs_to_pull_handler_id = g_signal_connect (subsink, "new-buffer", G_CALLBACK (gstCBsubtitleAvail), this);
                         g_object_set (G_OBJECT (subsink), "caps", gst_caps_from_string("text/plain; text/x-plain; text/x-raw; text/x-pango-markup; video/x-dvd-subpicture; subpicture/x-pgs"), NULL);
-                        g_object_set (G_OBJECT (m_gst_playbin), "text-sink", subsink, NULL);
-                        g_object_set (G_OBJECT (m_gst_playbin), "current-text", -1, NULL);
-                }
-
-                GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE (m_gst_playbin));
+                        g_object_set (G_OBJECT (pipeline), "text-sink", subsink, NULL);
+                        g_object_set (G_OBJECT (pipeline), "current-text", -1, NULL);
+                }
+
+                GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline));
 #if GST_VERSION_MAJOR < 1
 //              gst_bus_set_sync_handler(bus, gstBusSyncHandler, this);
@@ -769 +781 @@
                         printf("found srt1: %s\n",srt_filename);
                         printf("found srt2: %s\n",g_filename_to_uri(srt_filename, NULL, NULL));
-                        g_object_set(G_OBJECT (m_gst_playbin), "suburi", g_filename_to_uri(srt_filename, NULL, NULL), NULL);            
-                }
-// srt end              
-
-                if(m_gst_playbin)
-                {
-                        gst_element_set_state(m_gst_playbin, GST_STATE_PLAYING);
-                }
+                        g_object_set(G_OBJECT (pipeline), "suburi", g_filename_to_uri(srt_filename, NULL, NULL), NULL);         
+                }
+// srt end      
+
+///////////////////
+//              CustomData data;
+                memset (&data, 0, sizeof (data));
+                data.pipeline = pipeline;
+//              GstBus *bus;
+//              bus = gst_element_get_bus (pipeline);
+                
+                // Start playing //
+                GstStateChangeReturn ret;
+                ret = gst_element_set_state (pipeline, GST_STATE_PLAYING);
+                if(ret == GST_STATE_CHANGE_FAILURE)
+                {
+                        g_printerr ("Unable to set the pipeline to the playing state.\n");
+                        gst_object_unref (pipeline);
+                        return -1;
+                }
+                else if(ret == GST_STATE_CHANGE_NO_PREROLL)
+                {
+                        data.is_live = TRUE;
+                }
+
+                data.loop = g_main_loop_new (NULL, FALSE);
+                data.pipeline = pipeline;
+                gst_bus_add_signal_watch (bus);
+//              g_signal_connect (bus, "message", G_CALLBACK (cb_message), &data);
+//              status.prefillbuffer = 1;
 
                 int count = 0;
@@ -786 +820 @@
                         m_gst_startpts = playergetpts();
                 }
+
                 return 0;
 #endif
@@ -792 +827 @@
         return 1;
 }
+
 
 #ifdef EPLAYER4
@@ -797 +833 @@
 {
         int m_buffer_size = size;
-        g_object_set (G_OBJECT (m_gst_playbin), "buffer-size", m_buffer_size, NULL);
+        g_object_set (G_OBJECT (pipeline), "buffer-size", m_buffer_size, NULL);
         return 0;
 }
@@ -810 +846 @@
 
 #ifdef EPLAYER4
-int gstbuscall(GstBus *bus, GstMessage *msg)
+int gstbuscall(GstBus *bus, GstMessage *msg, CustomData *data)
 {
 
         int ret = 1;
-        if(!m_gst_playbin) return 0;
+        if(!pipeline) return 0;
         if(!msg) return ret;
 
@@ -830 +866 @@
                         break;
                 case GST_MESSAGE_STATE_CHANGED:
-                        if(GST_MESSAGE_SRC(msg) != GST_OBJECT(m_gst_playbin))
+                        if(GST_MESSAGE_SRC(msg) != GST_OBJECT(pipeline))
                                 break;
 
@@ -848 +884 @@
                                 case GST_STATE_CHANGE_READY_TO_PAUSED:
 /*
-                                        GstElement *appsink = gst_bin_get_by_name(GST_BIN(m_gst_playbin), "subtitle_sink");
+                                        GstElement *appsink = gst_bin_get_by_name(GST_BIN(pipeline), "subtitle_sink");
                                         if(appsink)
                                         {
@@ -928 +964 @@
                         //m_event((iPlayableService*)this, evBuffering);
 */
+
+//debug(10, "gst player buffering");
+                        if(status.prefillbuffer == 1)
+                        {
+
+                                gint percent = 0;
+                                if (data->is_live) break;
+                                gst_message_parse_buffering (msg, &percent);
+                                g_print ("Buffering (%3d%%)\r", percent);
+                                if (percent < 100)
+                                {
+                                        gst_element_set_state (data->pipeline, GST_STATE_PAUSED);
+                                }
+                                else
+                                {
+                                        gst_element_set_state (data->pipeline, GST_STATE_PLAYING);
+                                        status.prefillbuffer = 0;
+                                }
+                        }
+                        break;
+
+/*
                         GstBufferingMode mode;
                         gst_message_parse_buffering(msg, &(status.bufferpercent));
                         gst_message_parse_buffering_stats(msg, &mode, &(status.avgInRate), &(status.avgOutRate), &(status.bufferingLeft));
 
-                        printf("#########################################################\n");
-                        printf("Buffering %u percent done\n", status.bufferpercent);
-                        printf("avgInRate %d\n", status.avgInRate);
-                        printf("avgOutRate %d\n", status.avgOutRate);
-                        printf("bufferingLeft %lld\n", status.bufferingLeft);
+//                      printf("#########################################################\n");
+//                      printf("Buffering %u percent done\n", status.bufferpercent);
+//                      printf("avgInRate %d\n", status.avgInRate);
+//                      printf("avgOutRate %d\n", status.avgOutRate);
+//                      printf("bufferingLeft %lld\n", status.bufferingLeft);
                                         
                         if(status.prefillbuffer == 1)
@@ -945 +1003 @@
                                 {
                                         GstState state;
-                                        gst_element_get_state(m_gst_playbin, &state, NULL, 0LL);
+                                        gst_element_get_state(pipeline, &state, NULL, 0LL);
                                         if (state != GST_STATE_PLAYING)
                                         {
                                                 // eDebug("start playing");
-                                                gst_element_set_state (m_gst_playbin, GST_STATE_PLAYING);
+                                                gst_element_set_state (pipeline, GST_STATE_PLAYING);
                                         }
 //                                      m_ignore_buffering_messages = 5;
@@ -957 +1015 @@
                                 {
                                         // eDebug("start pause");
-                                        gst_element_set_state (m_gst_playbin, GST_STATE_PAUSED);
+                                        gst_element_set_state (pipeline, GST_STATE_PAUSED);
 //                                      m_ignore_buffering_messages = 0;
                                 }
                         }
-
+*/
 /*
                                 GstBufferingMode mode;
                                 printf("GST_STATE_PAUSED\n");
-                                gst_element_set_state (m_gst_playbin, GST_STATE_PAUSED);
+                                gst_element_set_state (pipeline, GST_STATE_PAUSED);
 
 
@@ -977 +1035 @@
                                         {
                                                 GstState state;
-                                                gst_element_get_state(m_gst_playbin, &state, NULL, 0LL);
+                                                gst_element_get_state(pipeline, &state, NULL, 0LL);
                                                 if (state != GST_STATE_PLAYING)
                                                 {
                                                         // eDebug("start playing");
-                                                        gst_element_set_state (m_gst_playbin, GST_STATE_PLAYING);
+                                                        gst_element_set_state (pipeline, GST_STATE_PLAYING);
                                                 }
                                                 m_ignore_buffering_messages = 5;
@@ -988 +1046 @@
                                         {
                                                 // eDebug("start pause");
-                                                gst_element_set_state (m_gst_playbin, GST_STATE_PAUSED);
+                                                gst_element_set_state (pipeline, GST_STATE_PAUSED);
                                                 m_ignore_buffering_messages = 0;
                                         }
@@ -1090 +1148 @@
         int ret = 1;
 
-        if(m_gst_playbin)
-        {
-                GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(m_gst_playbin));
+        if(pipeline)
+        {
+                GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline));
                 GstMessage *message = NULL;
+//use global variale, with static var crash
+//              CustomData *data = NULL;
                 while((message = gst_bus_pop(bus)))
                 {
-                        ret = gstbuscall(bus, message);
+                        ret = gstbuscall(bus, message, &data);
                         gst_message_unref(message);
                 }
@@ -1116 +1176 @@
 
 #ifdef EPLAYER4
-        if(m_gst_playbin)
-                gst_element_set_state(m_gst_playbin, GST_STATE_PLAYING);
+        if(pipeline)
+                gst_element_set_state(pipeline, GST_STATE_PLAYING);
 #endif
 }
@@ -1145 +1205 @@
 
 #ifdef EPLAYER4
-        if(m_gst_playbin)
-        {
-                gst_element_set_state(m_gst_playbin, GST_STATE_NULL);
-                gst_object_unref(GST_OBJECT(m_gst_playbin));
-                m_gst_playbin = NULL;
+        if(pipeline)
+        {
+                gst_element_set_state(pipeline, GST_STATE_NULL);
+                gst_object_unref(GST_OBJECT(pipeline));
+                pipeline = NULL;
         }
 #endif
@@ -1165 +1225 @@
 
 #ifdef EPLAYER4
-        if(m_gst_playbin)
+        if(pipeline)
                 playerstop();
 #endif
@@ -1178 +1238 @@
 
 #ifdef EPLAYER4
-        if(m_gst_playbin)
-                gst_element_set_state(m_gst_playbin, GST_STATE_PAUSED);
+        if(pipeline)
+                gst_element_set_state(pipeline, GST_STATE_PAUSED);
 #endif
 }
@@ -1191 +1251 @@
 
 #ifdef EPLAYER4
-        if(m_gst_playbin)
-                gst_element_set_state(m_gst_playbin, GST_STATE_PLAYING);
+        if(pipeline)
+                gst_element_set_state(pipeline, GST_STATE_PLAYING);
 #endif
 }
@@ -1280 +1340 @@
         //GstFormat fmt = GST_FORMAT_TIME;
                 
-        if(m_gst_playbin)
+        if(pipeline)
         {
                 len = playergetlength();
@@ -1294 +1354 @@
                         playerstop();
                 else
-                        gst_element_seek(m_gst_playbin, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, nanos_pts, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
+                        gst_element_seek(pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, nanos_pts, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
         }
 #endif
@@ -1416 +1476 @@
         //TrackList = tmpTrackList;
         
-        if(m_gst_playbin != NULL)
+        if(pipeline != NULL)
         {
                 gint i, n_video = 0, n_audio = 0, n_text = 0;
                 
-                g_object_get(m_gst_playbin, "n-video", &n_video, NULL);
-                g_object_get(m_gst_playbin, "n-audio", &n_audio, NULL);
-                g_object_get(m_gst_playbin, "n-text", &n_text, NULL);
+                g_object_get(pipeline, "n-video", &n_video, NULL);
+                g_object_get(pipeline, "n-audio", &n_audio, NULL);
+                g_object_get(pipeline, "n-text", &n_text, NULL);
                 
                 switch(type)
@@ -1434 +1494 @@
                                         GstPad* pad = 0;
                                         
-                                        g_signal_emit_by_name (m_gst_playbin, "get-audio-pad", i, &pad);
+                                        g_signal_emit_by_name (pipeline, "get-audio-pad", i, &pad);
 #if GST_VERSION_MAJOR < 1
                                         GstCaps* caps = gst_pad_get_negotiated_caps(pad);
@@ -1446 +1506 @@
                                         const gchar *g_type = gst_structure_get_name(str);
 
-                                        g_signal_emit_by_name(m_gst_playbin, "get-audio-tags", i, &tags);
+                                        g_signal_emit_by_name(pipeline, "get-audio-tags", i, &tags);
 
 #if GST_VERSION_MAJOR < 1
@@ -1502 +1562 @@
 //                                      GstPad* pad = 0;
                                 
-                                        g_signal_emit_by_name(m_gst_playbin, "get-text-tags", i, &tags);
+                                        g_signal_emit_by_name(pipeline, "get-text-tags", i, &tags);
                                         
 #if GST_VERSION_MAJOR < 1
@@ -1525 +1585 @@
                                         }
 /*
-                                        g_signal_emit_by_name(m_gst_playbin, "get-text-pad", i, &pad);
+                                        g_signal_emit_by_name(pipeline, "get-text-pad", i, &pad);
                                         if(pad)
                                                 g_signal_connect(G_OBJECT(pad), "notify::caps", G_CALLBACK (gstTextpadHasCAPS), this);
@@ -1539 +1599 @@
                                         gchar *g_codec = NULL, *g_lang = NULL;
                                         
-                                        g_signal_emit_by_name(m_gst_playbin, "get-video-tags", i, &tags);
+                                        g_signal_emit_by_name(pipeline, "get-video-tags", i, &tags);
                                         
 #if GST_VERSION_MAJOR < 1
@@ -1613 +1673 @@
 
 #ifdef EPLAYER4
-        if(m_gst_playbin != NULL)
+        if(pipeline != NULL)
         {
                 switch(type)
                 {
                         case 1:
-                                g_object_get(G_OBJECT(m_gst_playbin), "current-audio", CurTrackId, NULL);
+                                g_object_get(G_OBJECT(pipeline), "current-audio", CurTrackId, NULL);
                                 break;
                 }
@@ -1646 +1706 @@
         
 /*
-        if(m_gst_playbin)
-        {
-                gst_element_query_position(m_gst_playbin, &fmt, (gint64*)&pts);
+        if(pipeline)
+        {
+                gst_element_query_position(pipeline, &fmt, (gint64*)&pts);
                 sec = pts / 1000000000;
                 pts = sec * 90000;
@@ -1655 +1715 @@
 */
 
-        if(m_gst_playbin)
+        if(pipeline)
         {
                 gint64 pos;
@@ -1661 +1721 @@
                 pts = 0;
 
-                g_object_get(G_OBJECT (m_gst_playbin), "audio-sink", &sink, NULL);
-
-                if(!sink) g_object_get (G_OBJECT (m_gst_playbin), "video-sink", &sink, NULL);
+                g_object_get(G_OBJECT (pipeline), "audio-sink", &sink, NULL);
+
+                if(!sink) g_object_get (G_OBJECT (pipeline), "video-sink", &sink, NULL);
                 if(!sink) return 0;
 
@@ -1674 +1734 @@
                 gst_object_unref(sink);
 
-                if(!use_get_decoder_time && !gst_element_query_position(m_gst_playbin, &fmt, &pos))
+                if(!use_get_decoder_time && !gst_element_query_position(pipeline, &fmt, &pos))
                         return 0;
 
@@ -1706 +1766 @@
         gint64 len;
 
-        if(m_gst_playbin)
-        {
-                gst_element_query_duration(m_gst_playbin, &fmt, &len);
+        if(pipeline)
+        {
+                gst_element_query_duration(pipeline, &fmt, &len);
                 length = len / 1000000000;
                 if(length < 0) length = 0;
@@ -1752 +1812 @@
 
 #ifdef EPLAYER4
-        if(m_gst_playbin != NULL)
-                g_object_set(G_OBJECT(m_gst_playbin), "current-audio", num, NULL);      
+        if(pipeline != NULL)
+                g_object_set(G_OBJECT(pipeline), "current-audio", num, NULL);   
 #endif
 }