X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fm3u.c;h=aaa8ab0ace5e6845c01f840054425c341b079151;hb=d69171a2d863fad067d87df764d90572e3e509b4;hp=8a9e696f3ed179946750cfef89aeb2194ec47498;hpb=f3903fcac703eb2415c21bd3f08a6ba655c5768b;p=vlc diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c index 8a9e696f3e..aaa8ab0ace 100644 --- a/modules/demux/playlist/m3u.c +++ b/modules/demux/playlist/m3u.c @@ -26,7 +26,11 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include #include @@ -35,6 +39,7 @@ struct demux_sys_t { char *psz_prefix; + char *(*pf_dup) (const char *); }; /***************************************************************************** @@ -43,59 +48,86 @@ struct demux_sys_t static int Demux( demux_t *p_demux); static int Control( demux_t *p_demux, int i_query, va_list args ); static void parseEXTINF( char *psz_string, char **ppsz_artist, char **ppsz_name, int *pi_duration ); +static bool ContainsURL( demux_t *p_demux ); + +static char *GuessEncoding (const char *str) +{ + return IsUTF8 (str) ? strdup (str) : FromLatin1 (str); +} /***************************************************************************** * Import_M3U: main import function *****************************************************************************/ -int E_(Import_M3U)( vlc_object_t *p_this ) +int Import_M3U( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t *)p_this; const uint8_t *p_peek; CHECK_PEEK( p_peek, 8 ); + char *(*pf_dup) (const char *); - if(! ( POKE( p_peek, "#EXTM3U", 7 ) || POKE( p_peek, "RTSPtext", 8 ) || - demux2_IsPathExtension( p_demux, ".m3u" ) || demux2_IsPathExtension( p_demux, ".vlc" ) || - /* A .ram file can contain a single rtsp link */ - demux2_IsPathExtension( p_demux, ".ram" ) || demux2_IsPathExtension( p_demux, ".rm" ) || - demux2_IsForced( p_demux, "m3u" ) ) ) + if( POKE( p_peek, "RTSPtext", 8 ) /* QuickTime */ + || demux_IsPathExtension( p_demux, ".m3u8" ) + || demux_IsForced( p_demux, "m3u8" ) ) + pf_dup = strdup; /* UTF-8 */ + else + if( POKE( p_peek, "#EXTM3U", 7 ) + || demux_IsPathExtension( p_demux, ".m3u" ) + || demux_IsPathExtension( p_demux, ".vlc" ) + || demux_IsForced( p_demux, "m3u" ) + || ContainsURL( p_demux ) ) + pf_dup = GuessEncoding; + else return VLC_EGENERIC; STANDARD_DEMUX_INIT_MSG( "found valid M3U playlist" ); - p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux ); + p_demux->p_sys->psz_prefix = FindPrefix( p_demux ); + p_demux->p_sys->pf_dup = pf_dup; return VLC_SUCCESS; } -/***************************************************************************** - * Deactivate: frees unused data - *****************************************************************************/ -void E_(Close_M3U)( vlc_object_t *p_this ) +static bool ContainsURL( demux_t *p_demux ) { - demux_t *p_demux = (demux_t *)p_this; - free( p_demux->p_sys->psz_prefix ); - free( p_demux->p_sys ); -} + const uint8_t *p_peek, *p_peek_end; + int i_peek; + i_peek = stream_Peek( p_demux->s, &p_peek, 1024 ); + if( i_peek <= 0 ) return false; + p_peek_end = p_peek + i_peek; -/* Gruik! */ -static inline char *MaybeFromLocaleDup (const char *str) -{ - if (str == NULL) - return NULL; + while( p_peek + sizeof( "https://" ) < p_peek_end ) + { + /* One line starting with an URL is enough */ + if( !strncasecmp( (const char *)p_peek, "http://", 7 ) || + !strncasecmp( (const char *)p_peek, "mms://", 6 ) || + !strncasecmp( (const char *)p_peek, "rtsp://", 7 ) || + !strncasecmp( (const char *)p_peek, "https://", 8 ) || + !strncasecmp( (const char *)p_peek, "ftp://", 6 ) ) + { + return true; + } + /* Comments and blank lines are ignored */ + else if( *p_peek != '#' && *p_peek != '\n' && *p_peek != '\r') + { + return false; + } - return IsUTF8 (str) ? strdup (str) : FromLocaleDup (str); + while( p_peek < p_peek_end && *p_peek != '\n' ) + p_peek++; + if ( *p_peek == '\n' ) + p_peek++; + } + return false; } - -static inline void MaybeFromLocaleRep (char **str) +/***************************************************************************** + * Deactivate: frees unused data + *****************************************************************************/ +void Close_M3U( vlc_object_t *p_this ) { - char *const orig_str = *str; - - if ((orig_str != NULL) && !IsUTF8 (orig_str)) - { - *str = FromLocaleDup (orig_str); - free (orig_str); - } + demux_t *p_demux = (demux_t *)p_this; + free( p_demux->p_sys->psz_prefix ); + free( p_demux->p_sys ); } @@ -104,15 +136,17 @@ static int Demux( demux_t *p_demux ) char *psz_line; char *psz_name = NULL; char *psz_artist = NULL; + char *psz_album_art = NULL; int i_parsed_duration = 0; mtime_t i_duration = -1; const char**ppsz_options = NULL; + char * (*pf_dup) (const char *) = p_demux->p_sys->pf_dup; int i_options = 0; - vlc_bool_t b_cleanup = VLC_FALSE; - vlc_bool_t b_enable_extvlcopt = config_GetInt( p_demux, "m3u-extvlcopt" ); + bool b_cleanup = false; input_item_t *p_input; - INIT_PLAYLIST_STUFF; + input_item_t *p_current_input = GetCurrentItem(p_demux); + input_item_node_t *p_subitems = input_item_node_Create( p_current_input ); psz_line = stream_ReadLine( p_demux->s ); while( psz_line ) @@ -138,33 +172,36 @@ static int Demux( demux_t *p_demux ) { /* Extended info */ psz_parse += sizeof("EXTINF:") - 1; + free(psz_name); + free(psz_artist); parseEXTINF( psz_parse, &psz_artist, &psz_name, &i_parsed_duration ); if( i_parsed_duration >= 0 ) - i_duration = i_parsed_duration * I64C(1000000); + i_duration = i_parsed_duration * INT64_C(1000000); if( psz_name ) - psz_name = strdup( psz_name ); + psz_name = pf_dup( psz_name ); if( psz_artist ) - psz_artist = strdup( psz_artist ); + psz_artist = pf_dup( psz_artist ); } else if( !strncasecmp( psz_parse, "EXTVLCOPT:", sizeof("EXTVLCOPT:") -1 ) ) { - if( b_enable_extvlcopt ) - { - /* VLC Option */ - char *psz_option; - psz_parse += sizeof("EXTVLCOPT:") -1; - if( !*psz_parse ) goto error; - - psz_option = MaybeFromLocaleDup( psz_parse ); - if( psz_option ) - INSERT_ELEM( ppsz_options, i_options, i_options, - psz_option ); - } - else - { - msg_Err( p_demux, "m3u EXTVLCOPT parsing is disabled for security reasons. If you need it and trust the m3u playlist you are trying to open, please append --m3u-extvlcopt to your command line." ); - } + /* VLC Option */ + char *psz_option; + psz_parse += sizeof("EXTVLCOPT:") -1; + if( !*psz_parse ) goto error; + + psz_option = pf_dup( psz_parse ); + if( psz_option ) + INSERT_ELEM( ppsz_options, i_options, i_options, + psz_option ); + } + /* Special case for jamendo which provide the albumart */ + else if( !strncasecmp( psz_parse, "EXTALBUMARTURL:", + sizeof( "EXTALBUMARTURL:" ) -1 ) ) + { + psz_parse += sizeof( "EXTALBUMARTURL:" ) - 1; + free( psz_album_art ); + psz_album_art = pf_dup( psz_parse ); } } else if( !strncasecmp( psz_parse, "RTSPtext", sizeof("RTSPtext") -1 ) ) @@ -174,26 +211,35 @@ static int Demux( demux_t *p_demux ) else if( *psz_parse ) { char *psz_mrl; - if( !psz_name || !*psz_name ) - { + + psz_parse = pf_dup( psz_parse ); + if( !psz_name && psz_parse ) /* Use filename as name for relative entries */ - psz_name = MaybeFromLocaleDup( psz_parse ); + psz_name = strdup( psz_parse ); + + psz_mrl = ProcessMRL( psz_parse, p_demux->p_sys->psz_prefix ); + + b_cleanup = true; + if( !psz_mrl ) + { + LocaleFree( psz_parse ); + goto error; } - psz_mrl = E_(ProcessMRL)( psz_parse, p_demux->p_sys->psz_prefix ); - MaybeFromLocaleRep( &psz_mrl ); + p_input = input_item_NewExt( p_demux, psz_mrl, psz_name, + i_options, ppsz_options, 0, i_duration ); - b_cleanup = VLC_TRUE; - if( !psz_mrl ) goto error; + LocaleFree( psz_parse ); + free( psz_mrl ); - p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name, - i_options, ppsz_options, i_duration ); - if ( psz_artist && *psz_artist ) - input_ItemAddInfo( p_input, _(VLC_META_INFO_CAT), - _(VLC_META_ARTIST), "%s", psz_artist ); - input_ItemAddSubItem( p_current_input, p_input ); + if ( !EMPTY_STR(psz_artist) ) + input_item_SetArtist( p_input, psz_artist ); + if( psz_name ) input_item_SetTitle( p_input, psz_name ); + if( !EMPTY_STR(psz_album_art) ) + input_item_SetArtURL( p_input, psz_album_art ); + + input_item_node_AppendItem( p_subitems, p_input ); vlc_gc_decref( p_input ); - free( psz_mrl ); } error: @@ -201,30 +247,32 @@ static int Demux( demux_t *p_demux ) /* Fetch another line */ free( psz_line ); psz_line = stream_ReadLine( p_demux->s ); - if( !psz_line ) b_cleanup = VLC_TRUE; + if( !psz_line ) b_cleanup = true; if( b_cleanup ) { /* Cleanup state */ while( i_options-- ) free( (char*)ppsz_options[i_options] ); - if( ppsz_options ) free( ppsz_options ); - ppsz_options = NULL; i_options = 0; - if( psz_name ) free( psz_name ); - psz_name = NULL; - if ( psz_artist ) free( psz_artist ); - psz_artist = NULL; + FREENULL( ppsz_options ); + i_options = 0; + FREENULL( psz_name ); + FREENULL( psz_artist ); + FREENULL( psz_album_art ); i_parsed_duration = 0; i_duration = -1; - b_cleanup = VLC_FALSE; + b_cleanup = false; } } - HANDLE_PLAY_AND_RELEASE; + input_item_node_PostAndDelete( p_subitems ); + vlc_gc_decref(p_current_input); + var_Destroy( p_demux, "m3u-extvlcopt" ); return 0; /* Needed for correct operation of go back */ } static int Control( demux_t *p_demux, int i_query, va_list args ) { + VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args); return VLC_EGENERIC; }