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

[soc]: r4879 - concat/ffmpeg.c.diff
by gkovacs 01 Aug '09

01 Aug '09

Author: gkovacs Date: Sat Aug 1 03:46:23 2009 New Revision: 4879 Log: removed conc parameter and original multi-file interface in favor of comma-separated file list Modified: concat/ffmpeg.c.diff Modified: concat/ffmpeg.c.diff ============================================================================== --- concat/ffmpeg.c.diff Sat Aug 1 03:41:12 2009 (r4878) +++ concat/ffmpeg.c.diff Sat Aug 1 03:46:23 2009 (r4879) @@ -1,5 +1,5 @@ diff --git a/ffmpeg.c b/ffmpeg.c -index 22bfed8..fe39b2d 100644 +index 22bfed8..945c9c7 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -70,6 +70,8 @@ @@ -11,18 +11,16 @@ index 22bfed8..fe39b2d 100644 const char program_name[] = "FFmpeg"; const int program_birth_year = 2000; -@@ -223,6 +225,10 @@ static unsigned int sws_flags = SWS_BICUBIC; +@@ -223,6 +225,8 @@ static unsigned int sws_flags = SWS_BICUBIC; static int64_t timer_start; -+static int concatenate_video_files; -+ +PlaylistContext *playlist_ctx; + static uint8_t *audio_buf; static uint8_t *audio_out; static uint8_t *audio_out2; -@@ -1237,7 +1243,8 @@ static void print_report(AVFormatContext **output_files, +@@ -1237,7 +1241,8 @@ static void print_report(AVFormatContext **output_files, /* pkt = NULL means EOF (needed to flush decoder buffers) */ static int output_packet(AVInputStream *ist, int ist_index, AVOutputStream **ost_table, int nb_ostreams, @@ -32,7 +30,7 @@ index 22bfed8..fe39b2d 100644 { AVFormatContext *os; AVOutputStream *ost; -@@ -1250,7 +1257,24 @@ static int output_packet(AVInputStream *ist, int ist_index, +@@ -1250,7 +1255,24 @@ static int output_packet(AVInputStream *ist, int ist_index, AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; AVPacket avpkt; @@ -58,7 +56,7 @@ index 22bfed8..fe39b2d 100644 if(ist->next_pts == AV_NOPTS_VALUE) ist->next_pts= ist->pts; -@@ -1644,6 +1668,7 @@ static int av_encode(AVFormatContext **output_files, +@@ -1644,6 +1666,7 @@ static int av_encode(AVFormatContext **output_files, uint8_t no_packet[MAX_FILES]={0}; int no_packet_count=0; @@ -66,7 +64,7 @@ index 22bfed8..fe39b2d 100644 file_table= av_mallocz(nb_input_files * sizeof(AVInputFile)); if (!file_table) goto fail; -@@ -2278,8 +2303,7 @@ static int av_encode(AVFormatContext **output_files, +@@ -2278,8 +2301,7 @@ static int av_encode(AVFormatContext **output_files, } //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size); @@ -76,7 +74,7 @@ index 22bfed8..fe39b2d 100644 if (verbose >= 0) fprintf(stderr, "Error while decoding stream #%d.%d\n", ist->file_index, ist->index); -@@ -2300,7 +2324,7 @@ static int av_encode(AVFormatContext **output_files, +@@ -2300,7 +2322,7 @@ static int av_encode(AVFormatContext **output_files, for(i=0;i<nb_istreams;i++) { ist = ist_table[i]; if (ist->decoding_needed) { @@ -85,7 +83,7 @@ index 22bfed8..fe39b2d 100644 } } -@@ -2848,6 +2872,7 @@ static enum CodecID find_codec_or_die(const char *name, int type, int encoder) +@@ -2848,10 +2870,12 @@ static enum CodecID find_codec_or_die(const char *name, int type, int encoder) static void opt_input_file(const char *filename) { @@ -93,33 +91,15 @@ index 22bfed8..fe39b2d 100644 AVFormatContext *ic; AVFormatParameters params, *ap = &params; int err, i, ret, rfps, rfps_base; -@@ -2859,6 +2884,45 @@ static void opt_input_file(const char *filename) + int64_t timestamp; ++ char concatenate_video_files; + + if (!strcmp(filename, "-")) + filename = "pipe:"; +@@ -2859,6 +2883,24 @@ static void opt_input_file(const char *filename) using_stdin |= !strncmp(filename, "pipe:", 5) || !strcmp(filename, "/dev/stdin"); -+ if (concatenate_video_files) { // need to specify -conc before -i -+ if (!playlist_ctx) { -+ ic = avformat_alloc_context(); -+ av_log(ic, AV_LOG_DEBUG, "Generating playlist ctx\n"); -+ playlist_ctx = av_mallocz(sizeof(*playlist_ctx)); -+ ff_playlist_add_path(playlist_ctx, filename); -+ ic->nb_streams = 2; -+ ic->iformat = ff_concat_alloc_demuxer(); -+ ff_playlist_set_context(ic, playlist_ctx); -+ ff_playlist_populate_context(playlist_ctx, playlist_ctx->pe_curidx); -+ ff_playlist_set_streams(ic); -+ nb_input_files = 1; -+ input_files[0] = ic; -+ goto configcodecs; -+ } -+ else { -+ av_log(ic, AV_LOG_DEBUG, "Adding file %s to playlist\n", filename); -+ ff_playlist_add_path(playlist_ctx, filename); -+ return; -+ } -+ } -+ -+ // alternative interface for concat - specify -i item1,item2,item3 + playlist_ctx = ff_playlist_from_encodedstring(filename, ','); + if (playlist_ctx) { + av_log(ic, AV_LOG_DEBUG, "Generating playlist from %s\n", filename); @@ -135,11 +115,13 @@ index 22bfed8..fe39b2d 100644 + input_files[0] = ic; + goto configcodecs; + } ++ else ++ concatenate_video_files = 0; + /* get default parameters from command line */ ic = avformat_alloc_context(); -@@ -2925,6 +2989,8 @@ static void opt_input_file(const char *filename) +@@ -2925,6 +2967,8 @@ static void opt_input_file(const char *filename) start_time = 0; } @@ -148,7 +130,7 @@ index 22bfed8..fe39b2d 100644 /* update the current parameters so that they match the one of the input stream */ for(i=0;i<ic->nb_streams;i++) { AVCodecContext *enc = ic->streams[i]->codec; -@@ -3000,6 +3066,8 @@ static void opt_input_file(const char *filename) +@@ -3000,6 +3044,8 @@ static void opt_input_file(const char *filename) dump_format(ic, nb_input_files, filename, 0); nb_input_files++; @@ -157,11 +139,3 @@ index 22bfed8..fe39b2d 100644 file_iformat = NULL; file_oformat = NULL; -@@ -3874,6 +3942,7 @@ static const OptionDef options[] = { - { "programid", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&opt_programid}, "desired program number", "" }, - { "xerror", OPT_BOOL, {(void*)&exit_on_error}, "exit on error", "error" }, - { "copyinkf", OPT_BOOL | OPT_EXPERT, {(void*)&copy_initial_nonkeyframes}, "copy initial non-keyframes" }, -+ { "conc", OPT_BOOL, {(void*)&concatenate_video_files}, "concatenate video files", "concatenate" }, - - /* video options */ - { "b", OPT_FUNC2 | HAS_ARG | OPT_VIDEO, {(void*)opt_bitrate}, "set bitrate (in bits/s)", "bitrate" },

1 0

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

01 Aug '09

Author: gkovacs Date: Sat Aug 1 03:41:12 2009 New Revision: 4878 Log: removing redundant comment Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sat Aug 1 03:40:15 2009 (r4877) +++ concat/libavformat/playlist.c Sat Aug 1 03:41:12 2009 (r4878) @@ -136,7 +136,6 @@ void ff_playlist_add_path(PlaylistContex ctx->durations[ctx->pelist_size] = NULL; } -// converts list of mixed absolute and relative paths into all absolute paths void ff_playlist_relative_paths(char **flist, int len, const char *workingdir) { int i;

1 0

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

01 Aug '09

Author: gkovacs Date: Sat Aug 1 03:40:15 2009 New Revision: 4877 Log: use avformat_alloc_context rather than av_mallocz to allocate AVFormatContext Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sat Aug 1 03:38:26 2009 (r4876) +++ concat/libavformat/playlist.c Sat Aug 1 03:40:15 2009 (r4877) @@ -37,7 +37,7 @@ AVFormatContext *ff_playlist_alloc_formatcontext(char *filename) { int err; - AVFormatContext *ic = av_mallocz(sizeof(*ic)); + AVFormatContext *ic = avformat_alloc_context(); err = av_open_input_file(&(ic), filename, ic->iformat, 0, NULL); if (err < 0) av_log(ic, AV_LOG_ERROR, "Error during av_open_input_file\n");

1 0

[soc]: r4876 - concat/libavformat/playlist.h
by gkovacs 01 Aug '09

01 Aug '09

Author: gkovacs Date: Sat Aug 1 03:38:26 2009 New Revision: 4876 Log: additional updates to doxygen comments Modified: concat/libavformat/playlist.h Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Sat Aug 1 03:33:14 2009 (r4875) +++ concat/libavformat/playlist.h Sat Aug 1 03:38:26 2009 (r4876) @@ -44,14 +44,15 @@ typedef struct PlaylistContext { char **flist; /**< List of file names for each playlist item */ AVFormatContext **icl; /**< List of FormatContext for each playlist items */ - int pelist_size; /**< Number of PlayElem stored in pelist */ - int pe_curidx; /**< Index of the PlayElem that packets are being read from */ + int pelist_size; /**< Number of playlist elements stored in icl */ + int pe_curidx; /**< Index of the AVFormatContext in icl that packets are being read from */ int64_t *durations; /**< Durations, in AV_TIME_BASE units, for each playlist item */ } PlaylistContext; -/** @fn int ff_playlist_alloc_playelem(PlayElem* pe) +/** @fn AVFormatContext *ff_playlist_alloc_formatcontext(char *filename) * @brief Allocates and opens file, codecs, and streams associated with filename. * @param filename Null-terminated string of file to open. + * @return Returns an allocated AVFormatContext. */ AVFormatContext *ff_playlist_alloc_formatcontext(char *filename);

1 0

[soc]: r4875 - in concat: ffplay.c.diff libavformat/playlist.c libavformat/playlist.h
by gkovacs 01 Aug '09

01 Aug '09

Author: gkovacs Date: Sat Aug 1 03:33:14 2009 New Revision: 4875 Log: temporarily removing ff_playlist_get_stream used only by ffplay Modified: concat/ffplay.c.diff concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/ffplay.c.diff ============================================================================== --- concat/ffplay.c.diff Sat Aug 1 03:30:26 2009 (r4874) +++ concat/ffplay.c.diff Sat Aug 1 03:33:14 2009 (r4875) @@ -1,5 +1,5 @@ diff --git a/ffplay.c b/ffplay.c -index 5f88a46..7e0ecb1 100644 +index 5f88a46..b49b978 100644 --- a/ffplay.c +++ b/ffplay.c @@ -30,6 +30,8 @@ @@ -115,7 +115,7 @@ index 5f88a46..7e0ecb1 100644 /* if error, we skip the frame */ pkt_temp->size = 0; + if (pl_ctx && pkt) { -+ AVStream *propst = ff_playlist_get_stream(pl_ctx, st_idx+1, pkt->stream_index); ++ AVStream *propst = 0;//ff_playlist_get_stream(pl_ctx, st_idx+1, pkt->stream_index); + if (propst && propst->codec && propst->codec->codec_type == CODEC_TYPE_AUDIO) { + if (!propst->codec->codec) { + AVCodec *codec = avcodec_find_decoder(propst->codec->codec_id); Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sat Aug 1 03:30:26 2009 (r4874) +++ concat/libavformat/playlist.c Sat Aug 1 03:33:14 2009 (r4875) @@ -83,16 +83,6 @@ void ff_playlist_set_context(AVFormatCon ic->priv_data = ctx; } -AVStream *ff_playlist_get_stream(PlaylistContext *ctx, int pe_idx, int stream_index) -{ - if (ctx && pe_idx < ctx->pelist_size && ctx->icl && ctx->icl[pe_idx] && - ctx->icl[pe_idx] && stream_index < ctx->icl[pe_idx]->nb_streams && - ctx->icl[pe_idx]->streams && ctx->icl[pe_idx]->streams[stream_index]) - return ctx->icl[pe_idx]->streams[stream_index]; - else - return NULL; -} - void ff_playlist_split_encodedstring(char *s, char sep, char ***flist_ptr, int *len_ptr) { char c, *ts, **flist; Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Sat Aug 1 03:30:26 2009 (r4874) +++ concat/libavformat/playlist.h Sat Aug 1 03:33:14 2009 (r4875) @@ -82,14 +82,6 @@ PlaylistContext* ff_playlist_get_context */ void ff_playlist_set_context(AVFormatContext *ic, PlaylistContext *ctx); -/** @fn AVStream *ff_playlist_get_stream(PlaylistContext *ctx, int pe_idx, int stream_index) - * @brief Obtains a specified stream from a specified item in a PlaylistContext. - * @param ctx PlaylistContext which contains the desired stream. - * @param pe_idx Index that the PlayElem has in the PlaylistContext (playlist item number), PlayElem should already be open. - * @param stream_index Index of the multimedia stream (audio or video) within the PlayElem. - */ -AVStream *ff_playlist_get_stream(PlaylistContext *ctx, int pe_idx, int stream_index); - /** @fn void ff_playlist_relative_paths(char **flist, int len, const char *workingdir) * @brief Converts a list of mixed relative or absolute paths into all absolute paths. * @param flist List of null-terminated strings of relative or absolute paths.

1 0

[soc]: r4874 - concat/libavformat/playlist.h
by gkovacs 01 Aug '09

01 Aug '09

Author: gkovacs Date: Sat Aug 1 03:30:26 2009 New Revision: 4874 Log: updating doxygen comments Modified: concat/libavformat/playlist.h Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Sat Aug 1 03:16:18 2009 (r4873) +++ concat/libavformat/playlist.h Sat Aug 1 03:30:26 2009 (r4874) @@ -46,7 +46,7 @@ typedef struct PlaylistContext { AVFormatContext **icl; /**< List of FormatContext for each playlist items */ int pelist_size; /**< Number of PlayElem stored in pelist */ int pe_curidx; /**< Index of the PlayElem that packets are being read from */ - int64_t *durations; /**< Durations, in 10^-6 seconds, for each playlist item */ + int64_t *durations; /**< Durations, in AV_TIME_BASE units, for each playlist item */ } PlaylistContext; /** @fn int ff_playlist_alloc_playelem(PlayElem* pe) @@ -55,12 +55,17 @@ typedef struct PlaylistContext { */ AVFormatContext *ff_playlist_alloc_formatcontext(char *filename); -/** @fn void ff_playlist_populate_context(PlaylistContext *playlc, AVFormatContext *s, int stream_index) - * @brief Opens the current PlayElem from the PlaylistContext. - * @param s AVFormatContext of the concat-type demuxer, which contains the PlaylistContext. +/** @fn void ff_playlist_populate_context(PlaylistContext *ctx, int pe_curidx) + * @brief Opens the playlist element with the specified index from the PlaylistContext. + * @param ctx PlaylistContext containing the desired playlist element. + * @param pe_curidx Index of the playlist element to be opened. */ void ff_playlist_populate_context(PlaylistContext *ctx, int pe_curidx); +/** @fn void ff_playlist_set_streams(AVFormatContext *s) + * @brief Sets the master concat-type demuxer's streams to those of its currently opened playlist element. + * @param s AVFormatContext of the concat-type demuxer, which contains the PlaylistContext and substreams. + */ void ff_playlist_set_streams(AVFormatContext *s); /** @fn PlaylistContext* ff_playlist_get_context(AVFormatContext *ic) @@ -113,10 +118,16 @@ PlaylistContext *ff_playlist_from_encode /** @fn void ff_playlist_add_path(PlaylistContext *ctx, char *itempath) * @brief Adds PlayElem for item located at specified path to a PlaylistContext. * @param ctx Pre-allocated PlaylistContext to add elements to. - * @param Absolute path to item for which to add a playlist element. + * @param itempath Absolute path to item for which to add a playlist element. */ void ff_playlist_add_path(PlaylistContext *ctx, char *itempath); +/** @fn int64_t ff_playlist_time_offset(int64_t *durations, int pe_curidx) + * @brief Calculates the total time offset of an element in a PlaylistContext in AV_TIME_BASE units. + * @param durations Durations of playlist items in AV_TIME_BASE units, array must be of size greater than or equal to pe_curidx. + * @param pe_curidx Index of the playlist element for which to calculate the time offset. + * @return Returns the time offset in AV_TIME_BASE units. + */ int64_t ff_playlist_time_offset(int64_t *durations, int pe_curidx); int ff_playlist_stream_index_from_time(PlaylistContext *ctx, int64_t pts);

1 0

[soc]: r4873 - concat/libavformat/concatgen.h
by gkovacs 01 Aug '09

01 Aug '09

Author: gkovacs Date: Sat Aug 1 03:16:18 2009 New Revision: 4873 Log: aesthetic fix to break long line Modified: concat/libavformat/concatgen.h Modified: concat/libavformat/concatgen.h ============================================================================== --- concat/libavformat/concatgen.h Sat Aug 1 03:13:41 2009 (r4872) +++ concat/libavformat/concatgen.h Sat Aug 1 03:16:18 2009 (r4873) @@ -28,7 +28,10 @@ int ff_concatgen_read_packet(AVFormatCon int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); -int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); +int64_t ff_concatgen_read_timestamp(AVFormatContext *s, + int stream_index, + int64_t *pos, + int64_t pos_limit); int ff_concatgen_read_close(AVFormatContext *s);

1 0

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

01 Aug '09

Author: gkovacs Date: Sat Aug 1 03:13:41 2009 New Revision: 4872 Log: no longer using AVPacket to store stream pointer Modified: concat/libavformat/concatgen.c Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Fri Jul 31 17:36:07 2009 (r4871) +++ concat/libavformat/concatgen.c Sat Aug 1 03:13:41 2009 (r4872) @@ -45,7 +45,6 @@ int ff_concatgen_read_packet(AVFormatCon ret = ic->iformat->read_packet(ic, pkt); if (pkt) { stream_index = pkt->stream_index; - pkt->stream = ic->streams[pkt->stream_index]; } if (ret >= 0) { if (pkt) {

1 0