X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fm3u.c;h=d0e86422403ec65e33993f961aaa5eae195b6129;hb=5e33034d87a3e3258573410053f0bfc1e7925674;hp=e5df415b074df5877baaf6ce7190ad3edecdd16f;hpb=4a253e8cab2b09e6cb0a71e67c3ad540024c9f16;p=vlc diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c index e5df415b07..d0e8642240 100644 --- a/modules/demux/playlist/m3u.c +++ b/modules/demux/playlist/m3u.c @@ -1,11 +1,11 @@ /***************************************************************************** * m3u.c : M3U playlist format import ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * 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 *); }; /***************************************************************************** @@ -44,6 +47,13 @@ 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 @@ -51,81 +61,92 @@ static int Control( demux_t *p_demux, int i_query, va_list args ); int Import_M3U( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t *)p_this; - - uint8_t *p_peek; - char *psz_ext; - - if( stream_Peek( p_demux->s , &p_peek, 7 ) < 7 ) - { - return VLC_EGENERIC; - } - psz_ext = strrchr ( p_demux->psz_path, '.' ); - - if( !strncmp( p_peek, "#EXTM3U", 7 ) ) - { - ; - } - else if( ( psz_ext && !strcasecmp( psz_ext, ".m3u") ) || - ( psz_ext && !strcasecmp( psz_ext, ".ram") ) || - /* A .ram file can contain a single rtsp link */ - ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "m3u") ) ) - { - ; - } + 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; - } - msg_Dbg( p_demux, "found valid M3U playlist file"); - 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 ) - { - msg_Err( p_demux, "Out of memory" ); - return VLC_ENOMEM; - } + 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; return VLC_SUCCESS; } +static bool ContainsURL( demux_t *p_demux ) +{ + 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; + + 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; + } + + while( p_peek < p_peek_end && *p_peek != '\n' ) + p_peek++; + if ( *p_peek == '\n' ) + p_peek++; + } + return false; +} + /***************************************************************************** * Deactivate: frees unused data *****************************************************************************/ 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; - mtime_t i_duration = -1; - char **ppsz_options = NULL; - int i_options = 0, i; - - playlist_item_t *p_item; - - 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; - } - - playlist_ItemToNode( p_playlist, p_playlist->status.p_item ); - p_playlist->status.p_item->input.i_type = ITEM_TYPE_PLAYLIST; + 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; + bool b_cleanup = false; + input_item_t *p_input; + + 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 ) @@ -150,65 +171,75 @@ static int Demux( demux_t *p_demux ) if( !strncasecmp( psz_parse, "EXTINF:", sizeof("EXTINF:") -1 ) ) { /* Extended info */ - char *psz_duration; psz_parse += sizeof("EXTINF:") - 1; - while( *psz_parse == '\t' || *psz_parse == ' ' ) psz_parse++; - - psz_duration = psz_parse; - psz_parse = strchr( psz_parse, ',' ); - if( psz_parse ) - { - *psz_parse = '\0'; - psz_parse++; - psz_name = strdup( psz_parse ); - i_duration = atoi( psz_duration ); - if( i_duration != -1 ) i_duration *= 1000000; - } + 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 * 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 ) ) - { /* VLC Option */ char *psz_option; 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 = - ProcessMRL( psz_parse, p_demux->p_sys->psz_prefix ); + char *psz_mrl; - b_cleanup = VLC_TRUE; - if( !psz_mrl ) goto error; + psz_parse = pf_dup( psz_parse ); + if( !psz_name && psz_parse ) + /* Use filename as name for relative entries */ + psz_name = strdup( psz_parse ); - p_item = playlist_ItemNew( p_playlist, psz_mrl, psz_name ); - for( i = 0; i< i_options; i++ ) + psz_mrl = ProcessMRL( psz_parse, p_demux->p_sys->psz_prefix ); + + b_cleanup = true; + if( !psz_mrl ) { - playlist_ItemAddOption( p_item, ppsz_options[i] ); + free( psz_parse ); + goto error; } - p_item->input.i_duration = i_duration; - playlist_NodeAddItem( p_playlist, p_item, - p_playlist->status.p_item->pp_parents[0]->i_view, - p_playlist->status.p_item, PLAYLIST_APPEND, - PLAYLIST_END ); + p_input = input_item_NewExt( p_demux, psz_mrl, psz_name, + i_options, ppsz_options, 0, i_duration ); - /* We need to declare the parents of the node as the - * * same of the parent's ones */ - for( i= 1 ; i< p_playlist->status.p_item->i_parents; i ++ ) - { - playlist_ItemAddParent( p_item, - p_playlist->status.p_item->pp_parents[i]->i_view, - p_playlist->status.p_item ); - } + free( psz_parse ); free( psz_mrl ); + + 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 ); } error: @@ -216,31 +247,99 @@ 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 ); - ppsz_options = NULL; i_options = 0; - if( psz_name ) free( psz_name ); - psz_name = NULL; + while( i_options-- ) free( (char*)ppsz_options[i_options] ); + 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; } } - - /* Go back and play the playlist */ - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, p_playlist->status.i_view, - p_playlist->status.p_item, NULL ); - - 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, + char **ppsz_name, int *pi_duration) +{ + char *end = NULL; + char *psz_item = NULL; + + end = psz_string + strlen( psz_string ); + + /* ignore whitespaces */ + for (; psz_string < end && ( *psz_string == '\t' || *psz_string == ' ' ); + psz_string++ ); + + /* duration: read to next comma */ + psz_item = psz_string; + psz_string = strchr( psz_string, ',' ); + if ( psz_string ) + { + *psz_string = '\0'; + *pi_duration = atoi( psz_item ); + } + else + { + return; + } + + if ( psz_string < end ) /* continue parsing if possible */ + psz_string++; + + /* analyse the remaining string */ + psz_item = strstr( psz_string, " - " ); + + /* here we have the 0.8.2+ format with artist */ + if ( psz_item ) + { + /* *** "EXTINF:time,artist - name" */ + *psz_item = '\0'; + *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 == ',' ) + { + /* *** "EXTINF:time,,name" */ + psz_string++; + *ppsz_name = psz_string; + return; + } + + psz_item = psz_string; + psz_string = strchr( psz_string, ',' ); + if ( psz_string ) + { + /* *** "EXTINF:time,artist,name" */ + *psz_string = '\0'; + *ppsz_artist = psz_item; + *ppsz_name = psz_string+1; + } + else + { + /* *** "EXTINF:time,name" */ + *ppsz_name = psz_item; + } + return; +} +