Author: gkovacs Date: Sat Jul 4 22:22:45 2009 New Revision: 4596 Log: renamed PlaylistD to PlaylistC (playlist context) as suggeste by Baptiste Coudurier Modified: concat/libavformat/concatgen.c concat/libavformat/m3u.c concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Sat Jul 4 20:59:56 2009 (r4595) +++ concat/libavformat/concatgen.c Sat Jul 4 22:22:45 2009 (r4596) @@ -27,7 +27,7 @@ int concatgen_read_packet(AVFormatContex int i; int ret; int stream_index; - PlaylistD *playld; + PlaylistC *playld; AVFormatContext *ic; playld = s->priv_data; stream_index = 0; @@ -77,7 +77,7 @@ int concatgen_read_seek(AVFormatContext int64_t pts, int flags) { - PlaylistD *playld; + PlaylistC *playld; AVFormatContext *ic; playld = s->priv_data; ic = playld->pelist[playld->pe_curidxs[0]]->ic; @@ -90,7 +90,7 @@ int concatgen_read_timestamp(AVFormatCon int64_t pos_limit) { printf("m3u_read_timestamp called\n"); - PlaylistD *playld; + PlaylistC *playld; AVFormatContext *ic; playld = s->priv_data; ic = playld->pelist[playld->pe_curidxs[0]]->ic; @@ -102,7 +102,7 @@ int concatgen_read_timestamp(AVFormatCon int concatgen_read_close(AVFormatContext *s) { printf("m3u_read_close called\n"); - PlaylistD *playld; + PlaylistC *playld; AVFormatContext *ic; playld = s->priv_data; ic = playld->pelist[playld->pe_curidxs[0]]->ic; @@ -114,7 +114,7 @@ int concatgen_read_close(AVFormatContext int concatgen_read_play(AVFormatContext *s) { printf("m3u_read_play called\n"); - PlaylistD *playld; + PlaylistC *playld; AVFormatContext *ic; playld = s->priv_data; ic = playld->pelist[playld->pe_curidxs[0]]->ic; @@ -124,7 +124,7 @@ int concatgen_read_play(AVFormatContext int concatgen_read_pause(AVFormatContext *s) { printf("m3u_read_pause called\n"); - PlaylistD *playld; + PlaylistC *playld; AVFormatContext *ic; playld = s->priv_data; ic = playld->pelist[playld->pe_curidxs[0]]->ic; Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Sat Jul 4 20:59:56 2009 (r4595) +++ concat/libavformat/m3u.c Sat Jul 4 22:22:45 2009 (r4596) @@ -82,21 +82,21 @@ static int m3u_read_header(AVFormatConte AVFormatParameters *ap) { int i; - PlaylistD *playld = ff_make_playlistd(s->filename); + PlaylistC *playlc = ff_make_playlistc(s->filename); m3u_list_files(s->pb, - &(playld->flist), - &(playld->pelist_size), - playld->workingdir); - playld->pelist = av_malloc(playld->pelist_size * sizeof(PlayElem*)); - memset(playld->pelist, 0, playld->pelist_size * sizeof(PlayElem*)); - s->priv_data = playld; - for (i = 0; i < playld->pe_curidxs_size; ++i) { - ff_playlist_populate_context(playld, s, i); + &(playlc->flist), + &(playlc->pelist_size), + playlc->workingdir); + playlc->pelist = av_malloc(playlc->pelist_size * sizeof(PlayElem*)); + memset(playlc->pelist, 0, playlc->pelist_size * sizeof(PlayElem*)); + s->priv_data = playlc; + for (i = 0; i < playlc->pe_curidxs_size; ++i) { + ff_playlist_populate_context(playlc, s, i); } return 0; } -#if CONFIG_CONCAT_DEMUXER +#if CONFIG_M3U_DEMUXER AVInputFormat m3u_demuxer = { "m3u", NULL_IF_CONFIG_SMALL("M3U format"), Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sat Jul 4 20:59:56 2009 (r4595) +++ concat/libavformat/playlist.c Sat Jul 4 22:22:45 2009 (r4596) @@ -77,10 +77,10 @@ PlayElem* ff_make_playelem(char *filenam return pe; } -PlaylistD* ff_make_playlistd(char *filename) +PlaylistC* ff_make_playlistc(char *filename) { int i; - PlaylistD *playld = av_malloc(sizeof(PlaylistD)); + PlaylistC *playld = av_malloc(sizeof(PlaylistC)); playld->time_offsets_size = 2; // TODO don't assume we have just 2 streams playld->time_offsets = av_malloc(sizeof(playld->time_offsets) * playld->time_offsets_size); for (i = 0; i < playld->time_offsets_size; ++i) @@ -172,7 +172,7 @@ void ff_split_wd_fn(char *filepath, (*filename)[cofp-lslash] = 0; } -int ff_playlist_populate_context(PlaylistD *playld, +int ff_playlist_populate_context(PlaylistC *playld, AVFormatContext *s, int stream_index) { Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Sat Jul 4 20:59:56 2009 (r4595) +++ concat/libavformat/playlist.h Sat Jul 4 22:22:45 2009 (r4596) @@ -35,7 +35,7 @@ typedef struct PlayElem { int64_t indv_time; } PlayElem; -typedef struct PlaylistD { +typedef struct PlaylistC { char **flist; // int flist_len; PlayElem **pelist; @@ -50,13 +50,13 @@ typedef struct PlaylistD { char *filename; int64_t *time_offsets; int time_offsets_size; -} PlaylistD; +} PlaylistC; PlayElem* ff_make_playelem(char *filename); -PlaylistD* ff_make_playlistd(char *filename); +PlaylistC* ff_make_playlistc(char *filename); -int ff_playlist_populate_context(PlaylistD *playld, AVFormatContext *s, int stream_index); +int ff_playlist_populate_context(PlaylistC *playld, AVFormatContext *s, int stream_index); char* ff_conc_strings(char *string1, char *string2);