Merge branch 'bug_258_sorting_of_configsatlist' into experimental

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

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index af9e1d34a52725b2f270b1b4f170b6cc3285cccb..c95609a31dde231c498ead998c34a804c9708182 100644 (file)
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -2,20 +2,23 @@
 
        /* note: this requires gstreamer 0.10.x and a big list of plugins. */
        /* it's currently hardcoded to use a big-endian alsasink as sink. */
 
        /* note: this requires gstreamer 0.10.x and a big list of plugins. */
        /* it's currently hardcoded to use a big-endian alsasink as sink. */

+#include <lib/base/ebase.h>

 #include <lib/base/eerror.h>
 #include <lib/base/eerror.h>

+#include <lib/base/init_num.h>
+#include <lib/base/init.h>
+#include <lib/base/nconfig.h>

 #include <lib/base/object.h>
 #include <lib/base/object.h>

-#include <lib/base/ebase.h>
-#include <string>
+#include <lib/dvb/decoder.h>
+#include <lib/components/file_eraser.h>
+#include <lib/gui/esubtitle.h>

 #include <lib/service/servicemp3.h>
 #include <lib/service/service.h>
 #include <lib/service/servicemp3.h>
 #include <lib/service/service.h>

-#include <lib/components/file_eraser.h>
-#include <lib/base/init_num.h>
-#include <lib/base/init.h>
+
+#include <string>
+

 #include <gst/gst.h>
 #include <gst/pbutils/missing-plugins.h>
 #include <sys/stat.h>
 #include <gst/gst.h>
 #include <gst/pbutils/missing-plugins.h>
 #include <sys/stat.h>

-/* for subtitles */
-#include <lib/gui/esubtitle.h>

 
 // eServiceFactoryMP3
 
 
 // eServiceFactoryMP3
 


@@ -34,6 +37,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
                extensions.push_back("vob");
                extensions.push_back("wav");
                extensions.push_back("wave");
                extensions.push_back("vob");
                extensions.push_back("wav");
                extensions.push_back("wave");

+               extensions.push_back("m4v");

                extensions.push_back("mkv");
                extensions.push_back("avi");
                extensions.push_back("divx");
                extensions.push_back("mkv");
                extensions.push_back("avi");
                extensions.push_back("divx");


@@ -42,6 +46,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
                extensions.push_back("mp4");
                extensions.push_back("mov");
                extensions.push_back("m4a");
                extensions.push_back("mp4");
                extensions.push_back("mov");
                extensions.push_back("m4a");

+               extensions.push_back("m2ts");

                sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
        }
 
                sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
        }
 


@@ -186,6 +191,8 @@ int eStaticServiceMP3Info::getLength(const eServiceReference &ref)
 }
 
 // eServiceMP3
 }
 
 // eServiceMP3

+int eServiceMP3::ac3_delay,
+    eServiceMP3::pcm_delay;

 
 eServiceMP3::eServiceMP3(eServiceReference ref)
        :m_ref(ref), m_pump(eApp, 1)
 
 eServiceMP3::eServiceMP3(eServiceReference ref)
        :m_ref(ref), m_pump(eApp, 1)


@@ -193,7 +200,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
        m_seekTimeout = eTimer::create(eApp);
        m_subtitle_sync_timer = eTimer::create(eApp);
        m_stream_tags = 0;
        m_seekTimeout = eTimer::create(eApp);
        m_subtitle_sync_timer = eTimer::create(eApp);
        m_stream_tags = 0;

-       m_currentAudioStream = 0;
+       m_currentAudioStream = -1;

        m_currentSubtitleStream = 0;
        m_subtitle_widget = 0;
        m_currentTrickRatio = 0;
        m_currentSubtitleStream = 0;
        m_subtitle_widget = 0;
        m_currentTrickRatio = 0;


@@ -235,7 +242,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
                sourceinfo.containertype = ctAVI;
                sourceinfo.is_video = TRUE;
        }
                sourceinfo.containertype = ctAVI;
                sourceinfo.is_video = TRUE;
        }

