From patchwork Fri Oct 14 10:15:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38731 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp244670pzb; Fri, 14 Oct 2022 03:19:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6klQHNn7jT6PO6ANJIXnL7IuGnRafVPGrcCoDL/NTJRmaEJxb2j4rZrfcAlqBKO6cv7/GR X-Received: by 2002:aa7:cc8a:0:b0:45b:f851:2943 with SMTP id p10-20020aa7cc8a000000b0045bf8512943mr3682790edt.103.1665742787865; Fri, 14 Oct 2022 03:19:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665742787; cv=none; d=google.com; s=arc-20160816; b=CaLsrCHfXC0zpvtjwMT8RLUXvyRb0rlFs+yVK4YLlG0Oelzy6YZizpLem+Ks7BgD7D yd8ewxsUorGwg041VyZx1az5QagtQtrHxPvcqg/jrVMVbipP+3Gn/ujfOIKS47gUGBBm q7XuKYnqV4mpNQ/wWDYLOsobDOewqyLxkChmNBPym0RK3DP68+6C+iFl+QtQhmRC7wtF r46Ndcol/ofYXs24WkY27lPB8trZseu6ZFA0ClWuAApDWLHANOL9U2Df7+SibbynZQHY JY9mOr1nc0SSs9vLXbPm/ayVjlCQMlE5XtY/cwVmdkB23JI0KXgDkYYgI6yMcFGsbY2r 5P8g== 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=deOWePwBQCMnBYEOEmyv3NQqPOv+YEdt5peZPb3W8j8=; b=IWberVElGrA2SC/u18rsFGtmXnnduiFBy1ETLxW45fHCwmm7Y67jqKa5GE3J3pe+5u EFEfO3A5q+e5sQf1A8HGtfXQegMV1MBAWes3Etne/5y6csqwDcInJyrI+6+qRS1v2sUt q2shf2KjZnJa10j0oGRpoLpkKO2hpT+DG3jBecisZp2jyEO/vNvky1X6S5Z0Ar4OKQyA 2sAsNHoIvq8OQNdDKVp5OKyamtPTUqKB0EpjjhsqmhNdTeWf9cYaVGGOgMtoT8wNg2/M 47jiKAkTxDoOlbbj/hVqdVrLtCuF0ov8DfhLvdlpdmAo9DqTL/QYzDGAr9QVOud8rlfm lSjw== 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 a5-20020a056402168500b004592b993080si1662690edv.162.2022.10.14.03.19.47; Fri, 14 Oct 2022 03:19:47 -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 1E9A968BDD8; Fri, 14 Oct 2022 13:18:41 +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 60CE868BDA1 for ; Fri, 14 Oct 2022 13:18:31 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B5ABD2405EC for ; Fri, 14 Oct 2022 12:18:29 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id JTaOJnxUGjpo for ; Fri, 14 Oct 2022 12:18:26 +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 E075B2404F5 for ; Fri, 14 Oct 2022 12:18:24 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 102003A13D9 for ; Fri, 14 Oct 2022 12:18:24 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Oct 2022 12:15:42 +0200 Message-Id: <20221014101548.3486-3-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221014101548.3486-1-anton@khirnov.net> References: <20221013134904.10104-1-anton@khirnov.net> <20221014101548.3486-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/22] fftools/ffmpeg_mux_init: pass Muxer to new_output_stream() 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: umF6mbbWEzwx And intermediate functions. Will be useful in the following commit. --- fftools/ffmpeg_mux_init.c | 97 ++++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 3945bbed3a..222519f5ce 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -164,8 +164,10 @@ static int get_preset_file_2(const char *preset_name, const char *codec_name, AV return ret; } -static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, enum AVMediaType type, int source_index) +static OutputStream *new_output_stream(Muxer *mux, OptionsContext *o, + enum AVMediaType type, int source_index) { + AVFormatContext *oc = mux->fc; OutputStream *ost; const AVCodec *enc; AVStream *st = avformat_new_stream(oc, NULL); @@ -403,13 +405,14 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str) } } -static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, int source_index) +static OutputStream *new_video_stream(Muxer *mux, OptionsContext *o, int source_index) { + AVFormatContext *oc = mux->fc; AVStream *st; OutputStream *ost; char *frame_rate = NULL, *max_frame_rate = NULL, *frame_aspect_ratio = NULL; - ost = new_output_stream(o, oc, AVMEDIA_TYPE_VIDEO, source_index); + ost = new_output_stream(mux, o, AVMEDIA_TYPE_VIDEO, source_index); st = ost->st; MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st); @@ -636,12 +639,13 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in return ost; } -static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, int source_index) +static OutputStream *new_audio_stream(Muxer *mux, OptionsContext *o, int source_index) { + AVFormatContext *oc = mux->fc; AVStream *st; OutputStream *ost; - ost = new_output_stream(o, oc, AVMEDIA_TYPE_AUDIO, source_index); + ost = new_output_stream(mux, o, AVMEDIA_TYPE_AUDIO, source_index); st = ost->st; @@ -733,11 +737,11 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in return ost; } -static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc, int source_index) +static OutputStream *new_data_stream(Muxer *mux, OptionsContext *o, int source_index) { OutputStream *ost; - ost = new_output_stream(o, oc, AVMEDIA_TYPE_DATA, source_index); + ost = new_output_stream(mux, o, AVMEDIA_TYPE_DATA, source_index); if (ost->enc_ctx) { av_log(NULL, AV_LOG_FATAL, "Data stream encoding not supported yet (only streamcopy)\n"); exit_program(1); @@ -746,11 +750,11 @@ static OutputStream *new_data_stream(OptionsContext *o, AVFormatContext *oc, int return ost; } -static OutputStream *new_unknown_stream(OptionsContext *o, AVFormatContext *oc, int source_index) +static OutputStream *new_unknown_stream(Muxer *mux, OptionsContext *o, int source_index) { OutputStream *ost; - ost = new_output_stream(o, oc, AVMEDIA_TYPE_UNKNOWN, source_index); + ost = new_output_stream(mux, o, AVMEDIA_TYPE_UNKNOWN, source_index); if (ost->enc_ctx) { av_log(NULL, AV_LOG_FATAL, "Unknown stream encoding not supported yet (only streamcopy)\n"); exit_program(1); @@ -759,26 +763,26 @@ static OutputStream *new_unknown_stream(OptionsContext *o, AVFormatContext *oc, return ost; } -static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *oc, int source_index) +static OutputStream *new_attachment_stream(Muxer *mux, OptionsContext *o, int source_index) { - OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT, source_index); + OutputStream *ost = new_output_stream(mux, o, AVMEDIA_TYPE_ATTACHMENT, source_index); ost->finished = 1; return ost; } -static OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc, int source_index) +static OutputStream *new_subtitle_stream(Muxer *mux, OptionsContext *o, int source_index) { AVStream *st; OutputStream *ost; - ost = new_output_stream(o, oc, AVMEDIA_TYPE_SUBTITLE, source_index); + ost = new_output_stream(mux, o, AVMEDIA_TYPE_SUBTITLE, source_index); st = ost->st; if (ost->enc_ctx) { AVCodecContext *subtitle_enc = ost->enc_ctx; char *frame_size = NULL; - MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, oc, st); + MATCH_PER_STREAM_OPT(frame_sizes, str, frame_size, mux->fc, st); if (frame_size && av_parse_video_size(&subtitle_enc->width, &subtitle_enc->height, frame_size) < 0) { av_log(NULL, AV_LOG_FATAL, "Invalid frame size: %s.\n", frame_size); exit_program(1); @@ -789,13 +793,13 @@ static OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc, } static void init_output_filter(OutputFilter *ofilter, OptionsContext *o, - AVFormatContext *oc) + Muxer *mux) { OutputStream *ost; switch (ofilter->type) { - case AVMEDIA_TYPE_VIDEO: ost = new_video_stream(o, oc, -1); break; - case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream(o, oc, -1); break; + case AVMEDIA_TYPE_VIDEO: ost = new_video_stream(mux, o, -1); break; + case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream(mux, o, -1); break; default: av_log(NULL, AV_LOG_FATAL, "Only video and audio filters are supported " "currently.\n"); @@ -829,9 +833,9 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o, avfilter_inout_free(&ofilter->out_tmp); } -static void map_auto_video(OutputFile *of, AVFormatContext *oc, - OptionsContext *o) +static void map_auto_video(Muxer *mux, OptionsContext *o) { + AVFormatContext *oc = mux->fc; InputStream *ist; int best_score = 0, idx = -1; int qcr; @@ -872,12 +876,12 @@ static void map_auto_video(OutputFile *of, AVFormatContext *oc, } } if (idx >= 0) - new_video_stream(o, oc, idx); + new_video_stream(mux, o, idx); } -static void map_auto_audio(OutputFile *of, AVFormatContext *oc, - OptionsContext *o) +static void map_auto_audio(Muxer *mux, OptionsContext *o) { + AVFormatContext *oc = mux->fc; InputStream *ist; int best_score = 0, idx = -1; @@ -911,12 +915,12 @@ static void map_auto_audio(OutputFile *of, AVFormatContext *oc, } } if (idx >= 0) - new_audio_stream(o, oc, idx); + new_audio_stream(mux, o, idx); } -static void map_auto_subtitle(OutputFile *of, AVFormatContext *oc, - OptionsContext *o) +static void map_auto_subtitle(Muxer *mux, OptionsContext *o) { + AVFormatContext *oc = mux->fc; char *subtitle_codec_name = NULL; /* subtitles: pick first */ @@ -946,15 +950,15 @@ static void map_auto_subtitle(OutputFile *of, AVFormatContext *oc, input_descriptor && output_descriptor && (!input_descriptor->props || !output_descriptor->props)) { - new_subtitle_stream(o, oc, i); + new_subtitle_stream(mux, o, i); break; } } } -static void map_auto_data(OutputFile *of, AVFormatContext *oc, - OptionsContext *o) +static void map_auto_data(Muxer *mux, OptionsContext *o) { + AVFormatContext *oc = mux->fc; /* Data only if codec id match */ enum AVCodecID codec_id = av_guess_codec(oc->oformat, NULL, oc->url, NULL, AVMEDIA_TYPE_DATA); for (int i = 0; codec_id != AV_CODEC_ID_NONE && i < nb_input_streams; i++) { @@ -962,12 +966,11 @@ static void map_auto_data(OutputFile *of, AVFormatContext *oc, continue; if (input_streams[i]->st->codecpar->codec_type == AVMEDIA_TYPE_DATA && input_streams[i]->st->codecpar->codec_id == codec_id ) - new_data_stream(o, oc, i); + new_data_stream(mux, o, i); } } -static void map_manual(OutputFile *of, AVFormatContext *oc, - OptionsContext *o, const StreamMap *map) +static void map_manual(Muxer *mux, OptionsContext *o, const StreamMap *map) { InputStream *ist; @@ -995,7 +998,7 @@ loop_end: "in any defined filter graph, or was already used elsewhere.\n", map->linklabel); exit_program(1); } - init_output_filter(ofilter, o, oc); + init_output_filter(ofilter, o, mux); } else { int src_idx = input_files[map->file_index]->ist_index + map->stream_index; @@ -1015,14 +1018,14 @@ loop_end: return; switch (ist->st->codecpar->codec_type) { - case AVMEDIA_TYPE_VIDEO: new_video_stream (o, oc, src_idx); break; - case AVMEDIA_TYPE_AUDIO: new_audio_stream (o, oc, src_idx); break; - case AVMEDIA_TYPE_SUBTITLE: new_subtitle_stream (o, oc, src_idx); break; - case AVMEDIA_TYPE_DATA: new_data_stream (o, oc, src_idx); break; - case AVMEDIA_TYPE_ATTACHMENT: new_attachment_stream(o, oc, src_idx); break; + case AVMEDIA_TYPE_VIDEO: new_video_stream (mux, o, src_idx); break; + case AVMEDIA_TYPE_AUDIO: new_audio_stream (mux, o, src_idx); break; + case AVMEDIA_TYPE_SUBTITLE: new_subtitle_stream (mux, o, src_idx); break; + case AVMEDIA_TYPE_DATA: new_data_stream (mux, o, src_idx); break; + case AVMEDIA_TYPE_ATTACHMENT: new_attachment_stream(mux, o, src_idx); break; case AVMEDIA_TYPE_UNKNOWN: if (copy_unknown_streams) { - new_unknown_stream (o, oc, src_idx); + new_unknown_stream (mux, o, src_idx); break; } default: @@ -1131,7 +1134,7 @@ static int setup_sync_queues(Muxer *mux, AVFormatContext *oc, int64_t buf_size_u return 0; } -static void of_add_attachments(AVFormatContext *oc, OptionsContext *o) +static void of_add_attachments(Muxer *mux, OptionsContext *o) { OutputStream *ost; int err; @@ -1161,7 +1164,7 @@ static void of_add_attachments(AVFormatContext *oc, OptionsContext *o) avio_read(pb, attachment, len); memset(attachment + len, 0, AV_INPUT_BUFFER_PADDING_SIZE); - ost = new_attachment_stream(o, oc, -1); + ost = new_attachment_stream(mux, o, -1); ost->attachment_filename = o->attachments[i]; ost->st->codecpar->extradata = attachment; ost->st->codecpar->extradata_size = len; @@ -1654,26 +1657,26 @@ int of_open(OptionsContext *o, const char *filename) case AVMEDIA_TYPE_AUDIO: o->audio_disable = 1; break; case AVMEDIA_TYPE_SUBTITLE: o->subtitle_disable = 1; break; } - init_output_filter(ofilter, o, oc); + init_output_filter(ofilter, o, mux); } } if (!o->nb_stream_maps) { /* pick the "best" stream of each type */ if (!o->video_disable) - map_auto_video(of, oc, o); + map_auto_video(mux, o); if (!o->audio_disable) - map_auto_audio(of, oc, o); + map_auto_audio(mux, o); if (!o->subtitle_disable) - map_auto_subtitle(of, oc, o); + map_auto_subtitle(mux, o); if (!o->data_disable) - map_auto_data(of, oc, o); + map_auto_data(mux, o); } else { for (int i = 0; i < o->nb_stream_maps; i++) - map_manual(of, oc, o, &o->stream_maps[i]); + map_manual(mux, o, &o->stream_maps[i]); } - of_add_attachments(oc, o); + of_add_attachments(mux, o); if (!oc->nb_streams && !(oc->oformat->flags & AVFMT_NOSTREAMS)) { av_dump_format(oc, nb_output_files - 1, oc->url, 1);