X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicemp3.h;h=50957c4d797bdc25894de3d3ad6384d3bf0d97e2;hp=173084d49a1e5540e0d4b8a8c055354bc3162fc0;hb=da4e5045bfbe6faa22cd15f7bbb99cccd4f625de;hpb=3b39f8eba7740ada48af5e3b6e7b1aaa59e3356e

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 173084d..50957c4 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -167,12 +167,18 @@ public:
 		int bufferPercent;
 		int avgInRate;
 		int avgOutRate;
-		long long bufferingLeft;
+		int64_t bufferingLeft;
 		bufferInfo()
 			:bufferPercent(0), avgInRate(0), avgOutRate(0), bufferingLeft(-1)
 		{
 		}
 	};
+	struct errorInfo
+	{
+		std::string error_message;
+		std::string missing_codec;
+	};
+
 private:
 	static int pcm_delay;
 	static int ac3_delay;
@@ -183,70 +189,64 @@ private:
 	std::vector<subtitleStream> m_subtitleStreams;
 	eSubtitleWidget *m_subtitle_widget;
 	int m_currentTrickRatio;
-	ePtr<eTimer> m_seekTimeout;
-	void seekTimeoutCB();
 	friend class eServiceFactoryMP3;
 	eServiceReference m_ref;
 	int m_buffer_size;
+
 	bufferInfo m_bufferInfo;
+	errorInfo m_errorInfo;
 	eServiceMP3(eServiceReference ref);
 	Signal2<void,iPlayableService*,int> m_event;
 	enum
 	{
 		stIdle, stRunning, stStopped,
-	};
-	int m_state;
-	GstElement *m_gst_playbin;
-	GstElement *m_gst_subtitlebin;
-	GstTagList *m_stream_tags;
-
-	struct Message
-	{
-		Message()
-			:type(-1)
-		{}
-		Message(int type)
-			:type(type)
-		{}
-		Message(int type, GstPad *pad)
-			:type(type)
-		{
-			d.pad=pad;
-		}
-
-		int type;
-		union {
-			GstPad *pad; // for msg type 3
-		} d;
-	};
-
-	eFixedMessagePump<Message> m_pump;
-	std::string m_error_message;
-
-	audiotype_t gstCheckAudioPad(GstStructure* structure);
-	void gstBusCall(GstBus *bus, GstMessage *msg);
-	static GstBusSyncReply gstBusSyncHandler(GstBus *bus, GstMessage *message, gpointer user_data);
-	static void gstHTTPSourceSetAgent(GObject *source, GParamSpec *unused, gpointer user_data);
-	static void gstCBsubtitleAvail(GstElement *element, gpointer user_data);
-	static GstCaps* gstGhostpadGetCAPS (GstPad * pad);
-	static gboolean gstGhostpadAcceptCAPS(GstPad * pad, GstCaps * caps);
-	static void gstGhostpadLink(gpointer user_data, GstCaps * caps);
-	static GstFlowReturn gstGhostpadBufferAlloc(GstPad *pad, guint64 offset, guint size, GstCaps *caps, GstBuffer **buf);
-	static void gstGhostpadHasCAPS(GstPad *pad, GParamSpec * unused, gpointer user_data);
-	static gboolean gstGhostpadSinkEvent(GstPad * pad, GstEvent * event);
-	static GstFlowReturn gstGhostpadChainFunction(GstPad * pad, GstBuffer * buffer);
-/*	static void gstCBsubtitleCAPS(GObject *obj, GParamSpec *pspec, gpointer user_data);
-	static void gstCBsubtitleLink(subtype_t type, gpointer user_data);
-	static gboolean gstCBsubtitleDrop(GstPad *pad, GstBuffer *buffer, gpointer user_data);*/
+        };
+        int m_state;
+        GstElement *m_gst_playbin, *audioSink, *videoSink;
+        GstTagList *m_stream_tags;
+
+        struct Message
+        {
+                Message()
+                        :type(-1)
+                {}
+                Message(int type)
+                        :type(type)
+                {}
+                Message(int type, GstPad *pad)
+                        :type(type)
+                {
+                        d.pad=pad;
+                }
+				Message(int type, GstBuffer *buffer)
+                        :type(type)
+                {
+                        d.buffer=buffer;
+                }
+
+                int type;
+                union {
+                        GstBuffer *buffer; // for msg type 2
+                        GstPad *pad; // for msg type 3
+                } d;
+        };
+
+        eFixedMessagePump<Message> m_pump;
+
+        audiotype_t gstCheckAudioPad(GstStructure* structure);
+#if GST_VERSION_MAJOR < 1
+        static gint match_sinktype(GstElement *element, gpointer type);
+#else
+        static gint match_sinktype(const GValue *velement, const gchar *type);
+#endif
+        void gstBusCall(GstBus *bus, GstMessage *msg);
+        static GstBusSyncReply gstBusSyncHandler(GstBus *bus, GstMessage *message, gpointer user_data);
+	static void gstTextpadHasCAPS(GstPad *pad, GParamSpec * unused, gpointer user_data);
+	void gstTextpadHasCAPS_synced(GstPad *pad);
+        static void gstCBsubtitleAvail(GstElement *element, GstBuffer *buffer, gpointer user_data);
+        GstPad* gstCreateSubtitleSink(eServiceMP3* _this, subtype_t type);
 	void gstPoll(const Message&);
-	void gstGhostpadHasCAPS_synced(GstPad *pad);
-
-	GstPadBufferAllocFunction m_ghost_pad_buffer_alloc;
-	GstPadChainFunction m_ghost_pad_chain_function;
-	GstPadEventFunction m_ghost_pad_subtitle_sink_event;
-	GstCaps *m_gst_prev_subtitle_caps;
-	GstSegment m_gst_subtitle_segment;
-	GstPadEventFunction m_gst_sink_event;
+        static void gstHTTPSourceSetAgent(GObject *source, GParamSpec *unused, gpointer user_data);
 
 	struct SubtitlePage
 	{
@@ -255,20 +255,17 @@ private:
 		eVobSubtitlePage vob_page;
 	};
 
-	std::list<SubtitlePage> m_subtitle_pages;
-	ePtr<eTimer> m_subtitle_sync_timer;
-	ePtr<eTimer> m_subtitle_hide_timer;
-	ePtr<eTimer> m_streamingsrc_timeout;
-	pts_t m_prev_decoder_time;
-	int m_decoder_time_valid_state;
-
-	void pushSubtitles();
-	void pullSubtitle();
-	void hideSubtitles();
-	void sourceTimeout();
-	int m_subs_to_pull;
-	sourceStream m_sourceinfo;
-	eSingleLock m_subs_to_pull_lock;
+        std::list<SubtitlePage> m_subtitle_pages;
+        ePtr<eTimer> m_subtitle_sync_timer;
+        
+        ePtr<eTimer> m_streamingsrc_timeout;
+        pts_t m_prev_decoder_time;
+        int m_decoder_time_valid_state;
+
+        void pushSubtitles();
+        void pullSubtitle(GstBuffer *buffer);
+        void sourceTimeout();
+        sourceStream m_sourceinfo;
 	gulong m_subs_to_pull_handler_id;
 
 	RESULT seekToImpl(pts_t to);