From patchwork Thu Apr 13 14:12:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41156 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1288633pzb; Thu, 13 Apr 2023 07:18:19 -0700 (PDT) X-Google-Smtp-Source: AKy350b55DrIlKSZyko76Kzi+6sDNixe7CrmfG+rK+g2FIY0sCiq9HvuDKVo/Az/KToZCvBK1Jix X-Received: by 2002:a17:906:e25a:b0:94a:96c4:2361 with SMTP id gq26-20020a170906e25a00b0094a96c42361mr2700777ejb.73.1681395498723; Thu, 13 Apr 2023 07:18:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681395498; cv=none; d=google.com; s=arc-20160816; b=EARYsusRfBdHzQrQxww/n7knKigoirEazOWLF6WKGOAoe02z8Erwof6AZYyMUNllP9 Ys93dCouFrlhsVIliNJRMSxBwLHLc9vZO1Abv88HB1gTgB+mBMOK1dOxGv3MkBWYvmw6 HpbOBmq+v4uj7/LfxZOiIZ8aJ662/qPaEm5fMrxCpEmhNhcXp1W8UF1bK6qpSETyWKI8 ZqXu9E5m3oSRkKWPBPbMkIZ7KqfgdDW5HUibH0PPz0ZPWT6kXM+KInb7otVodtzBthXq dBqWqjLf7WRfs3WfV4wYkh9g80ZJtvFu1Sh9pCZqOnj97hsVAd2vwf7ueAKf0uRfokp2 BKyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=qlv4DLwGVrdV0+cGy1BQYQJFfEs7ubu1XLgTQ2YkNWk=; b=drQnS+CXoV9K0oZBSPw1zsqjlw62qGOnzczbSuWWRCh7BKqLM4WJOMJ9ulurtqKmA8 ENCTGfgiNNtT7i4QcWak9RL8RopTD/u/hIQKYpq+Ma8Vahl+aSjd9ZsV6hIqyh7rEBup rtQ/5dHq5RC9mIfGV6hknVIOVMFB8Yq45FDMmcEqT5M6FdIBKWx3KHHxPEMOv6RJE6hj kJFCIQtbEIqnCsOm4ZGnzWKoYgYbp3FJqOuD4K5fPzp7+d01wgGx4rsRK+pky7OxwOBJ kZxUFmYEYWXYv4ucqvkKJLkU7HFJQtBxVJmipSkzpBZCJE8esq72vDLtQikCrrCxAt/q t0sw== 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 fu37-20020a170907b02500b0094c67d4acdcsi1839773ejc.372.2023.04.13.07.18.18; Thu, 13 Apr 2023 07:18:18 -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 D9E0468BE48; Thu, 13 Apr 2023 17:16:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DDAA68BE3D for ; Thu, 13 Apr 2023 17:15:59 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 03D7F2405EC for ; Thu, 13 Apr 2023 16:15:57 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id i0XmGzMya9VH for ; Thu, 13 Apr 2023 16:15:53 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 229A52404F5 for ; Thu, 13 Apr 2023 16:15:53 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id DECB53A03E5 for ; Thu, 13 Apr 2023 16:15:52 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2023 16:12:01 +0200 Message-Id: <20230413141223.17245-3-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230413141223.17245-1-anton@khirnov.net> References: <20230413141223.17245-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/25] fftools/ffmpeg: move init_output_stream_streamcopy() to ffmpeg_mux_init 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wrv/7kNOUTm0 Everything in it can be done immediately when creating the output stream, there is no reason to postpone it. --- fftools/ffmpeg.c | 136 ------------------------------------ fftools/ffmpeg_mux_init.c | 143 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 136 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 6e44542776..c1070485be 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1985,136 +1985,6 @@ static int init_input_stream(InputStream *ist, char *error, int error_len) return 0; } -static int init_output_stream_streamcopy(OutputStream *ost) -{ - OutputFile *of = output_files[ost->file_index]; - InputStream *ist = ost->ist; - InputFile *ifile = input_files[ist->file_index]; - AVCodecParameters *par = ost->st->codecpar; - AVCodecContext *codec_ctx; - AVRational sar; - int i, ret; - uint32_t codec_tag = par->codec_tag; - - av_assert0(ist && !ost->filter); - - codec_ctx = avcodec_alloc_context3(NULL); - if (!codec_ctx) - return AVERROR(ENOMEM); - - ret = avcodec_parameters_to_context(codec_ctx, ist->par); - if (ret >= 0) - ret = av_opt_set_dict(codec_ctx, &ost->encoder_opts); - if (ret < 0) { - av_log(ost, AV_LOG_FATAL, - "Error setting up codec context options.\n"); - avcodec_free_context(&codec_ctx); - return ret; - } - - ret = avcodec_parameters_from_context(par, codec_ctx); - avcodec_free_context(&codec_ctx); - if (ret < 0) { - av_log(ost, AV_LOG_FATAL, - "Error getting reference codec parameters.\n"); - return ret; - } - - if (!codec_tag) { - unsigned int codec_tag_tmp; - if (!of->format->codec_tag || - av_codec_get_id (of->format->codec_tag, par->codec_tag) == par->codec_id || - !av_codec_get_tag2(of->format->codec_tag, par->codec_id, &codec_tag_tmp)) - codec_tag = par->codec_tag; - } - - par->codec_tag = codec_tag; - - if (!ost->frame_rate.num) - ost->frame_rate = ist->framerate; - - if (ost->frame_rate.num) - ost->st->avg_frame_rate = ost->frame_rate; - else - ost->st->avg_frame_rate = ist->st->avg_frame_rate; - - ret = avformat_transfer_internal_stream_timing_info(of->format, ost->st, ist->st, copy_tb); - if (ret < 0) - return ret; - - // copy timebase while removing common factors - if (ost->st->time_base.num <= 0 || ost->st->time_base.den <= 0) { - if (ost->frame_rate.num) - ost->st->time_base = av_inv_q(ost->frame_rate); - else - ost->st->time_base = av_add_q(av_stream_get_codec_timebase(ost->st), (AVRational){0, 1}); - } - - // copy estimated duration as a hint to the muxer - if (ost->st->duration <= 0 && ist->st->duration > 0) - ost->st->duration = av_rescale_q(ist->st->duration, ist->st->time_base, ost->st->time_base); - - if (!ost->copy_prior_start) { - ost->ts_copy_start = (of->start_time == AV_NOPTS_VALUE) ? - 0 : of->start_time; - if (copy_ts && ifile->start_time != AV_NOPTS_VALUE) { - ost->ts_copy_start = FFMAX(ost->ts_copy_start, - ifile->start_time + ifile->ts_offset); - } - } - - if (ist->st->nb_side_data) { - for (i = 0; i < ist->st->nb_side_data; i++) { - const AVPacketSideData *sd_src = &ist->st->side_data[i]; - uint8_t *dst_data; - - dst_data = av_stream_new_side_data(ost->st, sd_src->type, sd_src->size); - if (!dst_data) - return AVERROR(ENOMEM); - memcpy(dst_data, sd_src->data, sd_src->size); - } - } - -#if FFMPEG_ROTATION_METADATA - if (ost->rotate_overridden) { - uint8_t *sd = av_stream_new_side_data(ost->st, AV_PKT_DATA_DISPLAYMATRIX, - sizeof(int32_t) * 9); - if (sd) - av_display_rotation_set((int32_t *)sd, -ost->rotate_override_value); - } -#endif - - switch (par->codec_type) { - case AVMEDIA_TYPE_AUDIO: - if ((par->block_align == 1 || par->block_align == 1152 || par->block_align == 576) && - par->codec_id == AV_CODEC_ID_MP3) - par->block_align = 0; - if (par->codec_id == AV_CODEC_ID_AC3) - par->block_align = 0; - break; - case AVMEDIA_TYPE_VIDEO: - if (ost->frame_aspect_ratio.num) { // overridden by the -aspect cli option - sar = - av_mul_q(ost->frame_aspect_ratio, - (AVRational){ par->height, par->width }); - av_log(ost, AV_LOG_WARNING, "Overriding aspect ratio " - "with stream copy may produce invalid files\n"); - } - else if (ist->st->sample_aspect_ratio.num) - sar = ist->st->sample_aspect_ratio; - else - sar = par->sample_aspect_ratio; - ost->st->sample_aspect_ratio = par->sample_aspect_ratio = sar; - ost->st->avg_frame_rate = ist->st->avg_frame_rate; - ost->st->r_frame_rate = ist->st->r_frame_rate; - break; - } - - ost->mux_timebase = ist->st->time_base; - - return 0; -} - static int init_output_stream_nofilter(OutputStream *ost) { int ret = 0; @@ -2124,12 +1994,6 @@ static int init_output_stream_nofilter(OutputStream *ost) if (ret < 0) return ret; } else { - if (ost->ist) { - ret = init_output_stream_streamcopy(ost); - if (ret < 0) - return ret; - } - ret = of_stream_init(output_files[ost->file_index], ost); if (ret < 0) return ret; diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 714315cfd0..06a6b3fd2d 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -37,6 +37,7 @@ #include "libavutil/avutil.h" #include "libavutil/bprint.h" #include "libavutil/dict.h" +#include "libavutil/display.h" #include "libavutil/getenv_utf8.h" #include "libavutil/intreadwrite.h" #include "libavutil/log.h" @@ -839,6 +840,142 @@ static void new_stream_subtitle(Muxer *mux, const OptionsContext *o, } } +static int streamcopy_init(const Muxer *mux, const OptionsContext *o, + OutputStream *ost) +{ + const InputStream *ist = ost->ist; + const InputFile *ifile = input_files[ist->file_index]; + + AVCodecParameters *par = ost->st->codecpar; + uint32_t codec_tag = par->codec_tag; + + AVCodecContext *codec_ctx = NULL; + AVDictionary *codec_opts = NULL; + int ret = 0; + + codec_ctx = avcodec_alloc_context3(NULL); + if (!codec_ctx) + return AVERROR(ENOMEM); + + ret = avcodec_parameters_to_context(codec_ctx, ist->par); + if (ret >= 0) + ret = av_opt_set_dict(codec_ctx, &ost->encoder_opts); + if (ret < 0) { + av_log(ost, AV_LOG_FATAL, + "Error setting up codec context options.\n"); + goto fail; + } + + ret = avcodec_parameters_from_context(par, codec_ctx); + if (ret < 0) { + av_log(ost, AV_LOG_FATAL, + "Error getting reference codec parameters.\n"); + goto fail; + } + + if (!codec_tag) { + const struct AVCodecTag * const *ct = mux->fc->oformat->codec_tag; + unsigned int codec_tag_tmp; + if (!ct || av_codec_get_id (ct, par->codec_tag) == par->codec_id || + !av_codec_get_tag2(ct, par->codec_id, &codec_tag_tmp)) + codec_tag = par->codec_tag; + } + + par->codec_tag = codec_tag; + + if (!ost->frame_rate.num) + ost->frame_rate = ist->framerate; + + if (ost->frame_rate.num) + ost->st->avg_frame_rate = ost->frame_rate; + else + ost->st->avg_frame_rate = ist->st->avg_frame_rate; + + ret = avformat_transfer_internal_stream_timing_info(mux->fc->oformat, + ost->st, ist->st, copy_tb); + if (ret < 0) + goto fail; + + // copy timebase while removing common factors + if (ost->st->time_base.num <= 0 || ost->st->time_base.den <= 0) { + if (ost->frame_rate.num) + ost->st->time_base = av_inv_q(ost->frame_rate); + else + ost->st->time_base = av_add_q(av_stream_get_codec_timebase(ost->st), (AVRational){0, 1}); + } + + // copy estimated duration as a hint to the muxer + if (ost->st->duration <= 0 && ist->st->duration > 0) + ost->st->duration = av_rescale_q(ist->st->duration, ist->st->time_base, ost->st->time_base); + + if (!ost->copy_prior_start) { + ost->ts_copy_start = (mux->of.start_time == AV_NOPTS_VALUE) ? + 0 : mux->of.start_time; + if (copy_ts && ifile->start_time != AV_NOPTS_VALUE) { + ost->ts_copy_start = FFMAX(ost->ts_copy_start, + ifile->start_time + ifile->ts_offset); + } + } + + if (ist->st->nb_side_data) { + for (int i = 0; i < ist->st->nb_side_data; i++) { + const AVPacketSideData *sd_src = &ist->st->side_data[i]; + uint8_t *dst_data; + + dst_data = av_stream_new_side_data(ost->st, sd_src->type, sd_src->size); + if (!dst_data) { + ret = AVERROR(ENOMEM); + goto fail; + } + memcpy(dst_data, sd_src->data, sd_src->size); + } + } + +#if FFMPEG_ROTATION_METADATA + if (ost->rotate_overridden) { + uint8_t *sd = av_stream_new_side_data(ost->st, AV_PKT_DATA_DISPLAYMATRIX, + sizeof(int32_t) * 9); + if (sd) + av_display_rotation_set((int32_t *)sd, -ost->rotate_override_value); + } +#endif + + switch (par->codec_type) { + case AVMEDIA_TYPE_AUDIO: + if ((par->block_align == 1 || par->block_align == 1152 || par->block_align == 576) && + par->codec_id == AV_CODEC_ID_MP3) + par->block_align = 0; + if (par->codec_id == AV_CODEC_ID_AC3) + par->block_align = 0; + break; + case AVMEDIA_TYPE_VIDEO: { + AVRational sar; + if (ost->frame_aspect_ratio.num) { // overridden by the -aspect cli option + sar = + av_mul_q(ost->frame_aspect_ratio, + (AVRational){ par->height, par->width }); + av_log(ost, AV_LOG_WARNING, "Overriding aspect ratio " + "with stream copy may produce invalid files\n"); + } + else if (ist->st->sample_aspect_ratio.num) + sar = ist->st->sample_aspect_ratio; + else + sar = par->sample_aspect_ratio; + ost->st->sample_aspect_ratio = par->sample_aspect_ratio = sar; + ost->st->avg_frame_rate = ist->st->avg_frame_rate; + ost->st->r_frame_rate = ist->st->r_frame_rate; + break; + } + } + + ost->mux_timebase = ist->st->time_base; + +fail: + avcodec_free_context(&codec_ctx); + av_dict_free(&codec_opts); + return ret; +} + static OutputStream *ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, InputStream *ist) { @@ -1086,6 +1223,12 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o, default: new_stream_unknown (mux, o, ost); break; } + if (ost->ist && !ost->enc) { + ret = streamcopy_init(mux, o, ost); + if (ret < 0) + exit_program(1); + } + return ost; }