X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fm3u.c;h=2ac9622900895af3b5974f27e1329a4762dd3cc4;hb=fdbda6fec038e314228314288d29e2c218c0aeef;hp=6848c81cf49d76846771d9a3dba882474ae43bf7;hpb=0fd33223a7445e5732fc8db2c8468233b07f8ace;p=vlc diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c index 6848c81cf4..2ac9622900 100644 --- a/modules/demux/playlist/m3u.c +++ b/modules/demux/playlist/m3u.c @@ -4,8 +4,8 @@ * Copyright (C) 2004 the VideoLAN team * $Id$ * - * Authors: Clément Stenac - * Sigmund Augdal + * Authors: Clément Stenac + * Sigmund Augdal Helberg * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,24 +19,27 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include -#include /* ENOMEM */ #include "playlist.h" struct demux_sys_t { char *psz_prefix; + char *(*pf_dup) (const char *); }; /***************************************************************************** @@ -45,95 +48,105 @@ 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, "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; - uint8_t *p_peek; - char *psz_ext; + STANDARD_DEMUX_INIT_MSG( "found valid M3U playlist" ); + p_demux->p_sys->psz_prefix = FindPrefix( p_demux ); + p_demux->p_sys->pf_dup = pf_dup; - if( stream_Peek( p_demux->s , &p_peek, 7 ) < 7 ) - { - return VLC_EGENERIC; - } - psz_ext = strrchr ( p_demux->psz_path, '.' ); + return VLC_SUCCESS; +} - if( !strncmp( (char *)p_peek, "#EXTM3U", 7 ) ) - { - ; - } - else if( ( psz_ext && !strcasecmp( psz_ext, ".m3u") ) || - ( psz_ext && !strcasecmp( psz_ext, ".ram") ) || - ( psz_ext && !strcasecmp( psz_ext, ".rm") ) || - /* A .ram file can contain a single rtsp link */ - ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "m3u") ) ) - { - ; - } - else - { - return VLC_EGENERIC; - } - msg_Dbg( p_demux, "found valid M3U playlist file"); +static bool ContainsURL( demux_t *p_demux ) +{ + const uint8_t *p_peek, *p_peek_end; + int i_peek; - p_demux->pf_control = Control; - p_demux->pf_demux = Demux; - p_demux->p_sys = malloc( sizeof(demux_sys_t) ); - if( p_demux->p_sys == NULL ) + i_peek = stream_Peek( p_demux->s, &p_peek, 1024 ); + if( i_peek <= 0 ) return false; + p_peek_end = p_peek + i_peek; + + while( p_peek + sizeof( "https://" ) < p_peek_end ) { - msg_Err( p_demux, "Out of memory" ); - return VLC_ENOMEM; - } - p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux ); + /* 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 VLC_SUCCESS; + while( p_peek < p_peek_end && *p_peek != '\n' ) + p_peek++; + if ( *p_peek == '\n' ) + p_peek++; + } + return false; } /***************************************************************************** * Deactivate: frees unused data *****************************************************************************/ -void E_(Close_M3U)( vlc_object_t *p_this ) +void Close_M3U( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t *)p_this; - - if( p_demux->p_sys->psz_prefix ) free( p_demux->p_sys->psz_prefix ); + free( p_demux->p_sys->psz_prefix ); free( p_demux->p_sys ); } + static int Demux( demux_t *p_demux ) { - playlist_t *p_playlist; 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; - char **ppsz_options = NULL; - int i_options = 0, i; - - playlist_item_t *p_item, *p_current; - - vlc_bool_t b_play; - - vlc_bool_t b_cleanup = VLC_FALSE; - - p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST, - FIND_PARENT ); - if( !p_playlist ) - { - msg_Err( p_demux, "can't find playlist" ); - return -1; - } + const char**ppsz_options = NULL; + char * (*pf_dup) (const char *) = p_demux->p_sys->pf_dup; + int i_options = 0; + bool b_cleanup = false; + input_item_t *p_input; - b_play = E_(FindItem)( p_demux, p_playlist, &p_current ); - - playlist_ItemToNode( p_playlist, p_current ); - p_current->input.i_type = ITEM_TYPE_PLAYLIST; + 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 ) @@ -159,13 +172,15 @@ 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 * 1000000; - if ( psz_name ) - psz_name = strdup( psz_name ); - if ( psz_artist ) - psz_artist = strdup( psz_artist ); + if( i_parsed_duration >= 0 ) + i_duration = i_parsed_duration * INT64_C(1000000); + if( psz_name ) + psz_name = pf_dup( psz_name ); + if( psz_artist ) + psz_artist = pf_dup( psz_artist ); } else if( !strncasecmp( psz_parse, "EXTVLCOPT:", sizeof("EXTVLCOPT:") -1 ) ) @@ -175,52 +190,56 @@ static int Demux( demux_t *p_demux ) psz_parse += sizeof("EXTVLCOPT:") -1; if( !*psz_parse ) goto error; - psz_option = strdup( psz_parse ); + 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 ) ) + { + ;/* special case to handle QuickTime RTSPtext redirect files */ } 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 = strdup( psz_parse ); - } - - psz_mrl = E_(ProcessMRL)( psz_parse, p_demux->p_sys->psz_prefix ); - b_cleanup = VLC_TRUE; - if( !psz_mrl ) goto error; + psz_mrl = ProcessMRL( psz_parse, p_demux->p_sys->psz_prefix ); - EnsureUTF8( psz_name ); - EnsureUTF8( psz_mrl ); - - p_item = playlist_ItemNew( p_playlist, psz_mrl, psz_name ); - for( i = 0; i< i_options; i++ ) + b_cleanup = true; + if( !psz_mrl ) { - EnsureUTF8( ppsz_options[i] ); - playlist_ItemAddOption( p_item, ppsz_options[i] ); + LocaleFree( psz_parse ); + goto error; } - p_item->input.i_duration = i_duration; - if ( psz_artist && *psz_artist ) - vlc_input_item_AddInfo( &p_item->input, _("Meta-information"), - _("Artist"), "%s", psz_artist ); - playlist_NodeAddItem( p_playlist, p_item, - p_current->pp_parents[0]->i_view, - p_current, PLAYLIST_APPEND, - PLAYLIST_END ); - /* We need to declare the parents of the node as the - * * same of the parent's ones */ - playlist_CopyParents( p_current, p_item ); - - vlc_input_item_CopyOptions( &p_current->input, - &p_item->input ); + p_input = input_item_NewExt( p_demux, psz_mrl, psz_name, + i_options, ppsz_options, 0, i_duration ); + LocaleFree( psz_parse ); free( psz_mrl ); + + if ( psz_artist && *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 ); } error: @@ -228,45 +247,39 @@ 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( ppsz_options[i_options] ); - if( ppsz_options ) free( ppsz_options ); + while( i_options-- ) free( (char*)ppsz_options[i_options] ); + free( ppsz_options ); ppsz_options = NULL; i_options = 0; - if( psz_name ) free( psz_name ); + free( psz_name ); psz_name = NULL; - if ( psz_artist ) free( psz_artist ); + free( psz_artist ); psz_artist = NULL; + free( psz_album_art ); + psz_album_art = NULL; i_parsed_duration = 0; i_duration = -1; - b_cleanup = VLC_FALSE; + b_cleanup = false; } } - - /* Go back and play the playlist */ - if( b_play && p_playlist->status.p_item && - p_playlist->status.p_item->i_children > 0 ) - { - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, - p_playlist->status.i_view, - p_playlist->status.p_item, - p_playlist->status.p_item->pp_children[0] ); - } - - vlc_object_release( p_playlist ); - return VLC_SUCCESS; + 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; } -static void parseEXTINF(char *psz_string, char **ppsz_artist, +static void parseEXTINF(char *psz_string, char **ppsz_artist, char **ppsz_name, int *pi_duration) { char *end = NULL; @@ -275,7 +288,7 @@ static void parseEXTINF(char *psz_string, char **ppsz_artist, end = psz_string + strlen( psz_string ); /* ignore whitespaces */ - for (; psz_string < end && ( *psz_string == '\t' || *psz_string == ' ' ); + for (; psz_string < end && ( *psz_string == '\t' || *psz_string == ' ' ); psz_string++ ); /* duration: read to next comma */ @@ -305,7 +318,7 @@ static void parseEXTINF(char *psz_string, char **ppsz_artist, *ppsz_artist = psz_string; *ppsz_name = psz_item + 3; /* points directly after ' - ' */ return; - } + } /* reaching this point means: 0.8.1- with artist or something without artist */ if ( *psz_string == ',' ) @@ -314,7 +327,7 @@ static void parseEXTINF(char *psz_string, char **ppsz_artist, psz_string++; *ppsz_name = psz_string; return; - } + } psz_item = psz_string; psz_string = strchr( psz_string, ',' );