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

[soc]: r4651 - concat/libavformat/xspf.c
by gkovacs 07 Jul '09

07 Jul '09

Author: gkovacs Date: Tue Jul 7 04:32:55 2009 New Revision: 4651 Log: reimplemented xspf without datanode Modified: concat/libavformat/xspf.c Modified: concat/libavformat/xspf.c ============================================================================== --- concat/libavformat/xspf.c Tue Jul 7 04:21:29 2009 (r4650) +++ concat/libavformat/xspf.c Tue Jul 7 04:32:55 2009 (r4651) @@ -20,7 +20,6 @@ */ #include "concatgen.h" -#include "datanode.h" /* The ffmpeg codecs we support, and the IDs they have in the file */ static const AVCodecTag codec_xspf_tags[] = { @@ -41,18 +40,57 @@ static int xspf_probe(AVProbeData *p) return 0; } -static int xspf_list_files(ByteIOContext *s, PlaylistContext *ctx) +static int xspf_list_files(ByteIOContext *b, PlaylistContext *ctx) { - int i; + int i, j, c; + unsigned int buflen; + char state; char **flist; - StringList *l; - DataNode *d; - l = ff_stringlist_alloc(); - d = ff_datanode_tree_from_xml(s); - ff_datanode_visualize(d); - ff_datanode_filter_values_by_name(d, l, "location"); - ff_stringlist_print(l); - ff_stringlist_export(l, &flist, &(ctx->pelist_size)); + char buf[1024]; + char s[5]; + char t[] = "<location>"; + state = flist = buflen = i = j = 0; + while ((c = url_fgetc(b))) { + if (c == EOF) + break; + if (state == 0) { + s[0] = s[1]; + s[1] = s[2]; + s[2] = s[3]; + s[3] = s[4]; + s[4] = s[5]; + s[5] = s[6]; + s[6] = s[7]; + s[7] = s[8]; + s[8] = s[9]; + s[9] = c; + if (s[0] == t[0] && s[1] == t[1] && s[2] == t[2] && s[3] == t[3] && s[4] == t[4] && + s[5] == t[5] && s[6] == t[6] && s[7] == t[7] && s[8] == t[8] && s[9] == t[9]) + state = 1; + } + else { + if (c == '<') { + termfn: + buf[i++] = 0; + flist = av_fast_realloc(flist, &buflen, sizeof(*flist) * (j+2)); + flist[j] = av_malloc(i); + av_strlcpy(flist[j++], buf, i); + i = 0; + state = 0; + s[sizeof(s)-1] = c; + continue; + } + else { + buf[i++] = c; + if (i >= sizeof(buf)-1) + goto termfn; + } + } + } + if (!flist) // no files have been found + return AVERROR_EOF; + flist[j] = 0; + ctx->pelist_size = j; ff_playlist_relative_paths(flist, ctx->workingdir); ctx->pelist = av_malloc(ctx->pelist_size * sizeof(*(ctx->pelist))); memset(ctx->pelist, 0, ctx->pelist_size * sizeof(*(ctx->pelist))); @@ -69,7 +107,10 @@ static int xspf_read_header(AVFormatCont { int i; PlaylistContext *ctx = ff_playlist_alloc_context(s->filename); - xspf_list_files(s->pb, ctx); + if (xspf_list_files(s->pb, ctx)) { + fprintf(stderr, "no playlist items found in %s\n", s->filename); + return AVERROR_EOF; + } s->priv_data = ctx; for (i = 0; i < ctx->pe_curidxs_size; ++i) { ff_playlist_populate_context(ctx, s, i);

1 0

[soc]: r4650 - concat/libavformat/pls.c
by gkovacs 07 Jul '09

07 Jul '09

