FCL/sf/mw/qtextensions: comparison qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp

equal deleted inserted replaced

-:2b40d63a9c3d
+:90517678cc4f
 #endif
 QGstreamerPlayerSession::QGstreamerPlayerSession(QObject *parent)
 :QObject(parent),
 m_state(QMediaPlayer::StoppedState),
-m_mediaStatus(QMediaPlayer::UnknownMediaStatus),
 m_busHelper(0),
 m_playbin(0),
 m_nullVideoOutput(0),
 m_bus(0),
 m_renderer(0),
 m_busHelper = new QGstreamerBusHelper(m_bus, this);
 connect(m_busHelper, SIGNAL(message(QGstreamerMessage)), SLOT(busMessage(QGstreamerMessage)));
 m_busHelper->installSyncEventFilter(this);
 m_nullVideoOutput = gst_element_factory_make("fakesink", NULL);
+gst_object_ref(GST_OBJECT(m_nullVideoOutput));
 g_object_set(G_OBJECT(m_playbin), "video-sink", m_nullVideoOutput, NULL);
 // Initial volume
 double volume = 1.0;
 g_object_get(G_OBJECT(m_playbin), "volume", &volume, NULL);
 stop();
 delete m_busHelper;
 gst_object_unref(GST_OBJECT(m_bus));
 gst_object_unref(GST_OBJECT(m_playbin));
