From patchwork Fri Feb 17 17:02:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 40423 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1499412pzk; Fri, 17 Feb 2023 09:03:22 -0800 (PST) X-Google-Smtp-Source: AK7set8UED80x+OlNEdR0FLxY1t8k/MKtbiIrxTkfp5XqAz79qpy0Sn29kIYpdJqadhMPKI4nCmS X-Received: by 2002:a17:907:97cd:b0:8b7:80d5:e7e5 with SMTP id js13-20020a17090797cd00b008b780d5e7e5mr1455926ejc.17.1676653401907; Fri, 17 Feb 2023 09:03:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676653401; cv=none; d=google.com; s=arc-20160816; b=HWu0iuVmtprl0jn+LrK3aU27JDwgM/RGh20l1UImFTFeQKFdVd4JsDsxVBTD33mB1Z TvtVZNwluQZUeYfRT6u1W2A3kj79H6s3X+aXoa7GCZmc1IDUPq1yisYG3fwGm79FSb1U cNXuRN3FXj01TrO+MvGh7yNNfWKA/1R731sb7Nh/mapc6gVlJ73EzfgDbR/FwUsyt4jI Tmo1f5A7LOuuuhwET+TiT9K7XRJzNp36r212bqtqP/n2RSDdJrY3RM0VRf9wbDxjjkZS gTWzxLhxxIU7GBftcStZQoBdWN4qneuAzq+RCdbDzpsriSPJQVXBstS7V0MutrA8zCCB DK4g== 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=Kcmac+PPCPHK9WjUmCvMCj+IgzkX7ix2kZmJHmSY+o0=; b=junU9fiWN2OasZsG6SWWrKRMCPD1g8bwTiSky7JM9yJVwr4g0a+Ef/et+q6NXtrvMm JBzsW6wM8kiXd/RgQIrhKP2olvpp4fJ2bkfWRu0RrFnoga0gNFDn6o4PcXc1opGjhatG 5IY6ApvUWaoRZ2J4Lf4O4G5rzBwuCvTMd7tgG1gQODbU/GNsyNPLTOZyrnxhV+QHj1xf 3YMAjC8m/MCZQh5WBeWmERVwf1Qj0fiz041KWC7ghtLAK6pnj0KRyWPK77jwtaVeWahB v9JIoZ5o0V1dw2x4eCtUXa4J/ji4KGEWkPJXr4cSVZZ4r1Qodsz3oU5Ij2AN02fGnoxX aBWw== 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 w12-20020a50fa8c000000b004acdef7bab2si6039574edr.220.2023.02.17.09.03.21; Fri, 17 Feb 2023 09:03: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 0B3D068BE80; Fri, 17 Feb 2023 19:03:18 +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 13E0868B418 for ; Fri, 17 Feb 2023 19:03:12 +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-103.mailbox.org (Postfix) with ESMTPS id 4PJJ6N5Vbtz9sW3 for ; Fri, 17 Feb 2023 18:03:08 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Feb 2023 22:32:45 +0530 Message-Id: <20230217170249.8148-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/5] avformat: add av_program_add_stream_index2() 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: nPMDZg+D84AE av_program_add_stream_index() added in 526efa10534 may fail to carry out its purpose but the lack of a return value stops callers from catching any error. Fixed in new function. --- As suggested by Andreas in https://ffmpeg.org/pipermail/ffmpeg-devel/2023-February/306645.html doc/APIchanges | 3 +++ libavformat/avformat.c | 21 +++++++++++++++------ libavformat/avformat.h | 13 +++++++++++++ libavformat/version.h | 2 +- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 29161e30bf..889f9925b1 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-02-xx - xxxxxxxxxx - lavf 60.3.100 - avformat.h + Add av_program_add_stream_index2(). + 2023-02-16 - xxxxxxxxxx - lavf 60.2.100 - avformat.h Deprecate AVFormatContext io_close callback. The superior io_close2 callback should be used instead. diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 708d90b38c..0f203e4f86 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -333,14 +333,14 @@ AVProgram *av_new_program(AVFormatContext *ac, int id) return program; } -void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx) +int av_program_add_stream_index2(AVFormatContext *ac, int progid, unsigned idx) { AVProgram *program = NULL; void *tmp; if (idx >= ac->nb_streams) { - av_log(ac, AV_LOG_ERROR, "stream index %d is not valid\n", idx); - return; + av_log(ac, AV_LOG_ERROR, "stream index %d is greater than stream count %d\n", idx, ac->nb_streams); + return AVERROR(EINVAL); } for (unsigned i = 0; i < ac->nb_programs; i++) { @@ -349,15 +349,24 @@ void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx) program = ac->programs[i]; for (unsigned j = 0; j < program->nb_stream_indexes; j++) if (program->stream_index[j] == idx) - return; + return 0; tmp = av_realloc_array(program->stream_index, program->nb_stream_indexes+1, sizeof(unsigned int)); if (!tmp) - return; + return AVERROR(ENOMEM); program->stream_index = tmp; program->stream_index[program->nb_stream_indexes++] = idx; - return; + return 0; } + + av_log(ac, AV_LOG_ERROR, "No program with id %d found\n", progid); + return AVERROR(EINVAL); +} + +void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx) +{ + av_program_add_stream_index2(ac, progid, idx); + return; } AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int s) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1916aa2dc5..33ab0bc8ba 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2046,6 +2046,19 @@ AVProgram *av_find_program_from_stream(AVFormatContext *ic, AVProgram *last, int void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx); +/** + * Add the supplied index of a stream to the AVProgram with matching id. + * + * @param ac the format context which contains the target AVProgram + * @param progid the ID of the AVProgram whose stream index is to be updated + * @param idx the index of the stream to be added + * + * @return >=0 upon successful addition or if index was already present, + * AVERROR if no matching program is found or stream index is invalid or + * the stream index array reallocation failed. + */ +int av_program_add_stream_index2(AVFormatContext *ac, int progid, unsigned int idx); + /** * Find the "best" stream in the file. * The best stream is determined according to various heuristics as the most diff --git a/libavformat/version.h b/libavformat/version.h index 904e7f06aa..7ff1483912 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 2 +#define LIBAVFORMAT_VERSION_MINOR 3 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ From patchwork Fri Feb 17 17:02:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 40424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1499680pzk; Fri, 17 Feb 2023 09:03:35 -0800 (PST) X-Google-Smtp-Source: AK7set/hWShDZrKHm0KfssnfEY/LxzXi4mFfoHQuZ7gQmPCNIXAbraoQSB2yDDG5aFFa8/cT48mB X-Received: by 2002:a17:906:c55:b0:8b1:7dea:cc40 with SMTP id t21-20020a1709060c5500b008b17deacc40mr3677342ejf.9.1676653415171; Fri, 17 Feb 2023 09:03:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676653415; cv=none; d=google.com; s=arc-20160816; b=iKvXE3TnQGdfkumftAE/Rev24urhnuVbwQjx8IwaM170cHrrurgaxiKF9A2oqdXKos v918/RkjjLuMqXbStXItozJuaAoC6ZSeOVBFDVIF1Blyi0LRMJhxBCIxoNyYXkZeHMv9 3darfaRbl6rMr4RVHaQ2hb7cr7v5WvgN3c0QJuTM4xbMuZ0RC3lYSyPmwOAFnm49i6mz W8IjyXXzUZU0Hg71WneIQgUCb9JltfYwUqRl+6Oo/XBGfZ5WPf8k7q6DqzUjV7s7Tmka h1WE5wj0ngVNbZHShsoO2aWfqvK3jcamR5HadQON5E29atYiORtd/oUD5QTyhWESGjxt tlKw== 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=nIcYIEIP1dXYzBcB8qaxajuY0ordCVDulyjac9pzQn8=; b=wMZu/O4f4AUqI5TM4yHqYnX+gQ4BoUhOFYY9Muv3I1KMH6+zjxibWyj0pmt/wG+gN+ i6Q03kMKVKgW6egEqAoNM+xx7tT+x4fd8bcRPpfhwpuwr5dY99mssGYFahpQt5TqQN6T 6PCafDStxOpkfKvJ+POpj28qZpZ84bqd4ieJwtViKwt1zf69hOp+euU/eiUoyVsjFjH5 nSdfCMWBg8bYylYI1/SSHkSBrQlCt0m8Gpq+QdFmNn+e599Mqob37H4CrEFb0fVXt3+R GOyYvqTKAWPJaM42tbul9DvTdg0htjBWrJbdGDW0rZeJDn87ngcSq6A5iPzQtm9MYOe3 AgCg== 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 v19-20020a17090651d300b008b13c785d5bsi6608354ejk.247.2023.02.17.09.03.34; Fri, 17 Feb 2023 09:03:35 -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 0D62868BDFF; Fri, 17 Feb 2023 19:03:20 +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 131CA68BE85 for ; Fri, 17 Feb 2023 19:03:13 +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-202.mailbox.org (Postfix) with ESMTPS id 4PJJ6Q4FVGz9sWD for ; Fri, 17 Feb 2023 18:03:10 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Feb 2023 22:32:46 +0530 Message-Id: <20230217170249.8148-2-ffmpeg@gyani.pro> In-Reply-To: <20230217170249.8148-1-ffmpeg@gyani.pro> References: <20230217170249.8148-1-ffmpeg@gyani.pro> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PJJ6Q4FVGz9sWD Subject: [FFmpeg-devel] [PATCH v3 2/5] 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: 42siGK1Ea7Rl Helper to transfer programs from one muxing context to another. --- doc/APIchanges | 3 ++ libavformat/avformat.c | 66 ++++++++++++++++++++++++++++++++++++++++++ libavformat/avformat.h | 22 ++++++++++++++ libavformat/version.h | 3 +- 4 files changed, 93 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 889f9925b1..2588c17560 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-02-xx - xxxxxxxxxx - lavf 60.4.100 - avformat.h + Add av_program_copy() + 2023-02-xx - xxxxxxxxxx - lavf 60.3.100 - avformat.h Add av_program_add_stream_index2(). diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 0f203e4f86..64741b6f4a 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -369,6 +369,72 @@ void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned idx) return; } +int av_program_copy(AVFormatContext *dst, const AVFormatContext *src, int progid, int overwrite) +{ + const AVProgram *src_prog = NULL; + AVProgram *dst_prog = NULL; + int ret, idx = -1; + + for (unsigned i = 0; i < src->nb_programs; i++) + if (src->programs[i]->id == progid) + src_prog = src->programs[i]; + + if (!src_prog) { + av_log(dst, AV_LOG_ERROR, "source program not found: id=0x%04x\n", progid); + return AVERROR(EINVAL); + } + + for (unsigned i = 0; i < dst->nb_programs; i++) { + if (dst->programs[i]->id == progid) + idx = i; + } + + if (idx >= 0 && !overwrite) { + av_log(dst, AV_LOG_WARNING, "target muxer already has program with id=0x%04x; not overwriting\n", progid); + return 0; + } + + av_log(dst, 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 ret; + } + } + + /* 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 (unsigned i = 0; i < dst->nb_streams; i++) { + for (unsigned j = 0; j < src_prog->nb_stream_indexes; j++) + if (dst->streams[i]->id == src->streams[src_prog->stream_index[j]]->id) { + if (ret = av_program_add_stream_index2(dst, dst_prog->id, i) < 0) + return ret; + } + } + + if (ret = av_dict_copy(&dst_prog->metadata, src_prog->metadata, 0) < 0) + return ret; + + 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 33ab0bc8ba..46b4d177c3 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1886,6 +1886,28 @@ 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. + * + * Streams in the destination context whose IDs match the IDs of the streams in the + * source AVProgram index are added to the stream index of the copied AVProgram. + * + * If a new program has to be added, the function expects and requires any existing buffer + * holding the array of pointers to AVPrograms in the destination context to have its size + * be a power-of-two value. This should be the case if all earlier programs were created + * using av_new_program or this function. + * + * @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, const AVFormatContext *src, int progid, int overwrite); + /** * @} */ diff --git a/libavformat/version.h b/libavformat/version.h index 7ff1483912..62fa908659 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,8 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 3 +#define LIBAVFORMAT_VERSION_MINOR 4 + #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ From patchwork Fri Feb 17 17:02: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: 40425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1499907pzk; Fri, 17 Feb 2023 09:03:47 -0800 (PST) X-Google-Smtp-Source: AK7set//mdpjlRbDsLJCa3QzL0TRcZozs8xsBEkHFe8jHvk4CagN0EtFPPE057a42aoNewy3TKkn X-Received: by 2002:a05:6402:516f:b0:4ac:c507:702d with SMTP id d15-20020a056402516f00b004acc507702dmr2308218ede.28.1676653427495; Fri, 17 Feb 2023 09:03:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676653427; cv=none; d=google.com; s=arc-20160816; b=lKVA3yUv1gUXa68Zg8sN0apDSHyGlY/t2XGN85e5+YcAKxyn21WzhlBbspP0fx2sff 6jfrvmIffUcz7Kn427uLlWv3rch8uwFkEW/Q8cyq3JROubfM6C3PNjiziD2xUg3bLgkv vAGe2EZ07op3eFt2+Ck5RuwzthX9rG+uTNj1hx4rC6axS7E2OIBVZd6MI4+UQvH//uFF H9q1VuVJ54P7ed47aUl8PJ9dZCOZ/EDRPiQMrPpwHyepEWRh6jdOLvVvEIcfso/ypzkz 873lb904t5E8XgdBtH/vtibJu3F1UDheQq0vmsNmYEio5dJSlGYuXgw6tJIKXYZi67D8 kWag== 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=w0hiF/aewk1oKD/TTRnj9CRzG1/XX8uhjWlGNPc5xLY=; b=NgBd7Rdv+QKDXsyG19SrrVb1jucQkKv3J1icMqB7p+o/IurHdsI4kCnrt31o3hG26W Crwz21rtCEVII4a/NejnH5kN6MDEKCDC/P3LUqDV23xMpmhJfOCICGYfDyxcZpiQx4lA JzOHwVjKUkpKoa2cTzKprlUfladBs4M3VAF/qO0eaWOlyHMJDrRtvYmKYqXg2BhCaJUH WfS9p4bkpr0Rgm6v6NVFjcjN3oc+zsvLGkN3iN6JMczAbhsc47Dew3forRxtl4yXA6rB 845mSrMcDCUdoh7+uHuLCzD0TMz+44yn7nyg8DCuRPxEUxs6C4eMlE/DOm2UTTwGj/vY 7L9w== 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 n3-20020a056402060300b0049e34ecef4asi5830694edv.5.2023.02.17.09.03.47; Fri, 17 Feb 2023 09:03:47 -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 127B768BECD; Fri, 17 Feb 2023 19:03:21 +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 3D5E668BE46 for ; Fri, 17 Feb 2023 19:03:14 +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 4PJJ6R6Flgz9sWt for ; Fri, 17 Feb 2023 18:03:11 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Feb 2023 22:32:47 +0530 Message-Id: <20230217170249.8148-3-ffmpeg@gyani.pro> In-Reply-To: <20230217170249.8148-1-ffmpeg@gyani.pro> References: <20230217170249.8148-1-ffmpeg@gyani.pro> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PJJ6R6Flgz9sWt Subject: [FFmpeg-devel] [PATCH v3 3/5] 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: FdJJnyVTUyoF --- libavformat/hlsenc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index e1f96feda3..cf2b36da01 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -911,6 +911,14 @@ FF_ENABLE_DEPRECATION_WARNINGS st->id = vs->streams[i]->id; } + for (i = 0; i < s->nb_programs; i++) { + ret = av_program_copy(oc, (const AVFormatContext *)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); + break; + } + } + vs->start_pos = 0; vs->new_start = 1; From patchwork Fri Feb 17 17:02: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: 40426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1500126pzk; Fri, 17 Feb 2023 09:03:59 -0800 (PST) X-Google-Smtp-Source: AK7set8i++f2LddzX7shxYc/+gNsg+tkxDM2Budg4eW2ZO49vpvw0ajrOGR5wFHESZZdx31iX9c8 X-Received: by 2002:a17:906:e89:b0:8aa:12c2:5ef2 with SMTP id p9-20020a1709060e8900b008aa12c25ef2mr9955112ejf.13.1676653439047; Fri, 17 Feb 2023 09:03:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676653439; cv=none; d=google.com; s=arc-20160816; b=HwRixvKq+5r8NHTcBoX7q8QW69UvUIg6NKclrycppOw2we/iZx78ZfFG93SLAHWYzI Z7YWjvHCBtboT1wM433G1xNTKRGqTo4b2qdEe+v+iV6oV/hm/9/E6Sa4KuWTriS34yAn ZObB0hJ5FrhprpqDdmZLtkyJkelgBrcL3Lt7tiWkxfQf/ANyow+cuFxVptO+J6HccwhB zkEzTXELb9LCG1ZN5rITLePLqBwfCloa07JpDhLINOtcFKsGdBNI7kyXNRl4uxbUiI2Y YRw1lZT9zmN9P9lNR6ZpmzsxskdoH/H4JHY88EKZagw6XrHN0ZJFsNpkHAZlqxJP15Fe woQQ== 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=iWgtBDx95BG8wGl9ChElKunDYG90WRDMKv4/pQxFw5Y=; b=qylngiYWT+LSF7A7VcaavwO+SMxzwz2iyS/kOFzNRrwNVYDs/ki4hFoTkTvWq08r+G KfnmRCUntR15mbe6Vn7bTjdmuX6lUf3RKcOS6psPlBwCADeNW7c6z1XOVlLROQP1zRzD /bFzYLlrsUWMCINrZ81bbudbXwp/EqgwvHq9vc3gfXK79FykkkFye60cXlX6BVpJL1Jk RfL+eTnlOQHMvdtPxzmrfnb34t/ONFvE9G662vzn8n+hbaxStmnTrlVDZxjxStxEUzdC l8CZ3atMg8qkcUlnUK2avLoP+6OKEWJz3DxzdTWncEaLZA4zItg44s52AHUnUpTSbulK Allw== 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 w24-20020aa7d298000000b004ab44dde183si5474414edq.281.2023.02.17.09.03.58; Fri, 17 Feb 2023 09:03:59 -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 1FC4868BED2; Fri, 17 Feb 2023 19:03:23 +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 85BDA68BEBF for ; Fri, 17 Feb 2023 19:03:15 +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-201.mailbox.org (Postfix) with ESMTPS id 4PJJ6T10vXz9scX for ; Fri, 17 Feb 2023 18:03:13 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Feb 2023 22:32:48 +0530 Message-Id: <20230217170249.8148-4-ffmpeg@gyani.pro> In-Reply-To: <20230217170249.8148-1-ffmpeg@gyani.pro> References: <20230217170249.8148-1-ffmpeg@gyani.pro> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PJJ6T10vXz9scX Subject: [FFmpeg-devel] [PATCH v3 4/5] 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: kxbzc9pkNdSK --- libavformat/segment.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/segment.c b/libavformat/segment.c index 2a82f39f31..5017fb628d 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -186,6 +186,14 @@ FF_ENABLE_DEPRECATION_WARNINGS } } + for (i = 0; i < s->nb_programs; i++) { + ret = av_program_copy(oc, (const AVFormatContext *)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); + break; + } + } + return 0; } From patchwork Fri Feb 17 17:02: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: 40427 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1500374pzk; Fri, 17 Feb 2023 09:04:11 -0800 (PST) X-Google-Smtp-Source: AK7set9oC8gobW2iNZPW7xtVe7b+f02kDmahMEyzqQUIpPuc4bfLLejJHEdIg5ttXLyv5CiSNGSw X-Received: by 2002:a17:907:7206:b0:8b2:e93:3f59 with SMTP id dr6-20020a170907720600b008b20e933f59mr3063086ejc.31.1676653451161; Fri, 17 Feb 2023 09:04:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676653451; cv=none; d=google.com; s=arc-20160816; b=zzPMZIk3R36bUR5OH2JSHcMlFqmFjsaTL9x/26wvAW2Z+I8TUGoTo3EXawyjqRSZHo 5FRvhv1fBcNR7A6y9SoFYFRoI+ao3eRrv2hwGUkgW3AwFH0FXuAlXkAN7mh4KeZDGUHX nznbAaRxmkD+Mo9Ltig2qAitoZmkI1blGpu1eAVWQBGFxAA199hiXPWxLZ3b5cX3pG+w RqUJ1hNzNXCCPj7/Q0OpKA8/7tuARZypO0zrkBHcKlEuN3ZqNhi3V2CZAhkIjsIobvmX vPNbF5CjMXJZFPQx0TD7J+nSsihZODraZZK4pCMw/XFoOIGSkgFm7flM0YGAKJvwCbD5 pMNg== 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=+FqoI54rHiHxG9SxC5TnGcqnCGmquEHDYateONhQ22g=; b=CZCPNSycgoEDPaE2ALVpLloDe1lEY5Y5fVvjPfVkghjs6sFwNoCpUp7mLdQR5hXluS oNFs4KTrfO5JzIREvM0775WTqFGYHgZ9JNWgbTSUrGUcvmx60viw4n3yIar4BbIokpAj FDCydwSfnp0YnSbiRjmlXsc2A+Hu9zZmAcw87htQ/qrPj/Tlk076TLUBPbds48tH4w0y E7SdHEO59Ign+zRJ6o7jXsvqMzmOd9QmiCZSpV3kQGOYsRuwrWfLtta3YqFqppy9PxPF vK64TIwT4jpq4ho/3TeYOiFT4HQwEXP5Z1Mu035wF4qYK7d/NkRhmLPFh0aURCQmgI80 eyQw== 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 ep11-20020a1709069b4b00b008b12cdad0e3si4800207ejc.230.2023.02.17.09.04.10; Fri, 17 Feb 2023 09:04:11 -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 283E168BECE; Fri, 17 Feb 2023 19:03:24 +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 ECD1168BEA3 for ; Fri, 17 Feb 2023 19:03:16 +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-101.mailbox.org (Postfix) with ESMTPS id 4PJJ6V3S8Kz9sSj for ; Fri, 17 Feb 2023 18:03:14 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Feb 2023 22:32:49 +0530 Message-Id: <20230217170249.8148-5-ffmpeg@gyani.pro> In-Reply-To: <20230217170249.8148-1-ffmpeg@gyani.pro> References: <20230217170249.8148-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 5/5] 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: 28ttC9/H1pI5 --- libavformat/tee.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/tee.c b/libavformat/tee.c index cb555f52fd..a917cb0244 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -295,6 +295,14 @@ FF_ENABLE_DEPRECATION_WARNINGS } } + for (i = 0; i < avf->nb_programs; i++) { + ret = av_program_copy(avf2, (const AVFormatContext *)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); + break; + } + } + ret = ff_format_output_open(avf2, filename, &options); if (ret < 0) { av_log(avf, AV_LOG_ERROR, "Slave '%s': error opening: %s\n", slave,