-       else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0)
+       else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0 || strcasecmp(ext, ".m4v") == 0)

        {
                sourceinfo.containertype = ctMP4;
                sourceinfo.is_video = TRUE;
        {
                sourceinfo.containertype = ctMP4;
                sourceinfo.is_video = TRUE;


@@ -301,7 +308,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
                eDebug("eServiceMP3::sorry, can't play: missing gst-plugin-appsink");
        else
        {
                eDebug("eServiceMP3::sorry, can't play: missing gst-plugin-appsink");
        else
        {

-               g_signal_connect (subsink, "new-buffer", G_CALLBACK (gstCBsubtitleAvail), this);
+               m_subs_to_pull_handler_id = g_signal_connect (subsink, "new-buffer", G_CALLBACK (gstCBsubtitleAvail), this);

                g_object_set (G_OBJECT (m_gst_playbin), "text-sink", subsink, NULL);
        }
 
                g_object_set (G_OBJECT (m_gst_playbin), "text-sink", subsink, NULL);
        }
 


@@ -334,16 +341,28 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
                m_gst_playbin = 0;
        }
 
                m_gst_playbin = 0;
        }
 

-       gst_element_set_state (m_gst_playbin, GST_STATE_PLAYING);

        setBufferSize(m_buffer_size);
 }
 
 eServiceMP3::~eServiceMP3()
 {
        setBufferSize(m_buffer_size);
 }
 
 eServiceMP3::~eServiceMP3()
 {

+       // disconnect subtitle callback
+       GstElement *sink;
+       g_object_get (G_OBJECT (m_gst_playbin), "text-sink", &sink, NULL);
+       if (sink)
+       {
+               g_signal_handler_disconnect (sink, m_subs_to_pull_handler_id);
+               gst_object_unref(sink);
+       }
+

        delete m_subtitle_widget;
        delete m_subtitle_widget;

+
+       // disconnect sync handler callback
+       gst_bus_set_sync_handler(gst_pipeline_get_bus (GST_PIPELINE (m_gst_playbin)), NULL, NULL);
+

        if (m_state == stRunning)
                stop();
        if (m_state == stRunning)
                stop();

-       
+

        if (m_stream_tags)
                gst_tag_list_free(m_stream_tags);
        
        if (m_stream_tags)
                gst_tag_list_free(m_stream_tags);
        


@@ -354,7 +373,7 @@ eServiceMP3::~eServiceMP3()
        }
 }
 
        }
 }
 

-DEFINE_REF(eServiceMP3);       
+DEFINE_REF(eServiceMP3);

 
 RESULT eServiceMP3::connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)
 {
 
 RESULT eServiceMP3::connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)
 {


@@ -365,25 +384,30 @@ RESULT eServiceMP3::connectEvent(const Slot2<void,iPlayableService*,int> &event,
 RESULT eServiceMP3::start()
 {
        ASSERT(m_state == stIdle);
 RESULT eServiceMP3::start()
 {
        ASSERT(m_state == stIdle);

-       
+

        m_state = stRunning;
        if (m_gst_playbin)
        {
                eDebug("eServiceMP3::starting pipeline");
                gst_element_set_state (m_gst_playbin, GST_STATE_PLAYING);
        }
        m_state = stRunning;
        if (m_gst_playbin)
        {
                eDebug("eServiceMP3::starting pipeline");
                gst_element_set_state (m_gst_playbin, GST_STATE_PLAYING);
        }

+

        m_event(this, evStart);
        m_event(this, evStart);

+

        return 0;
 }
 
 RESULT eServiceMP3::stop()
 {
        ASSERT(m_state != stIdle);
        return 0;
 }
 
 RESULT eServiceMP3::stop()
 {
        ASSERT(m_state != stIdle);

+

        if (m_state == stStopped)
                return -1;
        if (m_state == stStopped)
                return -1;

+

        eDebug("eServiceMP3::stop %s", m_ref.path.c_str());
        gst_element_set_state(m_gst_playbin, GST_STATE_NULL);
        m_state = stStopped;
        eDebug("eServiceMP3::stop %s", m_ref.path.c_str());
        gst_element_set_state(m_gst_playbin, GST_STATE_NULL);
        m_state = stStopped;

+

        return 0;
 }
 
        return 0;
 }
 


@@ -641,7 +665,6 @@ RESULT eServiceMP3::getName(std::string &name)
        return 0;
 }
 
        return 0;
 }
 

