From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 82E4642E3E for ; Wed, 10 Aug 2022 01:05:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 470EE68B813; Wed, 10 Aug 2022 04:05:31 +0300 (EEST) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A5D368B6B9 for ; Wed, 10 Aug 2022 04:05:25 +0300 (EEST) Received: by mail-pj1-f47.google.com with SMTP id b4so13287467pji.4 for ; Tue, 09 Aug 2022 18:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sandflow-com.20210112.gappssmtp.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc; bh=913XV75rMW0pD5MB3sDFIw7XwT8A8tyyqn7MZWU/wJ4=; b=HoxFzI/NtqGT15pa5WTDXmn56+mVU8uUqHnKYv5Hical40q+cpeh4/+nOOrsOweYQ2 X4VgYrfFqQcBxmRVt32KP2O+MEDVIQbk7Vz+2G1W/ZbR1L4GV1xVk8Aj9wut2b5s7bMj 2Eqti+hE3dkbfb/hlYUHzY+yUHZds09m1ZmY8dYSpIcuvDpelWEUPZpAOe98eUqCo9NS B5L6oQVKmbbK5M4jNwTSNzQqQsPVLol85joDpGOY7yFwOycmjOhDPGiLwTzZNAQhhkyB jd18o1bufKz6pqThOtG0UrZwKRRN9LhY7/OlZcb8+GIY2DjQqHrhzXrVCWqJVIEMC6wS 9bvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc; bh=913XV75rMW0pD5MB3sDFIw7XwT8A8tyyqn7MZWU/wJ4=; b=CsIDgvcJB6Vmm+BDwdX6VkgLlxfI9Q2TcBDILkJYd15rsCPJrt9qB3TFbOKibAvF3c 25+kv0Hg2La+ZZTcIk0LcKcLFYmovJcZvmtxHND5e5xWW8ihbnnbVbkMOm2H8O57ffBu zE1LS2/yYjB73b5i4QOhS50a9BtaTClzUvtF4wsgq2mYU8eegM7VYnJFj9yS1F0fr4cY z5svOd4GLVivJnu9/hBdHE+XSwcz45bpwWexHRN1xBZMaLm8hLQE2jbUXmYNAoir+Mj1 q+OlgkwWOkWPuAv+h9ll6wMR3VJBtHoNgctwA3AG+XwsTlLrpXuCYdiKW54VCmTa5Deq Nxxg== X-Gm-Message-State: ACgBeo1djTqwgtq1FvVCXc7/TQrQoTrKUg2atDCrq2mkCy/XQqB+YQx8 lw3PatnDYf8RDv4C2YgSUCmvHU5rDTSXLg== X-Google-Smtp-Source: AA6agR5u0IuasZAq6X20esW4C+Irpof7i+eXCZApA0OwJ7s5qdzjMyeFlytB7LhHJXOplohXQIS9sw== X-Received: by 2002:a17:90b:4ac7:b0:1f5:3441:d11a with SMTP id mh7-20020a17090b4ac700b001f53441d11amr1103114pjb.182.1660093521654; Tue, 09 Aug 2022 18:05:21 -0700 (PDT) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com. [209.85.215.181]) by smtp.gmail.com with ESMTPSA id z18-20020aa79492000000b0052d16416effsm519032pfk.80.2022.08.09.18.05.20 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Aug 2022 18:05:20 -0700 (PDT) Received: by mail-pg1-f181.google.com with SMTP id 73so12927192pgb.9 for ; Tue, 09 Aug 2022 18:05:20 -0700 (PDT) X-Received: by 2002:a05:6a00:2195:b0:52e:6157:904d with SMTP id h21-20020a056a00219500b0052e6157904dmr25467688pfi.44.1660093519916; Tue, 09 Aug 2022 18:05:19 -0700 (PDT) MIME-Version: 1.0 References: <20220806233520.1154-1-pal@sandflow.com> In-Reply-To: From: Pierre-Anthony Lemieux Date: Tue, 9 Aug 2022 18:05:08 -0700 X-Gmail-Original-Message-ID: Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH v7 1/2] avformat: refactor ff_stream_encode_params_copy() to stream_params_copy() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Mon, Aug 8, 2022 at 7:50 AM Pierre-Anthony Lemieux wrote: > > On Mon, Aug 8, 2022 at 7:48 AM Andreas Rheinhardt > wrote: > > > > pal@sandflow.com: > > > From: Pierre-Anthony Lemieux > > > > > > Addresses http://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/299726.html > > > > > > --- > > > libavformat/avformat.c | 66 ++++++++++++++++++++++++++++++++++++++++ > > > libavformat/fifo.c | 8 ++--- > > > libavformat/internal.h | 11 +++++++ > > > libavformat/mux.h | 9 ------ > > > libavformat/mux_utils.c | 28 ----------------- > > > libavformat/segment.c | 6 ++-- > > > libavformat/tee.c | 7 ++--- > > > libavformat/webm_chunk.c | 6 ++-- > > > 8 files changed, 86 insertions(+), 55 deletions(-) > > > > > > diff --git a/libavformat/avformat.c b/libavformat/avformat.c > > > index 30d6ea6a49..19c7219471 100644 > > > --- a/libavformat/avformat.c > > > +++ b/libavformat/avformat.c > > > @@ -235,6 +235,72 @@ int ff_stream_side_data_copy(AVStream *dst, const AVStream *src) > > > return 0; > > > } > > > > > > +/** > > > + * Copy all stream parameters from source to destination stream, with the > > > + * exception of the index field, which is usually set by avformat_new_stream(). > > > + * > > > + * @param dst pointer to destination AVStream > > > + * @param src pointer to source AVStream > > > + * @return >=0 on success, AVERROR code on error > > > + */ > > > +static int stream_params_copy(AVStream *dst, const AVStream *src) > > > +{ > > > + int ret; > > > + > > > + dst->id = src->id; > > > + dst->time_base = src->time_base; > > > + dst->start_time = src->start_time; > > > + dst->duration = src->duration; > > > + dst->nb_frames = src->nb_frames; > > > + dst->disposition = src->disposition; > > > + dst->discard = src->discard; > > > + dst->sample_aspect_ratio = src->sample_aspect_ratio; > > > + dst->avg_frame_rate = src->avg_frame_rate; > > > + dst->event_flags = src->event_flags; > > > + dst->r_frame_rate = src->r_frame_rate; > > > + dst->pts_wrap_bits = src->pts_wrap_bits; > > > + > > > + av_dict_free(&dst->metadata); > > > + ret = av_dict_copy(&dst->metadata, src->metadata, 0); > > > + if (ret < 0) > > > + return ret; > > > + > > > + ret = avcodec_parameters_copy(dst->codecpar, src->codecpar); > > > + if (ret < 0) > > > + return ret; > > > + > > > + ret = ff_stream_side_data_copy(dst, src); > > > + if (ret < 0) > > > + return ret; > > > + > > > + av_packet_unref(&dst->attached_pic); > > > + if (src->attached_pic.data) { > > > + ret = av_packet_ref(&dst->attached_pic, &src->attached_pic); > > > + if (ret < 0) > > > + return ret; > > > + } > > > + > > > + return 0; > > > +} > > > + > > > +AVStream *ff_stream_clone(AVFormatContext *dst_ctx, const AVStream *src) > > > +{ > > > + AVStream *st; > > > + int ret; > > > + > > > + st = avformat_new_stream(dst_ctx, NULL); > > > + if (!st) > > > + return NULL; > > > + > > > + ret = stream_params_copy(st, src); > > > + if (ret < 0) { > > > + ff_remove_stream(dst_ctx, st); > > > + return NULL; > > > + } > > > + > > > + return st; > > > +} > > > + > > > AVProgram *av_new_program(AVFormatContext *ac, int id) > > > { > > > AVProgram *program = NULL; > > > diff --git a/libavformat/fifo.c b/libavformat/fifo.c > > > index ead2bdc5cf..55d413b952 100644 > > > --- a/libavformat/fifo.c > > > +++ b/libavformat/fifo.c > > > @@ -505,13 +505,11 @@ static int fifo_mux_init(AVFormatContext *avf, const AVOutputFormat *oformat, > > > avf2->flags = avf->flags; > > > > > > for (i = 0; i < avf->nb_streams; ++i) { > > > - AVStream *st = avformat_new_stream(avf2, NULL); > > > + AVStream *st = NULL; > > > + > > > + st = ff_stream_clone(avf2, avf->streams[i]); > > > > I don't know why you stopped initializing st directly with its eventual > > value (if I see this corrently, the line wouldn't be overlong). I can > > fix this upon commit if you allow. Anyway, I will apply this in two days > > unless there are any comments from anyone else. > > I thought if() was not favored. > > Please modify as you see fit. > > Thanks. Couldn't this entire code block be simplified to the following? for (i = 0; i < avf->nb_streams; ++i) if (!ff_stream_clone(avf2, avf->streams[i])) return AVERROR(ENOMEM); Happy to submit a revised patch if it helps. > > > > > > if (!st) > > > return AVERROR(ENOMEM); > > > - > > > - ret = ff_stream_encode_params_copy(st, avf->streams[i]); > > > - if (ret < 0) > > > - return ret; > > > } > > > > > > return 0; > > > diff --git a/libavformat/internal.h b/libavformat/internal.h > > > index b6b8fbf56f..9b07cfb271 100644 > > > --- a/libavformat/internal.h > > > +++ b/libavformat/internal.h > > > @@ -625,6 +625,17 @@ enum AVCodecID ff_get_pcm_codec_id(int bps, int flt, int be, int sflags); > > > */ > > > int ff_stream_side_data_copy(AVStream *dst, const AVStream *src); > > > > > > +/** > > > + * Create a new stream and copy to it all parameters from a source stream, with > > > + * the exception of the index field, which is set when the new stream is > > > + * created. > > > + * > > > + * @param dst_ctx pointer to the context in which the new stream is created > > > + * @param src pointer to source AVStream > > > + * @return pointer to the new stream or NULL on error > > > + */ > > > +AVStream *ff_stream_clone(AVFormatContext *dst_ctx, const AVStream *src); > > > + > > > /** > > > * Wrap ffurl_move() and log if error happens. > > > * > > > diff --git a/libavformat/mux.h b/libavformat/mux.h > > > index c01da82194..1bfcaf795f 100644 > > > --- a/libavformat/mux.h > > > +++ b/libavformat/mux.h > > > @@ -113,15 +113,6 @@ int ff_format_shift_data(AVFormatContext *s, int64_t read_start, int shift_size) > > > */ > > > int ff_format_output_open(AVFormatContext *s, const char *url, AVDictionary **options); > > > > > > -/** > > > - * Copy encoding parameters from source to destination stream > > > - * > > > - * @param dst pointer to destination AVStream > > > - * @param src pointer to source AVStream > > > - * @return >=0 on success, AVERROR code on error > > > - */ > > > -int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src); > > > - > > > /** > > > * Parse creation_time in AVFormatContext metadata if exists and warn if the > > > * parsing fails. > > > diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c > > > index eb8ea3d560..2fa2ab5b0f 100644 > > > --- a/libavformat/mux_utils.c > > > +++ b/libavformat/mux_utils.c > > > @@ -121,34 +121,6 @@ int ff_format_output_open(AVFormatContext *s, const char *url, AVDictionary **op > > > return 0; > > > } > > > > > > -int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src) > > > -{ > > > - int ret; > > > - > > > - dst->id = src->id; > > > - dst->time_base = src->time_base; > > > - dst->nb_frames = src->nb_frames; > > > - dst->disposition = src->disposition; > > > - dst->sample_aspect_ratio = src->sample_aspect_ratio; > > > - dst->avg_frame_rate = src->avg_frame_rate; > > > - dst->r_frame_rate = src->r_frame_rate; > > > - > > > - av_dict_free(&dst->metadata); > > > - ret = av_dict_copy(&dst->metadata, src->metadata, 0); > > > - if (ret < 0) > > > - return ret; > > > - > > > - ret = avcodec_parameters_copy(dst->codecpar, src->codecpar); > > > - if (ret < 0) > > > - return ret; > > > - > > > - ret = ff_stream_side_data_copy(dst, src); > > > - if (ret < 0) > > > - return ret; > > > - > > > - return 0; > > > -} > > > - > > > int ff_parse_creation_time_metadata(AVFormatContext *s, int64_t *timestamp, int return_seconds) > > > { > > > AVDictionaryEntry *entry; > > > diff --git a/libavformat/segment.c b/libavformat/segment.c > > > index fa435d9f32..c904e20708 100644 > > > --- a/libavformat/segment.c > > > +++ b/libavformat/segment.c > > > @@ -167,11 +167,9 @@ static int segment_mux_init(AVFormatContext *s) > > > AVStream *st, *ist = s->streams[i]; > > > AVCodecParameters *ipar = ist->codecpar, *opar; > > > > > > - if (!(st = avformat_new_stream(oc, NULL))) > > > + st = ff_stream_clone(oc, ist); > > > + if (!st) > > > return AVERROR(ENOMEM); > > > - ret = ff_stream_encode_params_copy(st, ist); > > > - if (ret < 0) > > > - return ret; > > > opar = st->codecpar; > > > if (!oc->oformat->codec_tag || > > > av_codec_get_id (oc->oformat->codec_tag, ipar->codec_tag) == opar->codec_id || > > > diff --git a/libavformat/tee.c b/libavformat/tee.c > > > index f1f2a9d2a5..dd408dd096 100644 > > > --- a/libavformat/tee.c > > > +++ b/libavformat/tee.c > > > @@ -284,14 +284,11 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) > > > } > > > tee_slave->stream_map[i] = stream_count++; > > > > > > - if (!(st2 = avformat_new_stream(avf2, NULL))) { > > > + st2 = ff_stream_clone(avf2, st); > > > + if (!st2) { > > > ret = AVERROR(ENOMEM); > > > goto end; > > > } > > > - > > > - ret = ff_stream_encode_params_copy(st2, st); > > > - if (ret < 0) > > > - goto end; > > > } > > > > > > ret = ff_format_output_open(avf2, filename, &options); > > > diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c > > > index d69db3a004..9e71a1209d 100644 > > > --- a/libavformat/webm_chunk.c > > > +++ b/libavformat/webm_chunk.c > > > @@ -91,12 +91,10 @@ static int webm_chunk_init(AVFormatContext *s) > > > if ((ret = av_dict_copy(&oc->metadata, s->metadata, 0)) < 0) > > > return ret; > > > > > > - if (!(st = avformat_new_stream(oc, NULL))) > > > + st = ff_stream_clone(oc, ost); > > > + if (!st) > > > return AVERROR(ENOMEM); > > > > > > - if ((ret = ff_stream_encode_params_copy(st, ost)) < 0) > > > - return ret; > > > - > > > if (wc->http_method) > > > if ((ret = av_dict_set(&dict, "method", wc->http_method, 0)) < 0) > > > return ret; > > > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > > To unsubscribe, visit link above, or email > > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".