Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
6a370dcf
Commit
6a370dcf
authored
Nov 04, 2015
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test: fix test_media_preparsed
Don't use libvlc_media_parse and libvlc_media_get_tracks_info (deprecated).
parent
7da16002
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
19 deletions
+36
-19
test/Makefile.am
test/Makefile.am
+1
-1
test/libvlc/media.c
test/libvlc/media.c
+35
-18
No files found.
test/Makefile.am
View file @
6a370dcf
...
...
@@ -66,7 +66,7 @@ test_libvlc_core_LDADD = $(LIBVLC)
test_libvlc_equalizer_SOURCES
=
libvlc/equalizer.c
test_libvlc_equalizer_LDADD
=
$(LIBVLC)
test_libvlc_media_SOURCES
=
libvlc/media.c
test_libvlc_media_LDADD
=
$(LIBVLC)
test_libvlc_media_LDADD
=
$(LIBVLC
CORE)
$(LIBVLC
)
test_libvlc_media_list_player_SOURCES
=
libvlc/media_list_player.c
test_libvlc_media_list_player_LDADD
=
$(LIBVLC)
test_libvlc_media_list_SOURCES
=
libvlc/media_list.c
...
...
test/libvlc/media.c
View file @
6a370dcf
...
...
@@ -23,12 +23,26 @@
#include "test.h"
#include <vlc_common.h>
#include <vlc_threads.h>
struct
test_media_preparsed_sys
{
vlc_mutex_t
lock
;
vlc_cond_t
wait
;
bool
preparsed
;
};
static
void
preparsed_changed
(
const
libvlc_event_t
*
event
,
void
*
user_data
)
{
(
void
)
event
;
int
*
received
=
user_data
;
*
received
=
true
;
struct
test_media_preparsed_sys
*
sys
=
user_data
;
vlc_mutex_lock
(
&
sys
->
lock
);
sys
->
preparsed
=
true
;
vlc_cond_signal
(
&
sys
->
wait
);
vlc_mutex_unlock
(
&
sys
->
lock
);
}
static
void
test_media_preparsed
(
const
char
**
argv
,
int
argc
)
...
...
@@ -44,30 +58,33 @@ static void test_media_preparsed(const char** argv, int argc)
libvlc_media_t
*
media
=
libvlc_media_new_path
(
vlc
,
file
);
assert
(
media
!=
NULL
);
volatile
int
received
=
false
;
struct
test_media_preparsed_sys
preparsed_sys
,
*
sys
=
&
preparsed_sys
;
sys
->
preparsed
=
false
;
vlc_mutex_init
(
&
sys
->
lock
);
vlc_cond_init
(
&
sys
->
wait
);
// Check to see if we are properly receiving the event.
libvlc_event_manager_t
*
em
=
libvlc_media_event_manager
(
media
);
libvlc_event_attach
(
em
,
libvlc_MediaParsedChanged
,
preparsed_changed
,
(
void
*
)
&
received
);
libvlc_event_attach
(
em
,
libvlc_MediaParsedChanged
,
preparsed_changed
,
sys
);
// Parse the media. This is synchronous.
libvlc_media_parse
(
media
);
libvlc_media_parse
_async
(
media
);
// Wait to see if we properly receive preparsed.
while
(
!
received
);
// Wait for preparsed event
vlc_mutex_lock
(
&
sys
->
lock
);
while
(
!
sys
->
preparsed
)
vlc_cond_wait
(
&
sys
->
wait
,
&
sys
->
lock
);
vlc_mutex_unlock
(
&
sys
->
lock
);
// We are good, now check Elementary Stream info.
libvlc_media_track_info_t
*
tracks
=
NULL
;
int
num
=
libvlc_media_get_tracks_info
(
media
,
&
tracks
);
#warning libvlc_media_get_tracks_info is a broken function.
// This is broken.
// assert(num == 1);
if
(
num
!=
1
)
printf
(
"WARNING: libvlc_media_get_tracks_info is not working."
);
if
(
num
>
0
)
free
(
tracks
);
libvlc_media_track_t
**
tracks
;
unsigned
nb_tracks
=
libvlc_media_tracks_get
(
media
,
&
tracks
);
assert
(
nb_tracks
==
1
);
assert
(
tracks
[
0
]
->
i_type
==
libvlc_track_video
);
libvlc_media_tracks_release
(
tracks
,
nb_tracks
);
vlc_mutex_destroy
(
&
sys
->
lock
);
vlc_cond_destroy
(
&
sys
->
wait
);
libvlc_media_release
(
media
);
libvlc_release
(
vlc
);
...
...
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