Merge branch 'bug_258_sorting_of_configsatlist' into experimental

[enigma2.git] / lib / service / servicemp3.h

diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index d5e6a1698e8170d51e4d8fd4b7338abd4a28714f..985179f65642143902bb0a9a5ef7df6bef8fd762 100644 (file)
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -49,8 +49,9 @@ typedef enum { atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG, atFL
 typedef enum { stPlainText, stSSA, stSRT } subtype_t;
 typedef enum { ctNone, ctMPEGTS, ctMPEGPS, ctMKV, ctAVI, ctMP4, ctVCD, ctCDA } containertype_t;
 
 typedef enum { stPlainText, stSSA, stSRT } subtype_t;
 typedef enum { ctNone, ctMPEGTS, ctMPEGPS, ctMKV, ctAVI, ctMP4, ctVCD, ctCDA } containertype_t;
 

-class eServiceMP3: public iPlayableService, public iPauseableService, 
-       public iServiceInformation, public iSeekableService, public iAudioTrackSelection, public iAudioChannelSelection, public iSubtitleOutput, public Object
+class eServiceMP3: public iPlayableService, public iPauseableService,
+       public iServiceInformation, public iSeekableService, public iAudioTrackSelection, public iAudioChannelSelection, 
+       public iSubtitleOutput, public iStreamedService, public iAudioDelay, public Object

 {
        DECLARE_REF(eServiceMP3);
 public:
 {
        DECLARE_REF(eServiceMP3);
 public:


@@ -70,16 +71,17 @@ public:
        RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
        RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr);
        RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
        RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
        RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr);
        RESULT subtitle(ePtr<iSubtitleOutput> &ptr);

+       RESULT audioDelay(ePtr<iAudioDelay> &ptr);

 
                // not implemented (yet)
        RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = 0; return -1; }
        RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = 0; return -1; }
        RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = 0; return -1; }
        RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = 0; return -1; }
 
                // not implemented (yet)
        RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = 0; return -1; }
        RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = 0; return -1; }
        RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = 0; return -1; }
        RESULT cueSheet(ePtr<iCueSheet> &ptr) { ptr = 0; return -1; }

-       RESULT audioDelay(ePtr<iAudioDelay> &ptr) { ptr = 0; return -1; }
+

        RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = 0; return -1; }
        RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr) { ptr = 0; return -1; }

-       RESULT stream(ePtr<iStreamableService> &ptr) { ptr = 0; return -1; }

        RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
        RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }

+       RESULT stream(ePtr<iStreamableService> &ptr) { ptr = 0; return -1; }

 
                // iPausableService
        RESULT pause();
 
                // iPausableService
        RESULT pause();


@@ -117,6 +119,17 @@ public:
        PyObject *getSubtitleList();
        PyObject *getCachedSubtitle();
 
        PyObject *getSubtitleList();
        PyObject *getCachedSubtitle();
 

+               // iStreamedService
+       RESULT streamed(ePtr<iStreamedService> &ptr);
+       PyObject *getBufferCharge();
+       int setBufferSize(int size);
+
+               // iAudioDelay
+       int getAC3Delay();
+       int getPCMDelay();
+       void setAC3Delay(int);
+       void setPCMDelay(int);
+

        struct audioStream
        {
                GstPad* pad;
        struct audioStream
        {
                GstPad* pad;


@@ -149,7 +162,20 @@ public:
                {
                }
        };
                {
                }
        };

+       struct bufferInfo
+       {
+               int bufferPercent;
+               int avgInRate;
+               int avgOutRate;
+               long long bufferingLeft;
+               bufferInfo()
+                       :bufferPercent(0), avgInRate(0), avgOutRate(0), bufferingLeft(-1)
+               {
+               }
+       };

 private:
 private:

+       static int pcm_delay;
+       static int ac3_delay;

        int m_currentAudioStream;
        int m_currentSubtitleStream;
        int selectAudioStream(int i);
        int m_currentAudioStream;
        int m_currentSubtitleStream;
        int selectAudioStream(int i);


@@ -160,9 +186,10 @@ private:
        ePtr<eTimer> m_seekTimeout;
        void seekTimeoutCB();
        friend class eServiceFactoryMP3;
        ePtr<eTimer> m_seekTimeout;
        void seekTimeoutCB();
        friend class eServiceFactoryMP3;

-       std::string m_filename;
-       std::string m_title;
-       eServiceMP3(const char *filename, const char *title);
+       eServiceReference m_ref;
+       int m_buffer_size;
+       bufferInfo m_bufferInfo;
+       eServiceMP3(eServiceReference ref);

        Signal2<void,iPlayableService*,int> m_event;
        enum
        {
        Signal2<void,iPlayableService*,int> m_event;
        enum
        {


@@ -177,18 +204,19 @@ private:
        audiotype_t gstCheckAudioPad(GstStructure* structure);
        void gstBusCall(GstBus *bus, GstMessage *msg);
        static GstBusSyncReply gstBusSyncHandler(GstBus *bus, GstMessage *message, gpointer user_data);
        audiotype_t gstCheckAudioPad(GstStructure* structure);
        void gstBusCall(GstBus *bus, GstMessage *msg);
        static GstBusSyncReply gstBusSyncHandler(GstBus *bus, GstMessage *message, gpointer user_data);

-       static void gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer data); /* for mpegdemux */
-       static void gstCBfilterPadAdded(GstElement *filter, GstPad *pad, gpointer user_data); /* for id3demux */
-       static void gstCBnewPad(GstElement *decodebin, GstPad *pad, gboolean last, gpointer data); /* for decodebin */
-       static void gstCBunknownType(GstElement *decodebin, GstPad *pad, GstCaps *l, gpointer data);

        static void gstCBsubtitleAvail(GstElement *element, gpointer user_data);
        static void gstCBsubtitleAvail(GstElement *element, gpointer user_data);

-       static void gstCBsubtitlePadEvent(GstPad *pad, GstEvent *event, gpointer user_data);

        GstPad* gstCreateSubtitleSink(eServiceMP3* _this, subtype_t type);
        void gstPoll(const int&);
 
        std::list<ePangoSubtitlePage> m_subtitle_pages;
        ePtr<eTimer> m_subtitle_sync_timer;
        void pushSubtitles();
        GstPad* gstCreateSubtitleSink(eServiceMP3* _this, subtype_t type);
        void gstPoll(const int&);
 
        std::list<ePangoSubtitlePage> m_subtitle_pages;
        ePtr<eTimer> m_subtitle_sync_timer;
        void pushSubtitles();

+       void pullSubtitle();
+       int m_subs_to_pull;
+       eSingleLock m_subs_to_pull_lock;
+       gulong m_subs_to_pull_handler_id;
+
+       RESULT seekToImpl(pts_t to);

 
        gint m_aspect, m_width, m_height, m_framerate, m_progressive;
        RESULT trickSeek(gdouble ratio);
 
        gint m_aspect, m_width, m_height, m_framerate, m_progressive;
        RESULT trickSeek(gdouble ratio);