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 4A96F43DED for ; Fri, 12 Aug 2022 16:46:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55FDD68B926; Fri, 12 Aug 2022 19:46:27 +0300 (EEST) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2DA868B647 for ; Fri, 12 Aug 2022 19:46:20 +0300 (EEST) Received: by mail-pj1-f53.google.com with SMTP id e8-20020a17090a280800b001f2fef7886eso1396210pjd.3 for ; Fri, 12 Aug 2022 09:46:20 -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=B5LAkUzz/ob8m93uCV1MyDLjnhB6dFFhyW/+3WlDhTM=; b=lo/9AHXNK7ISiJb17PCZjLn+7HO6SckA9owu9nb9vyA71TFjValsFs+3Vgk3tOR64v DaAxDSgGlJFGUl02fEvtLep6KZnS7cd1Svq8nOEkFH+1JTi7Q1ZswiPwgUhpZQZnyvC8 XlbX76xfYZYLvGFXfYfD1kXOFsVkmLdhw3jIJSJkgTcE8CZJdx/7hU1FXmh4TgLnvbdR 8XW0o8QqmtZQ9SLZ/SWz+l3bgdZKtoNSndUuShnlvIfxz+1jkJXBEpepVLA4hE6UENIp 6Y1/X09jjgd9a3rrN3uIzyo6X/Hwxt+vRVi1UQJhwirLIzIdHYdyxgMX5ZWL8PpQZpSi YH1w== 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=B5LAkUzz/ob8m93uCV1MyDLjnhB6dFFhyW/+3WlDhTM=; b=MLNGWykd/jJdsbWa2ZbAMp+z4OjjAwjOh9Q3dLIXRxjGbuqmiva8PJORMtYn3RSWW0 mMn6JUpbcGkIFz2JlH4314F6n2+Gu+TPbeyGNzDAtVQUDTKGnMuUw0dDwOKLClkCkEHn cCr8qCsECdpRVlv3M8X7y2werjnnyL+mZR2tMPZjzZ+rW2f/AzOHnlcHisG3SNoY51de 16KdRR0DCSxBo7HCtS8GPx6eSxwCVhbnuOBDKh0NeaNT7RXYWo18pk0vA4bEDAOSwZIK dQ3xIHTz8/bv5Gy5ZrfSVDd/YW6SfOy3FHhrcObdWYLatmIbChMsn/2l4VbVKB54SMmf O1ww== X-Gm-Message-State: ACgBeo363hAS/zIafNkskRQQyt9OHZfFLPK5jH89mdX+b9ihqXfN8RTl Va+6ym2wI+zspPqHPQET6z1OQoF3UcpTdg== X-Google-Smtp-Source: AA6agR4YZMKmWopKEDYOj5fIIbsJU96MvZHbO1FM+GSpWRfauxlsJCUuwP8zblTR9qRFTN2vi5zW8g== X-Received: by 2002:a17:902:a5c5:b0:16f:1e31:daab with SMTP id t5-20020a170902a5c500b0016f1e31daabmr4887561plq.82.1660322778068; Fri, 12 Aug 2022 09:46:18 -0700 (PDT) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com. [209.85.214.171]) by smtp.gmail.com with ESMTPSA id j19-20020a17090a589300b001f2fc3828e4sm25426pji.24.2022.08.12.09.46.17 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Aug 2022 09:46:17 -0700 (PDT) Received: by mail-pl1-f171.google.com with SMTP id m2so1239204pls.4 for ; Fri, 12 Aug 2022 09:46:17 -0700 (PDT) X-Received: by 2002:a17:902:ee54:b0:16e:cdf5:3dbe with SMTP id 20-20020a170902ee5400b0016ecdf53dbemr4869814plo.92.1660322776590; Fri, 12 Aug 2022 09:46:16 -0700 (PDT) MIME-Version: 1.0 References: <20220806233520.1154-1-pal@sandflow.com> In-Reply-To: From: Pierre-Anthony Lemieux Date: Fri, 12 Aug 2022 09:46:04 -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 Tue, Aug 9, 2022 at 6:05 PM Pierre-Anthony Lemieux wrote: > > 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. See v8. > > > > > > > > > > > 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".