From af70aa4526b24f4715ff3eec65a8260b159e71de Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 17 Aug 2011 09:56:08 +0200 Subject: [PATCH] avconv: add a wrapper for output AVFormatContexts and merge output_opts into it --- avconv.c | 73 +++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/avconv.c b/avconv.c index f3536d2673..6b9c1b9eb0 100644 --- a/avconv.c +++ b/avconv.c @@ -102,10 +102,6 @@ static const OptionDef options[]; static const char *last_asked_format = NULL; static AVDictionary *ts_scale; -static AVFormatContext *output_files[MAX_FILES]; -static AVDictionary *output_opts[MAX_FILES]; -static int nb_output_files = 0; - static StreamMap *stream_maps = NULL; static int nb_stream_maps; @@ -310,11 +306,19 @@ typedef struct InputFile { int64_t ts_offset; } InputFile; +typedef struct OutputFile { + AVFormatContext *ctx; + AVDictionary *opts; +} OutputFile; + static InputStream *input_streams = NULL; static int nb_input_streams = 0; static InputFile *input_files = NULL; static int nb_input_files = 0; +static OutputFile *output_files = NULL; +static int nb_output_files = 0; + #if CONFIG_AVFILTER static int configure_video_filters(InputStream *ist, OutputStream *ost) @@ -437,12 +441,12 @@ static int exit_program(int ret) /* close files */ for(i=0;ioformat->flags & AVFMT_NOFILE) && s->pb) avio_close(s->pb); avformat_free_context(s); av_free(output_streams_for_file[i]); - av_dict_free(&output_opts[i]); + av_dict_free(&output_files[i].opts); } for(i=0;ipb); if(total_size<0) // FIXME improve avio_size() so it works with non seekable output too @@ -1607,7 +1612,7 @@ static int output_packet(InputStream *ist, int ist_index, if (ost->picref) ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); #endif - os = output_files[ost->file_index]; + os = output_files[ost->file_index].ctx; /* set the input output pts pairs */ //ost->sync_ipts = (double)(ist->pts + input_files[ist->file_index].ts_offset - start_time)/ AV_TIME_BASE; @@ -1721,7 +1726,7 @@ static int output_packet(InputStream *ist, int ist_index, ost = ost_table[i]; if (ost->source_index == ist_index) { AVCodecContext *enc= ost->st->codec; - os = output_files[ost->file_index]; + os = output_files[ost->file_index].ctx; if(ost->st->codec->codec_type == AVMEDIA_TYPE_AUDIO && enc->frame_size <=1) continue; @@ -1802,19 +1807,27 @@ static int output_packet(InputStream *ist, int ist_index, return 0; } -static void print_sdp(AVFormatContext **avc, int n) +static void print_sdp(OutputFile *output_files, int n) { char sdp[2048]; + int i; + AVFormatContext **avc = av_malloc(sizeof(*avc)*n); + + if (!avc) + exit_program(1); + for (i = 0; i < n; i++) + avc[i] = output_files[i].ctx; av_sdp_create(avc, n, sdp, sizeof(sdp)); printf("SDP:\n%s\n", sdp); fflush(stdout); + av_freep(&avc); } /* * The following code is the main loop of the file converter */ -static int transcode(AVFormatContext **output_files, +static int transcode(OutputFile *output_files, int nb_output_files, InputFile *input_files, int nb_input_files) @@ -1836,9 +1849,9 @@ static int transcode(AVFormatContext **output_files, /* output stream init */ nb_ostreams = 0; for(i=0;inb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) { - av_dump_format(output_files[i], i, output_files[i]->filename, 1); + av_dump_format(os, i, os->filename, 1); fprintf(stderr, "Output file #%d does not contain any stream\n", i); ret = AVERROR(EINVAL); goto fail; @@ -1851,7 +1864,7 @@ static int transcode(AVFormatContext **output_files, goto fail; n = 0; for(k=0;knb_streams; i++, n++) ost_table[n] = output_streams_for_file[k][i]; } @@ -1859,7 +1872,7 @@ static int transcode(AVFormatContext **output_files, /* for each output stream, we compute the right encoding parameters */ for(i=0;ifile_index]; + os = output_files[ost->file_index].ctx; ist = &input_streams[ost->source_index]; codec = ost->st->codec; @@ -2168,15 +2181,15 @@ static int transcode(AVFormatContext **output_files, } /* open files and write file headers */ - for(i=0;ioformat->name, "rtp")) { + assert_avoptions(output_files[i].opts); + if (strcmp(os->oformat->name, "rtp")) { want_sdp = 0; } } @@ -2185,7 +2198,7 @@ static int transcode(AVFormatContext **output_files, /* dump the file output parameters - cannot be done before in case of stream copy */ for(i=0;ifilename, 1); + av_dump_format(output_files[i].ctx, i, output_files[i].ctx->filename, 1); } /* dump the stream mapping */ @@ -2240,7 +2253,7 @@ static int transcode(AVFormatContext **output_files, int64_t ipts; double opts; ost = ost_table[i]; - os = output_files[ost->file_index]; + os = output_files[ost->file_index].ctx; ist = &input_streams[ost->source_index]; if(ist->is_past_recording_time || no_packet[ist->file_index]) continue; @@ -2273,7 +2286,7 @@ static int transcode(AVFormatContext **output_files, } /* finish if limit size exhausted */ - if (limit_filesize != 0 && limit_filesize <= avio_tell(output_files[0]->pb)) + if (limit_filesize != 0 && limit_filesize <= avio_tell(output_files[0].ctx->pb)) break; /* read a frame from it and output it in the fifo */ @@ -2374,7 +2387,7 @@ static int transcode(AVFormatContext **output_files, /* write the trailer if needed and close file */ for(i=0;inb_chapters; i++) { @@ -3571,8 +3584,12 @@ static void opt_output_file(const char *filename) av_dict_copy(&oc->metadata, metadata, 0); av_dict_free(&metadata); - av_dict_copy(&output_opts[nb_output_files], format_opts, 0); - output_files[nb_output_files++] = oc; + + if (nb_output_files == MAX_FILES) + exit_program(1); /* a temporary hack until all the other MAX_FILES-sized arrays are removed */ + output_files = grow_array(output_files, sizeof(*output_files), &nb_output_files, nb_output_files + 1); + output_files[nb_output_files - 1].ctx = oc; + av_dict_copy(&output_files[nb_output_files - 1].opts, format_opts, 0); /* check filename in case of an image number is expected */ if (oc->oformat->flags & AVFMT_NEEDNUMBER) { -- 2.11.0