From patchwork Mon Jul 25 08:16:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 36953 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1893400pzb; Mon, 25 Jul 2022 01:17:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sdM9cJLawragC0pEENA1OHWMFELUXtRMFlZERqNftXMKzQFAT7FSwXxGUGgzypf7zTgKFH X-Received: by 2002:a17:907:6e10:b0:72b:7ddc:e9e6 with SMTP id sd16-20020a1709076e1000b0072b7ddce9e6mr9093398ejc.12.1658737022571; Mon, 25 Jul 2022 01:17:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658737022; cv=none; d=google.com; s=arc-20160816; b=kayQjsjEmODPvlpmrc6sDxqFUuujqPHL6ceHA+GnYo1HrzV9w9I1XvHNdqNuY2rY89 1QehsoCoXnRTPaajzrYlm2zK6oFcEIt8p4Dqz8q3kIqTRbGmg8T2uQnDfYBceORtOaqs g0H/7kO11yV14noM4rSbrSsFPNp4vGMHMVRlI698im8ikyQCs6QyYBMqORaG+gvLWi0g DTs64m60q45VczDn0xotKfgFlwkZcdaZjyj61so/SoF0/ojlXJ7+5xRZD0fDhqN7myrc PGI2hpRku1+cYT4TMYU1T9OwhGwz5Z0PwNnV/H++iVWmL4WnST9Plk/RijJfcsC8yKsS dWQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=D/LiUe2/kWzLLg0bTolaZ+g+CkYClYQYU8/sC8osZZI=; b=FEgolsuILjqBmEpUuXHLYLJCUyyWoUsdrFJlhCgMx+6vNYiOwSMGy1Zlh3hYWF/ffn eCVFhNCt7dbHVM2V6u2IMuXMhX4eQFVUBIKmqTek0V2l2klZW3tzvbh/4XnjlTcgRnpl WD7+HObGtmL7kfD9VQtpskv16MlqXTE+b56LL3YXRTyOeyIr+Vu20r8DjX4sifp+5vCS pRi2YUOPpbZaZy9fw1mowdrUMRMk9tf3LVeKbg3f52m/fjuFgv64qyGTcZikOX2lUK44 8rwLlCpsxE8Hhbk/FGl8Z6z+la2djM/JItaEiNwVLOW3haEev4OhVyCgKtwlApr5hrDs EMLg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id au9-20020a170907092900b006e89d168e62si7986694ejc.820.2022.07.25.01.17.00; Mon, 25 Jul 2022 01:17:02 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B39B68B7D4; Mon, 25 Jul 2022 11:16:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0173E68A628 for ; Mon, 25 Jul 2022 11:16:50 +0300 (EEST) Received: by mail-wm1-f48.google.com with SMTP id i205-20020a1c3bd6000000b003a2fa488efdso3089087wma.4 for ; Mon, 25 Jul 2022 01:16:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=S1tvrVieM9HzJRcYa51TYwNAPvVsZjiCg0kJUz43L9w=; b=FxQmndJCxMvm3hM4XdWpR+oeILhhPTxsMgy9iN6p/YtWUlJJ8OOSM8CueVCv8jgavH GqB+BzdGTsP7dfj8xaMVB/uJMQ6YKXCzdCDAJLWTDo40wsVubQUq7pVMjPL1DlgPOsyb s5W5ct9Pkvg7CjTAEEkw6TJm4fBVx1N0uIr5x/bKKXl/VzhWSrNrmrqhUVC2P2U6RBwd 9Sz+nH5Akv8JF1icBXTLMa3vbMNdsnYJlBlCcYp+ckq3RGmgs3e8wVfwPZ01OQRodFwp /LLK8au1Ash10NZ1Auj0Xh2onS/1hk7DxuLtzYkQtgk469uHqIlsllxX0xcZUC0xVoGu hAaQ== X-Gm-Message-State: AJIora+jZ08VMacMhn3WqPGL28doa6ZCpRNex4ihexLh2BES2pLyo+vj j5Fe6AzERP+s2oRFVVA48S0Fz5iro4ise3uK X-Received: by 2002:a05:600c:3004:b0:3a3:12b4:24c5 with SMTP id j4-20020a05600c300400b003a312b424c5mr7464723wmh.123.1658737009649; Mon, 25 Jul 2022 01:16:49 -0700 (PDT) Received: from localhost (lfbn-poi-1-254-151.w86-233.abo.wanadoo.fr. [86.233.210.151]) by smtp.gmail.com with ESMTPSA id o24-20020a05600c379800b003a327f19bf9sm17661095wmr.14.2022.07.25.01.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 01:16:49 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Mon, 25 Jul 2022 10:16:48 +0200 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Jul 2022 10:16:44 +0200 Message-Id: <20220725081645.12834-1-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] avformat: refactor ff_stream_encode_params_copy() to ff_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 Cc: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1hra5VZiVDG7 From: Pierre-Anthony Lemieux As discussed at https://ffmpeg.org/pipermail/ffmpeg-devel/2022-July/298491.html. Note that ff_stream_params_copy() does not copy the index field, which is usually set by avformat_new_stream(). --- libavformat/avformat.c | 37 +++++++++++++++++++++++++++++++++++++ libavformat/fifo.c | 2 +- libavformat/internal.h | 10 ++++++++++ libavformat/mux.h | 9 --------- libavformat/mux_utils.c | 28 ---------------------------- libavformat/segment.c | 2 +- libavformat/tee.c | 2 +- libavformat/webm_chunk.c | 2 +- 8 files changed, 51 insertions(+), 41 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 30d6ea6a49..c426dbfa45 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -235,6 +235,43 @@ int ff_stream_side_data_copy(AVStream *dst, const AVStream *src) return 0; } +int ff_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; + + ret = av_packet_ref(&dst->attached_pic, &src->attached_pic); + if (ret < 0) + return ret; + + return 0; +} + AVProgram *av_new_program(AVFormatContext *ac, int id) { AVProgram *program = NULL; diff --git a/libavformat/fifo.c b/libavformat/fifo.c index ead2bdc5cf..fef116d040 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -509,7 +509,7 @@ static int fifo_mux_init(AVFormatContext *avf, const AVOutputFormat *oformat, if (!st) return AVERROR(ENOMEM); - ret = ff_stream_encode_params_copy(st, avf->streams[i]); + ret = ff_stream_params_copy(st, avf->streams[i]); if (ret < 0) return ret; } diff --git a/libavformat/internal.h b/libavformat/internal.h index b6b8fbf56f..774ff57698 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -625,6 +625,16 @@ 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); +/** + * 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 + */ +int ff_stream_params_copy(AVStream *dst, 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..a8f3e94714 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -169,7 +169,7 @@ static int segment_mux_init(AVFormatContext *s) if (!(st = avformat_new_stream(oc, NULL))) return AVERROR(ENOMEM); - ret = ff_stream_encode_params_copy(st, ist); + ret = ff_stream_params_copy(st, ist); if (ret < 0) return ret; opar = st->codecpar; diff --git a/libavformat/tee.c b/libavformat/tee.c index f1f2a9d2a5..dbfad604d0 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -289,7 +289,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) goto end; } - ret = ff_stream_encode_params_copy(st2, st); + ret = ff_stream_params_copy(st2, st); if (ret < 0) goto end; } diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index d69db3a004..39f21fce7a 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -94,7 +94,7 @@ static int webm_chunk_init(AVFormatContext *s) if (!(st = avformat_new_stream(oc, NULL))) return AVERROR(ENOMEM); - if ((ret = ff_stream_encode_params_copy(st, ost)) < 0) + if ((ret = ff_stream_params_copy(st, ost)) < 0) return ret; if (wc->http_method)