X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fm3u.c;h=1a054a29f05d74b2ba202b6fed54520dc0924bc6;hb=5dd166aea54615debc47126762b0470e921ddcb2;hp=e5df415b074df5877baaf6ce7190ad3edecdd16f;hpb=4a253e8cab2b09e6cb0a71e67c3ad540024c9f16;p=vlc diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c index e5df415b07..1a054a29f0 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,19 +19,21 @@ * * 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 @@ -44,6 +46,7 @@ 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 ); /***************************************************************************** * Import_M3U: main import function @@ -51,41 +54,17 @@ 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 ) - { + const uint8_t *p_peek; + CHECK_PEEK( p_peek, 8 ); + + if(! ( POKE( p_peek, "#EXTM3U", 7 ) || POKE( p_peek, "RTSPtext", 8 ) || + demux_IsPathExtension( p_demux, ".m3u" ) || demux_IsPathExtension( p_demux, ".vlc" ) || + /* A .ram file can contain a single rtsp link */ + demux_IsPathExtension( p_demux, ".ram" ) || demux_IsPathExtension( p_demux, ".rm" ) || + demux_IsForced( p_demux, "m3u" ) ) ) 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") ) ) - { - ; - } - 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 ); return VLC_SUCCESS; @@ -97,35 +76,46 @@ int Import_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 ) + +/* Gruik! */ +static inline char *MaybeFromLocaleDup (const char *str) { - playlist_t *p_playlist; - char *psz_line; + if (str == NULL) + return NULL; - char *psz_name = NULL; - mtime_t i_duration = -1; - char **ppsz_options = NULL; - int i_options = 0, i; + return IsUTF8 (str) ? strdup (str) : FromLocaleDup (str); +} - playlist_item_t *p_item; - vlc_bool_t b_cleanup = VLC_FALSE; +static inline void MaybeFromLocaleRep (char **str) +{ + char *const orig_str = *str; - p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST, - FIND_PARENT ); - if( !p_playlist ) + if ((orig_str != NULL) && !IsUTF8 (orig_str)) { - msg_Err( p_demux, "can't find playlist" ); - return -1; + *str = FromLocaleDup (orig_str); + free (orig_str); } +} - playlist_ItemToNode( p_playlist, p_playlist->status.p_item ); - p_playlist->status.p_item->input.i_type = ITEM_TYPE_PLAYLIST; + +static int Demux( demux_t *p_demux ) +{ + char *psz_line; + char *psz_name = NULL; + char *psz_artist = NULL; + int i_parsed_duration = 0; + mtime_t i_duration = -1; + const char**ppsz_options = NULL; + int i_options = 0; + bool b_cleanup = false; + input_item_t *p_input; + + INIT_PLAYLIST_STUFF; psz_line = stream_ReadLine( p_demux->s ); while( psz_line ) @@ -150,64 +140,58 @@ 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; - } + 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 = strdup( psz_name ); + if( psz_artist ) + psz_artist = strdup( 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 = MaybeFromLocaleDup( psz_parse ); if( psz_option ) INSERT_ELEM( ppsz_options, i_options, i_options, psz_option ); } } + 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; + if( !psz_name || !*psz_name ) + { + /* Use filename as name for relative entries */ + psz_name = MaybeFromLocaleDup( psz_parse ); + } + + psz_mrl = ProcessMRL( psz_parse, p_demux->p_sys->psz_prefix ); + MaybeFromLocaleRep( &psz_mrl ); - b_cleanup = VLC_TRUE; + b_cleanup = true; if( !psz_mrl ) goto error; - p_item = playlist_ItemNew( p_playlist, psz_mrl, psz_name ); - for( i = 0; i< i_options; i++ ) - { - playlist_ItemAddOption( p_item, ppsz_options[i] ); - } - p_item->input.i_duration = i_duration; + p_input = input_ItemNewExt( p_demux, psz_mrl, psz_name, + 0, NULL, 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 ); + if ( psz_artist && *psz_artist ) + input_item_SetArtist( p_input, psz_artist ); - /* 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 ); - } + input_ItemAddSubItem( p_current_input, p_input ); + for( int i = 0; i < i_options; i++ ) + input_ItemAddOpt( p_input, ppsz_options[i], 0 ); + vlc_gc_decref( p_input ); free( psz_mrl ); } @@ -216,31 +200,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 ); + 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; + free( psz_artist ); + psz_artist = NULL; + 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; + HANDLE_PLAY_AND_RELEASE; + 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; +} +