diff options
Diffstat (limited to 'src/plugins/vlc_extractor.c')
-rw-r--r-- | src/plugins/vlc_extractor.c | 62 |
1 files changed, 8 insertions, 54 deletions
diff --git a/src/plugins/vlc_extractor.c b/src/plugins/vlc_extractor.c index 6005c86..922da0f 100644 --- a/src/plugins/vlc_extractor.c +++ b/src/plugins/vlc_extractor.c | |||
@@ -273,10 +273,12 @@ my_logger (void *data, | |||
273 | const char *fmt, | 273 | const char *fmt, |
274 | va_list args) | 274 | va_list args) |
275 | { | 275 | { |
276 | #if 0 | ||
276 | vfprintf (stderr, | 277 | vfprintf (stderr, |
277 | fmt, | 278 | fmt, |
278 | args); | 279 | args); |
279 | fprintf (stderr, "\n"); | 280 | fprintf (stderr, "\n"); |
281 | #endif | ||
280 | } | 282 | } |
281 | 283 | ||
282 | 284 | ||
@@ -314,52 +316,12 @@ EXTRACTOR_vlc_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
314 | libvlc_log_set (vlc, | 316 | libvlc_log_set (vlc, |
315 | &my_logger, | 317 | &my_logger, |
316 | NULL); | 318 | NULL); |
317 | if (1) | 319 | media = libvlc_media_new_callbacks (vlc, |
318 | { | 320 | &open_cb, |
319 | fprintf (stderr, | 321 | &read_cb, |
320 | "Opening file `%s'\n", | 322 | &seek_cb, |
321 | "testdata/matroska_flame.mkv"); | 323 | &close_cb, |
322 | media = libvlc_media_new_path (vlc, | 324 | ec); |
323 | "testdata/matroska_flame.mkv"); | ||
324 | if (NULL == media) | ||
325 | { | ||
326 | fprintf (stderr, | ||
327 | "Open failed\n"); | ||
328 | libvlc_release (vlc); | ||
329 | return; | ||
330 | } | ||
331 | } | ||
332 | else if (0) | ||
333 | { | ||
334 | fprintf (stderr, | ||
335 | "Opening file `%s'\n", | ||
336 | "testdata/matroska_flame.mkv"); | ||
337 | int fd = open ("testdata/matroska_flame.mkv", | ||
338 | O_RDONLY); | ||
339 | if (-1 == fd) | ||
340 | { | ||
341 | fprintf (stderr, | ||
342 | "Open failed: %s\n", | ||
343 | strerror (errno)); | ||
344 | libvlc_release (vlc); | ||
345 | return; | ||
346 | } | ||
347 | media = libvlc_media_new_fd (vlc, | ||
348 | fd); | ||
349 | } | ||
350 | else if (0) | ||
351 | { | ||
352 | fprintf (stderr, | ||
353 | "Reading via IPC\n"); | ||
354 | media = libvlc_media_new_callbacks (vlc, | ||
355 | &open_cb, | ||
356 | &read_cb, | ||
357 | &seek_cb, | ||
358 | &close_cb, | ||
359 | ec); | ||
360 | } | ||
361 | else | ||
362 | abort (); | ||
363 | if (NULL == media) | 325 | if (NULL == media) |
364 | { | 326 | { |
365 | libvlc_release (vlc); | 327 | libvlc_release (vlc); |
@@ -371,8 +333,6 @@ EXTRACTOR_vlc_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
371 | libvlc_MediaParsedChanged, | 333 | libvlc_MediaParsedChanged, |
372 | &media_ready, | 334 | &media_ready, |
373 | ec); | 335 | ec); |
374 | fprintf (stderr, | ||
375 | "Triggering parser\n"); | ||
376 | { | 336 | { |
377 | int status; | 337 | int status; |
378 | 338 | ||
@@ -381,13 +341,7 @@ EXTRACTOR_vlc_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
381 | | libvlc_media_parse_network | 341 | | libvlc_media_parse_network |
382 | | libvlc_media_fetch_network, | 342 | | libvlc_media_fetch_network, |
383 | 30000); /* 30s timeout */ | 343 | 30000); /* 30s timeout */ |
384 | fprintf (stderr, | ||
385 | "Status: %d\n", | ||
386 | status); | ||
387 | } | 344 | } |
388 | fprintf (stderr, | ||
389 | "Sleeping\n"); | ||
390 | sleep (10); | ||
391 | extract (ec, | 345 | extract (ec, |
392 | media); | 346 | media); |
393 | libvlc_media_release (media); | 347 | libvlc_media_release (media); |