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
ed294e59
Commit
ed294e59
authored
Jun 29, 2018
by
Val Doroshchuk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test
parent
24638fbb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
src/gstreamerextras/playback/qgstreamermediaplayer.cpp
src/gstreamerextras/playback/qgstreamermediaplayer.cpp
+1
-3
tests/auto/integration/qml/player/tst_player.qml
tests/auto/integration/qml/player/tst_player.qml
+3
-1
No files found.
src/gstreamerextras/playback/qgstreamermediaplayer.cpp
View file @
ed294e59
...
...
@@ -39,10 +39,7 @@
#include "qgstreamermediaplayer.h"
#include <private/qgstreamervideorenderer_p.h>
#include <private/qgstreamerplayercontrol_p.h>
#include <private/qgstreamerplayersession_p.h>
#include <private/qgstvideorenderersink_p.h>
#include <QPointer>
#include <QMediaService>
#include <QtMultimedia/qmediametadata.h>
...
...
@@ -310,6 +307,7 @@ void QGstreamerMediaPlayer::setMediaObject(QMediaObject *src)
connect
(
d
->
session
,
&
QGstreamerPlayerSession
::
rendererChanged
,
[
d
](
QGstreamerVideoRendererInterface
*
r
)
{
d
->
renderer
=
static_cast
<
QGstreamerVideoRenderer
*>
(
r
);
// Set pipeline when surface is ready.
d
->
updatePipeline
();
});
...
...
tests/auto/integration/qml/player/tst_player.qml
View file @
ed294e59
...
...
@@ -173,10 +173,12 @@ Item {
function
test_setTextStream
()
{
spyTextStream
.
clear
()
control
.
textStream
=
0
compare
(
control
.
textStream
,
0
)
compare
(
spyTextStream
.
count
,
1
)
control
.
textStream
=
1
compare
(
control
.
textStream
,
1
)
compare
(
spyTextStream
.
count
,
1
)
compare
(
spyTextStream
.
count
,
2
)
}
function
test_textStreamProperties
()
{
...
...
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