summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPiotr Srebrny <piotr.srebrny@qt.io>2022-12-02 13:51:17 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-12-02 14:49:13 +0000
commit6431ea03e0fc0cbf97028dc3bd1915d603e9c166 (patch)
tree63042e9caaff0602fbaadbe9c47965d62430f260 /src
parent851bfde3d40f9d42a97b7636403e1bcc38bbc5d7 (diff)
Remove unncessary checks as playbin is never null
QGstreamerAudioDecoder constructor receives not null playbin, thus it will never be null. Change-Id: Idd1e8f0840cdc7736b3724f1706c76663ffa46c0 Reviewed-by: Lars Knoll <lars@knoll.priv.no> (cherry picked from commit fe1ede7ce059c91404e348ee2cbbf70dc6f3afd2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/multimedia/gstreamer/audio/qgstreameraudiodecoder.cpp19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/plugins/multimedia/gstreamer/audio/qgstreameraudiodecoder.cpp b/src/plugins/multimedia/gstreamer/audio/qgstreameraudiodecoder.cpp
index 1bf4c2021..2c8a27969 100644
--- a/src/plugins/multimedia/gstreamer/audio/qgstreameraudiodecoder.cpp
+++ b/src/plugins/multimedia/gstreamer/audio/qgstreameraudiodecoder.cpp
@@ -70,9 +70,6 @@ QGstreamerAudioDecoder::QGstreamerAudioDecoder(QAudioDecoder *parent)
QGstreamerAudioDecoder::~QGstreamerAudioDecoder()
{
- if (m_playbin.isNull())
- return;
-
stop();
#if QT_CONFIG(gstreamer_app)
@@ -269,11 +266,6 @@ void QGstreamerAudioDecoder::setSourceDevice(QIODevice *device)
void QGstreamerAudioDecoder::start()
{
- if (m_playbin.isNull()) {
- processInvalidMedia(QAudioDecoder::ResourceError, QLatin1String("Playbin element is not valid"));
- return;
- }
-
addAppSink();
if (!mSource.isEmpty()) {
@@ -315,9 +307,6 @@ void QGstreamerAudioDecoder::start()
void QGstreamerAudioDecoder::stop()
{
- if (m_playbin.isNull())
- return;
-
m_playbin.setState(GST_STATE_NULL);
removeAppSink();
@@ -444,9 +433,6 @@ GstFlowReturn QGstreamerAudioDecoder::new_sample(GstAppSink *, gpointer user_dat
void QGstreamerAudioDecoder::setAudioFlags(bool wantNativeAudio)
{
- if (m_playbin.isNull())
- return;
-
int flags = m_playbin.getInt("flags");
// make sure not to use GST_PLAY_FLAG_NATIVE_AUDIO unless desired
// it prevents audio format conversion
@@ -488,10 +474,7 @@ void QGstreamerAudioDecoder::removeAppSink()
void QGstreamerAudioDecoder::updateDuration()
{
- int duration = -1;
-
- if (!m_playbin.isNull())
- duration = m_playbin.duration() / 1000000;
+ int duration = m_playbin.duration() / 1000000;
if (m_duration != duration) {
m_duration = duration;