extensions.push_back("mp4");
extensions.push_back("mov");
extensions.push_back("m4a");
+ extensions.push_back("flv");
+ extensions.push_back("3gp");
+ extensions.push_back("3g2");
+ extensions.push_back("dts");
+ extensions.push_back("wmv");
+ extensions.push_back("asf");
+ extensions.push_back("wma");
sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
}
m_errorInfo.missing_codec = "";
//vuplus
m_is_hls_stream = 0;
+ audioSink = videoSink = NULL;
CONNECT(m_seekTimeout->timeout, eServiceMP3::seekTimeoutCB);
CONNECT(m_subtitle_sync_timer->timeout, eServiceMP3::pushSubtitles);
uri = g_filename_to_uri(filename, NULL, NULL);
- eDebug("eServiceMP3::playbin2 uri=%s", uri);
+ //eDebug("eServiceMP3::playbin2 uri=%s", uri);
+ eDebug("eServiceMP3::playbin2");
m_gst_playbin = gst_element_factory_make("playbin2", "playbin");
if (!m_gst_playbin)
if (m_stream_tags)
gst_tag_list_free(m_stream_tags);
+
+ if (audioSink)
+ {
+ gst_object_unref(GST_OBJECT(audioSink));
+ audioSink = NULL;
+ }
+ if (videoSink)
+ {
+ gst_object_unref(GST_OBJECT(videoSink));
+ videoSink = NULL;
+ }
if (m_gst_playbin)
{
//GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN(m_gst_playbin),GST_DEBUG_GRAPH_SHOW_ALL,"e2-playbin");
- eDebug("eServiceMP3::stop %s", m_ref.path.c_str());
+ //eDebug("eServiceMP3::stop %s", m_ref.path.c_str());
+ eDebug("eServiceMP3::stop service..");
gst_element_set_state(m_gst_playbin, GST_STATE_NULL);
m_state = stStopped;
{
GstFormat fmt = GST_FORMAT_TIME;
gint64 pos;
- GstElement *sink;
pts = 0;
if (!m_gst_playbin)
if (m_state != stRunning)
return -1;
- 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);
-
- if (!sink)
- return -1;
-
- gchar *name = gst_element_get_name(sink);
- gboolean use_get_decoder_time = strstr(name, "dvbaudiosink") || strstr(name, "dvbvideosink");
- g_free(name);
-
- if (use_get_decoder_time)
- g_signal_emit_by_name(sink, "get-decoder-time", &pos);
-
- gst_object_unref(sink);
-
- if (!use_get_decoder_time && !gst_element_query_position(m_gst_playbin, &fmt, &pos)) {
- eDebug("gst_element_query_position failed in getPlayPosition");
- return -1;
+ if (audioSink || videoSink)
+ {
+ g_signal_emit_by_name(audioSink ? audioSink : videoSink, "get-decoder-time", &pos);
+ if (!GST_CLOCK_TIME_IS_VALID(pos))
+ return -1;
+ }
+ else
+ {
+ if(!gst_element_query_position(m_gst_playbin, &fmt, &pos))
+ {
+ eDebug("gst_element_query_position failed in getPlayPosition");
+ return -1;
+ }
}
/* pos is in nanoseconds. we have 90 000 pts per second. */
return 0;
if (m_state != stRunning)
return 0;
- if (m_sourceinfo.is_streaming)
- return 0;
g_object_get (G_OBJECT (m_gst_playbin), "video-sink", &sink, NULL);
subtype_t type = stUnknown;
GstCaps* caps = gst_pad_get_negotiated_caps(pad);
+ if (!caps && !g_codec)
+ {
+ caps = gst_pad_get_allowed_caps(pad);
+ }
+
if ( caps )
{
GstStructure* str = gst_caps_get_structure(caps, 0);
return type;
}
+gint eServiceMP3::match_sinktype(GstElement *element, gpointer type)
+{
+ return strcmp(g_type_name(G_OBJECT_TYPE(element)), (const char*)type);
+}
+
void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
{
if (!msg)
} break;
case GST_STATE_CHANGE_READY_TO_PAUSED:
{
+ GstIterator *children;
GstElement *appsink = gst_bin_get_by_name(GST_BIN(m_gst_playbin), "subtitle_sink");
if (appsink)
{
eDebug("eServiceMP3::appsink properties set!");
gst_object_unref(appsink);
}
+
+ if (audioSink)
+ {
+ gst_object_unref(GST_OBJECT(audioSink));
+ audioSink = NULL;
+ }
+ if (videoSink)
+ {
+ gst_object_unref(GST_OBJECT(videoSink));
+ videoSink = NULL;
+ }
+
+ children = gst_bin_iterate_recurse(GST_BIN(m_gst_playbin));
+ audioSink = GST_ELEMENT_CAST(gst_iterator_find_custom(children, (GCompareFunc)match_sinktype, (gpointer)"GstDVBAudioSink"));
+ gst_iterator_free(children);
+
+ children = gst_bin_iterate_recurse(GST_BIN(m_gst_playbin));
+ videoSink = GST_ELEMENT_CAST(gst_iterator_find_custom(children, (GCompareFunc)match_sinktype, (gpointer)"GstDVBVideoSink"));
+ gst_iterator_free(children);
+
setAC3Delay(ac3_delay);
setPCMDelay(pcm_delay);
} break;
} break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
{
+ if (audioSink)
+ {
+ gst_object_unref(GST_OBJECT(audioSink));
+ audioSink = NULL;
+ }
+ if (videoSink)
+ {
+ gst_object_unref(GST_OBJECT(videoSink));
+ videoSink = NULL;
+ }
} break;
case GST_STATE_CHANGE_READY_TO_NULL:
{
GError *err;
gst_message_parse_error (msg, &err, &debug);
g_free (debug);
- eWarning("Gstreamer error: %s (%i) from %s", err->message, err->code, sourceName );
+ eWarning("Gstreamer error: %s (domain:%i, code:%i) from %s", err->message, err->domain, err->code, sourceName );
if ( err->domain == GST_STREAM_ERROR )
{
if ( err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND )
m_event((iPlayableService*)this, evUser+10);
}
}
+ else //if( err->domain == 1232 )
+ {
+ if ( err->code == 5 )
+ m_event((iPlayableService*)this, evUser+20);
+ }
g_error_free(err);
break;
}
{
if ( gst_is_missing_plugin_message(msg) )
{
- GstCaps *caps;
- gst_structure_get (msgstruct, "detail", GST_TYPE_CAPS, &caps, NULL);
- std::string codec = (const char*) gst_caps_to_string(caps);
- gchar *description = gst_missing_plugin_message_get_description(msg);
- if ( description )
+ GstCaps *caps= NULL;
+ gboolean ret = gst_structure_get (msgstruct, "detail", GST_TYPE_CAPS, &caps, NULL);
+ if (ret)
{
- eDebug("eServiceMP3::m_errorInfo.missing_codec = %s", codec.c_str());
- m_errorInfo.error_message = "GStreamer plugin " + (std::string)description + " not available!\n";
- m_errorInfo.missing_codec = codec.substr(0,(codec.find_first_of(',')));
- g_free(description);
+ std::string codec = (const char*) gst_caps_to_string(caps);
+ gchar *description = gst_missing_plugin_message_get_description(msg);
+ if ( description )
+ {
+ eDebug("eServiceMP3::m_errorInfo.missing_codec = %s", codec.c_str());
+ m_errorInfo.error_message = "GStreamer plugin " + (std::string)description + " not available!\n";
+ m_errorInfo.missing_codec = codec.substr(0,(codec.find_first_of(',')));
+ g_free(description);
+ }
+ gst_caps_unref(caps);
}
- gst_caps_unref(caps);
}
else
{
return;
else
{
- GstElement *sink;
int config_delay_int = delay;
- g_object_get (G_OBJECT (m_gst_playbin), "video-sink", &sink, NULL);
-
- if (sink)
+ if (videoSink)
{
std::string config_delay;
if(ePythonConfigQuery::getConfigValue("config.av.generalAC3delay", config_delay) == 0)
config_delay_int += atoi(config_delay.c_str());
- gst_object_unref(sink);
}
else
{
config_delay_int = 0;
}
- g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &sink, NULL);
-
- if (sink)
+ if (audioSink)
{
- gchar *name = gst_element_get_name(sink);
- if (strstr(name, "dvbaudiosink"))
- eTSMPEGDecoder::setHwAC3Delay(config_delay_int);
- g_free(name);
- gst_object_unref(sink);
+ eTSMPEGDecoder::setHwAC3Delay(config_delay_int);
}
}
}
return;
else
{
- GstElement *sink;
int config_delay_int = delay;
- g_object_get (G_OBJECT (m_gst_playbin), "video-sink", &sink, NULL);
-
- if (sink)
+ if (videoSink)
{
std::string config_delay;
if(ePythonConfigQuery::getConfigValue("config.av.generalPCMdelay", config_delay) == 0)
config_delay_int += atoi(config_delay.c_str());
- gst_object_unref(sink);
}
else
{
config_delay_int = 0;
}
- g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &sink, NULL);
-
- if (sink)
+ if (audioSink)
{
- 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);
+ eTSMPEGDecoder::setHwPCMDelay(config_delay_int);
}
}
}
projects / vuplus_dvbapp / blobdiff