Author: gkovacs Date: Tue Jul 7 04:21:29 2009 New Revision: 4650 Log: added null check and error handling in pls Modified: concat/libavformat/pls.c Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Tue Jul 7 03:48:25 2009 (r4649) +++ concat/libavformat/pls.c Tue Jul 7 04:21:29 2009 (r4650) @@ -87,6 +87,8 @@ static int pls_list_files(ByteIOContext } } } + if (!flist) // no files have been found + return AVERROR_EOF; flist[j] = 0; ctx->pelist_size = j; ff_playlist_relative_paths(flist, ctx->workingdir); @@ -105,7 +107,10 @@ static int pls_read_header(AVFormatConte { int i; PlaylistContext *ctx = ff_playlist_alloc_context(s->filename); - pls_list_files(s->pb, ctx); + if (pls_list_files(s->pb, ctx)) { + fprintf(stderr, "no playlist items found in %s\n", s->filename); + return AVERROR_EOF; + } s->priv_data = ctx; for (i = 0; i < ctx->pe_curidxs_size; ++i) { ff_playlist_populate_context(ctx, s, i);

1 0

[soc]: r4649 - in concat: ffmpeg.c.diff libavformat/concat.c libavformat/concat.h
by gkovacs 07 Jul '09

07 Jul '09

