slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'jb47099' into 'mer-5.6'

Browse Source 
[playback] Emit missing-plugin codec descriptions as QMediaPlayer::FormatErrors. JB#47099

See merge request mer-core/qtmultimedia!32
Change-Id: I9af46f3d04f1ff19ae0615b73a4fec3ab1ee90df
This commit is contained in:
Andrew Branson
2019-12-19 20:26:13 +00:00
committed by Andrew Branson
parent 93ec8cd223 5a7951ad80
commit c0ab4fd8c6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
View File

@@ -46,6 +46,7 @@
#include <gst/gstvalue.h>
#include <gst/base/gstbasesrc.h>
#include <gst/pbutils/missing-plugins.h>
#include <QtMultimedia/qmediametadata.h>
#include <QtCore/qdatetime.h>
@@ -1309,13 +1310,15 @@ bool QGstreamerPlayerSession::processBusMessage(const QGstreamerMessage &message
handlePlaybin2 = true;
}
if (gst_is_missing_plugin_message(gm)) {
emit error(int(QMediaPlayer::FormatError), gst_missing_plugin_message_get_description(gm));
}
if (handlePlaybin2) {
if (GST_MESSAGE_TYPE(gm) == GST_MESSAGE_WARNING) {
GError *err;
gchar *debug;
gst_message_parse_warning(gm, &err, &debug);
if (err->domain == GST_STREAM_ERROR && err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND)
emit error(int(QMediaPlayer::FormatError), tr("Cannot play stream of type: <unknown>"));
// GStreamer shows warning for HTTP playlists
if (!m_isPlaylist)
qWarning() << "Warning:" << QString::fromUtf8(err->message);