-

 int eServiceMP3::getInfo(int w)
 {
        const gchar *tag = 0;
 int eServiceMP3::getInfo(int w)
 {
        const gchar *tag = 0;


@@ -937,6 +960,12 @@ RESULT eServiceMP3::subtitle(ePtr<iSubtitleOutput> &ptr)
        return 0;
 }
 
        return 0;
 }
 

+RESULT eServiceMP3::audioDelay(ePtr<iAudioDelay> &ptr)
+{
+       ptr = this;
+       return 0;
+}
+

 int eServiceMP3::getNumberOfTracks()
 {
        return m_audioStreams.size();
 int eServiceMP3::getNumberOfTracks()
 {
        return m_audioStreams.size();


@@ -944,6 +973,8 @@ int eServiceMP3::getNumberOfTracks()
 
 int eServiceMP3::getCurrentTrack()
 {
 
 int eServiceMP3::getCurrentTrack()
 {

+       if (m_currentAudioStream == -1)
+               g_object_get (G_OBJECT (m_gst_playbin), "current-audio", &m_currentAudioStream, NULL);

        return m_currentAudioStream;
 }
 
        return m_currentAudioStream;
 }
 


@@ -1073,6 +1104,8 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
                                                g_object_set (G_OBJECT (sink), "emit-signals", TRUE, NULL);
                                                gst_object_unref(sink);
                                        }
                                                g_object_set (G_OBJECT (sink), "emit-signals", TRUE, NULL);
                                                gst_object_unref(sink);
                                        }

+                                       setAC3Delay(ac3_delay);
+                                       setPCMDelay(pcm_delay);

                                }       break;
                                case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
                                {
                                }       break;
                                case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
                                {


@@ -1559,6 +1592,75 @@ int eServiceMP3::setBufferSize(int size)
        return 0;
 }
 
        return 0;
 }
 

+int eServiceMP3::getAC3Delay()
+{
+       return ac3_delay;
+}
+
+int eServiceMP3::getPCMDelay()
+{
+       return pcm_delay;
+}
+
+void eServiceMP3::setAC3Delay(int delay)
+{
+       if (!m_gst_playbin || m_state != stRunning)
+               return;
+       else
+       {
+               GstElement *sink;
+               std::string config_delay;
+               int config_delay_int = delay;
+               if(ePythonConfigQuery::getConfigValue("config.av.generalAC3delay", config_delay) == 0)
+                       config_delay_int += atoi(config_delay.c_str());
+
+               g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &sink, NULL);
+
+               if (!sink)
+                       return;
+               else {
+                       gchar *name = gst_element_get_name(sink);
+
+                       if (strstr(name, "dvbaudiosink"))
+                               eTSMPEGDecoder::setHwAC3Delay(config_delay_int);
+                       g_free(name);
+                       gst_object_unref(sink);
+               }
+       }
+}
+
+void eServiceMP3::setPCMDelay(int delay)
+{
+       if (!m_gst_playbin || m_state != stRunning)
+               return;
+       else
+       {
+               GstElement *sink;
+               std::string config_delay;
+               int config_delay_int = delay;
+               if(ePythonConfigQuery::getConfigValue("config.av.generalPCMdelay", config_delay) == 0)
+                       config_delay_int += atoi(config_delay.c_str());
+
+               g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &sink, NULL);
+
+               if (!sink)
+                       return;
+               else {
+                       gchar *name = gst_element_get_name(sink);
+
+                       if (strstr(name, "dvbaudiosink"))
+                               eTSMPEGDecoder::setHwPCMDelay(config_delay_int);
+                       else {
+                               // this is realy untested..and not used yet
+                               gint64 offset = config_delay_int;
+                               offset *= 1000000; // milli to nano
+                               g_object_set (G_OBJECT (m_gst_playbin), "ts-offset", offset, NULL);
+                       }
+                       g_free(name);
+                       gst_object_unref(sink);
+               }
+       }
+}

 
 #else
 #warning gstreamer not available, not building media player
 
 #else
 #warning gstreamer not available, not building media player