Castopod
/
kasts
mirror of https://github.com/KDE/kasts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert disabling video on gstreamer 

This was causing audio-only tracks to make gstreamer hang indefinitely.
This commit is contained in:
Bart De Vries 2023-01-18 21:23:41 +01:00
parent 61e88840ca
commit b7c68996eb
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/kmediasession/mediabackends/gstmediabackend.cpp
View File

@ -28,7 +28,6 @@ private:
GstElement *m_audioBin = nullptr; GstElement *m_audioBin = nullptr;
GstElement *m_audioSink = nullptr; GstElement *m_audioSink = nullptr;
GstElement *m_videoBin = nullptr; GstElement *m_videoBin = nullptr;
GstElement *m_videoSink = nullptr;
GstElement *m_scaleTempo = nullptr; GstElement *m_scaleTempo = nullptr;
GstElement *m_audioConvert = nullptr; GstElement *m_audioConvert = nullptr;
GstElement *m_audioResample = nullptr; GstElement *m_audioResample = nullptr;
@ -87,8 +86,7 @@ GstMediaBackend::GstMediaBackend(QObject *parent)
d->m_scaleTempo = gst_element_factory_make("scaletempo", "scale_tempo"); d->m_scaleTempo = gst_element_factory_make("scaletempo", "scale_tempo");
d->m_audioConvert = gst_element_factory_make("audioconvert", "convert"); d->m_audioConvert = gst_element_factory_make("audioconvert", "convert");
d->m_audioSink = gst_element_factory_make("autoaudiosink", "audio_sink"); d->m_audioSink = gst_element_factory_make("autoaudiosink", "audio_sink");
d->m_videoSink = gst_element_factory_make("fakevideosink", "video_sink"); if (!d->m_scaleTempo || !d->m_audioConvert || !d->m_audioSink) {
if (!d->m_scaleTempo || !d->m_audioConvert || !d->m_audioSink || !d->m_videoSink) {
qCDebug(GstMediaBackendLog) << "Not all elements could be created."; qCDebug(GstMediaBackendLog) << "Not all elements could be created.";
} }
@ -105,20 +103,6 @@ GstMediaBackend::GstMediaBackend(QObject *parent)
/* Set playbin's audio sink to be our sink bin */ /* Set playbin's audio sink to be our sink bin */
g_object_set(GST_OBJECT(d->m_pipeline), "audio-sink", d->m_audioBin, nullptr); g_object_set(GST_OBJECT(d->m_pipeline), "audio-sink", d->m_audioBin, nullptr);
/* Create the video sink bin, add the elements and link them */
// TODO: handle video (using fakevideosink currently)
d->m_videoBin = gst_bin_new("video_sink_bin");
gst_bin_add_many(GST_BIN(d->m_audioBin), d->m_videoSink, NULL);
// gst_element_link_many(d->m_videoSink, nullptr); // only needed when > 1 element
GstPad *pad_video = gst_element_get_static_pad(d->m_videoSink, "sink");
GstPad *ghost_pad_video = gst_ghost_pad_new("sink", pad_video);
gst_pad_set_active(ghost_pad_video, TRUE);
gst_element_add_pad(d->m_videoBin, ghost_pad_video);
gst_object_unref(pad_video);
/* Set playbin's audio sink to be our sink bin */
g_object_set(GST_OBJECT(d->m_pipeline), "video-sink", d->m_videoBin, nullptr);
// get bus and connect to get messages sent through callbacks // get bus and connect to get messages sent through callbacks
// TODO: implement fallback in case gmainloop support is not available in qt // TODO: implement fallback in case gmainloop support is not available in qt
d->m_bus = gst_element_get_bus(d->m_pipeline); d->m_bus = gst_element_get_bus(d->m_pipeline);