August 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r5356 - concat/libavformat/playlist.c
by gkovacs 29 Aug '09

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:49:51 2009 New Revision: 5356 Log: don't implicitly declare ff_concat_alloc_demuxer Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sun Aug 30 00:48:41 2009 (r5355) +++ concat/libavformat/playlist.c Sun Aug 30 00:49:51 2009 (r5356) @@ -30,6 +30,7 @@ #include "playlist.h" #include "concatgen.h" +#include "concat.h" AVFormatContext *ff_playlist_alloc_formatcontext(char *filename) {

1 0

[soc]: r5355 - concat/libavformat/playlist.c
by gkovacs 29 Aug '09

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:48:41 2009 New Revision: 5355 Log: remove ff_playlist_populate_context Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sun Aug 30 00:44:42 2009 (r5354) +++ concat/libavformat/playlist.c Sun Aug 30 00:48:41 2009 (r5355) @@ -69,15 +69,6 @@ AVFormatContext *ff_playlist_alloc_conca return ic; } -int ff_playlist_populate_context(AVPlaylistContext *ctx, int pe_curidx) -{ - if (!ctx->formatcontext_list[pe_curidx]) { - if (!(ctx->formatcontext_list[pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[pe_curidx]))) - return AVERROR_NOFMT; - } - return 0; -} - int ff_playlist_set_streams(AVPlaylistContext *ctx) { unsigned int i;

1 0

[soc]: r5354 - concat/libavformat/avplaylist.c
by gkovacs 29 Aug '09

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:44:42 2009 New Revision: 5354 Log: subtract removed index's nb_streams and durations values from summed lists Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Sun Aug 30 00:36:41 2009 (r5353) +++ concat/libavformat/avplaylist.c Sun Aug 30 00:44:42 2009 (r5354) @@ -121,7 +121,7 @@ int av_playlist_insert_playlist(AVPlayli int av_playlist_remove_item(AVPlaylistContext *ctx, int pos) { - int i; + int i, cur_offset; int64_t *durations_tmp; unsigned int *nb_streams_list_tmp; AVFormatContext **formatcontext_list_tmp; @@ -137,8 +137,12 @@ int av_playlist_remove_item(AVPlaylistCo return AVERROR_NOMEM; } else ctx->flist = flist_tmp; + if (pos > 0) + cur_offset = ctx->durations[pos] - ctx->durations[pos - 1]; + else + cur_offset = ctx->durations[pos]; for (i = pos; i < ctx->pelist_size; ++i) - ctx->durations[i] = ctx->durations[i + 1]; + ctx->durations[i] = ctx->durations[i + 1] - cur_offset; durations_tmp = av_realloc(ctx->durations, sizeof(*(ctx->durations)) * (ctx->pelist_size)); if (!durations_tmp) { @@ -146,8 +150,12 @@ int av_playlist_remove_item(AVPlaylistCo return AVERROR_NOMEM; } else ctx->durations = durations_tmp; + if (pos > 0) + cur_offset = ctx->nb_streams_list[pos] - ctx->nb_streams_list[pos - 1]; + else + cur_offset = ctx->nb_streams_list[pos]; for (i = pos; i < ctx->pelist_size; ++i) - ctx->nb_streams_list[i] = ctx->nb_streams_list[i + 1]; + ctx->nb_streams_list[i] = ctx->nb_streams_list[i + 1] - cur_offset; nb_streams_list_tmp = av_realloc(ctx->nb_streams_list, sizeof(*(ctx->nb_streams_list)) * (ctx->pelist_size)); if (!nb_streams_list_tmp) {

1 0

[soc]: r5353 - in concat/libavformat: m3u.c pls.c utils.c.diff xspf.c
by gkovacs 29 Aug '09

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:36:41 2009 New Revision: 5353 Log: break long lines Modified: concat/libavformat/m3u.c concat/libavformat/pls.c concat/libavformat/utils.c.diff concat/libavformat/xspf.c Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Sun Aug 30 00:35:11 2009 (r5352) +++ concat/libavformat/m3u.c Sun Aug 30 00:36:41 2009 (r5353) @@ -106,7 +106,8 @@ static int m3u_read_header(AVFormatConte s->priv_data = ctx; ctx->master_formatcontext = s; if (!ctx->formatcontext_list[ctx->pe_curidx]) { - if (!(ctx->formatcontext_list[ctx->pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) + if (!(ctx->formatcontext_list[ctx->pe_curidx] = + ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) return AVERROR_NOFMT; } ff_playlist_set_streams(ctx); Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Sun Aug 30 00:35:11 2009 (r5352) +++ concat/libavformat/pls.c Sun Aug 30 00:36:41 2009 (r5353) @@ -125,7 +125,8 @@ static int pls_read_header(AVFormatConte s->priv_data = ctx; ctx->master_formatcontext = s; if (!ctx->formatcontext_list[ctx->pe_curidx]) { - if (!(ctx->formatcontext_list[ctx->pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) + if (!(ctx->formatcontext_list[ctx->pe_curidx] = + ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) return AVERROR_NOFMT; } ff_playlist_set_streams(ctx); Modified: concat/libavformat/utils.c.diff ============================================================================== --- concat/libavformat/utils.c.diff Sun Aug 30 00:35:11 2009 (r5352) +++ concat/libavformat/utils.c.diff Sun Aug 30 00:36:41 2009 (r5353) @@ -1,5 +1,5 @@ diff --git a/libavformat/utils.c b/libavformat/utils.c -index 4cec286..2d2549a 100644 +index 4cec286..f673716 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -27,6 +27,8 @@ @@ -21,7 +21,7 @@ index 4cec286..2d2549a 100644 AVProbeData probe_data, *pd = &probe_data; ByteIOContext *pb = NULL; -@@ -447,6 +450,30 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, +@@ -447,6 +450,31 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, fmt = av_probe_input_format(pd, 0); } @@ -39,7 +39,8 @@ index 4cec286..2d2549a 100644 + av_free(flist); + av_strlcpy(ic->filename, filename, sizeof(ic->filename)); + if (!playlist_ctx->formatcontext_list[playlist_ctx->pe_curidx]) { -+ if (!(playlist_ctx->formatcontext_list[playlist_ctx->pe_curidx] = ff_playlist_alloc_formatcontext(playlist_ctx->flist[playlist_ctx->pe_curidx]))) ++ if (!(playlist_ctx->formatcontext_list[playlist_ctx->pe_curidx] = ++ ff_playlist_alloc_formatcontext(playlist_ctx->flist[playlist_ctx->pe_curidx]))) + return AVERROR_NOFMT; + } + ff_playlist_set_streams(playlist_ctx); Modified: concat/libavformat/xspf.c ============================================================================== --- concat/libavformat/xspf.c Sun Aug 30 00:35:11 2009 (r5352) +++ concat/libavformat/xspf.c Sun Aug 30 00:36:41 2009 (r5353) @@ -148,7 +148,8 @@ static int xspf_read_header(AVFormatCont s->priv_data = ctx; ctx->master_formatcontext = s; if (!ctx->formatcontext_list[ctx->pe_curidx]) { - if (!(ctx->formatcontext_list[ctx->pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) + if (!(ctx->formatcontext_list[ctx->pe_curidx] = + ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) return AVERROR_NOFMT; } ff_playlist_set_streams(ctx);

1 0

[soc]: r5352 - in concat/libavformat: concatgen.c m3u.c playlist.h pls.c utils.c.diff xspf.c
by gkovacs 29 Aug '09

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:35:11 2009 New Revision: 5352 Log: remove ff_playlist_populate_context Modified: concat/libavformat/concatgen.c concat/libavformat/m3u.c concat/libavformat/playlist.h concat/libavformat/pls.c concat/libavformat/utils.c.diff concat/libavformat/xspf.c Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Sun Aug 30 00:24:36 2009 (r5351) +++ concat/libavformat/concatgen.c Sun Aug 30 00:35:11 2009 (r5352) @@ -81,10 +81,11 @@ int ff_concatgen_read_packet(AVFormatCon // -32 AVERROR_EOF for avi, -51 for ogg av_log(ic, AV_LOG_DEBUG, "Switching stream %d to %d\n", stream_index, ctx->pe_curidx+1); - ctx->pe_curidx++; - if (ff_playlist_populate_context(ctx, ctx->pe_curidx) < 0) { - av_log(NULL, AV_LOG_ERROR, "Failed to switch to AVFormatContext %d\n", ctx->pe_curidx); - break; + if (!ctx->formatcontext_list[++ctx->pe_curidx]) { + if (!(ctx->formatcontext_list[ctx->pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) { + av_log(NULL, AV_LOG_ERROR, "Failed to switch to AVFormatContext %d\n", ctx->pe_curidx); + break; + } } if ((ff_playlist_set_streams(ctx)) < 0) { av_log(NULL, AV_LOG_ERROR, "Failed to open codecs for streams in %d\n", ctx->pe_curidx); @@ -121,10 +122,11 @@ int ff_concatgen_read_seek(AVFormatConte ctx->pe_curidx = ff_playlist_stream_index_from_time(ctx, pts_avtimebase, &localpts_avtimebase); - err = ff_playlist_populate_context(ctx, ctx->pe_curidx); - if (err < 0) { - av_log(NULL, AV_LOG_ERROR, "Failed to switch to AVFormatContext %d\n", ctx->pe_curidx); - return err; + if (!ctx->formatcontext_list[ctx->pe_curidx]) { + if (!(ctx->formatcontext_list[ctx->pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) { + av_log(NULL, AV_LOG_ERROR, "Failed to switch to AVFormatContext %d\n", ctx->pe_curidx); + return AVERROR_NOFMT; + } } err = ff_playlist_set_streams(ctx); if (err < 0) { Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Sun Aug 30 00:24:36 2009 (r5351) +++ concat/libavformat/m3u.c Sun Aug 30 00:35:11 2009 (r5352) @@ -105,7 +105,10 @@ static int m3u_read_header(AVFormatConte av_free(flist); s->priv_data = ctx; ctx->master_formatcontext = s; - ff_playlist_populate_context(ctx, ctx->pe_curidx); + if (!ctx->formatcontext_list[ctx->pe_curidx]) { + if (!(ctx->formatcontext_list[ctx->pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) + return AVERROR_NOFMT; + } ff_playlist_set_streams(ctx); return 0; } Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Sun Aug 30 00:24:36 2009 (r5351) +++ concat/libavformat/playlist.h Sun Aug 30 00:35:11 2009 (r5352) @@ -44,13 +44,6 @@ AVFormatContext *ff_playlist_alloc_forma */ AVFormatContext *ff_playlist_alloc_concat_formatcontext(void); -/** @brief Opens the playlist element with the specified index from the AVPlaylistContext. - * @param ctx AVPlaylistContext containing the desired playlist element. - * @param pe_curidx Index of the playlist element to be opened. - * @return Returns 0 upon success, or negative upon failure. - */ -int ff_playlist_populate_context(AVPlaylistContext *ctx, int pe_curidx); - /** @brief Sets the master concat-type demuxer's streams to those of its currently opened playlist element. * Does nothing if using a standalone playlist (master_formatcontext is NULL). * @param ctx AVPlaylistContext within which the list of playlist elements and durations are stored. Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Sun Aug 30 00:24:36 2009 (r5351) +++ concat/libavformat/pls.c Sun Aug 30 00:35:11 2009 (r5352) @@ -124,7 +124,10 @@ static int pls_read_header(AVFormatConte av_free(flist); s->priv_data = ctx; ctx->master_formatcontext = s; - ff_playlist_populate_context(ctx, ctx->pe_curidx); + if (!ctx->formatcontext_list[ctx->pe_curidx]) { + if (!(ctx->formatcontext_list[ctx->pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) + return AVERROR_NOFMT; + } ff_playlist_set_streams(ctx); return 0; } Modified: concat/libavformat/utils.c.diff ============================================================================== --- concat/libavformat/utils.c.diff Sun Aug 30 00:24:36 2009 (r5351) +++ concat/libavformat/utils.c.diff Sun Aug 30 00:35:11 2009 (r5352) @@ -1,5 +1,5 @@ diff --git a/libavformat/utils.c b/libavformat/utils.c -index 4cec286..1463428 100644 +index 4cec286..2d2549a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -27,6 +27,8 @@ @@ -21,7 +21,7 @@ index 4cec286..1463428 100644 AVProbeData probe_data, *pd = &probe_data; ByteIOContext *pb = NULL; -@@ -447,6 +450,27 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, +@@ -447,6 +450,30 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, fmt = av_probe_input_format(pd, 0); } @@ -38,7 +38,10 @@ index 4cec286..1463428 100644 + } + av_free(flist); + av_strlcpy(ic->filename, filename, sizeof(ic->filename)); -+ ff_playlist_populate_context(playlist_ctx, playlist_ctx->pe_curidx); ++ if (!playlist_ctx->formatcontext_list[playlist_ctx->pe_curidx]) { ++ if (!(playlist_ctx->formatcontext_list[playlist_ctx->pe_curidx] = ff_playlist_alloc_formatcontext(playlist_ctx->flist[playlist_ctx->pe_curidx]))) ++ return AVERROR_NOFMT; ++ } + ff_playlist_set_streams(playlist_ctx); + *ic_ptr = ic; + return 0; Modified: concat/libavformat/xspf.c ============================================================================== --- concat/libavformat/xspf.c Sun Aug 30 00:24:36 2009 (r5351) +++ concat/libavformat/xspf.c Sun Aug 30 00:35:11 2009 (r5352) @@ -147,7 +147,10 @@ static int xspf_read_header(AVFormatCont av_free(flist); s->priv_data = ctx; ctx->master_formatcontext = s; - ff_playlist_populate_context(ctx, ctx->pe_curidx); + if (!ctx->formatcontext_list[ctx->pe_curidx]) { + if (!(ctx->formatcontext_list[ctx->pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]))) + return AVERROR_NOFMT; + } ff_playlist_set_streams(ctx); return 0; }

1 0

[soc]: r5351 - concat/libavformat/avplaylist.c
by gkovacs 29 Aug '09

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:24:36 2009 New Revision: 5351 Log: don't implicitly declare ff_playlist_alloc_formatcontext Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Sun Aug 30 00:22:49 2009 (r5350) +++ concat/libavformat/avplaylist.c Sun Aug 30 00:24:36 2009 (r5351) @@ -34,6 +34,7 @@ #include "riff.h" #include "libavutil/avstring.h" #include "internal.h" +#include "playlist.h" AVPlaylistContext *av_playlist_alloc(void) {

1 0

[soc]: r5350 - in concat/libavformat: avplaylist.c playlist.c
by gkovacs 29 Aug '09

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:22:49 2009 New Revision: 5350 Log: resize formatcontext_list in insert_item rather than waiting until populate_context Modified: concat/libavformat/avplaylist.c concat/libavformat/playlist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Sun Aug 30 00:14:55 2009 (r5349) +++ concat/libavformat/avplaylist.c Sun Aug 30 00:22:49 2009 (r5350) @@ -45,6 +45,7 @@ int av_playlist_insert_item(AVPlaylistCo int i, itempath_len; int64_t *durations_tmp; unsigned int *nb_streams_list_tmp; + AVFormatContext **formatcontext_list_tmp; char **flist_tmp; AVFormatContext *ic; flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (++ctx->pelist_size)); @@ -67,11 +68,20 @@ int av_playlist_insert_item(AVPlaylistCo return AVERROR_NOMEM; } else ctx->nb_streams_list = nb_streams_list_tmp; + formatcontext_list_tmp = av_realloc(ctx->formatcontext_list, + sizeof(*(ctx->formatcontext_list)) * (ctx->pelist_size)); + if (!formatcontext_list_tmp) { + av_log(NULL, AV_LOG_ERROR, "av_realloc error for formatcontext_list in av_playlist_insert_item\n"); + return AVERROR_NOMEM; + } else + ctx->formatcontext_list = formatcontext_list_tmp; for (i = ctx->pelist_size; i > pos; --i) { ctx->flist[i] = ctx->flist[i - 1]; ctx->durations[i] = ctx->durations[i - 1]; ctx->nb_streams_list[i] = ctx->nb_streams_list[i - 1]; + ctx->formatcontext_list[i] = ctx->formatcontext_list[i - 1]; } + ctx->formatcontext_list[pos] = NULL; itempath_len = strlen(itempath); ctx->flist[pos] = av_malloc(itempath_len + 1); if (!ctx->flist[pos]) { Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sun Aug 30 00:14:55 2009 (r5349) +++ concat/libavformat/playlist.c Sun Aug 30 00:22:49 2009 (r5350) @@ -71,16 +71,10 @@ AVFormatContext *ff_playlist_alloc_conca int ff_playlist_populate_context(AVPlaylistContext *ctx, int pe_curidx) { - AVFormatContext **formatcontext_list_tmp = av_realloc(ctx->formatcontext_list, sizeof(*(ctx->formatcontext_list)) * (pe_curidx+2)); - if (!formatcontext_list_tmp) { - av_log(NULL, AV_LOG_ERROR, "av_realloc error in ff_playlist_populate_context\n"); - av_free(ctx->formatcontext_list); - return AVERROR_NOMEM; - } else - ctx->formatcontext_list = formatcontext_list_tmp; - ctx->formatcontext_list[pe_curidx+1] = NULL; - if (!(ctx->formatcontext_list[pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[pe_curidx]))) - return AVERROR_NOFMT; + if (!ctx->formatcontext_list[pe_curidx]) { + if (!(ctx->formatcontext_list[pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[pe_curidx]))) + return AVERROR_NOFMT; + } return 0; }

1 0

[soc]: r5349 - concat/libavformat/playlist.c
by gkovacs 29 Aug '09

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:14:55 2009 New Revision: 5349 Log: av_close_input_file already calls av_close_input_stream and av_free Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sun Aug 30 00:13:23 2009 (r5348) +++ concat/libavformat/playlist.c Sun Aug 30 00:14:55 2009 (r5349) @@ -49,8 +49,6 @@ AVFormatContext *ff_playlist_alloc_forma if (err < 0) { av_log(ic, AV_LOG_ERROR, "Could not find stream info\n"); av_close_input_file(ic); - av_close_input_stream(ic); - av_free(ic); return NULL; } return ic;

1 0

[soc]: r5348 - in concat/libavformat: avplaylist.c playlist.c
by gkovacs 29 Aug '09

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:13:23 2009 New Revision: 5348 Log: set durations and nb_streams_list directly in av_playlist_insert_item rather than waiting until populate_context Modified: concat/libavformat/avplaylist.c concat/libavformat/playlist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Sat Aug 29 23:57:50 2009 (r5347) +++ concat/libavformat/avplaylist.c Sun Aug 30 00:13:23 2009 (r5348) @@ -46,6 +46,7 @@ int av_playlist_insert_item(AVPlaylistCo int64_t *durations_tmp; unsigned int *nb_streams_list_tmp; char **flist_tmp; + AVFormatContext *ic; flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (++ctx->pelist_size)); if (!flist_tmp) { av_log(NULL, AV_LOG_ERROR, "av_realloc error for flist in av_playlist_insert_item\n"); @@ -71,8 +72,6 @@ int av_playlist_insert_item(AVPlaylistCo ctx->durations[i] = ctx->durations[i - 1]; ctx->nb_streams_list[i] = ctx->nb_streams_list[i - 1]; } - ctx->durations[pos] = 0; - ctx->nb_streams_list[pos] = 0; itempath_len = strlen(itempath); ctx->flist[pos] = av_malloc(itempath_len + 1); if (!ctx->flist[pos]) { @@ -80,6 +79,19 @@ int av_playlist_insert_item(AVPlaylistCo return AVERROR_NOMEM; } av_strlcpy(ctx->flist[pos], itempath, itempath_len + 1); + ic = ff_playlist_alloc_formatcontext(itempath); + if (!ic) { + av_log(NULL, AV_LOG_ERROR, "failed to allocate and open %s in av_playlist_insert_item\n", itempath); + return AVERROR_NOMEM; + } + if (pos > 0) { + ctx->durations[pos] = ic->duration + ctx->durations[pos - 1]; + ctx->nb_streams_list[pos] = ic->nb_streams + ctx->nb_streams_list[pos - 1]; + } else { + ctx->durations[pos] = ic->duration; + ctx->nb_streams_list[pos] = ic->nb_streams; + } + av_close_input_file(ic); return 0; } Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sat Aug 29 23:57:50 2009 (r5347) +++ concat/libavformat/playlist.c Sun Aug 30 00:13:23 2009 (r5348) @@ -83,13 +83,6 @@ int ff_playlist_populate_context(AVPlayl ctx->formatcontext_list[pe_curidx+1] = NULL; if (!(ctx->formatcontext_list[pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[pe_curidx]))) return AVERROR_NOFMT; - if (pe_curidx > 0) { - ctx->durations[pe_curidx] = ctx->durations[pe_curidx - 1] + ctx->formatcontext_list[pe_curidx]->duration; - ctx->nb_streams_list[pe_curidx] = ctx->nb_streams_list[pe_curidx - 1] + ctx->formatcontext_list[pe_curidx]->nb_streams; - } else { - ctx->durations[pe_curidx] = ctx->formatcontext_list[pe_curidx]->duration; - ctx->nb_streams_list[pe_curidx] = ctx->formatcontext_list[pe_curidx]->nb_streams; - } return 0; }

1 0

[soc]: r5347 - concat/libavformat/avplaylist.c
by gkovacs 29 Aug '09

29 Aug '09

Author: gkovacs Date: Sat Aug 29 23:57:50 2009 New Revision: 5347 Log: more descriptive error messages for av_realloc failures in insert_item and remove_item Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Sat Aug 29 23:34:43 2009 (r5346) +++ concat/libavformat/avplaylist.c Sat Aug 29 23:57:50 2009 (r5347) @@ -48,21 +48,21 @@ int av_playlist_insert_item(AVPlaylistCo char **flist_tmp; flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (++ctx->pelist_size)); if (!flist_tmp) { - av_log(NULL, AV_LOG_ERROR, "av_realloc error in av_playlist_insert_item\n"); + av_log(NULL, AV_LOG_ERROR, "av_realloc error for flist in av_playlist_insert_item\n"); return AVERROR_NOMEM; } else ctx->flist = flist_tmp; durations_tmp = av_realloc(ctx->durations, sizeof(*(ctx->durations)) * (ctx->pelist_size)); if (!durations_tmp) { - av_log(NULL, AV_LOG_ERROR, "av_realloc error in av_playlist_insert_item\n"); + av_log(NULL, AV_LOG_ERROR, "av_realloc error for durations in av_playlist_insert_item\n"); return AVERROR_NOMEM; } else ctx->durations = durations_tmp; nb_streams_list_tmp = av_realloc(ctx->nb_streams_list, sizeof(*(ctx->nb_streams_list)) * (ctx->pelist_size)); if (!nb_streams_list_tmp) { - av_log(NULL, AV_LOG_ERROR, "av_realloc error in av_playlist_insert_item\n"); + av_log(NULL, AV_LOG_ERROR, "av_realloc error for nb_streams_list in av_playlist_insert_item\n"); return AVERROR_NOMEM; } else ctx->nb_streams_list = nb_streams_list_tmp; @@ -110,7 +110,7 @@ int av_playlist_remove_item(AVPlaylistCo ctx->flist[i] = ctx->flist[i + 1]; flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (--ctx->pelist_size)); if (!flist_tmp) { - av_log(NULL, AV_LOG_ERROR, "av_realloc error in av_playlist_remove_item\n"); + av_log(NULL, AV_LOG_ERROR, "av_realloc error for flist in av_playlist_remove_item\n"); return AVERROR_NOMEM; } else ctx->flist = flist_tmp; @@ -119,7 +119,7 @@ int av_playlist_remove_item(AVPlaylistCo durations_tmp = av_realloc(ctx->durations, sizeof(*(ctx->durations)) * (ctx->pelist_size)); if (!durations_tmp) { - av_log(NULL, AV_LOG_ERROR, "av_realloc error in av_playlist_remove_item\n"); + av_log(NULL, AV_LOG_ERROR, "av_realloc error for durations in av_playlist_remove_item\n"); return AVERROR_NOMEM; } else ctx->durations = durations_tmp; @@ -128,7 +128,7 @@ int av_playlist_remove_item(AVPlaylistCo nb_streams_list_tmp = av_realloc(ctx->nb_streams_list, sizeof(*(ctx->nb_streams_list)) * (ctx->pelist_size)); if (!nb_streams_list_tmp) { - av_log(NULL, AV_LOG_ERROR, "av_realloc error in av_playlist_remove_item\n"); + av_log(NULL, AV_LOG_ERROR, "av_realloc error for nb_stream_list in av_playlist_remove_item\n"); return AVERROR_NOMEM; } else ctx->nb_streams_list = nb_streams_list_tmp; @@ -143,7 +143,7 @@ int av_playlist_remove_item(AVPlaylistCo formatcontext_list_tmp = av_realloc(ctx->formatcontext_list, sizeof(*(ctx->formatcontext_list)) * (ctx->pelist_size)); if (!formatcontext_list_tmp) { - av_log(NULL, AV_LOG_ERROR, "av_realloc error in av_playlist_remove_item\n"); + av_log(NULL, AV_LOG_ERROR, "av_realloc error for formatcontext_list in av_playlist_remove_item\n"); return AVERROR_NOMEM; } else ctx->formatcontext_list = formatcontext_list_tmp;

1 0