+gst_object_unref(GST_OBJECT(m_nullVideoOutput));
 }
 }
 void QGstreamerPlayerSession::load(const QUrl &url)
 {
 m_url = url;
 if (m_playbin) {
 m_tags.clear();
 emit tagsChanged();
-g_object_set(G_OBJECT(m_playbin), "uri", m_url.toString().toLocal8Bit().constData(), NULL);
+g_object_set(G_OBJECT(m_playbin), "uri", m_url.toEncoded().constData(), NULL);
 if (!m_streamTypes.isEmpty()) {
 m_streamProperties.clear();
 m_streamTypes.clear();
 bool QGstreamerPlayerSession::isSeekable() const
 {
 return m_seekable;
 }
-void QGstreamerPlayerSession::play()
+bool QGstreamerPlayerSession::play()
 {
 if (m_playbin) {
 if (gst_element_set_state(m_playbin, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) {
 qWarning() << "GStreamer; Unable to play -" << m_url.toString();
+m_state = QMediaPlayer::StoppedState;
+emit stateChanged(m_state);
+emit error(int(QMediaPlayer::ResourceError), tr("Unable to play %1").arg(m_url.path()));
+} else
+return true;
+}
+return false;
+}
+bool QGstreamerPlayerSession::pause()
+{
+if (m_playbin) {
+if (gst_element_set_state(m_playbin, GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE) {
+qWarning() << "GStreamer; Unable to play -" << m_url.toString();
 m_state = QMediaPlayer::StoppedState;
-m_mediaStatus = QMediaPlayer::InvalidMedia;
 emit stateChanged(m_state);
-emit mediaStatusChanged(m_mediaStatus);
+emit error(int(QMediaPlayer::ResourceError), tr("Unable to play %1").arg(m_url.path()));
-}
+} else
-}
+return true;
 }
-void QGstreamerPlayerSession::pause()
+return false;
-{
-if (m_playbin)
-gst_element_set_state(m_playbin, GST_STATE_PAUSED);
 }
 void QGstreamerPlayerSession::stop()
 {
 if (m_playbin) {
 if (m_state != QMediaPlayer::StoppedState)
 emit stateChanged(m_state = QMediaPlayer::StoppedState);
 }
 }
-void QGstreamerPlayerSession::seek(qint64 ms)
+bool QGstreamerPlayerSession::seek(qint64 ms)
 {
 if (m_playbin && m_state != QMediaPlayer::StoppedState) {
 gint64  position = (gint64)ms * 1000000;
-gst_element_seek_simple(m_playbin, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, position);
+return gst_element_seek_simple(m_playbin, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, position);
 }
+return false;
 }
 void QGstreamerPlayerSession::setVolume(int volume)
 {
-m_volume = volume;
+if (m_volume != volume) {
-emit volumeChanged(m_volume);
+m_volume = volume;
-if (!m_muted && m_playbin)
+if (m_playbin) {
-g_object_set(G_OBJECT(m_playbin), "volume", m_volume/100.0, NULL);
+#ifndef USE_PLAYBIN2
+if(!m_muted)
+#endif
+g_object_set(G_OBJECT(m_playbin), "volume", m_volume/100.0, NULL);
+}
+emit volumeChanged(m_volume);
+}
 }
 void QGstreamerPlayerSession::setMuted(bool muted)
 {
-m_muted = muted;
+if (m_muted != muted) {
+m_muted = muted;
-g_object_set(G_OBJECT(m_playbin), "volume", (m_muted ? 0 : m_volume/100.0), NULL);
+#ifdef USE_PLAYBIN2
-emit mutedStateChanged(m_muted);
+g_object_set(G_OBJECT(m_playbin), "mute", m_muted, NULL);
+#else
+g_object_set(G_OBJECT(m_playbin), "volume", (m_muted ? 0 : m_volume/100.0), NULL);
+#endif
+emit mutedStateChanged(m_muted);
+}
 }
 static void addTagToMap(const GstTagList *list,
 const gchar *tag,
 gpointer user_data)
 m_seekable = seekable;
 emit seekableChanged(m_seekable);
 }
 }
-void QGstreamerPlayerSession::setMediaStatus(QMediaPlayer::MediaStatus status)
-{
-if (m_mediaStatus != status) {
-m_mediaStatus = status;
-emit mediaStatusChanged(status);
-}
-}
 bool QGstreamerPlayerSession::processSyncMessage(const QGstreamerMessage &message)
 {
 GstMessage* gm = message.rawMessage();
 if (gm &&
 if (newPos/1000 != m_lastPosition) {
 m_lastPosition = newPos/1000;
 emit positionChanged(newPos);
 }
+double volume = 1.0;
+g_object_get(G_OBJECT(m_playbin), "volume", &volume, NULL);
+if (m_volume != int(volume*100)) {
+m_volume = int(volume*100);
+emit volumeChanged(m_volume);
+}
 } else {
 //tag message comes from elements inside playbin, not from playbin itself
 if (GST_MESSAGE_TYPE(gm) == GST_MESSAGE_TAG) {
 //qDebug() << "tag message";
 GstTagList *tag_list;
 emit tagsChanged();
 }
 if (GST_MESSAGE_SRC(gm) == GST_OBJECT_CAST(m_playbin)) {
 switch (GST_MESSAGE_TYPE(gm))  {
-case GST_MESSAGE_DURATION:
-break;
 case GST_MESSAGE_STATE_CHANGED:
 {
 GstState    oldState;
 GstState    newState;
 GstState    pending;
 .arg(states[pending]);*/
 switch (newState) {
 case GST_STATE_VOID_PENDING:
 case GST_STATE_NULL:
-setMediaStatus(QMediaPlayer::UnknownMediaStatus);
 setSeekable(false);
 if (m_state != QMediaPlayer::StoppedState)
 emit stateChanged(m_state = QMediaPlayer::StoppedState);
 break;
 case GST_STATE_READY:
-setMediaStatus(QMediaPlayer::LoadedMedia);
 setSeekable(false);
 if (m_state != QMediaPlayer::StoppedState)
 emit stateChanged(m_state = QMediaPlayer::StoppedState);
 break;
 case GST_STATE_PAUSED:
-//don't emit state changes for intermediate states
+if (m_state != QMediaPlayer::PausedState)
-if (m_state != QMediaPlayer::PausedState && pending == GST_STATE_VOID_PENDING)
 emit stateChanged(m_state = QMediaPlayer::PausedState);
-setMediaStatus(QMediaPlayer::LoadedMedia);
 //check for seekable
 if (oldState == GST_STATE_READY) {
 /*
 //gst_element_seek_simple doesn't work reliably here, have to find a better solution
 if (oldState == GST_STATE_PAUSED)
 getStreamsInfo();
 if (m_state != QMediaPlayer::PlayingState)
 emit stateChanged(m_state = QMediaPlayer::PlayingState);
 break;
 }
 }
 break;
 case GST_MESSAGE_EOS:
-if (m_state != QMediaPlayer::StoppedState)
-emit stateChanged(m_state = QMediaPlayer::StoppedState);
-setMediaStatus(QMediaPlayer::EndOfMedia);
 emit playbackFinished();
 break;
 case GST_MESSAGE_TAG:
 case GST_MESSAGE_STREAM_STATUS:
 case GST_MESSAGE_UNKNOWN:
+break;
 case GST_MESSAGE_ERROR:
+{
+GError *err;
+gchar *debug;
+gst_message_parse_error (gm, &err, &debug);
+emit error(int(QMediaPlayer::ResourceError), QString::fromUtf8(err->message));
+qWarning() << "Error:" << QString::fromUtf8(err->message);
+g_error_free (err);
+g_free (debug);
+}
+break;
 case GST_MESSAGE_WARNING:
 case GST_MESSAGE_INFO:
 break;
 case GST_MESSAGE_BUFFERING:
-setMediaStatus(QMediaPlayer::BufferingMedia);
+{
+int progress = 0;
+gst_message_parse_buffering(gm, &progress);
+emit bufferingProgressChanged(progress);
+}
 break;
 case GST_MESSAGE_STATE_DIRTY:
 case GST_MESSAGE_STEP_DONE:
 case GST_MESSAGE_CLOCK_PROVIDE:
 case GST_MESSAGE_CLOCK_LOST:
 case GST_MESSAGE_NEW_CLOCK:
 case GST_MESSAGE_STRUCTURE_CHANGE:
 case GST_MESSAGE_APPLICATION:
 case GST_MESSAGE_ELEMENT:
+break;
 case GST_MESSAGE_SEGMENT_START:
+{
+const GstStructure *structure = gst_message_get_structure(gm);
+qint64 position = g_value_get_int64(gst_structure_get_value(structure, "position"));
+position /= 1000000;
+m_lastPosition = position;
+emit positionChanged(position);
+}
+break;
 case GST_MESSAGE_SEGMENT_DONE:
+break;
+case GST_MESSAGE_DURATION:
+{
+GstFormat   format = GST_FORMAT_TIME;
+gint64      duration = 0;
+if (gst_element_query_duration(m_playbin, &format, &duration)) {
+int newDuration = duration / 1000000;
+if (m_duration != newDuration) {
+m_duration = newDuration;
+emit durationChanged(m_duration);
+}
+}
+}
+break;
 case GST_MESSAGE_LATENCY:
 #if (GST_VERSION_MAJOR >= 0) &&  (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 13)
 case GST_MESSAGE_ASYNC_START:
 case GST_MESSAGE_ASYNC_DONE:
 #if GST_VERSION_MICRO >= 23

changeset 4	90517678cc4f
parent 1	2b40d63a9c3d
child 5	453da2cfceef