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

[soc]: r5297 - in concat/libavformat: avplaylist.c avplaylist.h
by gkovacs 26 Aug '09

26 Aug '09

Author: gkovacs Date: Wed Aug 26 09:42:59 2009 New Revision: 5297 Log: added av_playlist_insert_path Modified: concat/libavformat/avplaylist.c concat/libavformat/avplaylist.h Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Wed Aug 26 08:46:00 2009 (r5296) +++ concat/libavformat/avplaylist.c Wed Aug 26 09:42:59 2009 (r5297) @@ -86,21 +86,24 @@ int av_playlist_split_encodedstring(cons av_free(sepidx); } -int av_playlist_add_path(AVPlaylistContext *ctx, const char *itempath) +int av_playlist_insert_path(AVPlaylistContext *ctx, const char *itempath, int pos) { + int i; int64_t *durations_tmp; unsigned int *nb_streams_list_tmp; char **flist_tmp; flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (++ctx->pelist_size+1)); if (!flist_tmp) { av_log(NULL, AV_LOG_ERROR, "av_realloc error in av_playlist_add_path\n"); - av_free(ctx->durations); - ctx->durations = NULL; + av_free(ctx->flist); + ctx->flist = NULL; return AVERROR_NOMEM; } else ctx->flist = flist_tmp; + for (i = ctx->pelist_size; i > pos; --i) + ctx->flist[i] = ctx->flist[i - 1]; + ctx->flist[pos] = itempath; ctx->flist[ctx->pelist_size] = NULL; - ctx->flist[ctx->pelist_size-1] = itempath; durations_tmp = av_realloc(ctx->durations, sizeof(*(ctx->durations)) * (ctx->pelist_size+1)); if (!durations_tmp) { @@ -110,6 +113,9 @@ int av_playlist_add_path(AVPlaylistConte return AVERROR_NOMEM; } else ctx->durations = durations_tmp; + for (i = ctx->pelist_size; i > pos; --i) + ctx->durations[i] = ctx->durations[i - 1]; + ctx->durations[pos] = 0; ctx->durations[ctx->pelist_size] = 0; nb_streams_list_tmp = av_realloc(ctx->nb_streams_list, sizeof(*(ctx->nb_streams_list)) * (ctx->pelist_size+1)); @@ -120,10 +126,18 @@ int av_playlist_add_path(AVPlaylistConte return AVERROR_NOMEM; } else ctx->nb_streams_list = nb_streams_list_tmp; + for (i = ctx->pelist_size; i > pos; --i) + ctx->nb_streams_list[i] = ctx->nb_streams_list[i - 1]; + ctx->nb_streams_list[pos] = 0; ctx->nb_streams_list[ctx->pelist_size] = 0; return 0; } +int av_playlist_add_path(AVPlaylistContext *ctx, const char *itempath) +{ + return av_playlist_insert_path(ctx, itempath, ctx->pelist_size); +} + void av_playlist_relative_paths(char **flist, int len, const char *workingdir) Modified: concat/libavformat/avplaylist.h ============================================================================== --- concat/libavformat/avplaylist.h Wed Aug 26 08:46:00 2009 (r5296) +++ concat/libavformat/avplaylist.h Wed Aug 26 09:42:59 2009 (r5297) @@ -77,4 +77,13 @@ int av_playlist_split_encodedstring(cons */ int av_playlist_add_path(AVPlaylistContext *ctx, const char *itempath); +/** @brief Creates and adds AVFormatContext for item located at specified path to a AVPlaylistContext + * at specified index. Existing items will be shifted up in the list. + * @param ctx Pre-allocated AVPlaylistContext to add elements to. + * @param itempath Absolute path to item for which to add a playlist element. + * @param pos Index which the newly inserted item will occupy. + * @return Returns 0 upon success, or negative upon failure. + */ +int av_playlist_insert_path(AVPlaylistContext *ctx, const char *itempath, int pos); + #endif /* AVFORMAT_AVPLAYLIST_H */

1 0

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

26 Aug '09

Author: gkovacs Date: Wed Aug 26 08:46:00 2009 New Revision: 5296 Log: remove unused playlist.h include in avplaylist.c Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Wed Aug 26 08:45:09 2009 (r5295) +++ concat/libavformat/avplaylist.c Wed Aug 26 08:46:00 2009 (r5296) @@ -34,7 +34,6 @@ #include "riff.h" #include "libavutil/avstring.h" #include "internal.h" -#include "playlist.h" int av_playlist_split_encodedstring(const char *s, const char sep,

1 0

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

26 Aug '09

Author: gkovacs Date: Wed Aug 26 08:45:09 2009 New Revision: 5295 Log: remove unused concat.h include in avplaylist.c Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Wed Aug 26 08:42:54 2009 (r5294) +++ concat/libavformat/avplaylist.c Wed Aug 26 08:45:09 2009 (r5295) @@ -34,7 +34,6 @@ #include "riff.h" #include "libavutil/avstring.h" #include "internal.h" -#include "concat.h" #include "playlist.h" int av_playlist_split_encodedstring(const char *s,

1 0

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

26 Aug '09

Author: gkovacs Date: Wed Aug 26 08:32:17 2009 New Revision: 5293 Log: use more understandable variable names in av_playlist_localstidx_from_streamidx Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Wed Aug 26 08:10:37 2009 (r5292) +++ concat/libavformat/avplaylist.c Wed Aug 26 08:32:17 2009 (r5293) @@ -148,11 +148,11 @@ void av_playlist_relative_paths(char **f int av_playlist_localstidx_from_streamidx(AVPlaylistContext *ctx, int stream_index) { - unsigned int i, cur, prev; - cur = prev = 0; - for (i = 0; stream_index >= cur; ++i) { - prev = cur; - cur = ctx->nb_streams_list[i]; + unsigned int i, stream_total, stream_offset; + stream_total = stream_offset = 0; + for (i = 0; stream_index >= stream_total; ++i) { + stream_offset = stream_total; + stream_total = ctx->nb_streams_list[i]; } - return stream_index - prev; + return stream_index - stream_offset; }

1 0

[soc]: r5292 - in concat/libavformat: avplaylist.c avplaylist.h m3u.c pls.c utils.c.diff xspf.c
by gkovacs 26 Aug '09

26 Aug '09

Author: gkovacs Date: Wed Aug 26 08:10:37 2009 New Revision: 5292 Log: remove trivial convenience function playlist_add_filelist Modified: concat/libavformat/avplaylist.c concat/libavformat/avplaylist.h concat/libavformat/m3u.c concat/libavformat/pls.c concat/libavformat/utils.c.diff concat/libavformat/xspf.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Wed Aug 26 08:04:23 2009 (r5291) +++ concat/libavformat/avplaylist.c Wed Aug 26 08:10:37 2009 (r5292) @@ -88,17 +88,6 @@ int av_playlist_split_encodedstring(cons av_free(sepidx); } -int av_playlist_add_filelist(AVPlaylistContext *ctx, const char **flist, int len) -{ - int i, err; - for (i = 0; i < len; ++i) { - err = av_playlist_add_path(ctx, flist[i]); - if (err) - return err; - } - return 0; -} - int av_playlist_add_path(AVPlaylistContext *ctx, const char *itempath) { int64_t *durations_tmp; Modified: concat/libavformat/avplaylist.h ============================================================================== --- concat/libavformat/avplaylist.h Wed Aug 26 08:04:23 2009 (r5291) +++ concat/libavformat/avplaylist.h Wed Aug 26 08:10:37 2009 (r5292) @@ -70,14 +70,6 @@ int av_playlist_split_encodedstring(cons char ***flist_ptr, int *len_ptr); -/** @brief Adds playlist elements specified by a file list to a AVPlaylistContext. - * @param ctx Pre-allocated AVPlaylistContext to add elements to. - * @param flist List of filenames from which to construct the playlist. - * @param len Length of filename list. - * @return Returns 0 upon success, or negative upon failure. - */ -int av_playlist_add_filelist(AVPlaylistContext *ctx, const char **flist, int len); - /** @brief Creates and adds AVFormatContext for item located at specified path to a AVPlaylistContext. * @param ctx Pre-allocated AVPlaylistContext to add elements to. * @param itempath Absolute path to item for which to add a playlist element. Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Wed Aug 26 08:04:23 2009 (r5291) +++ concat/libavformat/m3u.c Wed Aug 26 08:10:37 2009 (r5292) @@ -86,7 +86,7 @@ static int m3u_read_header(AVFormatConte { AVPlaylistContext *ctx; char **flist; - int flist_len; + int flist_len, i; m3u_list_files(s->pb, &flist, &flist_len); if (!flist || flist_len <= 0) { fprintf(stderr, "no playlist items found in %s\n", s->filename); @@ -98,7 +98,8 @@ static int m3u_read_header(AVFormatConte av_log(NULL, AV_LOG_ERROR, "failed to allocate AVPlaylistContext in m3u_read_header\n"); return AVERROR_NOMEM; } - av_playlist_add_filelist(ctx, flist, flist_len); + for (i = 0; i < flist_len; ++i) + av_playlist_add_path(ctx, flist[i]); av_free(flist); s->priv_data = ctx; ctx->master_formatcontext = s; Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Wed Aug 26 08:04:23 2009 (r5291) +++ concat/libavformat/pls.c Wed Aug 26 08:10:37 2009 (r5292) @@ -105,7 +105,7 @@ static int pls_read_header(AVFormatConte { AVPlaylistContext *ctx; char **flist; - int flist_len; + int flist_len, i; pls_list_files(s->pb, &flist, &flist_len); if (!flist || flist_len <= 0) { fprintf(stderr, "no playlist items found in %s\n", s->filename); @@ -117,7 +117,8 @@ static int pls_read_header(AVFormatConte av_log(NULL, AV_LOG_ERROR, "failed to allocate AVPlaylistContext in pls_read_header\n"); return AVERROR_NOMEM; } - av_playlist_add_filelist(ctx, flist, flist_len); + for (i = 0; i < flist_len; ++i) + av_playlist_add_path(ctx, flist[i]); av_free(flist); s->priv_data = ctx; ctx->master_formatcontext = s; Modified: concat/libavformat/utils.c.diff ============================================================================== --- concat/libavformat/utils.c.diff Wed Aug 26 08:04:23 2009 (r5291) +++ concat/libavformat/utils.c.diff Wed Aug 26 08:10:37 2009 (r5292) @@ -1,5 +1,5 @@ diff --git a/libavformat/utils.c b/libavformat/utils.c -index 4cec286..76cd878 100644 +index 4cec286..97c17f0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -27,6 +27,8 @@ @@ -16,12 +16,12 @@ index 4cec286..76cd878 100644 AVFormatParameters *ap) { - int err, probe_size; -+ int err, probe_size, flist_len; ++ int err, probe_size, flist_len, i; + char **flist; AVProbeData probe_data, *pd = &probe_data; ByteIOContext *pb = NULL; -@@ -447,6 +450,23 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, +@@ -447,6 +450,24 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, fmt = av_probe_input_format(pd, 0); } @@ -32,7 +32,8 @@ index 4cec286..76cd878 100644 + AVPlaylistContext *playlist_ctx = ic->priv_data; + if (playlist_ctx) { + av_log(ic, AV_LOG_DEBUG, "Generating playlist from %s\n", filename); -+ av_playlist_add_filelist(playlist_ctx, flist, flist_len); ++ for (i = 0; i < flist_len; ++i) ++ av_playlist_add_path(playlist_ctx, flist[i]); + av_strlcpy(ic->filename, filename, sizeof(ic->filename)); + ff_playlist_populate_context(playlist_ctx, playlist_ctx->pe_curidx); + ff_playlist_set_streams(playlist_ctx); Modified: concat/libavformat/xspf.c ============================================================================== --- concat/libavformat/xspf.c Wed Aug 26 08:04:23 2009 (r5291) +++ concat/libavformat/xspf.c Wed Aug 26 08:10:37 2009 (r5292) @@ -128,7 +128,7 @@ static int xspf_read_header(AVFormatCont { AVPlaylistContext *ctx; char **flist; - int flist_len; + int flist_len, i; xspf_list_files(s->pb, &flist, &flist_len); if (!flist || flist_len <= 0) { fprintf(stderr, "no playlist items found in %s\n", s->filename); @@ -140,7 +140,8 @@ static int xspf_read_header(AVFormatCont av_log(NULL, AV_LOG_ERROR, "failed to allocate AVPlaylistContext in xspf_read_header\n"); return AVERROR_NOMEM; } - av_playlist_add_filelist(ctx, flist, flist_len); + for (i = 0; i < flist_len; ++i) + av_playlist_add_path(ctx, flist[i]); av_free(flist); s->priv_data = ctx; ctx->master_formatcontext = s;

1 0

[soc]: r5291 - in concat/libavformat: avplaylist.c avplaylist.h concatgen.c playlist.c playlist.h
by gkovacs 26 Aug '09

26 Aug '09

Author: gkovacs Date: Wed Aug 26 08:04:23 2009 New Revision: 5291 Log: move stream_index_from_time out of public header Modified: concat/libavformat/avplaylist.c concat/libavformat/avplaylist.h concat/libavformat/concatgen.c concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Wed Aug 26 08:00:40 2009 (r5290) +++ concat/libavformat/avplaylist.c Wed Aug 26 08:04:23 2009 (r5291) @@ -157,22 +157,6 @@ void av_playlist_relative_paths(char **f } } -int av_playlist_stream_index_from_time(AVPlaylistContext *ctx, - int64_t pts, - int64_t *localpts) -{ - int64_t total = 0; - int i = ctx->pe_curidx; - while (pts >= total) { - if (i >= ctx->pelist_size) - break; - total = ctx->durations[i++]; - } - if (localpts) - *localpts = pts-(total-ctx->durations[i-1]); - return i; -} - int av_playlist_localstidx_from_streamidx(AVPlaylistContext *ctx, int stream_index) { unsigned int i, cur, prev; Modified: concat/libavformat/avplaylist.h ============================================================================== --- concat/libavformat/avplaylist.h Wed Aug 26 08:00:40 2009 (r5290) +++ concat/libavformat/avplaylist.h Wed Aug 26 08:04:23 2009 (r5291) @@ -85,16 +85,6 @@ int av_playlist_add_filelist(AVPlaylistC */ int av_playlist_add_path(AVPlaylistContext *ctx, const char *itempath); -/** @brief Calculates the index of the playlist item which would contain the timestamp specified in AV_TIME_BASE units. - * @param ctx AVPlaylistContext within which the list of playlist elements and durations are stored. - * @param pts Timestamp in AV_TIME_BASE. - * @param localpts Time in the local demuxer's timeframe in AV_TIME_BASE units; if null, not calculated. - * @return Returns the index of the stream which covers the specified time range. - */ -int av_playlist_stream_index_from_time(AVPlaylistContext *ctx, - int64_t pts, - int64_t *localpts); - /** @brief Calculates the local stream index which corresponds to a global stream index. * @param ctx AVPlaylistContext within which the list of playlist elements and durations are stored. * @param stream_index Global stream index, the index of the stream within the playlist demuxer. Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Wed Aug 26 08:00:40 2009 (r5290) +++ concat/libavformat/concatgen.c Wed Aug 26 08:04:23 2009 (r5291) @@ -118,7 +118,7 @@ int ff_concatgen_read_seek(AVFormatConte pts_avtimebase = av_rescale_q(pts, ic->streams[stream_index]->time_base, AV_TIME_BASE_Q); - ctx->pe_curidx = av_playlist_stream_index_from_time(ctx, + ctx->pe_curidx = ff_playlist_stream_index_from_time(ctx, pts_avtimebase, &localpts_avtimebase); err = ff_playlist_populate_context(ctx, ctx->pe_curidx); Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Wed Aug 26 08:00:40 2009 (r5290) +++ concat/libavformat/playlist.c Wed Aug 26 08:04:23 2009 (r5291) @@ -134,3 +134,19 @@ int ff_playlist_set_streams(AVPlaylistCo s->iformat->read_timestamp = NULL; return 0; } + +int ff_playlist_stream_index_from_time(AVPlaylistContext *ctx, + int64_t pts, + int64_t *localpts) +{ + int64_t total = 0; + int i = ctx->pe_curidx; + while (pts >= total) { + if (i >= ctx->pelist_size) + break; + total = ctx->durations[i++]; + } + if (localpts) + *localpts = pts-(total-ctx->durations[i-1]); + return i; +} Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Wed Aug 26 08:00:40 2009 (r5290) +++ concat/libavformat/playlist.h Wed Aug 26 08:04:23 2009 (r5291) @@ -58,5 +58,15 @@ int ff_playlist_populate_context(AVPlayl */ int ff_playlist_set_streams(AVPlaylistContext *ctx); +/** @brief Calculates the index of the playlist item which would contain the timestamp specified in AV_TIME_BASE units. + * @param ctx AVPlaylistContext within which the list of playlist elements and durations are stored. + * @param pts Timestamp in AV_TIME_BASE. + * @param localpts Time in the local demuxer's timeframe in AV_TIME_BASE units; if null, not calculated. + * @return Returns the index of the stream which covers the specified time range. + */ +int ff_playlist_stream_index_from_time(AVPlaylistContext *ctx, + int64_t pts, + int64_t *localpts); + #endif /* AVFORMAT_PLAYLIST_H */

1 0

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

26 Aug '09

Author: gkovacs Date: Wed Aug 26 08:00:40 2009 New Revision: 5290 Log: remove unused commented-out code Modified: concat/libavformat/concatgen.c Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Wed Aug 26 07:58:26 2009 (r5289) +++ concat/libavformat/concatgen.c Wed Aug 26 08:00:40 2009 (r5290) @@ -82,9 +82,6 @@ int ff_concatgen_read_packet(AVFormatCon av_log(ic, AV_LOG_DEBUG, "Switching stream %d to %d\n", stream_index, ctx->pe_curidx+1); ctx->pe_curidx++; - //ctx->pe_curidx = av_playlist_stream_index_from_time(ctx, - //av_playlist_time_offset(ctx->durations, ctx->pe_curidx), - //NULL); 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;

1 0

[soc]: r5289 - in concat/libavformat: avplaylist.h concatgen.c playlist.c
by gkovacs 26 Aug '09

26 Aug '09

Author: gkovacs Date: Wed Aug 26 07:58:26 2009 New Revision: 5289 Log: include current duration in summed durations list Modified: concat/libavformat/avplaylist.h concat/libavformat/concatgen.c concat/libavformat/playlist.c Modified: concat/libavformat/avplaylist.h ============================================================================== --- concat/libavformat/avplaylist.h Wed Aug 26 07:51:19 2009 (r5288) +++ concat/libavformat/avplaylist.h Wed Aug 26 07:58:26 2009 (r5289) @@ -44,7 +44,7 @@ typedef struct AVPlaylistContext { AVFormatContext **formatcontext_list; /**< List of AVFormatContext for each playlist item */ int pelist_size; /**< Number of playlist elements stored in formatcontext_list */ int pe_curidx; /**< Index of the AVFormatContext in formatcontext_list that packets are being read from */ - int64_t *durations; /**< Sum of previous durations, in AV_TIME_BASE units, for each playlist item */ + int64_t *durations; /**< Sum of current and previous durations, in AV_TIME_BASE units, for each playlist item */ unsigned int *nb_streams_list; /**< Sum of current and previous number of streams in each playlist item*/ AVFormatContext *master_formatcontext; /**< Parent AVFormatContext of which priv_data is this playlist. NULL if playlist is used standalone. */ } AVPlaylistContext; Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Wed Aug 26 07:51:19 2009 (r5288) +++ concat/libavformat/concatgen.c Wed Aug 26 07:58:26 2009 (r5289) @@ -61,9 +61,11 @@ int ff_concatgen_read_packet(AVFormatCon pkt->stream_index = stream_index + streams_offset; if (!ic->streams[stream_index]->codec->has_b_frames || ic->streams[stream_index]->codec->codec->id == CODEC_ID_MPEG1VIDEO) { - int64_t time_offset_localbase = av_rescale_q(ctx->durations[ctx->pe_curidx], - AV_TIME_BASE_Q, - ic->streams[stream_index]->time_base); + int64_t time_offset_localbase = 0; + if (ctx->pe_curidx > 0) + time_offset_localbase = av_rescale_q(ctx->durations[ctx->pe_curidx - 1], + AV_TIME_BASE_Q, + ic->streams[stream_index]->time_base); if (pkt->dts != AV_NOPTS_VALUE) pkt->dts += time_offset_localbase; if (pkt->pts != AV_NOPTS_VALUE) Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Wed Aug 26 07:51:19 2009 (r5288) +++ concat/libavformat/playlist.c Wed Aug 26 07:58:26 2009 (r5289) @@ -86,7 +86,7 @@ int ff_playlist_populate_context(AVPlayl 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] = 0; + 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]: r5288 - in concat/libavformat: avplaylist.c avplaylist.h playlist.c
by gkovacs 26 Aug '09

26 Aug '09

Author: gkovacs Date: Wed Aug 26 07:51:19 2009 New Revision: 5288 Log: use unsigned int for nb_streams_list since AVFormatContext->nb_streams is unsigned Modified: concat/libavformat/avplaylist.c concat/libavformat/avplaylist.h concat/libavformat/playlist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Wed Aug 26 07:47:59 2009 (r5287) +++ concat/libavformat/avplaylist.c Wed Aug 26 07:51:19 2009 (r5288) @@ -102,7 +102,7 @@ int av_playlist_add_filelist(AVPlaylistC int av_playlist_add_path(AVPlaylistContext *ctx, const char *itempath) { int64_t *durations_tmp; - int *nb_streams_list_tmp; + unsigned int *nb_streams_list_tmp; char **flist_tmp; flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (++ctx->pelist_size+1)); if (!flist_tmp) { @@ -175,7 +175,7 @@ int av_playlist_stream_index_from_time(A int av_playlist_localstidx_from_streamidx(AVPlaylistContext *ctx, int stream_index) { - int i, cur, prev; + unsigned int i, cur, prev; cur = prev = 0; for (i = 0; stream_index >= cur; ++i) { prev = cur; Modified: concat/libavformat/avplaylist.h ============================================================================== --- concat/libavformat/avplaylist.h Wed Aug 26 07:47:59 2009 (r5287) +++ concat/libavformat/avplaylist.h Wed Aug 26 07:51:19 2009 (r5288) @@ -45,7 +45,7 @@ typedef struct AVPlaylistContext { int pelist_size; /**< Number of playlist elements stored in formatcontext_list */ int pe_curidx; /**< Index of the AVFormatContext in formatcontext_list that packets are being read from */ int64_t *durations; /**< Sum of previous durations, in AV_TIME_BASE units, for each playlist item */ - int *nb_streams_list; /**< Sum of previous number of streams in each playlist item*/ + unsigned int *nb_streams_list; /**< Sum of current and previous number of streams in each playlist item*/ AVFormatContext *master_formatcontext; /**< Parent AVFormatContext of which priv_data is this playlist. NULL if playlist is used standalone. */ } AVPlaylistContext; Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Wed Aug 26 07:47:59 2009 (r5287) +++ concat/libavformat/playlist.c Wed Aug 26 07:51:19 2009 (r5288) @@ -94,12 +94,12 @@ int ff_playlist_populate_context(AVPlayl int ff_playlist_set_streams(AVPlaylistContext *ctx) { - int i; + unsigned int i; AVFormatContext *s, *ic; if (!(s = ctx->master_formatcontext)) return 0; ic = ctx->formatcontext_list[ctx->pe_curidx]; - int offset = 0; + 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

[soc]: r5287 - in concat/libavformat: avplaylist.c avplaylist.h concatgen.c playlist.c
by gkovacs 26 Aug '09

26 Aug '09

Author: gkovacs Date: Wed Aug 26 07:47:59 2009 New Revision: 5287 Log: remove streams_offset_from_playidx Modified: concat/libavformat/avplaylist.c concat/libavformat/avplaylist.h concat/libavformat/concatgen.c concat/libavformat/playlist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Wed Aug 26 07:35:17 2009 (r5286) +++ concat/libavformat/avplaylist.c Wed Aug 26 07:47:59 2009 (r5287) @@ -183,12 +183,3 @@ int av_playlist_localstidx_from_streamid } return stream_index - prev; } - -int av_playlist_streams_offset_from_playidx(AVPlaylistContext *ctx, int playidx) -{ - int i, total; - i = total = 0; - while (playidx > i) - total = ctx->nb_streams_list[i++]; - return total; -} Modified: concat/libavformat/avplaylist.h ============================================================================== --- concat/libavformat/avplaylist.h Wed Aug 26 07:35:17 2009 (r5286) +++ concat/libavformat/avplaylist.h Wed Aug 26 07:47:59 2009 (r5287) @@ -102,11 +102,4 @@ int av_playlist_stream_index_from_time(A */ int av_playlist_localstidx_from_streamidx(AVPlaylistContext *ctx, int stream_index); -/** @brief Calculates the stream offset which corresponds to the given playlist item index. - * @param ctx AVPlaylistContext within which the list of playlist elements and durations are stored. - * @param playidx Playlist item index, the index of the child demuxer within ctx->formatcontext_list. - * @return Returns the stream offset, which is global stream index - local stream index. - */ -int av_playlist_streams_offset_from_playidx(AVPlaylistContext *ctx, int playidx); - #endif /* AVFORMAT_AVPLAYLIST_H */ Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Wed Aug 26 07:35:17 2009 (r5286) +++ concat/libavformat/concatgen.c Wed Aug 26 07:47:59 2009 (r5287) @@ -54,7 +54,9 @@ int ff_concatgen_read_packet(AVFormatCon } if (ret >= 0) { if (pkt) { - int streams_offset = av_playlist_streams_offset_from_playidx(ctx, ctx->pe_curidx); + int streams_offset = 0; + if (ctx->pe_curidx > 0) + streams_offset = ctx->nb_streams_list[ctx->pe_curidx - 1]; stream_index = av_playlist_localstidx_from_streamidx(ctx, pkt->stream_index); pkt->stream_index = stream_index + streams_offset; if (!ic->streams[stream_index]->codec->has_b_frames || Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Wed Aug 26 07:35:17 2009 (r5286) +++ concat/libavformat/playlist.c Wed Aug 26 07:47:59 2009 (r5287) @@ -99,7 +99,9 @@ int ff_playlist_set_streams(AVPlaylistCo if (!(s = ctx->master_formatcontext)) return 0; ic = ctx->formatcontext_list[ctx->pe_curidx]; - int offset = av_playlist_streams_offset_from_playidx(ctx, ctx->pe_curidx); + int offset = 0; + if (ctx->pe_curidx > 0) + offset = ctx->nb_streams_list[ctx->pe_curidx - 1]; ic->iformat->read_header(ic, NULL); for (i = 0; i < ic->nb_streams; ++i) { s->streams[offset + i] = ic->streams[i];

1 0