From patchwork Tue Feb 7 14:58:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 40315 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp4382574pzk; Tue, 7 Feb 2023 06:59:34 -0800 (PST) X-Google-Smtp-Source: AK7set+GMyCgbseKLF+B04Pc8tH/Rgid1uqoL2BRDlI14iX8ypwN+e4xeUA9rXgFwNRt6mWrg9MY X-Received: by 2002:a17:906:eb14:b0:87b:d409:f087 with SMTP id mb20-20020a170906eb1400b0087bd409f087mr3650156ejb.21.1675781974694; Tue, 07 Feb 2023 06:59:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675781974; cv=none; d=google.com; s=arc-20160816; b=miw2hhGM7OWUFo5GBOCK10A1wSWlFcPKHka5xy1edRJYTwDw+2/2SLhACukVkmShYV 4Q6GYZQl3N6qQI4lgvK839v1sbDk/gfeXRdec+lzinKbC4jpqL/hpLDhXK2nLKp92a5P P0KsYxauz78NvydJTQvYzQPHVX9AFHSziunns+aTWiaGul3xPwuBkXrpHOnN+d2hWSvT HoorPjUNXazDOQtIlkO9wxc15rblNyJpFGkThCEH1HNPqF4X0OW3BxwEPZdp9cCdmhhw QSorUQSM9Fni3JpQXwhIRcS7KNA7TLIm/PHit3sRaIKviD3AEo665WPpbg1l/QzHSUSm IyAA== 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:message-id:date:to:from :delivered-to; bh=w26QMRdO4i5X3HjXE5/k62GcbKTTRC3NbeU4QTY8Eg8=; b=R26JE5tX06ZSZexuGChVflwCP3RM/zLHCesNakzKW60FNiTMr+JWxuWJw2XOOr6Fto hlIHuDBdXXP997uB4eelSpx+CS6HWese8zgSZ+VCNII9aR4Qccvy18/QwTZuSQp9jlQO qLVgK0VVT67NA8UGxcZ1pJd6GIUIUnJlicARC6QvENv4ItZekeVk3f1v95fIOKWD9SZF zOaizEIRmnV//4+bwGEs2TEUmVeAmRlHXOykvhrUzHGaFoVIPaJROkd8lFYj0XTjoEmz ikcni61JV1XB6ORKl29QwO3K2Nm+E5/0wNEBfFXfSiiRqlKU1ydcETXRTb8Hxj/Svid1 iE9A== 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 g3-20020aa7c583000000b004aaa55f599esi9959749edq.251.2023.02.07.06.59.33; Tue, 07 Feb 2023 06:59:34 -0800 (PST) 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 DD6A468BD48; Tue, 7 Feb 2023 16:59:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4992568BD33 for ; Tue, 7 Feb 2023 16:59:22 +0200 (EET) Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4PB5r80LwMz9sQp for ; Tue, 7 Feb 2023 15:59:20 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Feb 2023 20:28:47 +0530 Message-Id: <20230207145850.25485-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat: add av_program_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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2qdIP5rFnMxb Needed to transfer programs in parent muxing contexts to child muxers, like in hls, segment, tee muxers. --- doc/APIchanges | 3 +++ libavformat/avformat.c | 52 ++++++++++++++++++++++++++++++++++++++++++ libavformat/avformat.h | 2 ++ libavformat/version.h | 2 +- 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 6baf914760..4916d1abe8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2023-02-xx - xxxxxxxxxx - lavf 59.39.100 - avformat.h + Add av_program_copy() + 2023-0x-xx - xxxxxxxxxx - lavc 59.63.100 Allow AV_CODEC_FLAG_COPY_OPAQUE to be used with decoders. diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 19c7219471..ddea692cee 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -359,6 +359,58 @@ void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx) } } +int av_program_copy(AVFormatContext *dst, AVFormatContext *src, int progid) +{ + AVProgram *src_prog = NULL; + AVProgram *dst_prog = NULL; + int i, j, ret; + + for (i = 0; i < src->nb_programs; i++) + if (src->programs[i]->id == progid) + src_prog = src->programs[i]; + + if (!src_prog) { + av_log(src, AV_LOG_ERROR, "program not found: id=0x%04x\n", progid); + return AVERROR(EINVAL); + } + + av_log(src, AV_LOG_TRACE, "copying program: id=0x%04x\n", progid); + + dst_prog = av_mallocz(sizeof(*dst_prog)); + if (!dst_prog) + return AVERROR(ENOMEM); + ret = av_dynarray_add_nofree(&dst->programs, &dst->nb_programs, dst_prog); + if (ret < 0) { + av_free(dst_prog); + return AVERROR(ENOMEM); + } + + /* public fields */ + dst_prog->id = src_prog->id; + dst_prog->flags = src_prog->flags; + dst_prog->discard = src_prog->discard; + dst_prog->program_num = src_prog->program_num; + dst_prog->pmt_pid = src_prog->pmt_pid; + dst_prog->pcr_pid = src_prog->pcr_pid; + dst_prog->pmt_version = src_prog->pmt_version; + + for (i = 0; i < dst->nb_streams; i++) { + for (j = 0; j < src_prog->nb_stream_indexes; j++) + if (dst->streams[i]->id == src->streams[src_prog->stream_index[j]]->id) + av_program_add_stream_index(dst, dst_prog->id, i); + } + + av_dict_copy(&dst_prog->metadata, src_prog->metadata, 0); + + /* private fields */ + dst_prog->start_time = src_prog->start_time; + dst_prog->end_time = src_prog->end_time; + dst_prog->pts_wrap_reference = src_prog->pts_wrap_reference; + dst_prog->pts_wrap_behavior = src_prog->pts_wrap_behavior; + + return 0; +} + AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int s) { for (unsigned i = 0; i < ic->nb_programs; i++) { diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1d97d56ac5..db1d8c4fba 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1996,6 +1996,8 @@ uint8_t *av_stream_get_side_data(const AVStream *stream, AVProgram *av_new_program(AVFormatContext *s, int id); +int av_program_copy(AVFormatContext *dst, AVFormatContext *src, int progid); + /** * @} */ diff --git a/libavformat/version.h b/libavformat/version.h index 134cdb2b89..9aba356e09 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 38 +#define LIBAVFORMAT_VERSION_MINOR 39 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ From patchwork Tue Feb 7 14:58:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 40316 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp4382833pzk; Tue, 7 Feb 2023 06:59:45 -0800 (PST) X-Google-Smtp-Source: AK7set8SZskYhkWdI7U6K01SwVB/dpRBu2mxpe2z1unXVlgt7xwvQXR6HgO0MG3iYeaoIHrynGdC X-Received: by 2002:a17:906:a287:b0:877:573d:e919 with SMTP id i7-20020a170906a28700b00877573de919mr3969608ejz.20.1675781984748; Tue, 07 Feb 2023 06:59:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675781984; cv=none; d=google.com; s=arc-20160816; b=alxN9DgugGW1fFw71deW37HFVu4ZxSMPwcuLQRNlzwdJxtNIgVIr7vwXvVR/XFCgtL 21M0hhLjXFLFdDLt6jFNxqDw9iY4m5eaIgpPuy2Mdka4mN1PeYHEFTyZGsRJGj8UL5Pb V0lm3xqEa2v572jTekYglTRoBX41z0I6E0lb2SMLowF/nx7JHl656PK2LddR8g+aZPNl N+zlKjfCP2rdyKIaYvecxYf9EWiovaAThaLq4KyqYql/M9nXLujIZBKg+uhxN3W2wRkh 9tBEmSzY1BFcte/d7zFgWIVvK+FCrD4d8ZqN/ia9jMi23RUV3fodoAkLERJqBWI3Hz0X /Y4w== 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=4bll+Q4N5f2Spak/UINXF6D/W+rlkOFz8hJA3CCIH0E=; b=ZjXgi1FSc1EQYqbTbB+z3Jiqxk4thE/eWzQ5tXcTv+lViSvfD/tGNxSOio5pvV/W9p eAoiJ+2lDUCdJbj4vkk7ZoljlL0V0LPVx5yAXoWJhH9Cp8XFyQjSEAVj1l7mIbWUFpUI QmXhW5ZL9Sdr40niMn+78w4aB5AHNNLB9Yb0NRjf8X4L/vPFudOHG6hU14qrGR/Sys6q Zfb0Aba9y4YzdBY8uyqev5+Y16dX9KIwzV8/QBsAbD2R/xj4xzH9NDgm+6KJFrT8kDVc 8fOuQh6sNRDeUB0USogiBPaI8rC2z58/ggoCT5vtW04gmDq3ca8/kXWFPqI+x/j607Tq w5pQ== 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 vf8-20020a170907238800b0087880aa5e39si12578976ejb.505.2023.02.07.06.59.44; Tue, 07 Feb 2023 06:59:44 -0800 (PST) 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 0555368BDC0; Tue, 7 Feb 2023 16:59:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D796168BD33 for ; Tue, 7 Feb 2023 16:59:24 +0200 (EET) Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PB5r93h6Mz9scf for ; Tue, 7 Feb 2023 15:59:21 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Feb 2023 20:28:48 +0530 Message-Id: <20230207145850.25485-2-ffmpeg@gyani.pro> In-Reply-To: <20230207145850.25485-1-ffmpeg@gyani.pro> References: <20230207145850.25485-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/hls: relay programs to child muxers 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: 5DQuPMsu76AP --- libavformat/hlsenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 39df9becc7..bfad1eef90 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -907,6 +907,12 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs) st->id = vs->streams[i]->id; } + for (i = 0; i < s->nb_programs; i++) { + ret = av_program_copy(oc, s, s->programs[i]->id); + if (ret < 0) + av_log(s, AV_LOG_WARNING, "unable to transfer program %d to child muxer\n", s->programs[i]->id); + } + vs->start_pos = 0; vs->new_start = 1; From patchwork Tue Feb 7 14:58:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 40317 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp4383065pzk; Tue, 7 Feb 2023 06:59:54 -0800 (PST) X-Google-Smtp-Source: AK7set8aNPbO4LURLFsGViKNi2jPKJdX2q4PCJ+ovDItnsTQcv2Q1rjXrA+8DsO7X5cienrRvdu3 X-Received: by 2002:a17:906:b085:b0:878:78f9:d1be with SMTP id x5-20020a170906b08500b0087878f9d1bemr3498524ejy.23.1675781993891; Tue, 07 Feb 2023 06:59:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675781993; cv=none; d=google.com; s=arc-20160816; b=z5Ny4/QKFAqF5FZBmlJZtwKgLfqRCnLH0U9kMYCpQkjusBo3arQQQ7xv2BdPog4ilt IJWvyo5VN9cP65LD2HaiCSN9pamHdSG3qcoeQaCGieorbO2JkoEgsmuxtuCtLkNUSh3T vMvJbKfgVpIN6f36lZGMUf7CgVFQAkhmILodsb2Z3WiszUnhZ/gvFXX2uMr3kdBkRl78 8n0wce3ofXnHX6k5vk2E8buPggIuunDqIb84zsT/067MrEGRN8UTzJw+wM1t1rsC1fOw uCVcuJR/GZq8lTDiZcQvrF8SWN0XKjrTZP1kb5Lckty6FUhCidOWRG3zfo+cvnYHsa9w rSJg== 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=okdUUmVzXG4XCht8BXWQo7lMzcLL//bVb8w5iWcIG9w=; b=Kh2Y9dt8NCXFJ5KPBRKbUuzzWFS5qhboc6JTujj5/4A/XSxWjgGwh3Hln3IuDiT7pj qlM0HiXYty+REPJ7+DEmtu9t/jJpXSzY1yPPvUjP9zTJ+vFur7KzLGFabqkUrJ9/gI2s GDBk1e+S7Nm8d2eXJZ6S5KqvDWrMpVCXWnnES0HKZwxX+hvKfMnIjXp4/erldBaN5EOK tu+n/DWgLSuaqeMAaCXYKXzgXC3NyeTIgvE44oDQl6wDvISHnfl/+dN01+JvRbcHtNwi f2T05I2u1fRCoFNSrdzWCh3o5NeoUrl+nHgeGEOfYFxhUgr4lwJgJXRZz2Q5IbcDlFO0 ncUg== 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 mr42-20020a17090782aa00b00888161349d2si16878572ejc.203.2023.02.07.06.59.53; Tue, 07 Feb 2023 06:59:53 -0800 (PST) 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 1A91C68BE21; Tue, 7 Feb 2023 16:59:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B15C768B556 for ; Tue, 7 Feb 2023 16:59:25 +0200 (EET) Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4PB5rC1Lqvz9sb9 for ; Tue, 7 Feb 2023 15:59:23 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Feb 2023 20:28:49 +0530 Message-Id: <20230207145850.25485-3-ffmpeg@gyani.pro> In-Reply-To: <20230207145850.25485-1-ffmpeg@gyani.pro> References: <20230207145850.25485-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/segment: relay programs to child muxers 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: VS9hjIjuwWXI --- libavformat/segment.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/segment.c b/libavformat/segment.c index 80e4bf851c..a5acc28dfd 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -182,6 +182,12 @@ static int segment_mux_init(AVFormatContext *s) } } + for (i = 0; i < s->nb_programs; i++) { + ret = av_program_copy(oc, s, s->programs[i]->id); + if (ret < 0) + av_log(s, AV_LOG_WARNING, "unable to transfer program %d to child muxer\n", s->programs[i]->id); + } + return 0; } From patchwork Tue Feb 7 14:58:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 40318 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp4383317pzk; Tue, 7 Feb 2023 07:00:02 -0800 (PST) X-Google-Smtp-Source: AK7set+F0lRfPmm6TtHhwIomIfRvfOA1UbQQ//uTkcgF+6FZYCaSfXjGVCTWXUUE2nMRUkHvnzZ1 X-Received: by 2002:a17:906:7c07:b0:880:2870:7849 with SMTP id t7-20020a1709067c0700b0088028707849mr3714435ejo.74.1675782002745; Tue, 07 Feb 2023 07:00:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675782002; cv=none; d=google.com; s=arc-20160816; b=gsY4717cljJ5e7ruUz5aNsnRkU9ZuUjbK2lVLgavpTgeiRGFZ7A6vgt6iYNG5wA4+J xe65DozxtpNlT49C8+OzcCkPHHdduH1ozGOBy9nxih954OCVmhsDw4VUAzDcawSatogp Kvqwtzmvc5dygnT8mu/ReCJrguwE7s9OjqO6i24i4ad/0Hyy1FGTBmo9JbbD74drRefT vNPjpCyWiWXgkFhLRaLzFo+7xLWuKQQ2fAz7c5BuO2jIQKNtGWBJLcMXFCWM6iZqfHw7 G7mIAQDQbQVwcnidVvVKMPmKfEx1y0HffQhJtUbnp0+toUEBhCe9tj3PTfxl9+JTEbo3 NvAQ== 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=hH/XMcr6RIb3Pu1SJutntTSSIb2ECy+0xA6R88Bq1Ow=; b=YOIf+CcKN4jLgNruNuZOmirx+l8SuhhMGXMWEKIwlSgbg9oRwt6UpkqqDjwaVRp/ML 4hXOARaqKvTjUXi0Rjb7ULkLjbVR0Y7qhW70udLID92rZ0LTZl1v5TJa6wQ6dHCIAyfB tFWWTq5vlsR4jEVkOOiv/QXKHke6nEzZ8dYf501Nn60o4XDhHDm54U/3GkNMNCVwfaio RgqgZ6tfmsueXgKlNur15P0f4NQEt0bg5aQhAqLL1ApdQOCaqzZeWdjb20XpkEtMDFim sBxQ59RftYys8CaeI1Dv4KjS7KrVHEHT2P1dNPwzoM8KP+nkFQ3s46goBbBZo7ru7b4b 5PeA== 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 j29-20020a170906535d00b0086ea1c7ae21si21999869ejo.54.2023.02.07.07.00.02; Tue, 07 Feb 2023 07:00:02 -0800 (PST) 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 1169368BE57; Tue, 7 Feb 2023 16:59:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1BDE68BDE7 for ; Tue, 7 Feb 2023 16:59:26 +0200 (EET) Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4PB5rD320Cz9sl5 for ; Tue, 7 Feb 2023 15:59:24 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Feb 2023 20:28:50 +0530 Message-Id: <20230207145850.25485-4-ffmpeg@gyani.pro> In-Reply-To: <20230207145850.25485-1-ffmpeg@gyani.pro> References: <20230207145850.25485-1-ffmpeg@gyani.pro> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PB5rD320Cz9sl5 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/tee: relay programs to child muxers 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: TDsBTL+o1D+X --- libavformat/tee.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/tee.c b/libavformat/tee.c index dd408dd096..fd1b17ce7c 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -291,6 +291,12 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) } } + for (i = 0; i < avf->nb_programs; i++) { + ret = av_program_copy(avf2, avf, avf->programs[i]->id); + if (ret < 0) + av_log(avf, AV_LOG_WARNING, "unable to transfer program %d to child muxer\n", avf->programs[i]->id); + } + ret = ff_format_output_open(avf2, filename, &options); if (ret < 0) { av_log(avf, AV_LOG_ERROR, "Slave '%s': error opening: %s\n", slave,