Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
73ac0e72
Commit
73ac0e72
authored
Oct 15, 2014
by
François Grisez
Browse files
Fix a bug concerning the state getter of MSMediaPlayer
parent
f6d3d86b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
src/voip/msmediaplayer.c
src/voip/msmediaplayer.c
+1
-1
tester/mediastreamer2_player_tester.c
tester/mediastreamer2_player_tester.c
+6
-0
No files found.
src/voip/msmediaplayer.c
View file @
73ac0e72
...
...
@@ -221,7 +221,7 @@ MSPlayerState ms_media_player_get_state(MSMediaPlayer *obj) {
ms_filter_call_method
(
obj
->
player
,
MS_PLAYER_GET_STATE
,
&
state
);
return
state
;
}
else
{
return
MS
_PLAYER_CLOSE
;
return
MS
PlayerClosed
;
}
}
...
...
tester/mediastreamer2_player_tester.c
View file @
73ac0e72
...
...
@@ -74,21 +74,26 @@ static void play_file(const char *filepath, bool_t unsupported_format, bool_t se
CU_ASSERT_PTR_NOT_NULL
(
file_player
);
if
(
file_player
==
NULL
)
return
;
CU_ASSERT_EQUAL
(
ms_media_player_get_state
(
file_player
),
MSPlayerClosed
);
ms_media_player_set_eof_callback
(
file_player
,
eof_callback
,
&
eof
);
succeed
=
ms_media_player_open
(
file_player
,
filepath
);
if
(
unsupported_format
)
{
CU_ASSERT_FALSE
(
succeed
);
CU_ASSERT_EQUAL
(
ms_media_player_get_state
(
file_player
),
MSPlayerClosed
);
}
else
{
CU_ASSERT_TRUE
(
succeed
);
CU_ASSERT_EQUAL
(
ms_media_player_get_state
(
file_player
),
MSPlayerPaused
);
}
if
(
!
succeed
)
{
ms_media_player_free
(
file_player
);
return
;
}
succeed
=
ms_media_player_start
(
file_player
);
CU_ASSERT_TRUE
(
succeed
);
CU_ASSERT_EQUAL
(
ms_media_player_get_state
(
file_player
),
MSPlayerPlaying
);
if
(
seeking_test
)
{
CU_ASSERT_TRUE
(
ms_media_player_seek
(
file_player
,
5000
));
...
...
@@ -99,6 +104,7 @@ static void play_file(const char *filepath, bool_t unsupported_format, bool_t se
}
ms_media_player_close
(
file_player
);
CU_ASSERT_EQUAL
(
ms_media_player_get_state
(
file_player
),
MSPlayerClosed
);
ms_media_player_free
(
file_player
);
CU_ASSERT_TRUE
(
eof
.
eof
);
}
...
...
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