From patchwork Mon Aug 28 12:34:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43367 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3822:b0:149:dfde:5c0a with SMTP id p34csp113866pzf; Mon, 28 Aug 2023 05:37:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGoexg9uRSr7RjEqvFEoERyetvkwT900S7R1rJRwBa80MLHy/KK2nTDlwN4UGfj+yUUsng9 X-Received: by 2002:a17:907:7714:b0:99d:fd27:b38d with SMTP id kw20-20020a170907771400b0099dfd27b38dmr19076420ejc.70.1693226241755; Mon, 28 Aug 2023 05:37:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693226241; cv=none; d=google.com; s=arc-20160816; b=Bk94HRflWu3KGJK5BO9oxbV7vXVD55JTl8Cv5RqE8ufMrS21K1vSgSVOHldrOmZIIh azuMqb81Um0XItERP6o1HPKQwYYCBiQUpR7j2y/jUPFCCaGdQhe+tMwJNsoufEt+bgc2 rm4siD2l7Wdf02CUlu5bBg/shWvgzOz1V4kzJErXBI7usOMOugLEgnhtoGtgdC/5cJAi XWeqbAkm1hqem/DCMnJbJ5rRmSLr8WBRXXSPpBTF/DDxnMgEqcVhKuioIUDMea3PpPpP anJ/k9OS3hgWeJOu50kJ8juT9xNsKunmBF0fhKScZ5Bfvp3Vf3P6JhuQIcYQ0X2mZhiv AdrQ== 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:dkim-signature:delivered-to; bh=PaFiw0sLN90sid8m6r7HFGLt30ffNrg74XJ9dkZ5MBg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=BMn7QAkOmrcjhCl/TYDiPiiMdDZdHCoQFCY2KZFPEwY7WgoOtL1xhHbRDMLoE8K73p A1RrWMp1JAFcgi8iwFj0twxPi3OMDFsEdwcQx0NDM+zptGY43mbAv0UtdVR2wM5PD1Sd VBZN+2/Nmn45HhkJreNrbCP0wcNkTbMfRvkmNOm9pBB8+pl8bVVelo/wY6XjF4E0ULVY 85amuRn6bt0cHb4jFpG1AI/psAjGSNUGjeAAezx8/8SFak9z3XJ8QsZkcXz1vVG5uTJR e5q8EIskAdTvaMRLk7gD9VK7+ChjECewpGtQzOQCGEw0+Y8azC87b0L20xG7aaHyk9CK xuug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=pkjRloV4; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id mb9-20020a170906eb0900b0099bd73c9bcesi4091148ejb.730.2023.08.28.05.37.16; Mon, 28 Aug 2023 05:37:21 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=pkjRloV4; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB0F368C618; Mon, 28 Aug 2023 15:36:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9409268A05D for ; Mon, 28 Aug 2023 15:36:45 +0300 (EEST) Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6bc886d1504so2497137a34.0 for ; Mon, 28 Aug 2023 05:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693226204; x=1693831004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=fBGwHDWBas4ZxHAXuMVV1jUMBspTKvRWmn3N4xVQl/Q=; b=pkjRloV4uN3HAZ3nUvPM1KGfvGqB2mdhDC4yPaM9zATdZqxlVXH9SR/Q7JTmV752tm rt8yzreTHNuiJB1xzrwMIfZtP1jBJUJhut8tcuRVC8rqgy9MdK2b8p7sMxYNgP+IaUpL PHtQlO1FCsIlt8QwWs1d7eoj+7fUxnjNquSq4hetcFq7N1bYgNn1zOzjMIeNR1igd9UC 96IYCLAmQShE0hsAgV16EKXzyHsECMzH23sB8hVdmoFKj6u16INfVYjXLhm5kBjTWccF Cqz59+tYm8bfsZTC0ETDlqscuoItsxs2ayBXe6bJ9pxLtTFMuGXd1zrp+Nh/8ko6MgU+ cB8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693226204; x=1693831004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fBGwHDWBas4ZxHAXuMVV1jUMBspTKvRWmn3N4xVQl/Q=; b=dDrZExOQD6joyzFjjZhxbeHucStqRnOlbyGcceTOGCDoCMIwtYyr+tGL4lxc3RJevz 6rd1oPn6nqPY5oUhyBwiqbVgCapbesHavSf3FG4T5Pa0LjCO01KeZq56L7cWauPKJj8l 2hyV3cFFbRhDs7j2kzyG3lzjsUIzTk2RhGu3Ostj1vaugtmfs3QmVAFfsqd+zJQhzhNO Ws8JYmqbdZjA+594IoV+ctJnVPmP9aiuCUQVHGwCwU4wDL8PLAb4CIEsw1B5RX9NE05F RVCoTe02CsRbX4z0/MgH1KSCy6F+zeUbwd0+8Qg5mDdqunZBQ8ACn1kzPC2wmkq1AZiv IRIg== X-Gm-Message-State: AOJu0YywmN1fG4ypjImA68YMtKXvRWiHfGTuwMJmGUr8daSp66Y8zC7I St1fMiVqsFD5tJSKb42yhBc/ssZfnS8= X-Received: by 2002:a05:6830:22e4:b0:6be:fcc2:a3f5 with SMTP id t4-20020a05683022e400b006befcc2a3f5mr5748470otc.37.1693226203759; Mon, 28 Aug 2023 05:36:43 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id b15-20020a056830104f00b006b9a98b9659sm3404615otp.19.2023.08.28.05.36.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Aug 2023 05:36:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Aug 2023 09:34:54 -0300 Message-ID: <20230828123617.57535-3-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230828123617.57535-1-jamrial@gmail.com> References: <20230828123617.57535-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/12] avcodec/codec_par: add side data to AVCodecParameters 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: JWfgt4wXFhmk Signed-off-by: James Almer --- libavcodec/codec_par.c | 43 ++++++++++++++++++++++++++++++++++++++++++ libavcodec/codec_par.h | 6 ++++++ 2 files changed, 49 insertions(+) diff --git a/libavcodec/codec_par.c b/libavcodec/codec_par.c index a38a475dc7..a932323759 100644 --- a/libavcodec/codec_par.c +++ b/libavcodec/codec_par.c @@ -27,11 +27,13 @@ #include "libavutil/mem.h" #include "avcodec.h" #include "codec_par.h" +#include "packet.h" static void codec_parameters_reset(AVCodecParameters *par) { av_freep(&par->extradata); av_channel_layout_uninit(&par->ch_layout); + av_packet_side_data_set_free(&par->side_data); memset(par, 0, sizeof(*par)); @@ -72,6 +74,37 @@ void avcodec_parameters_free(AVCodecParameters **ppar) av_freep(ppar); } +static int codec_parameters_copy_side_data(AVPacketSideDataSet *dst, + const AVPacketSideDataSet *src) +{ + if (!src->nb_sd) + return 0; + + dst->nb_sd = 0; + dst->sd = av_calloc(src->nb_sd, sizeof(*dst->sd)); + if (!dst->sd) + return AVERROR(ENOMEM); + + for (int i = 0; i < src->nb_sd; i++) { + AVPacketSideData *sd = av_mallocz(sizeof(*sd)); + + if (!sd) + return AVERROR(ENOMEM); + + sd->data = av_memdup(src->sd[i]->data, src->sd[i]->size); + if (!sd->data) { + return AVERROR(ENOMEM); + av_free(sd); + } + + sd->type = src->sd[i]->type; + sd->size = src->sd[i]->size; + dst->sd[dst->nb_sd++] = sd; + } + + return 0; +} + int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src) { int ret; @@ -89,6 +122,9 @@ int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src memcpy(dst->extradata, src->extradata, src->extradata_size); dst->extradata_size = src->extradata_size; } + ret = codec_parameters_copy_side_data(&dst->side_data, &src->side_data); + if (ret < 0) + return ret; ret = av_channel_layout_copy(&dst->ch_layout, &src->ch_layout); if (ret < 0) @@ -177,6 +213,9 @@ FF_ENABLE_DEPRECATION_WARNINGS memcpy(par->extradata, codec->extradata, codec->extradata_size); par->extradata_size = codec->extradata_size; } + ret = codec_parameters_copy_side_data(&par->side_data, &codec->packet_side_data); + if (ret < 0) + return ret; return 0; } @@ -261,6 +300,10 @@ FF_ENABLE_DEPRECATION_WARNINGS memcpy(codec->extradata, par->extradata, par->extradata_size); codec->extradata_size = par->extradata_size; } + av_packet_side_data_set_free(&codec->packet_side_data); + ret = codec_parameters_copy_side_data(&codec->packet_side_data, &par->side_data); + if (ret < 0) + return ret; return 0; } diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h index add90fdb1e..169e595b7c 100644 --- a/libavcodec/codec_par.h +++ b/libavcodec/codec_par.h @@ -29,6 +29,7 @@ #include "libavutil/pixfmt.h" #include "codec_id.h" +#include "packet.h" /** * @addtogroup lavc_core @@ -223,6 +224,11 @@ typedef struct AVCodecParameters { * when no higher-level timing information is available. */ AVRational framerate; + + /** + * Additional data associated with the entire stream. + */ + AVPacketSideDataSet side_data; } AVCodecParameters; /**