From patchwork Thu Feb 9 10:55:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 40333 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp324047pzk; Thu, 9 Feb 2023 02:56:02 -0800 (PST) X-Google-Smtp-Source: AK7set9tsF1MUdGNxMNWsqjmivhfjQVtr0diZ6z+JhfKx3EZt83FBOQqdiHyBK2te9mqQuBx275L X-Received: by 2002:a50:871a:0:b0:4ab:1686:e90c with SMTP id i26-20020a50871a000000b004ab1686e90cmr3577497edb.15.1675940162112; Thu, 09 Feb 2023 02:56:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675940162; cv=none; d=google.com; s=arc-20160816; b=ZmTalOSPQZyvXFQR9tUUmTnxwUnuoR27XP6A+iXsP7XVHwiHjxj2b82mUBgoLHrthZ iKzZNgzcGP7dTwKVxOndZgSo1i3fJIuMiv1QebuGOMp+8L/SAe6XqF1wNaHipUGYY8rS rx/Qwy2oOt70W1xf+OMEuJWrrvMbRZMT4omc0rpSR0oTLPAPjm+ABPGNM2AQBEy7ES0J p4KAqwU6I13wnrCDo+LQt6s3QYXXq2KMh10j4opYsmuLFNJUi8Xq2wZF+OduzKP1Wu8D w4z+popN318dbEkyYiIgbH1+EEQx8HgUoA8MhgSds3C0N+Sk1sbxhuh1HodjH/GuVcuz r9dQ== 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=smIHtqMDeYtmPkzneHZd9NZc8a2RwUe0j4Y+3gjZAXk=; b=P7z5UdXRT/edXVHk14ZohAQCbeRt+lq8GD92urwAlnu7TUH1DifEVdMs2tBDqnx2+T tP234AHkVHBbtGf+Cp1xCRU3cRd7I55DNjKdjcpPCK84eTWItzekKAMDftWtRFrPEuPV XxAYwlCZro9aSo6nGFH6r7utixOFN1JD9UXq3BhWG7+XePvURdNg2fIkw3TUcbi+Qd1Y z9FEOEehoczmEiehvIaULvUsT1VoUyfSbYIAPGbIWJu9Ms9FgmWRaI/9YJFj4FwV5mEZ rBnhmdi0AJ45gbU5Oqs28K++wr2NRZjccJy0XgTGET9GjLfsIN8hrVmnSf+TAjMvhMdd 5Hjg== 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 e12-20020a50ec8c000000b0049defeaec6dsi1730921edr.530.2023.02.09.02.56.01; Thu, 09 Feb 2023 02:56: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 2A23868BE7F; Thu, 9 Feb 2023 12:55:57 +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 85E7C68BD1B for ; Thu, 9 Feb 2023 12:55:49 +0200 (EET) Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (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 4PCDLB63ZLz9sZh for ; Thu, 9 Feb 2023 11:55:46 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Feb 2023 16:25:16 +0530 Message-Id: <20230209105519.1814-1-ffmpeg@gyani.pro> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PCDLB63ZLz9sZh Subject: [FFmpeg-devel] [PATCH v2 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: ow6abFouEoVr Helper to transfer programs from one muxing context to another. --- doc/APIchanges | 3 ++ libavformat/avformat.c | 70 ++++++++++++++++++++++++++++++++++++++++++ libavformat/avformat.h | 14 +++++++++ libavformat/version.h | 2 +- 4 files changed, 88 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..d3c8def170 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -359,6 +359,76 @@ void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx) } } +int av_program_copy(AVFormatContext *dst, AVFormatContext *src, int progid, int overwrite) +{ + AVProgram *src_prog = NULL; + AVProgram *dst_prog = NULL; + int i, j, ret; + int idx = -1; + + 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, "source program not found: id=0x%04x\n", progid); + return AVERROR(EINVAL); + } + + for (i = 0; i < dst->nb_programs; i++) { + if (dst->programs[i]->id == progid) + idx = i; + } + + if (idx >= 0 && !overwrite) { + av_log(src, AV_LOG_ERROR, "target muxer already has program with id=0x%04x; not overwriting\n", progid); + return AVERROR(EINVAL); + } + + av_log(src, AV_LOG_TRACE, "%s program: id=0x%04x\n", idx >= 0 ? "overwriting" : "copying", progid); + + if (idx >= 0) { + dst_prog = dst->programs[idx]; + av_dict_free(&dst_prog->metadata); + av_freep(&dst_prog->stream_index); + dst_prog->nb_stream_indexes = 0; + } else { + 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..2b7ed3abd8 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1996,6 +1996,20 @@ uint8_t *av_stream_get_side_data(const AVStream *stream, AVProgram *av_new_program(AVFormatContext *s, int id); +/** + * Copy an AVProgram from one AVFormatContext to another. + * + * @param dst pointer to the target muxer context + * @param src pointer to the source muxer context + * @param progid ID of the program to be copied + * @param overwrite whether to overwrite if target muxer already + * contains a program with the same ID + * + * @return 0 in case of success, a negative AVERROR code in case of + * failure + */ +int av_program_copy(AVFormatContext *dst, AVFormatContext *src, int progid, int overwrite); + /** * @} */ 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 Thu Feb 9 10:55:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 40334 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp324124pzk; Thu, 9 Feb 2023 02:56:12 -0800 (PST) X-Google-Smtp-Source: AK7set8bmhC3THZlNbL0VslCs4HD5D51S1AqdxoeS+bAgx2WCZ+b6hhXUorZJpnZ0TWLh7EIUG3o X-Received: by 2002:a17:906:5295:b0:8ae:f18f:f2b5 with SMTP id c21-20020a170906529500b008aef18ff2b5mr5854914ejm.16.1675940172440; Thu, 09 Feb 2023 02:56:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675940172; cv=none; d=google.com; s=arc-20160816; b=z3fhJ/Bn7AIsxaqNyUxcytToSROaZGXXFPavXwC/SF1TuUNABleV5Mmv+S7OrSGqV8 3xDYQrYRC2TH8cyGmXGifiwmHKxDTJ1iZY5hSTwqYYTzCs2/3Bjbsp8dOxNnj9eV5J6w R3UgqezdPGJ/k3HP/EK9HGNOW/Olo6v3ItJj7vZqCALQy8Ax0emJ0tY26z4oEF6xUUbR RVPlLxsQf7R4v6llNQux8IA9FPywf/EXdOq3X7sxHIk4fIkZ3wJBTt91Pt9qStptXxUk yMEfRabJCpBSlK97GJzJRhmBR2wD00CEnDs2UjDS+JllQjvRNmpufT7FsRMBma2QclyY ordQ== 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=MAOneVY9AeJDagUWYtAd0ziQDLJxaTVgUpOr71REd/k=; b=QUVSrPmayRt4dUW5REPV6pQtSMrCOavLN6f9ekhL83dOx16LTCpAKahRUzb04AQtHb 1SIwWHhfkIrpe0rda6VKU9Wd21+rw15y93xDZNHHhYzr6JeHaBO5r0Ri41YIzIpR41CC /6nP2ZUwfSpNQOYz289k4ULJjlxg8Wqi+oBRGCBKgSP5f93MF51UBrT7qKSD9DETDZMm fCsEsy5nIk9NPpUEE6aZXEGEratD6eti/cDct8UuGwSLqtCRQW/z+DDFgJm4S3At9g6e X3F+3dyIO9Ou8Hyl7BqIWnlZv+BgSpX83YDm70OqYxNid9tlqN+ZOsfPyutNJtagvD3m cfqg== 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 13-20020a17090601cd00b0088a35d495a0si2285500ejj.304.2023.02.09.02.56.12; Thu, 09 Feb 2023 02:56:12 -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 487E068BEBE; Thu, 9 Feb 2023 12:55:58 +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 CFA2D68BD1B for ; Thu, 9 Feb 2023 12:55:50 +0200 (EET) Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (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 4PCDLD2Rp8z9sW2 for ; Thu, 9 Feb 2023 11:55:48 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Feb 2023 16:25:17 +0530 Message-Id: <20230209105519.1814-2-ffmpeg@gyani.pro> In-Reply-To: <20230209105519.1814-1-ffmpeg@gyani.pro> References: <20230209105519.1814-1-ffmpeg@gyani.pro> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PCDLD2Rp8z9sW2 Subject: [FFmpeg-devel] [PATCH v2 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: 3ypC1pXrY1GP --- libavformat/hlsenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 39df9becc7..0b66efad3e 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, 0); + 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 Thu Feb 9 10:55:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 40335 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp324192pzk; Thu, 9 Feb 2023 02:56:21 -0800 (PST) X-Google-Smtp-Source: AK7set/sPs7ShIT7jZse041dBKdGEVBBr26Fiu9tPqm5lObrcKcSFJWXQi/jDXvOirQ8drfmL0c/ X-Received: by 2002:a17:907:8a03:b0:8aa:bdeb:83b5 with SMTP id sc3-20020a1709078a0300b008aabdeb83b5mr11437418ejc.18.1675940181625; Thu, 09 Feb 2023 02:56:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675940181; cv=none; d=google.com; s=arc-20160816; b=heK/kmB0xpD8QlpQYYXcG0ueig6JLAqB8g/H3RgVogbJdB4QZjStLVnEKUtcVKtBhP VTyJJRvxAwMgd7kLAetH9JdsrThILFvOf8DrZqg2viVOLwUC3LJpQvwAHal3xtxzaCgf 0X8GJ2aOCr9Bu9wa60CMVT/c+uRuWOEOWTEmk3rfB9W9lmDvuEcjLwe8mKbA7d1u2wWC Qd/nQA3RNumrfNYQHIz/N/2Euan0UpH+wp14hkgT6sTgdHF9T0qyAR0OUzNK4r3wFB9/ nKhVkMFHBNMlZg5mlkMvL3v4R1gOnehdqaF8rzirXuxiqjN+hENOrazgzNyJsauL9Q6E KOvA== 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=W57zGEYcyR2XBq5BI0gKawVJbE3A3oLSz2nvtLzmeR8=; b=rr8lP0+yoqhaI8dOMCyqrCTUaJPkaCvZzJYKc14/5Tj9ItMgKO1MzwWoiaUu5Fs3h7 hAwupJuHhn8N0zcfCxb8iwdrhYKH33xFzEjBQyvd8g7S2pEb7tXJisveY0B1jXhRS7re qOy4JCgSfx013H51ryCTCVpy0L7c73rvzVhw+U9hyhxiPOqMpIjzB2JA9DIdcZRP7crx j17P8h6wZR18FLE27jq6/a2lXIHi0L8j+PYCSInObwUBbsV6a/NBvhgr23e/Ra5RP10I JFgy3FgZIyL4CAQMvlQOu1NouNDCWj/zuRcgGDIcpghWgHhtqNlxvu6h94vv96zTOYv7 3HZA== 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 mr30-20020a170907829e00b00888c44d9d86si2048012ejc.508.2023.02.09.02.56.21; Thu, 09 Feb 2023 02:56:21 -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 6994D68BEB9; Thu, 9 Feb 2023 12:55:59 +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 58F5868BE81 for ; Thu, 9 Feb 2023 12:55:52 +0200 (EET) Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (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 4PCDLF6STbz9scg for ; Thu, 9 Feb 2023 11:55:49 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Feb 2023 16:25:18 +0530 Message-Id: <20230209105519.1814-3-ffmpeg@gyani.pro> In-Reply-To: <20230209105519.1814-1-ffmpeg@gyani.pro> References: <20230209105519.1814-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: UEweM+iOLbxT --- libavformat/segment.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/segment.c b/libavformat/segment.c index 80e4bf851c..2d9f24e194 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, 0); + 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 Thu Feb 9 10:55:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 40336 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp324271pzk; Thu, 9 Feb 2023 02:56:30 -0800 (PST) X-Google-Smtp-Source: AK7set/fQGM1LcneBFOZU8IuLo8YZlpJ7N/JUniMxfx09yTuAwaOW5lBqO0hr6+PATr0wgaKnnxH X-Received: by 2002:a17:907:6d8a:b0:88f:8a5:b4cd with SMTP id sb10-20020a1709076d8a00b0088f08a5b4cdmr15084363ejc.1.1675940190693; Thu, 09 Feb 2023 02:56:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675940190; cv=none; d=google.com; s=arc-20160816; b=NneZmsaJlkGzA95rLZRailDlYbEGJ5aoou3p6sMweJilUwISurIIAfvUrHt9jUfzDu NiGLe8V5sRqvhEL8fAUAObpskTdhyxgflt+/ySZC4NAYOtWjeRQl4iJ4APZuZ/eMluB3 r1wQx60XXEKe7+d9Q2xMGBw1o8fi7/A1h8ILtUofGgb50B3QQPgxOLEHLvCmPksj1KOy 9TBJyotWp8XtBrNFuVN3M3aMlf5kEA4yWMDrE9Y/1xItNnZLhVXKjWax9AFEPbRIEcRh +MundVPi9NDWdc9SiWEkBdRXj1QVadBgOcAhNagZskCW6TMdt7Gg/nbhKUFchRlY+Hs7 FBkg== 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=g5VPnq9VebGyPRlgFgY72Pu6c8VYuuoQp2H5Jbv0HB4=; b=WByqhcK12ShVGT4mteaezv5hAzERtGHzg3knXox0o4SvLnoJ4ltxT1e4Q9jflKDdug gXPkfcCBgbnWMkNxLht+12N7L3NvYhNqDd5FFSzHY8cyqNj4o2WRvBf9184Dryj419pS 3MMctgsOupUqBIpA+tZbEkGu26EKhBwVWWaStA+QsgJ/bTfjiGTZpZJHJYcKo3B74/+U QihIpac95+VC7AeBv8xKBNyIJ5GNNZENtDMhci4iWynX2HEnQTKXSZEMzeNSodKscP/3 HnL321RYFfrzCZQqlcC/tF+9HpWuWgzMwHP8nTT9VlBWLab8zcmDpcIubezHksnJJG/f MPRw== 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 17-20020a170906001100b0078dbd939dacsi2306046eja.545.2023.02.09.02.56.30; Thu, 09 Feb 2023 02:56:30 -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 63C0F68BEC9; Thu, 9 Feb 2023 12:56:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9882468BEC5 for ; Thu, 9 Feb 2023 12:55:53 +0200 (EET) Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (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-101.mailbox.org (Postfix) with ESMTPS id 4PCDLH13gvz9sc7 for ; Thu, 9 Feb 2023 11:55:51 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Feb 2023 16:25:19 +0530 Message-Id: <20230209105519.1814-4-ffmpeg@gyani.pro> In-Reply-To: <20230209105519.1814-1-ffmpeg@gyani.pro> References: <20230209105519.1814-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: lXK8RDHlM/gT --- libavformat/tee.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/tee.c b/libavformat/tee.c index dd408dd096..2fde8a3828 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, 0); + 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,