X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Ffetcher.c;h=de85c8bf2cfb86a55fbb6e05119780a1b570309a;hb=bbb25382d9057fc86b1270d061126ce6f697d0d6;hp=aa6d16f2a99fc05229a2174d311abaae02d391ba;hpb=dcd72e40bcdb8ba4f736d8105dd942d201fb7289;p=vlc diff --git a/src/playlist/fetcher.c b/src/playlist/fetcher.c index aa6d16f2a9..de85c8bf2c 100644 --- a/src/playlist/fetcher.c +++ b/src/playlist/fetcher.c @@ -25,28 +25,30 @@ # include "config.h" #endif +#include + #include #include #include #include +#include +#include +#include #include "art.h" #include "fetcher.h" #include "playlist_internal.h" - /***************************************************************************** * Structures/definitions *****************************************************************************/ struct playlist_fetcher_t { - VLC_COMMON_MEMBERS; - playlist_t *p_playlist; - vlc_thread_t thread; vlc_mutex_t lock; - bool b_live, b_zombie; + vlc_cond_t wait; + bool b_live; int i_art_policy; int i_waiting; input_item_t **pp_waiting; @@ -62,18 +64,14 @@ static void *Thread( void * ); *****************************************************************************/ playlist_fetcher_t *playlist_fetcher_New( playlist_t *p_playlist ) { - playlist_fetcher_t *p_fetcher = - vlc_custom_create( p_playlist, sizeof(*p_fetcher), - VLC_OBJECT_GENERIC, "playlist fetcher" ); - + playlist_fetcher_t *p_fetcher = malloc( sizeof(*p_fetcher) ); if( !p_fetcher ) return NULL; - vlc_object_attach( p_fetcher, p_playlist ); p_fetcher->p_playlist = p_playlist; vlc_mutex_init( &p_fetcher->lock ); + vlc_cond_init( &p_fetcher->wait ); p_fetcher->b_live = false; - p_fetcher->b_zombie = false; p_fetcher->i_waiting = 0; p_fetcher->pp_waiting = NULL; p_fetcher->i_art_policy = var_GetInteger( p_playlist, "album-art" ); @@ -82,52 +80,47 @@ playlist_fetcher_t *playlist_fetcher_New( playlist_t *p_playlist ) return p_fetcher; } -void playlist_fetcher_Push( playlist_fetcher_t *p_fetcher, input_item_t *p_item ) +void playlist_fetcher_Push( playlist_fetcher_t *p_fetcher, + input_item_t *p_item ) { vlc_gc_incref( p_item ); vlc_mutex_lock( &p_fetcher->lock ); - if( p_fetcher->b_zombie ) /* FIXME: detach the thread */ - { - vlc_join( p_fetcher->thread, NULL ); - p_fetcher->b_zombie = false; - } - INSERT_ELEM( p_fetcher->pp_waiting, p_fetcher->i_waiting, p_fetcher->i_waiting, p_item ); if( !p_fetcher->b_live ) { - if( vlc_clone( &p_fetcher->thread, Thread, p_fetcher, - VLC_THREAD_PRIORITY_LOW ) ) - msg_Err( p_fetcher, "cannot spawn secondary preparse thread" ); + vlc_thread_t th; + + if( vlc_clone( &th, Thread, p_fetcher, VLC_THREAD_PRIORITY_LOW ) ) + msg_Err( p_fetcher->p_playlist, + "cannot spawn secondary preparse thread" ); else + { + vlc_detach( th ); p_fetcher->b_live = true; + } } vlc_mutex_unlock( &p_fetcher->lock ); } void playlist_fetcher_Delete( playlist_fetcher_t *p_fetcher ) { - bool b_join; - /* Destroy the item meta-infos fetcher */ vlc_mutex_lock( &p_fetcher->lock ); - if( p_fetcher->b_live ) - { - vlc_object_kill( p_fetcher ); - vlc_cancel( p_fetcher->thread ); - } - b_join = p_fetcher->b_live || p_fetcher->b_zombie; - vlc_mutex_unlock( &p_fetcher->lock ); - if( b_join ) - vlc_join( p_fetcher->thread, NULL ); - + /* Remove any left-over item, the fetcher will exit */ while( p_fetcher->i_waiting > 0 ) - { /* Any left-over unparsed item? */ + { vlc_gc_decref( p_fetcher->pp_waiting[0] ); REMOVE_ELEM( p_fetcher->pp_waiting, p_fetcher->i_waiting, 0 ); } + + while( p_fetcher->b_live ) + vlc_cond_wait( &p_fetcher->wait, &p_fetcher->lock ); + vlc_mutex_unlock( &p_fetcher->lock ); + + vlc_cond_destroy( &p_fetcher->wait ); vlc_mutex_destroy( &p_fetcher->lock ); - vlc_object_release( p_fetcher ); + free( p_fetcher ); } @@ -144,12 +137,10 @@ void playlist_fetcher_Delete( playlist_fetcher_t *p_fetcher ) static int FindArt( playlist_fetcher_t *p_fetcher, input_item_t *p_item ) { int i_ret; - module_t *p_module; - char *psz_title, *psz_artist, *psz_album; - psz_artist = input_item_GetArtist( p_item ); - psz_album = input_item_GetAlbum( p_item ); - psz_title = input_item_GetTitle( p_item ); + char *psz_artist = input_item_GetArtist( p_item ); + char *psz_album = input_item_GetAlbum( p_item ); + char *psz_title = input_item_GetTitle( p_item ); if( !psz_title ) psz_title = input_item_GetName( p_item ); @@ -165,7 +156,8 @@ static int FindArt( playlist_fetcher_t *p_fetcher, input_item_t *p_item ) if( !strcmp( album.psz_artist, psz_artist ) && !strcmp( album.psz_album, psz_album ) ) { - msg_Dbg( p_fetcher, " %s - %s has already been searched", + msg_Dbg( p_fetcher->p_playlist, + " %s - %s has already been searched", psz_artist, psz_album ); /* TODO-fenrir if we cache art filename too, we can go faster */ free( psz_artist ); @@ -211,7 +203,7 @@ static int FindArt( playlist_fetcher_t *p_fetcher, input_item_t *p_item ) psz_artist = input_item_GetArtist( p_item ); if( psz_album && psz_artist ) { - msg_Dbg( p_fetcher, "searching art for %s - %s", + msg_Dbg( p_fetcher->p_playlist, "searching art for %s - %s", psz_artist, psz_album ); } else @@ -220,24 +212,31 @@ static int FindArt( playlist_fetcher_t *p_fetcher, input_item_t *p_item ) if( !psz_title ) psz_title = input_item_GetName( p_item ); - msg_Dbg( p_fetcher, "searching art for %s", psz_title ); + msg_Dbg( p_fetcher->p_playlist, "searching art for %s", psz_title ); free( psz_title ); } /* Fetch the art url */ - p_fetcher->p_private = p_item; - - p_module = module_need( p_fetcher, "art finder", NULL, false ); + i_ret = VLC_EGENERIC; - if( p_module ) + vlc_object_t *p_parent = VLC_OBJECT(p_fetcher->p_playlist); + art_finder_t *p_finder = + vlc_custom_create( p_parent, sizeof( *p_finder ), VLC_OBJECT_GENERIC, + "art finder" ); + if( p_finder != NULL) { - module_unneed( p_fetcher, p_module ); - i_ret = 1; - } - else - { - msg_Dbg( p_fetcher, "unable to find art" ); - i_ret = VLC_EGENERIC; + module_t *p_module; + + vlc_object_attach( p_finder, p_parent ); + p_finder->p_item = p_item; + + p_module = module_need( p_finder, "art finder", NULL, false ); + if( p_module ) + { + module_unneed( p_finder, p_module ); + i_ret = 1; + } + vlc_object_release( p_finder ); } /* Record this album */ @@ -270,18 +269,19 @@ static int DownloadArt( playlist_fetcher_t *p_fetcher, input_item_t *p_item ) if( !strncmp( psz_arturl , "file://", 7 ) ) { - msg_Dbg( p_fetcher, "Album art is local file, no need to cache" ); + msg_Dbg( p_fetcher->p_playlist, + "Album art is local file, no need to cache" ); free( psz_arturl ); return VLC_SUCCESS; } if( !strncmp( psz_arturl , "APIC", 4 ) ) { - msg_Warn( p_fetcher, "APIC fetch not supported yet" ); + msg_Warn( p_fetcher->p_playlist, "APIC fetch not supported yet" ); goto error; } - stream_t *p_stream = stream_UrlNew( p_fetcher, psz_arturl ); + stream_t *p_stream = stream_UrlNew( p_fetcher->p_playlist, psz_arturl ); if( !p_stream ) goto error; @@ -294,7 +294,7 @@ static int DownloadArt( playlist_fetcher_t *p_fetcher, input_item_t *p_item ) if( i_data >= INT_MAX - i_read ) break; - p_data = realloc( p_data, i_data + i_read ); + p_data = realloc_or_free( p_data, i_data + i_read ); if( !p_data ) break; @@ -325,6 +325,28 @@ error: return VLC_EGENERIC; } +/** + * FetchMeta, run the "meta fetcher". They are going to do network + * connections, and gather information upon the playing media. + * (even artwork). + */ +static void FetchMeta( playlist_fetcher_t *p_fetcher, input_item_t *p_item ) +{ + demux_meta_t *p_demux_meta = vlc_custom_create(p_fetcher->p_playlist, + sizeof(*p_demux_meta), + VLC_OBJECT_GENERIC, "demux meta" ); + if( !p_demux_meta ) + return; + + vlc_object_attach( p_demux_meta, p_fetcher->p_playlist ); + p_demux_meta->p_demux = NULL; + p_demux_meta->p_item = p_item; + + module_t *p_meta_fetcher = module_need( p_demux_meta, "meta fetcher", NULL, false ); + if( p_meta_fetcher ) + module_unneed( p_demux_meta, p_meta_fetcher ); + vlc_object_release( p_demux_meta ); +} static int InputEvent( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) @@ -400,7 +422,7 @@ static void *Thread( void *p_data ) else { p_fetcher->b_live = false; - p_fetcher->b_zombie = true; + vlc_cond_signal( &p_fetcher->wait ); } vlc_mutex_unlock( &p_fetcher->lock ); @@ -408,22 +430,18 @@ static void *Thread( void *p_data ) break; /* */ - int canc = vlc_savecancel(); /* Wait that the input item is preparsed if it is being played */ WaitPreparsed( p_fetcher, p_item ); - /* */ - if( !vlc_object_alive( p_fetcher ) ) - goto end; + /* Triggers "meta fetcher", eventually fetch meta on the network. + * They are identical to "meta reader" expect that may actually + * takes time. That's why they are running here. + * The result of this fetch is not cached. */ + FetchMeta( p_fetcher, p_item ); /* Find art, and download it if needed */ int i_ret = FindArt( p_fetcher, p_item ); - - /* */ - if( !vlc_object_alive( p_fetcher ) ) - goto end; - if( i_ret == 1 ) i_ret = DownloadArt( p_fetcher, p_item ); @@ -441,16 +459,7 @@ static void *Thread( void *p_data ) input_item_SetArtNotFound( p_item, true ); } free( psz_name ); - - end: vlc_gc_decref( p_item ); - - vlc_restorecancel( canc ); - - int i_activity = var_GetInteger( p_playlist, "activity" ); - if( i_activity < 0 ) i_activity = 0; - /* Sleep at least 1ms and handle potential thread cancellation */ - msleep( (i_activity+1) * 1000 ); } return NULL; }