/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
+
+#include <stdio.h>
+#include <stdlib.h> /* malloc(), free() */
+
#include <vlc/input.h>
#include <vlc_playlist.h>
#include <vlc_md5.h>
+#include "charset.h"
#include "iso_lang.h"
#include "vlc_meta.h"
return I64C(1000000) * p_sys->i_time / p_sys->i_timescale;
}
-#define FREE( p ) if( p ) { free( p ); (p) = NULL;}
+/* Function to lookup the currently playing item */
+static vlc_bool_t FindItem( demux_t *p_demux, playlist_t *p_playlist,
+ playlist_item_t **pp_item );
/*****************************************************************************
* Open: check file and initializes MP4 structures
if( ( p_rmra = MP4_BoxGet( p_sys->p_root, "/moov/rmra" ) ) )
{
playlist_t *p_playlist;
- playlist_item_t *p_item;
+ playlist_item_t *p_current, *p_item_in_category;
int i_count = MP4_BoxCount( p_rmra, "rmda" );
int i;
vlc_bool_t b_play = VLC_FALSE;
FIND_ANYWHERE );
if( p_playlist )
{
- p_item = playlist_LockItemGetByInput( p_playlist,
- ((input_thread_t *)p_demux->p_parent)->input.p_item );
- playlist_ItemToNode( p_playlist, p_item );
+ b_play = FindItem( p_demux, p_playlist, &p_current );
+ p_item_in_category = playlist_ItemToNode( p_playlist, p_current );
+ p_current->p_input->i_type = ITEM_TYPE_PLAYLIST;
for( i = 0; i < i_count; i++ )
{
char *psz_ref;
uint32_t i_ref_type;
- if( !p_rdrf || !( psz_ref = p_rdrf->data.p_rdrf->psz_ref ) )
+ if( !p_rdrf || !( psz_ref = strdup( p_rdrf->data.p_rdrf->psz_ref ) ) )
{
continue;
}
if( !strncmp( psz_ref, "http://", 7 ) ||
!strncmp( psz_ref, "rtsp://", 7 ) )
{
- msg_Dbg( p_demux, "adding ref = `%s'", psz_ref );
- if( p_item )
- {
- playlist_item_t *p_child =
- playlist_ItemNew( p_playlist,
- psz_ref, psz_ref );
- if( p_child )
- {
- playlist_NodeAddItem( p_playlist, p_child,
- p_item->pp_parents[0]->i_view,
- p_item, PLAYLIST_APPEND,
- PLAYLIST_END );
- playlist_CopyParents( p_item, p_child );
- b_play = VLC_TRUE;
- }
- }
+ ;
}
else
{
- /* msg dbg relative ? */
- int i_path_size = strlen( p_demux->psz_access ) + 3 +
- strlen( p_demux->psz_path ) + strlen( psz_ref ) + 1;
-#ifdef HAVE_ALLOCA
- char *psz_absolute = alloca( i_path_size );
-#else
- char *psz_absolute = (char *)malloc( i_path_size );
-#endif
- char *end = strrchr( p_demux->psz_path, '/' );
+ char *psz_absolute;
+ char *psz_path = strdup( p_demux->psz_path );
+ char *end = strrchr( psz_path, '/' );
+ if( end ) end[1] = '\0';
+ else *psz_path = '\0';
- if( end )
- {
- int i_len = end + 1 - p_demux->psz_path;
+ asprintf( &psz_absolute, "%s://%s%s",
+ p_demux->psz_access, psz_path, psz_ref );
- strcpy( psz_absolute, p_demux->psz_access );
- strcat( psz_absolute, "://" );
- strncat( psz_absolute, p_demux->psz_path, i_len);
- }
- else
- {
- strcpy( psz_absolute, "" );
- }
- strcat( psz_absolute, psz_ref );
- msg_Dbg( p_demux, "adding ref = `%s'", psz_absolute );
- if( p_item )
- {
- playlist_item_t *p_child =
- playlist_ItemNew( p_playlist,
- psz_absolute,
- psz_absolute );
- if( p_child )
- {
- playlist_NodeAddItem( p_playlist, p_child,
- p_item->pp_parents[0]->i_view,
- p_item, PLAYLIST_APPEND,
- PLAYLIST_END );
- playlist_CopyParents( p_item, p_child );
- b_play = VLC_TRUE;
- }
- }
-#ifndef HAVE_ALLOCA
- free( psz_absolute );
-#endif
+ psz_ref = psz_absolute;
+ free( psz_path );
+ }
+ if( p_current )
+ {
+ input_item_t *p_input;
+ msg_Dbg( p_demux, "adding ref = `%s'", psz_ref );
+ p_input = input_ItemNewExt( p_playlist, psz_ref, NULL,
+ 0, NULL, -1 );
+ input_ItemCopyOptions( p_current->p_input, p_input );
+ playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
+ p_item_in_category, VLC_FALSE, PLAYLIST_APPEND );
}
}
else
msg_Err( p_demux, "unknown ref type=%4.4s FIXME (send a bug report)",
(char*)&p_rdrf->data.p_rdrf->i_ref_type );
}
+ if( psz_ref ) free( psz_ref );
}
- if( b_play == VLC_TRUE )
+ 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, NULL );
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
+ p_playlist->status.p_item, NULL );
}
vlc_object_release( p_playlist );
}
p_block->i_buffer = i_size + 1;
/* convert \r -> \n */
- while( ( p = strchr( p_block->p_buffer, '\r' ) ) )
+ while( ( p = strchr((char *) p_block->p_buffer, '\r' ) ) )
{
*p = '\n';
}
case DEMUX_GET_META:
{
- vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
- vlc_meta_t *meta;
+ vlc_meta_t *p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t*);
MP4_Box_t *p_udta = MP4_BoxGet( p_sys->p_root, "/moov/udta" );
MP4_Box_t *p_0xa9xxx;
if( p_udta == NULL )
{
return VLC_EGENERIC;
}
- *pp_meta = meta = vlc_meta_New();
for( p_0xa9xxx = p_udta->p_first; p_0xa9xxx != NULL;
p_0xa9xxx = p_0xa9xxx->p_next )
{
switch( p_0xa9xxx->i_type )
{
case FOURCC_0xa9nam: /* Full name */
- vlc_meta_Add( meta, VLC_META_TITLE, psz_utf );
+ vlc_meta_SetArtist( p_meta, psz_utf );
break;
case FOURCC_0xa9aut:
- vlc_meta_Add( meta, VLC_META_AUTHOR, psz_utf );
+ vlc_meta_SetAuthor( p_meta, psz_utf );
break;
case FOURCC_0xa9ART:
- vlc_meta_Add( meta, VLC_META_ARTIST, psz_utf );
+ vlc_meta_SetArtist( p_meta, psz_utf );
break;
case FOURCC_0xa9cpy:
- vlc_meta_Add( meta, VLC_META_COPYRIGHT, psz_utf );
+ vlc_meta_SetCopyright( p_meta, psz_utf );
break;
case FOURCC_0xa9day: /* Creation Date */
- vlc_meta_Add( meta, VLC_META_DATE, psz_utf );
+ vlc_meta_SetDate( p_meta, psz_utf );
break;
case FOURCC_0xa9des: /* Description */
- vlc_meta_Add( meta, VLC_META_DESCRIPTION, psz_utf );
+ vlc_meta_SetDescription( p_meta, psz_utf );
break;
case FOURCC_0xa9gen: /* Genre */
- vlc_meta_Add( meta, VLC_META_GENRE, psz_utf );
+ vlc_meta_SetGenre( p_meta, psz_utf );
break;
case FOURCC_0xa9swr:
{
MP4_TrackDestroy( p_demux, &p_sys->track[i_track] );
}
- FREE( p_sys->track );
+ FREENULL( p_sys->track );
free( p_sys );
}
p_track->fmt.video.i_aspect =
VOUT_ASPECT_FACTOR * p_track->i_width / p_track->i_height;
+ /* Support for cropping (eg. in H263 files) */
+ p_track->fmt.video.i_visible_width = p_track->fmt.video.i_width;
+ p_track->fmt.video.i_visible_height = p_track->fmt.video.i_height;
+
/* Frame rate */
p_track->fmt.video.i_frame_rate = p_track->i_timescale;
p_track->fmt.video.i_frame_rate_base = 1;
{
if( p_track->chunk )
{
- FREE(p_track->chunk[i_chunk].p_sample_count_dts);
- FREE(p_track->chunk[i_chunk].p_sample_delta_dts );
+ FREENULL(p_track->chunk[i_chunk].p_sample_count_dts);
+ FREENULL(p_track->chunk[i_chunk].p_sample_delta_dts );
- FREE(p_track->chunk[i_chunk].p_sample_count_pts);
- FREE(p_track->chunk[i_chunk].p_sample_offset_pts );
+ FREENULL(p_track->chunk[i_chunk].p_sample_count_pts);
+ FREENULL(p_track->chunk[i_chunk].p_sample_offset_pts );
}
}
- FREE( p_track->chunk );
+ FREENULL( p_track->chunk );
if( !p_track->i_sample_size )
{
- FREE( p_track->p_sample_size );
+ FREENULL( p_track->p_sample_size );
}
}
msg_Warn( p_demux, "elst old=%d new=%d", i_elst_last, tk->i_elst );
}
}
+
+static vlc_bool_t FindItem( demux_t *p_demux, playlist_t *p_playlist,
+ playlist_item_t **pp_item )
+{
+ vlc_bool_t b_play = var_CreateGetBool( p_demux, "playlist-autostart" );
+
+ if( b_play && p_playlist->status.p_item &&
+ p_playlist->status.p_item->p_input ==
+ ((input_thread_t *)p_demux->p_parent)->input.p_item )
+ {
+ msg_Dbg( p_playlist, "starting playlist playback" );
+ *pp_item = p_playlist->status.p_item;
+ b_play = VLC_TRUE;
+ }
+ else
+ {
+ input_item_t *p_current = ( (input_thread_t*)p_demux->p_parent)->
+ input.p_item;
+ *pp_item = playlist_LockItemGetByInput( p_playlist, p_current );
+ if( !*pp_item )
+ {
+ msg_Dbg( p_playlist, "unable to find item in playlist");
+ }
+ msg_Dbg( p_playlist, "not starting playlist playback");
+ b_play = VLC_FALSE;
+ }
+ return b_play;
+}
+
+