From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C8C04472CA for ; Mon, 4 Sep 2023 15:04:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22AE168C7A2; Mon, 4 Sep 2023 18:04:31 +0300 (EEST) Received: from mail-oa1-f47.google.com (mail-oa1-f47.google.com [209.85.160.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 053D768C2DC for ; Mon, 4 Sep 2023 18:04:23 +0300 (EEST) Received: by mail-oa1-f47.google.com with SMTP id 586e51a60fabf-1ba5cda3530so1259210fac.3 for ; Mon, 04 Sep 2023 08:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693839861; x=1694444661; darn=ffmpeg.org; 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=8imFGWktDw7krlAkP1wYOf7tVXWH/LLRlXFGxKjq8b8=; b=UnAR70TFuFo/QGY7N8NSyvnqTfjxl71FcUQJNviJ+QN5dlcXJy1HA0Qe3dXrcLnu4z XX3fMDFapHAm4IoKfBzXdTUioMjp82tR18KuukfK3YYVdayltZlaSQqb/lk4ilotvsS3 K8ooRksbh8ijGp00ZMbGe+sLMNsQyYvzrlVCBF1v6OOeeMpiPtfhI5BW83rRHATnlMcZ 5+INDsvnaBAq5U3v/mTO+O/Hn3w4LXzb0QjTA95okxYTSq0yieWeU3awakjYqVbyjBf/ gVMhoatFz1+Izr592EPCi/QlvMdRLQ60G5wR1yKS9ypDJ1/UhQ1AECeqLciyUPW1BgmO XRxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693839861; x=1694444661; 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=8imFGWktDw7krlAkP1wYOf7tVXWH/LLRlXFGxKjq8b8=; b=PfJ8SdiwbE5w2ryNkMMN0TCNCe1lr7FNY969kbla0vyZLEIRN7G/BiT4xq/wEm65kl yH5M5JYF8jJbnz+mIOhEqUzhIKq2WnEq78rVfIRU7eZf0frAjNjNUbVA98Fa0I/70dTf 9DrMdvoEJdwUsYZm87gfXSQMhSHayHz1qw6SLeXrtfmWe43xaKYjqXc3bazksfyjIcze N+uBmHD5UPHQKR/kuwx6Ozy7d8FWr65hwA+VtDuiUCklx2nFoAZeDf+kylxo0/F1NGo9 3ogDlQIeAZ/7Kdhd2C1zAo7nDnh5/hXqOnmc50fpyYWAEr32/7w+AcI05YK5TgYvj32X RKXg== X-Gm-Message-State: AOJu0Yx4In9o9y01O3R6vxr+tweanGVeVaNJS0FNBAhZuqrmlexsWRo3 v+G+QXmbX3QX9dIUZwp8yryDFOJPCwc= X-Google-Smtp-Source: AGHT+IE43ZLCR69LhzGBUf3Wkn5+iWtZAW5GfGc/CDge+3Ky4VqP+5aC4hVa4fJTuw3b2WH8kOOVxQ== X-Received: by 2002:a05:6808:200f:b0:3a3:1424:7258 with SMTP id q15-20020a056808200f00b003a314247258mr14069068oiw.3.1693839861119; Mon, 04 Sep 2023 08:04:21 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id z14-20020a54458e000000b003a9cd23980esm4946286oib.8.2023.09.04.08.04.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 08:04:20 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 12:03:55 -0300 Message-ID: <20230904150411.56777-3-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230904150411.56777-1-jamrial@gmail.com> References: <20230904150411.56777-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/17] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; /** -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".