Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Val Doroshchuk
qtgstreamerextras
Commits
0cec1d54
Commit
0cec1d54
authored
Dec 10, 2018
by
Val Doroshchuk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pipeline
parent
c71e92af
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
13 deletions
+36
-13
src/gstreamerextras/qgstreamerpipeline.cpp
src/gstreamerextras/qgstreamerpipeline.cpp
+26
-6
src/gstreamerextras/qgstreamerpipeline_p.h
src/gstreamerextras/qgstreamerpipeline_p.h
+5
-1
src/gstreamerextras/qgstreamerplaybin.cpp
src/gstreamerextras/qgstreamerplaybin.cpp
+5
-6
No files found.
src/gstreamerextras/qgstreamerpipeline.cpp
View file @
0cec1d54
...
...
@@ -54,6 +54,17 @@ void QGstreamerPipelinePrivate::updateMediaObject()
q
->
setMediaPlayer
(
obj
);
}
void
QGstreamerPipelinePrivate
::
updatePipeline
()
{
Q_Q
(
QGstreamerPipeline
);
auto
renderer
=
session
->
renderer
();
if
(
!
renderer
||
!
renderer
->
isReady
())
return
;
q
->
setPipeline
(
pendingPipelineDesc
);
}
QGstreamerPipeline
::
QGstreamerPipeline
(
QObject
*
parent
)
:
QGstreamerPipeline
(
new
QGstreamerPipelinePrivate
(
this
),
nullptr
,
parent
)
{
...
...
@@ -128,7 +139,10 @@ void QGstreamerPipeline::setMediaPlayer(QMediaPlayer *src)
if
(
!
d
->
session
)
return
;
connect
(
d
->
session
,
&
QGstreamerPlayerSession
::
pipelineChanged
,
this
,
&
QGstreamerPipeline
::
pipelineChanged
);
connect
(
d
->
session
,
&
QGstreamerPlayerSession
::
pipelineChanged
,
this
,
&
QGstreamerPipeline
::
pipelineChanged
);
connect
(
d
->
session
,
&
QGstreamerPlayerSession
::
rendererIsReady
,
d
,
&
QGstreamerPipelinePrivate
::
updatePipeline
);
d
->
mediaPlayer
=
src
;
emit
mediaPlayerChanged
();
...
...
@@ -136,18 +150,24 @@ void QGstreamerPipeline::setMediaPlayer(QMediaPlayer *src)
QString
QGstreamerPipeline
::
pipeline
()
const
{
return
d_func
()
->
pipeline
;
return
d_func
()
->
pipeline
Desc
;
}
void
QGstreamerPipeline
::
setPipeline
(
const
QString
&
desc
)
{
Q_D
(
QGstreamerPipeline
);
d
->
pipeline
=
desc
;
if
(
d
->
mediaPlayer
)
{
QString
pl
=
QLatin1String
(
"gst-pipeline:"
)
+
desc
;
d
->
pendingPipelineDesc
=
desc
;
if
(
!
d
->
mediaPlayer
||
d
->
pipelineDesc
==
desc
)
return
;
QString
pl
=
QLatin1String
(
"gst-pipeline:"
)
+
desc
;
if
(
d
->
source
)
d
->
source
->
setProperty
(
"source"
,
QVariant
::
fromValue
<
QUrl
>
(
QUrl
(
pl
)));
else
d
->
mediaPlayer
->
setMedia
(
QMediaContent
(
pl
));
}
d
->
pipelineDesc
=
d
->
pendingPipelineDesc
;
d
->
pendingPipelineDesc
.
clear
();
}
template
<
class
T
>
...
...
src/gstreamerextras/qgstreamerpipeline_p.h
View file @
0cec1d54
...
...
@@ -70,11 +70,15 @@ public:
public
Q_SLOTS
:
void
updateMediaObject
();
private
Q_SLOTS
:
void
updatePipeline
();
protected:
QPointer
<
QObject
>
source
;
QPointer
<
QMediaPlayer
>
mediaPlayer
;
QGstreamerPlayerSession
*
session
=
nullptr
;
QString
pipeline
;
QString
pipelineDesc
;
QString
pendingPipelineDesc
;
QGstreamerPipeline
*
q_ptr
=
nullptr
;
};
...
...
src/gstreamerextras/qgstreamerplaybin.cpp
View file @
0cec1d54
...
...
@@ -69,7 +69,7 @@ public:
public
Q_SLOTS
:
void
streamsChanged
();
void
updateP
ipel
in
e
();
void
updateP
layb
in
();
void
mediaPlayerChanged
();
protected:
...
...
@@ -106,9 +106,8 @@ void QGstreamerPlaybinPrivate::mediaPlayerChanged()
connect
(
session
,
&
QGstreamerPlayerSession
::
streamsChanged
,
this
,
&
QGstreamerPlaybinPrivate
::
streamsChanged
);
// Create pipeline when renderer is ready.
connect
(
session
,
&
QGstreamerPlayerSession
::
rendererIsReady
,
this
,
&
QGstreamerPlaybinPrivate
::
updateP
ipel
in
e
);
this
,
&
QGstreamerPlaybinPrivate
::
updateP
layb
in
);
// In case if these values've been applied
// before mediaObject is available.
...
...
@@ -119,7 +118,7 @@ void QGstreamerPlaybinPrivate::mediaPlayerChanged()
q
->
setVideoStream
(
pendingVideoStream
);
q
->
setTextStream
(
pendingTextStream
);
updateP
ipel
in
e
();
updateP
layb
in
();
}
static
GstElement
*
parseDesc
(
const
QString
&
name
)
...
...
@@ -134,7 +133,7 @@ static GstElement *parseDesc(const QString &name)
return
element
;
}
void
QGstreamerPlaybinPrivate
::
updateP
ipel
in
e
()
void
QGstreamerPlaybinPrivate
::
updateP
layb
in
()
{
Q_Q
(
QGstreamerPlaybin
);
...
...
@@ -272,7 +271,7 @@ void QGstreamerPlaybin::setVideoSink(const QString &desc)
if
(
!
d
->
session
||
d
->
videoSinkDesc
==
desc
)
return
;
d
->
updateP
ipel
in
e
();
d
->
updateP
layb
in
();
}
bool
QGstreamerPlaybin
::
showText
()
const
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment