From patchwork Sat Feb 18 04:49: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: 40437 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp344317pzk; Fri, 17 Feb 2023 20:50:46 -0800 (PST) X-Google-Smtp-Source: AK7set9GqmMTodo/VEqaLCK36R0HVbSrRX7PL8d/ruKP5c/7CVxCC2GM4rCVI2g1nnfTrrcZWxa9 X-Received: by 2002:a17:906:769a:b0:8b1:319c:c29e with SMTP id o26-20020a170906769a00b008b1319cc29emr2046590ejm.74.1676695846155; Fri, 17 Feb 2023 20:50:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676695846; cv=none; d=google.com; s=arc-20160816; b=fsPW+nh5MXnC3OpX9XGVsHkmTUWDW2Tx19JBluBkG2S+gisw1JeKWj9PwUQ24n6Ek+ qF8AU0nLF0IYHXbaSdyqWZ66sAXwsWUId4R3jbQh6WR6oRdAXrYNGrK8H0Met1T9chIQ YcLAxbCssDtBwtNxwhrTclhrEyuVNaTPjw1qc8sZlfkBQaarHVJgOJDH/hu23RPUVkaL aqDnaJNf5ce9Me+FKQpRxxQH9vGmLkCIKXXnVaKpe9RxdDI8m/Fw6D51sX9QbZfbV19R YWm+/AFMkN6WITQ5QeLswO/frLOFYtCcteerPgGCfRjU8OuQaWLtD/esmdwbRkKcJO9H iiIg== 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=C1Rs+m0vgHrKWMsw23fgVFJkUE1K/o+3Ti9Xg9hLDIebmSkOEvwT20GENgp5S0FmSN WCnR9F8dFltMjcweIuJiWyPc4M3k4zSr1tRA+Ba4IOsggLIAm/Mgz6y2eTw28hixe+zw 9uFSHNlCXJbC37RV/vJv8zHBCkHfVHPxw0o+iRGjOmO1ybdnpb2nR64nmmP9yGHtU2ur WcQD7dK5DUrDby7jxhnDCc2M7CzT5WYgfqGS0WrEox17uo6QZOR9eI/BHITefJsOYH7U O6Fa22fASM5tXFVPjzZsRlqu53I8qOv8EoDy57//LqBb72U8j+gZmnnqUqKFrT52pb19 r1mA== 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 e18-20020a50fb92000000b004acd2b308e0si7088281edq.404.2023.02.17.20.50.45; Fri, 17 Feb 2023 20:50:46 -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 C153468BE77; Sat, 18 Feb 2023 06:50:31 +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 2A87168AC05 for ; Sat, 18 Feb 2023 06:50:24 +0200 (EET) Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (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 4PJbpP4bJ8z9sS3 for ; Sat, 18 Feb 2023 05:50:21 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Feb 2023 10:19:46 +0530 Message-Id: <20230218044949.1179-2-ffmpeg@gyani.pro> In-Reply-To: <20230218044949.1179-1-ffmpeg@gyani.pro> References: <20230218044949.1179-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: gL2e+a9OlnTz 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, \