[vlc-commits] test: add test_media_subitems
Thomas Guillem
git at videolan.org
Fri Nov 6 08:57:16 CET 2015
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Nov 4 18:14:56 2015 +0100| [e4695f0adfd6514ed00c1f0aac6881de4353b596] | committer: Thomas Guillem
test: add test_media_subitems
Test media subitems when parsing a directory via a path, via a fd and via
various locations.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e4695f0adfd6514ed00c1f0aac6881de4353b596
---
test/libvlc/media.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 142 insertions(+), 1 deletion(-)
diff --git a/test/libvlc/media.c b/test/libvlc/media.c
index aceba84..e6201c5 100644
--- a/test/libvlc/media.c
+++ b/test/libvlc/media.c
@@ -22,8 +22,12 @@
**********************************************************************/
#include "test.h"
+#include "../lib/libvlc_internal.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
-#include <vlc_common.h>
#include <vlc_threads.h>
static void preparsed_changed(const libvlc_event_t *event, void *user_data)
@@ -71,11 +75,148 @@ static void test_media_preparsed(const char** argv, int argc)
libvlc_release (vlc);
}
+#define TEST_SUBITEMS_COUNT 6
+struct
+{
+ const char *file;
+ libvlc_media_type_t type;
+} test_media_subitems_list[TEST_SUBITEMS_COUNT] =
+{
+ { "directory", libvlc_media_type_directory, },
+ { "file.jpg", libvlc_media_type_file },
+ { "file.mkv", libvlc_media_type_file },
+ { "file.mp3", libvlc_media_type_file },
+ { "file.png", libvlc_media_type_file },
+ { "file.ts", libvlc_media_type_file },
+};
+
+static void subitem_tree_added(const libvlc_event_t *event, void *user_data)
+{
+ (void)event;
+ vlc_sem_t *sem = user_data;
+ vlc_sem_post (sem);
+}
+
+static void subitem_added(const libvlc_event_t *event, void *user_data)
+{
+#ifdef _WIN32
+#define FILE_SEPARATOR '\\'
+#else
+#define FILE_SEPARATOR '/'
+#endif
+ bool *subitems_found = user_data;
+ libvlc_media_t *m = event->u.media_subitem_added.new_child;
+ assert (m);
+
+ char *mrl = libvlc_media_get_mrl (m);
+ assert (mrl);
+
+ const char *file = strrchr (mrl, FILE_SEPARATOR);
+ assert (file);
+ file++;
+ log ("subitem_added, file: %s\n", file);
+
+ for (unsigned i = 0; i < TEST_SUBITEMS_COUNT; ++i)
+ {
+ if (strcmp (test_media_subitems_list[i].file, file) == 0)
+ {
+ assert (!subitems_found[i]);
+ assert (libvlc_media_get_type(m) == test_media_subitems_list[i].type);
+ subitems_found[i] = true;
+ }
+ }
+ free (mrl);
+#undef FILE_SEPARATOR
+}
+
+static void test_media_subitems_media(libvlc_media_t *media, bool play)
+{
+ libvlc_media_add_option(media, ":ignore-filetypes= ");
+
+ bool subitems_found[TEST_SUBITEMS_COUNT] = { 0 };
+ vlc_sem_t sem;
+ vlc_sem_init (&sem, 0);
+
+ libvlc_event_manager_t *em = libvlc_media_event_manager (media);
+ libvlc_event_attach (em, libvlc_MediaSubItemTreeAdded, subitem_tree_added, &sem);
+ libvlc_event_attach (em, libvlc_MediaSubItemAdded, subitem_added, subitems_found);
+
+ if (play)
+ {
+ /* XXX: libvlc_media_parse_async won't work with fd, since it won't be
+ * preparsed because fd:// is an unknown type, so play the file to
+ * force parsing. */
+ libvlc_media_player_t *mp = libvlc_media_player_new_from_media (media);
+ assert (mp);
+ assert (libvlc_media_player_play (mp) != -1);
+ vlc_sem_wait (&sem);
+ libvlc_media_player_release (mp);
+ }
+ else
+ {
+ libvlc_media_parse_async (media);
+ vlc_sem_wait (&sem);
+ }
+
+ vlc_sem_destroy (&sem);
+
+ for (unsigned i = 0; i < TEST_SUBITEMS_COUNT; ++i)
+ {
+ log ("test if %s was added\n", test_media_subitems_list[i].file);
+ assert (subitems_found[i]);
+ }
+}
+
+static void test_media_subitems(const char** argv, int argc)
+{
+ const char *subitems_path = SRCDIR"/samples/subitems";
+
+ libvlc_instance_t *vlc = libvlc_new (argc, argv);
+ assert (vlc != NULL);
+ libvlc_media_t *media;
+
+ log ("Testing media_subitems: path: '%s'\n", subitems_path);
+ media = libvlc_media_new_path (vlc, subitems_path);
+ assert (media != NULL);
+ test_media_subitems_media (media, false);
+ libvlc_media_release (media);
+
+ #define NB_LOCATIONS 3
+ char *subitems_realpath = realpath (subitems_path, NULL);
+ assert (subitems_realpath != NULL);
+ const char *schemes[NB_LOCATIONS] = { "file://", "stream://", "dir://" };
+ for (unsigned i = 0; i < NB_LOCATIONS; ++i)
+ {
+ char *location;
+ assert (asprintf (&location, "%s%s", schemes[i], subitems_realpath) != -1);
+ log ("Testing media_subitems: location: '%s'\n", location);
+ media = libvlc_media_new_location (vlc, location);
+ assert (media != NULL);
+ test_media_subitems_media (media, false);
+ free (location);
+ libvlc_media_release (media);
+ }
+ free (subitems_realpath);
+
+ int fd = open (subitems_path, O_RDONLY);
+ log ("Testing media_subitems: fd: '%d'\n", fd);
+ assert (fd >= 0);
+ media = libvlc_media_new_fd (vlc, fd);
+ assert (media != NULL);
+ test_media_subitems_media (media, true);
+ libvlc_media_release (media);
+ close (fd);
+
+
+ libvlc_release (vlc);
+}
+
int main (void)
{
test_init();
test_media_preparsed (test_defaults_args, test_defaults_nargs);
+ test_media_subitems (test_defaults_args, test_defaults_nargs);
return 0;
}
diff --git a/test/samples/subitems/directory/.keep b/test/samples/subitems/directory/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/samples/subitems/file.jpg b/test/samples/subitems/file.jpg
new file mode 100644
index 0000000..e69de29
diff --git a/test/samples/subitems/file.mkv b/test/samples/subitems/file.mkv
new file mode 100644
index 0000000..e69de29
diff --git a/test/samples/subitems/file.mp3 b/test/samples/subitems/file.mp3
new file mode 100644
index 0000000..e69de29
diff --git a/test/samples/subitems/file.png b/test/samples/subitems/file.png
new file mode 100644
index 0000000..e69de29
diff --git a/test/samples/subitems/file.ts b/test/samples/subitems/file.ts
new file mode 100644
index 0000000..e69de29
More information about the vlc-commits
mailing list