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

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

29 Aug '09

Author: gkovacs Date: Sun Aug 30 01:16:28 2009 New Revision: 5366 Log: remove unused variable Modified: concat/libavformat/concatgen.c Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Sun Aug 30 01:15:58 2009 (r5365) +++ concat/libavformat/concatgen.c Sun Aug 30 01:16:28 2009 (r5366) @@ -37,7 +37,7 @@ int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt) { - int ret, i, stream_index; + int ret, stream_index; char have_switched_streams = 0; AVPlaylistContext *ctx = s->priv_data; AVFormatContext *ic;

1 0

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

29 Aug '09

Author: gkovacs Date: Sun Aug 30 01:15:58 2009 New Revision: 5365 Log: update durations for master formatcontext after inserting or removing playlist items Modified: concat/libavformat/avplaylist.c concat/libavformat/concatgen.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Sun Aug 30 01:09:53 2009 (r5364) +++ concat/libavformat/avplaylist.c Sun Aug 30 01:15:58 2009 (r5365) @@ -110,6 +110,9 @@ int av_playlist_insert_item(AVPlaylistCo return AVERROR_NOMEM; } av_strlcpy(ctx->flist[pos], itempath, itempath_len + 1); + // duration is updated in case it's checked by a parent demuxer (chained concat demuxers) + if (ctx->master_formatcontext) + ctx->master_formatcontext->duration = ctx->durations[ctx->pelist_size - 1]; return 0; } @@ -191,6 +194,9 @@ int av_playlist_remove_item(AVPlaylistCo return AVERROR_NOMEM; } else ctx->formatcontext_list = formatcontext_list_tmp; + // duration is updated in case it's checked by a parent demuxer (chained concat demuxers) + if (ctx->master_formatcontext) + ctx->master_formatcontext->duration = ctx->durations[ctx->pelist_size - 1]; return 0; } Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Sun Aug 30 01:09:53 2009 (r5364) +++ concat/libavformat/concatgen.c Sun Aug 30 01:15:58 2009 (r5365) @@ -100,10 +100,6 @@ int ff_concatgen_read_packet(AVFormatCon } // have_switched_streams is set to avoid infinite loop have_switched_streams = 1; - // duration is updated in case it's checked by a parent demuxer (chained concat demuxers) - s->duration = 0; - for (i = 0; i < ctx->pe_curidx; ++i) - s->duration += ctx->durations[i]; continue; } else { av_log(ic, AV_LOG_ERROR, "Packet read error %d\n", ret);

1 0

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

29 Aug '09

Author: gkovacs Date: Sun Aug 30 01:09:53 2009 New Revision: 5364 Log: break long lines in concatgen.c Modified: concat/libavformat/concatgen.c Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Sun Aug 30 01:07:26 2009 (r5363) +++ concat/libavformat/concatgen.c Sun Aug 30 01:09:53 2009 (r5364) @@ -80,15 +80,22 @@ int ff_concatgen_read_packet(AVFormatCon // TODO switch from AVERROR_EOF to AVERROR_EOS // -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); + av_log(ic, AV_LOG_DEBUG, + "Switching stream %d to %d\n", + stream_index, ctx->pe_curidx+1); 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); + 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); + av_log(NULL, AV_LOG_ERROR, + "Failed to open codecs for streams in %d\n", + ctx->pe_curidx); break; } // have_switched_streams is set to avoid infinite loop @@ -123,14 +130,19 @@ int ff_concatgen_read_seek(AVFormatConte pts_avtimebase, &localpts_avtimebase); 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); + 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) { - av_log(NULL, AV_LOG_ERROR, "Failed to open codecs for streams in %d\n", ctx->pe_curidx); + av_log(NULL, AV_LOG_ERROR, + "Failed to open codecs for streams in %d\n", + ctx->pe_curidx); return err; } ic = ctx->formatcontext_list[ctx->pe_curidx];

1 0

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

29 Aug '09

Author: gkovacs Date: Sun Aug 30 01:07:26 2009 New Revision: 5363 Log: break long av_log lines in playlist.c Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sun Aug 30 01:06:07 2009 (r5362) +++ concat/libavformat/playlist.c Sun Aug 30 01:07:26 2009 (r5363) @@ -38,7 +38,8 @@ AVFormatContext *ff_playlist_alloc_forma int err; AVFormatContext *ic = avformat_alloc_context(); if (!ic) { - av_log(NULL, AV_LOG_ERROR, "unable to allocate AVFormatContext in ff_playlist_alloc_formatcontext\n"); + av_log(NULL, AV_LOG_ERROR, + "unable to allocate AVFormatContext in ff_playlist_alloc_formatcontext\n"); return NULL; } err = av_open_input_file(&ic, filename, ic->iformat, 0, NULL); @@ -61,7 +62,8 @@ AVFormatContext *ff_playlist_alloc_conca AVFormatContext *ic; AVPlaylistContext *ctx = av_playlist_alloc(); if (!ctx) { - av_log(NULL, AV_LOG_ERROR, "failed to allocate AVPlaylistContext in ff_playlist_alloc_concat_formatcontext\n"); + av_log(NULL, AV_LOG_ERROR, + "failed to allocate AVPlaylistContext in ff_playlist_alloc_concat_formatcontext\n"); return NULL; } ic = avformat_alloc_context(); @@ -126,7 +128,8 @@ int ff_playlist_split_encodedstring(cons buflen = len = 0; sepidx_tmp = av_fast_realloc(sepidx, &buflen, ++len); if (!sepidx_tmp) { - av_log(NULL, AV_LOG_ERROR, "av_realloc error in av_playlist_split_encodedstring\n"); + av_log(NULL, AV_LOG_ERROR, + "av_realloc error in av_playlist_split_encodedstring\n"); av_free(sepidx); return AVERROR_NOMEM; } @@ -140,7 +143,8 @@ int ff_playlist_split_encodedstring(cons sepidx_tmp = av_fast_realloc(sepidx, &buflen, ++len); if (!sepidx_tmp) { av_free(sepidx); - av_log(NULL, AV_LOG_ERROR, "av_fast_realloc error in av_playlist_split_encodedstring\n"); + av_log(NULL, AV_LOG_ERROR, + "av_fast_realloc error in av_playlist_split_encodedstring\n"); *flist_ptr = NULL; *len_ptr = 0; return AVERROR_NOMEM; @@ -156,7 +160,8 @@ int ff_playlist_split_encodedstring(cons for (i = 0; i < len; ++i) { flist[i] = av_malloc(sepidx[i+1]-sepidx[i]); if (!flist[i]) { - av_log(NULL, AV_LOG_ERROR, "av_malloc error in av_playlist_split_encodedstring\n"); + av_log(NULL, AV_LOG_ERROR, + "av_malloc error in av_playlist_split_encodedstring\n"); *flist_ptr = NULL; *len_ptr = 0; return AVERROR_NOMEM;

1 0

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

29 Aug '09

Author: gkovacs Date: Sun Aug 30 01:06:07 2009 New Revision: 5362 Log: break long av_log lines in avplaylist.c Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Sun Aug 30 01:03:40 2009 (r5361) +++ concat/libavformat/avplaylist.c Sun Aug 30 01:06:07 2009 (r5362) @@ -51,35 +51,41 @@ int av_playlist_insert_item(AVPlaylistCo 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"); + 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 for durations 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 for nb_streams_list 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; 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"); + 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; ctx->formatcontext_list[pos] = NULL; 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); + 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) { @@ -99,7 +105,8 @@ int av_playlist_insert_item(AVPlaylistCo itempath_len = strlen(itempath); ctx->flist[pos] = av_malloc(itempath_len + 1); if (!ctx->flist[pos]) { - av_log(NULL, AV_LOG_ERROR, "av_malloc error in av_playlist_insert_item\n"); + av_log(NULL, AV_LOG_ERROR, + "av_malloc error in av_playlist_insert_item\n"); return AVERROR_NOMEM; } av_strlcpy(ctx->flist[pos], itempath, itempath_len + 1); @@ -112,7 +119,9 @@ int av_playlist_insert_playlist(AVPlayli for (i = 0; i < insert_ctx->pelist_size; ++i) { err = av_playlist_insert_item(ctx, insert_ctx->flist[i], pos + i); if (err) { - av_log(NULL, AV_LOG_ERROR, "failed to insert item %d to new position %d in av_playlist_insert_playlist\n", i, pos + i); + av_log(NULL, AV_LOG_ERROR, + "failed to insert item %d to new position %d in av_playlist_insert_playlist\n", + i, pos + i); return err; } } @@ -133,7 +142,8 @@ 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 for flist 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; @@ -146,7 +156,8 @@ 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 for durations 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; @@ -159,7 +170,8 @@ 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 for nb_stream_list 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; @@ -174,7 +186,8 @@ 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 for formatcontext_list 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; @@ -187,7 +200,9 @@ int av_playlist_close(AVPlaylistContext while (ctx->pelist_size > 0) { err = av_playlist_remove_item(ctx, ctx->pelist_size-1); if (err) { - av_log(NULL, AV_LOG_ERROR, "failed to remove item %d from playlist", ctx->pelist_size-1); + av_log(NULL, AV_LOG_ERROR, + "failed to remove item %d from playlist", + ctx->pelist_size-1); return err; } }

1 0

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

29 Aug '09

Author: gkovacs Date: Sun Aug 30 01:03:40 2009 New Revision: 5361 Log: offset following summed values in nb_streams_list and durations when inserting item into playlist Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Sun Aug 30 00:54:58 2009 (r5360) +++ concat/libavformat/avplaylist.c Sun Aug 30 01:03:40 2009 (r5361) @@ -76,20 +76,7 @@ int av_playlist_insert_item(AVPlaylistCo 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]) { - av_log(NULL, AV_LOG_ERROR, "av_malloc error in av_playlist_insert_item\n"); - 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); @@ -103,6 +90,19 @@ int av_playlist_insert_item(AVPlaylistCo ctx->nb_streams_list[pos] = ic->nb_streams; } av_close_input_file(ic); + for (i = ctx->pelist_size; i > pos; --i) { + ctx->flist[i] = ctx->flist[i - 1]; + ctx->durations[i] = ctx->durations[i - 1] + ctx->durations[pos]; + ctx->nb_streams_list[i] = ctx->nb_streams_list[i - 1] + ctx->nb_streams_list[pos]; + ctx->formatcontext_list[i] = ctx->formatcontext_list[i - 1]; + } + itempath_len = strlen(itempath); + ctx->flist[pos] = av_malloc(itempath_len + 1); + if (!ctx->flist[pos]) { + av_log(NULL, AV_LOG_ERROR, "av_malloc error in av_playlist_insert_item\n"); + return AVERROR_NOMEM; + } + av_strlcpy(ctx->flist[pos], itempath, itempath_len + 1); return 0; }

1 0

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

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:54:58 2009 New Revision: 5360 Log: don't implicitly declare av_strlcpy and av_strlcat Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sun Aug 30 00:53:41 2009 (r5359) +++ concat/libavformat/playlist.c Sun Aug 30 00:54:58 2009 (r5360) @@ -31,6 +31,7 @@ #include "playlist.h" #include "concatgen.h" #include "concat.h" +#include "libavutil/avstring.h" AVFormatContext *ff_playlist_alloc_formatcontext(char *filename) {

1 0

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

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:53:41 2009 New Revision: 5359 Log: add return value to ff_playlist_split_encodedstring Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sun Aug 30 00:52:37 2009 (r5358) +++ concat/libavformat/playlist.c Sun Aug 30 00:53:41 2009 (r5359) @@ -163,6 +163,7 @@ int ff_playlist_split_encodedstring(cons av_strlcpy(flist[i], ts+sepidx[i], sepidx[i+1]-sepidx[i]); } av_free(sepidx); + return 0; } void ff_playlist_relative_paths(char **flist,

1 0

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

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:52:37 2009 New Revision: 5358 Log: aesthetics for variable declaration and assignment Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sun Aug 30 00:51:19 2009 (r5357) +++ concat/libavformat/playlist.c Sun Aug 30 00:52:37 2009 (r5358) @@ -72,14 +72,15 @@ AVFormatContext *ff_playlist_alloc_conca int ff_playlist_set_streams(AVPlaylistContext *ctx) { - unsigned int i; + unsigned int i, offset; AVFormatContext *s, *ic; - unsigned int offset = 0; if (!(s = ctx->master_formatcontext)) return 0; ic = ctx->formatcontext_list[ctx->pe_curidx]; if (ctx->pe_curidx > 0) offset = ctx->nb_streams_list[ctx->pe_curidx - 1]; + else + offset = 0; ic->iformat->read_header(ic, NULL); for (i = 0; i < ic->nb_streams; ++i) { s->streams[offset + i] = ic->streams[i];

1 0

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

29 Aug '09

Author: gkovacs Date: Sun Aug 30 00:51:19 2009 New Revision: 5357 Log: don't mix declarations and code Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sun Aug 30 00:49:51 2009 (r5356) +++ concat/libavformat/playlist.c Sun Aug 30 00:51:19 2009 (r5357) @@ -74,10 +74,10 @@ int ff_playlist_set_streams(AVPlaylistCo { unsigned int i; AVFormatContext *s, *ic; + unsigned int offset = 0; if (!(s = ctx->master_formatcontext)) return 0; ic = ctx->formatcontext_list[ctx->pe_curidx]; - unsigned int offset = 0; if (ctx->pe_curidx > 0) offset = ctx->nb_streams_list[ctx->pe_curidx - 1]; ic->iformat->read_header(ic, NULL);

1 0