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, \