Author: gkovacs Date: Tue Jul 7 03:48:25 2009 New Revision: 4649 Log: added back allocation to concat_alloc_demuxer Modified: concat/ffmpeg.c.diff concat/libavformat/concat.c concat/libavformat/concat.h Modified: concat/ffmpeg.c.diff ============================================================================== --- concat/ffmpeg.c.diff Tue Jul 7 03:41:48 2009 (r4648) +++ concat/ffmpeg.c.diff Tue Jul 7 03:48:25 2009 (r4649) @@ -1,5 +1,5 @@ diff --git a/ffmpeg.c b/ffmpeg.c -index 22bfed8..d3e812d 100644 +index 22bfed8..a8db150 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -70,6 +70,8 @@ @@ -91,7 +91,7 @@ index 22bfed8..d3e812d 100644 AVFormatContext *ic; AVFormatParameters params, *ap = &params; int err, i, ret, rfps, rfps_base; -@@ -2859,6 +2884,46 @@ static void opt_input_file(const char *filename) +@@ -2859,6 +2884,45 @@ static void opt_input_file(const char *filename) using_stdin |= !strncmp(filename, "pipe:", 5) || !strcmp(filename, "/dev/stdin"); @@ -112,8 +112,7 @@ index 22bfed8..d3e812d 100644 + av_strlcpy(playlist_ctx->pelist[playlist_ctx->pelist_size-1]->filename, filename, filenamelen+1); + av_strlcpy(ic->filename, filename, sizeof(ic->filename)); + ic->nb_streams = 2; -+ ic->iformat = av_malloc(sizeof(*(ic->iformat))); -+ concat_init_demuxer(ic->iformat); ++ ic->iformat = concat_alloc_demuxer(); + ic->priv_data = playlist_ctx; + for (i = 0; i < playlist_ctx->pe_curidxs_size; ++i) { + ff_playlist_populate_context(playlist_ctx, ic, i); @@ -138,7 +137,7 @@ index 22bfed8..d3e812d 100644 /* get default parameters from command line */ ic = avformat_alloc_context(); -@@ -2925,6 +2990,8 @@ static void opt_input_file(const char *filename) +@@ -2925,6 +2989,8 @@ static void opt_input_file(const char *filename) start_time = 0; } @@ -147,7 +146,7 @@ index 22bfed8..d3e812d 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 +3067,8 @@ static void opt_input_file(const char *filename) +@@ -3000,6 +3066,8 @@ static void opt_input_file(const char *filename) dump_format(ic, nb_input_files, filename, 0); nb_input_files++; @@ -156,7 +155,7 @@ index 22bfed8..d3e812d 100644 file_iformat = NULL; file_oformat = NULL; -@@ -3874,6 +3943,7 @@ static const OptionDef options[] = { +@@ -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" }, Modified: concat/libavformat/concat.c ============================================================================== --- concat/libavformat/concat.c Tue Jul 7 03:41:48 2009 (r4648) +++ concat/libavformat/concat.c Tue Jul 7 03:48:25 2009 (r4649) @@ -39,8 +39,9 @@ static int concat_read_header(AVFormatCo return 0; } -void concat_init_demuxer(AVInputFormat *cdm) +AVInputFormat* concat_alloc_demuxer(void) { + AVInputFormat *cdm = av_malloc(sizeof(*cdm)); cdm->name = "concat"; cdm->long_name = NULL_IF_CONFIG_SMALL("CONCAT format"); cdm->priv_data_size = sizeof(PlaylistContext); @@ -59,6 +60,7 @@ void concat_init_demuxer(AVInputFormat * cdm->read_seek2 = ff_concatgen_read_seek; cdm->metadata_conv = NULL; cdm->next = NULL; + return cdm; } #if CONFIG_CONCAT_DEMUXER Modified: concat/libavformat/concat.h ============================================================================== --- concat/libavformat/concat.h Tue Jul 7 03:41:48 2009 (r4648) +++ concat/libavformat/concat.h Tue Jul 7 03:48:25 2009 (r4649) @@ -28,7 +28,7 @@ //int concat_read_header(AVFormatContext *s, AVFormatParameters *ap); -void concat_init_demuxer(); +AVInputFormat* concat_alloc_demuxer(void); #endif /* AVFORMAT_CONCAT_H */

1 0

[soc]: r4646 - in concat: ffmpeg.c.diff libavformat/concat.c libavformat/concat.h libavformat/playlist.h
by gkovacs 07 Jul '09

07 Jul '09

Author: gkovacs Date: Tue Jul 7 03:03:21 2009 New Revision: 4646 Log: fixed inclusion guards, made concat_init_demuxer return void Modified: concat/ffmpeg.c.diff concat/libavformat/concat.c concat/libavformat/concat.h concat/libavformat/playlist.h Modified: concat/ffmpeg.c.diff ============================================================================== --- concat/ffmpeg.c.diff Mon Jul 6 23:54:01 2009 (r4645) +++ concat/ffmpeg.c.diff Tue Jul 7 03:03:21 2009 (r4646) @@ -1,5 +1,5 @@ diff --git a/ffmpeg.c b/ffmpeg.c -index 22bfed8..d30a5ac 100644 +index 22bfed8..d3e812d 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -70,6 +70,8 @@ @@ -91,7 +91,7 @@ index 22bfed8..d30a5ac 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) +@@ -2859,6 +2884,46 @@ static void opt_input_file(const char *filename) using_stdin |= !strncmp(filename, "pipe:", 5) || !strcmp(filename, "/dev/stdin"); @@ -112,7 +112,8 @@ index 22bfed8..d30a5ac 100644 + av_strlcpy(playlist_ctx->pelist[playlist_ctx->pelist_size-1]->filename, filename, filenamelen+1); + av_strlcpy(ic->filename, filename, sizeof(ic->filename)); + ic->nb_streams = 2; -+ ic->iformat = concat_make_demuxer(); ++ ic->iformat = av_malloc(sizeof(*(ic->iformat))); ++ concat_init_demuxer(ic->iformat); + ic->priv_data = playlist_ctx; + for (i = 0; i < playlist_ctx->pe_curidxs_size; ++i) { + ff_playlist_populate_context(playlist_ctx, ic, i); @@ -137,7 +138,7 @@ index 22bfed8..d30a5ac 100644 /* get default parameters from command line */ ic = avformat_alloc_context(); -@@ -2925,6 +2989,8 @@ static void opt_input_file(const char *filename) +@@ -2925,6 +2990,8 @@ static void opt_input_file(const char *filename) start_time = 0; } @@ -146,7 +147,7 @@ index 22bfed8..d30a5ac 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 +3067,8 @@ static void opt_input_file(const char *filename) dump_format(ic, nb_input_files, filename, 0); nb_input_files++; @@ -155,7 +156,7 @@ index 22bfed8..d30a5ac 100644 file_iformat = NULL; file_oformat = NULL; -@@ -3874,6 +3942,7 @@ static const OptionDef options[] = { +@@ -3874,6 +3943,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" }, Modified: concat/libavformat/concat.c ============================================================================== --- concat/libavformat/concat.c Mon Jul 6 23:54:01 2009 (r4645) +++ concat/libavformat/concat.c Tue Jul 7 03:03:21 2009 (r4646) @@ -39,9 +39,8 @@ static int concat_read_header(AVFormatCo return 0; } -AVInputFormat *concat_make_demuxer() +void concat_init_demuxer(AVInputFormat *cdm) { - AVInputFormat *cdm = av_malloc(sizeof(*cdm)); cdm->name = "concat"; cdm->long_name = NULL_IF_CONFIG_SMALL("CONCAT format"); cdm->priv_data_size = sizeof(PlaylistContext); @@ -60,7 +59,6 @@ AVInputFormat *concat_make_demuxer() cdm->read_seek2 = ff_concatgen_read_seek; cdm->metadata_conv = NULL; cdm->next = NULL; - return cdm; } #if CONFIG_CONCAT_DEMUXER Modified: concat/libavformat/concat.h ============================================================================== --- concat/libavformat/concat.h Mon Jul 6 23:54:01 2009 (r4645) +++ concat/libavformat/concat.h Tue Jul 7 03:03:21 2009 (r4646) @@ -21,14 +21,14 @@ #include "concatgen.h" -#ifndef _CONCAT_H -#define _CONCAT_H +#ifndef AVFORMAT_CONCAT_H +#define AVFORMAT_CONCAT_H //int concat_probe(AVProbeData *p); //int concat_read_header(AVFormatContext *s, AVFormatParameters *ap); -AVInputFormat *concat_make_demuxer(); +void concat_init_demuxer(); -#endif /* _CONCAT_H */ +#endif /* AVFORMAT_CONCAT_H */ Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Mon Jul 6 23:54:01 2009 (r4645) +++ concat/libavformat/playlist.h Tue Jul 7 03:03:21 2009 (r4646) @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _PLAYLIST_H -#define _PLAYLIST_H +#ifndef AVFORMAT_PLAYLIST_H +#define AVFORMAT_PLAYLIST_H #include "avformat.h" #include "riff.h" @@ -63,4 +63,4 @@ int64_t ff_playlist_get_duration(AVForma void ff_playlist_relative_paths(char **flist, const char *workingdir); -#endif /* _PLAYLIST_H */ +#endif /* AVFORMAT_PLAYLIST_H */

2 1

[soc]: r4647 - concat/libavformat/concat.c
by gkovacs 07 Jul '09

07 Jul '09

Author: gkovacs Date: Tue Jul 7 03:05:04 2009 New Revision: 4647 Log: aligned variable assignment list Modified: concat/libavformat/concat.c Modified: concat/libavformat/concat.c ============================================================================== --- concat/libavformat/concat.c Tue Jul 7 03:03:21 2009 (r4646) +++ concat/libavformat/concat.c Tue Jul 7 03:05:04 2009 (r4647) @@ -41,24 +41,24 @@ static int concat_read_header(AVFormatCo void concat_init_demuxer(AVInputFormat *cdm) { - cdm->name = "concat"; - cdm->long_name = NULL_IF_CONFIG_SMALL("CONCAT format"); + cdm->name = "concat"; + cdm->long_name = NULL_IF_CONFIG_SMALL("CONCAT format"); cdm->priv_data_size = sizeof(PlaylistContext); - cdm->read_probe = concat_probe; - cdm->read_header = concat_read_header; - cdm->read_packet = ff_concatgen_read_packet; - cdm->read_close = ff_concatgen_read_close; - cdm->read_seek = ff_concatgen_read_seek; + cdm->read_probe = concat_probe; + cdm->read_header = concat_read_header; + cdm->read_packet = ff_concatgen_read_packet; + cdm->read_close = ff_concatgen_read_close; + cdm->read_seek = ff_concatgen_read_seek; cdm->read_timestamp = ff_concatgen_read_timestamp; - cdm->flags = NULL; - cdm->extensions = NULL; - cdm->value = NULL; - cdm->read_play = ff_concatgen_read_play; - cdm->read_pause = ff_concatgen_read_pause; - cdm->codec_tag = codec_concat_tags; - cdm->read_seek2 = ff_concatgen_read_seek; - cdm->metadata_conv = NULL; - cdm->next = NULL; + cdm->flags = NULL; + cdm->extensions = NULL; + cdm->value = NULL; + cdm->read_play = ff_concatgen_read_play; + cdm->read_pause = ff_concatgen_read_pause; + cdm->codec_tag = codec_concat_tags; + cdm->read_seek2 = ff_concatgen_read_seek; + cdm->metadata_conv = NULL; + cdm->next = NULL; } #if CONFIG_CONCAT_DEMUXER

1 0

[soc]: r4610 - in concat: ffmpeg.c.diff libavformat/allformats.c.diff libavformat/concat.c libavformat/concat.h libavformat/m3u.c
by gkovacs 07 Jul '09

07 Jul '09

Author: gkovacs Date: Sun Jul 5 08:05:04 2009 New Revision: 4610 Log: added ffmpeg conc option to concatenate input files Modified: concat/ffmpeg.c.diff concat/libavformat/allformats.c.diff concat/libavformat/concat.c concat/libavformat/concat.h concat/libavformat/m3u.c Modified: concat/ffmpeg.c.diff ============================================================================== --- concat/ffmpeg.c.diff Sun Jul 5 08:04:45 2009 (r4609) +++ concat/ffmpeg.c.diff Sun Jul 5 08:05:04 2009 (r4610) @@ -1,8 +1,28 @@ diff --git a/ffmpeg.c b/ffmpeg.c -index 22bfed8..ec47a05 100644 +index 22bfed8..d7294c3 100644 --- a/ffmpeg.c +++ b/ffmpeg.c -@@ -1237,7 +1237,8 @@ static void print_report(AVFormatContext **output_files, +@@ -70,6 +70,8 @@ + + #undef exit + ++#include "libavformat/concat.h" ++ + const char program_name[] = "FFmpeg"; + const int program_birth_year = 2000; + +@@ -223,6 +225,10 @@ 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, /* pkt = NULL means EOF (needed to flush decoder buffers) */ static int output_packet(AVInputStream *ist, int ist_index, AVOutputStream **ost_table, int nb_ostreams, @@ -12,7 +32,7 @@ index 22bfed8..ec47a05 100644 { AVFormatContext *os; AVOutputStream *ost; -@@ -1250,6 +1251,23 @@ static int output_packet(AVInputStream *ist, int ist_index, +@@ -1250,6 +1257,23 @@ static int output_packet(AVInputStream *ist, int ist_index, AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; AVPacket avpkt; @@ -36,7 +56,7 @@ index 22bfed8..ec47a05 100644 if(ist->next_pts == AV_NOPTS_VALUE) ist->next_pts= ist->pts; -@@ -1292,8 +1310,10 @@ static int output_packet(AVInputStream *ist, int ist_index, +@@ -1292,8 +1316,10 @@ static int output_packet(AVInputStream *ist, int ist_index, endianness as CPU */ ret = avcodec_decode_audio3(ist->st->codec, samples, &data_size, &avpkt); @@ -48,7 +68,7 @@ index 22bfed8..ec47a05 100644 avpkt.data += ret; avpkt.size -= ret; /* Some bug in mpeg audio decoder gives */ -@@ -1314,9 +1334,12 @@ static int output_packet(AVInputStream *ist, int ist_index, +@@ -1314,9 +1340,12 @@ static int output_packet(AVInputStream *ist, int ist_index, ret = avcodec_decode_video2(ist->st->codec, &picture, &got_picture, &avpkt); ist->st->quality= picture.quality; @@ -62,7 +82,7 @@ index 22bfed8..ec47a05 100644 /* no picture yet */ goto discard_packet; } -@@ -1331,8 +1354,10 @@ static int output_packet(AVInputStream *ist, int ist_index, +@@ -1331,8 +1360,10 @@ static int output_packet(AVInputStream *ist, int ist_index, case CODEC_TYPE_SUBTITLE: ret = avcodec_decode_subtitle2(ist->st->codec, &subtitle, &got_subtitle, &avpkt); @@ -74,7 +94,15 @@ index 22bfed8..ec47a05 100644 if (!got_subtitle) { goto discard_packet; } -@@ -2278,8 +2303,9 @@ static int av_encode(AVFormatContext **output_files, +@@ -1644,6 +1675,7 @@ static int av_encode(AVFormatContext **output_files, + uint8_t no_packet[MAX_FILES]={0}; + int no_packet_count=0; + ++ + file_table= av_mallocz(nb_input_files * sizeof(AVInputFile)); + if (!file_table) + goto fail; +@@ -2278,8 +2310,9 @@ static int av_encode(AVFormatContext **output_files, } //fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size); @@ -86,7 +114,7 @@ index 22bfed8..ec47a05 100644 if (verbose >= 0) fprintf(stderr, "Error while decoding stream #%d.%d\n", ist->file_index, ist->index); -@@ -2300,7 +2326,7 @@ static int av_encode(AVFormatContext **output_files, +@@ -2300,7 +2333,7 @@ static int av_encode(AVFormatContext **output_files, for(i=0;i<nb_istreams;i++) { ist = ist_table[i]; if (ist->decoding_needed) { @@ -95,3 +123,36 @@ index 22bfed8..ec47a05 100644 } } +@@ -2848,6 +2881,7 @@ static enum CodecID find_codec_or_die(const char *name, int type, int encoder) + + static void opt_input_file(const char *filename) + { ++ + AVFormatContext *ic; + AVFormatParameters params, *ap = &params; + int err, i, ret, rfps, rfps_base; +@@ -2859,6 +2893,16 @@ 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) { ++ printf("need to generate playlist ctx\n"); ++ playlist_ctx = ff_playlist_make_context(filename); ++ nb_input_files = 1; ++ input_files[nb_input_files] = ic; ++ } ++ return; ++ } ++ + /* get default parameters from command line */ + ic = avformat_alloc_context(); + +@@ -3874,6 +3918,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" }, Modified: concat/libavformat/allformats.c.diff ============================================================================== --- concat/libavformat/allformats.c.diff Sun Jul 5 08:04:45 2009 (r4609) +++ concat/libavformat/allformats.c.diff Sun Jul 5 08:05:04 2009 (r4610) @@ -1,13 +1,12 @@ diff --git a/libavformat/allformats.c b/libavformat/allformats.c -index ad47631..5773fe6 100644 +index ad47631..08a460b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c -@@ -66,6 +66,8 @@ void av_register_all(void) +@@ -66,6 +66,7 @@ void av_register_all(void) REGISTER_DEMUXER (BFI, bfi); REGISTER_DEMUXER (C93, c93); REGISTER_DEMUXER (CAVSVIDEO, cavsvideo); + REGISTER_DEMUXER (M3U, m3u); -+ REGISTER_DEMUXER (CONCAT, concat); REGISTER_MUXER (CRC, crc); REGISTER_MUXDEMUX (DAUD, daud); REGISTER_MUXDEMUX (DIRAC, dirac); Modified: concat/libavformat/concat.c ============================================================================== --- concat/libavformat/concat.c Sun Jul 5 08:04:45 2009 (r4609) +++ concat/libavformat/concat.c Sun Jul 5 08:05:04 2009 (r4610) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "concatgen.h" +#include "concat.h" /* The ffmpeg codecs we support, and the IDs they have in the file */ static const AVCodecTag codec_concat_tags[] = { @@ -33,14 +33,37 @@ static int concat_probe(AVProbeData *p) } static int concat_read_header(AVFormatContext *s, - AVFormatParameters *ap) + AVFormatParameters *ap) { // PlaylistD should be constructed externally return 0; } +AVInputFormat *concat_make_demuxer() +{ + AVInputFormat *cdm = av_malloc(sizeof(*cdm)); + cdm->name = "concat"; + cdm->long_name = NULL_IF_CONFIG_SMALL("CONCAT format"); + cdm->priv_data_size = sizeof(PlaylistContext); + cdm->read_probe = concat_probe; + cdm->read_header = concat_read_header; + cdm->read_packet = concatgen_read_packet; + cdm->read_close = concatgen_read_close; + cdm->read_seek = concatgen_read_seek; + cdm->read_timestamp = concatgen_read_timestamp; + cdm->flags = NULL; + cdm->extensions = NULL; + cdm->value = NULL; + cdm->read_play = concatgen_read_play; + cdm->read_pause = concatgen_read_pause; + cdm->codec_tag = codec_concat_tags; + cdm->read_seek2 = concatgen_read_seek; + cdm->metadata_conv = NULL; + cdm->next = NULL; + return cdm; +} -#if CONFIG_CONCAT_DEMUXER +#if 0 AVInputFormat concat_demuxer = { "concat", NULL_IF_CONFIG_SMALL("CONCAT format"), Modified: concat/libavformat/concat.h ============================================================================== --- concat/libavformat/concat.h Sun Jul 5 08:04:45 2009 (r4609) +++ concat/libavformat/concat.h Sun Jul 5 08:05:04 2009 (r4610) @@ -1,2 +1,34 @@ +/* + * Standard playlist/concatenation demuxer + * Copyright (c) 2009 Geza Kovacs + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "concatgen.h" + +#ifndef _CONCAT_H +#define _CONCAT_H + +//int concat_probe(AVProbeData *p); + +//int concat_read_header(AVFormatContext *s, AVFormatParameters *ap); + +AVInputFormat *concat_make_demuxer(); +#endif /* _CONCAT_H */ Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Sun Jul 5 08:04:45 2009 (r4609) +++ concat/libavformat/m3u.c Sun Jul 5 08:05:04 2009 (r4610) @@ -87,8 +87,8 @@ static int m3u_read_header(AVFormatConte &(ctx->flist), &(ctx->pelist_size), ctx->workingdir); - ctx->pelist = av_malloc(ctx->pelist_size * sizeof(PlayElem*)); - memset(ctx->pelist, 0, ctx->pelist_size * sizeof(PlayElem*)); + ctx->pelist = av_malloc(ctx->pelist_size * sizeof(*(ctx->pelist))); + memset(ctx->pelist, 0, ctx->pelist_size * sizeof(*(ctx->pelist))); s->priv_data = ctx; for (i = 0; i < ctx->pe_curidxs_size; ++i) { ff_playlist_populate_context(ctx, s, i); @@ -100,7 +100,7 @@ static int m3u_read_header(AVFormatConte AVInputFormat m3u_demuxer = { "m3u", NULL_IF_CONFIG_SMALL("M3U format"), - 0, + sizeof(PlaylistContext), m3u_probe, m3u_read_header, concatgen_read_packet, @@ -113,7 +113,7 @@ AVInputFormat m3u_demuxer = { concatgen_read_play, concatgen_read_pause, (const AVCodecTag* const []){codec_m3u_tags, 0}, - NULL, //m3u_read_seek2 + concatgen_read_seek, //m3u_read_seek2 NULL, //metadata_conv NULL, //next };

2 1

[soc]: r4645 - concat/libavformat/playlist.c
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 23:54:01 2009 New Revision: 4645 Log: using av_log for error logging Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Mon Jul 6 23:36:16 2009 (r4644) +++ concat/libavformat/playlist.c Mon Jul 6 23:54:01 2009 (r4645) @@ -22,7 +22,6 @@ #include "avformat.h" #include "playlist.h" #include "internal.h" -#include <cmdutils.h> void ff_playlist_init_playelem(PlayElem *pe) { @@ -37,23 +36,23 @@ void ff_playlist_init_playelem(PlayElem pe->fmt = 0; err = av_open_input_file(&(pe->ic), pe->filename, pe->fmt, 0, pe->ap); if (err < 0) - print_error("during-open_input_playelem", err); + av_log(pe->ic, AV_LOG_ERROR, "Error during av_open_input_file\n"); pe->fmt = pe->ic->iformat; if (!pe->fmt) { fprintf(stderr, "pefmt not set\n"); } err = av_find_stream_info(pe->ic); if (err < 0) { - print_error("during-av_find_stream_info", err); + av_log(pe->ic, AV_LOG_ERROR, "Error during av_open_input_file\n"); } if(pe->ic->pb) { pe->ic->pb->eof_reached = 0; } else { - fprintf(stderr, "failed pe ic pb not set"); + av_log(NULL, AV_LOG_ERROR, "failed pe ic pb not set\n"); } if(!pe->fmt) { - fprintf(stderr, "failed pe ic fmt not set"); + av_log(NULL, AV_LOG_ERROR, "failed pe ic fmt not set\n"); } }

1 0

ALS Simple Profile
by Alex Converse 06 Jul '09

06 Jul '09

Thilo, Justin, et al. SC29 is voting on a simple profile for MPEG-4 ALS. It may be worthwhile to prioritze these simple profile features. Combined PDAM Registration and PDAM Consideration Ballot on ISO/IEC 14496-3:200X/PDAM 2: Information technology -- Coding of audio-visual objects -- Part 3: Audio, AMENDMENT 2: ALS simple profile and transport of SAOC [SC 29/WG 11 N 10826]: http://www.itscj.ipsj.or.jp/sc29/open/29view/29n10483t.doc Regards, Alex Converse

3 3

[soc]: r4644 - concat/libavformat/m3u.c
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 23:36:16 2009 New Revision: 4644 Log: removed size 0 malloc Modified: concat/libavformat/m3u.c Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Mon Jul 6 23:30:59 2009 (r4643) +++ concat/libavformat/m3u.c Mon Jul 6 23:36:16 2009 (r4644) @@ -46,7 +46,6 @@ static int m3u_list_files(ByteIOContext int i, j; int bufsize = 0; i = 0; - flist = av_malloc(sizeof(char*) * bufsize); while (1) { char *q; char linebuf[1024] = {0};

1 0

[soc]: r4643 - in concat/libavformat: m3u.c playlist.c playlist.h
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 23:30:59 2009 New Revision: 4643 Log: removed ff_buf_getline Modified: concat/libavformat/m3u.c concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Mon Jul 6 22:40:04 2009 (r4642) +++ concat/libavformat/m3u.c Mon Jul 6 23:30:59 2009 (r4643) @@ -48,13 +48,21 @@ static int m3u_list_files(ByteIOContext i = 0; flist = av_malloc(sizeof(char*) * bufsize); while (1) { - char *c = ff_buf_getline(s); - if (c == NULL) // EOF + char *q; + char linebuf[1024] = {0}; + if ((q = url_fgets(s, linebuf, sizeof(linebuf))) == NULL) // EOF break; - if (*c == 0) // hashed out + linebuf[sizeof(linebuf)-1] = 0; // cut off end if buffer overflowed + while (*q != 0) { + if (*q++ == '#') + *(q-1) = 0; + } + if (*linebuf == 0) // hashed out continue; flist = av_fast_realloc(flist, &bufsize, i+2); - flist[i++] = c; + flist[i] = av_malloc(q-linebuf+1); + av_strlcpy(flist[i], linebuf, q-linebuf+1); + flist[i++][q-linebuf] = 0; } ctx->pelist_size = i; flist[i] = 0; Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Mon Jul 6 22:40:04 2009 (r4642) +++ concat/libavformat/playlist.c Mon Jul 6 23:30:59 2009 (r4643) @@ -74,36 +74,6 @@ PlaylistContext* ff_playlist_alloc_conte return ctx; } -char* ff_buf_getline(ByteIOContext *s) -{ - char *q; - char *oq; - int bufsize = 64; - q = av_malloc(bufsize); - oq = q; - while (1) { - int c = url_fgetc(s); - if (c == EOF) - return NULL; - if (c == '\n') - break; - *q = c; - if ((++q)-oq == bufsize) { - oq = av_realloc(oq, bufsize+64); - q = oq + bufsize; - bufsize += 64; - } - } - *q = 0; - q = oq; - while (*q != 0 && *q != '#') { - ++q; - } - *q = 0; - oq = av_realloc(oq, (q-oq)+1); - return oq; -} - void ff_split_wd_fn(const char *filepath, char **workingdir, char **filename) Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Mon Jul 6 22:40:04 2009 (r4642) +++ concat/libavformat/playlist.h Mon Jul 6 23:30:59 2009 (r4643) @@ -57,8 +57,6 @@ PlaylistContext* ff_playlist_alloc_conte int ff_playlist_populate_context(PlaylistContext *playlc, AVFormatContext *s, int stream_index); -char* ff_buf_getline(ByteIOContext *s); - void ff_split_wd_fn(const char *filepath, char **workingdir, char **filename); int64_t ff_playlist_get_duration(AVFormatContext *ic, int stream_index);

1 0