From patchwork Thu Jul 20 20:34:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42863 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:672f:b0:130:ccc6:6c4b with SMTP id q47csp76843pzh; Thu, 20 Jul 2023 13:34:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlG/+EKKNNQCuYJvyJG0UeYrlGF39xqZ7BBhaqbHZ38rNRkgLzLeMXK+qO8Moi0+NDJ32iQ9 X-Received: by 2002:a17:907:320b:b0:997:beca:f9db with SMTP id xg11-20020a170907320b00b00997becaf9dbmr3930443ejb.54.1689885290450; Thu, 20 Jul 2023 13:34:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689885290; cv=none; d=google.com; s=arc-20160816; b=0ZMHXEEodVBvVJiu3iOMLP7lX3Lm43KGHJFSbcEJIjopfrZsBLIOOhc5tIocVoB2Wz 1tDecupaJesHXDX7pf1tt9vBV2omZuivgeL8xw+svIc3yXDfpPzbb4mXLdLnCjIr/kyc fcIfLLx0Sr8s06VTO9p4tjt6fcdlpFJZfwgr2MtrAKv1L4MGRhAUMHtFQz5bdeQQYTcl sooj2xwDqA4dpY6k+VM7BulZNGjyfvXp0cIUdw/xsJney0gvF2ZC3OCqbkyys2aFoVZJ ntNUtxQVVyIwcOoOYPA/uOuybkXScXhGqdlp6ROPf9Z/HW3BDihkzcPW88gloq2U0eJ6 hoAg== 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=9+6REUkjnHYq4E0inZerzPAHkvoGzPz27pN7iIOPlRA=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=c3PMYvLoEYAoXn9Cw3PxY9ChgO8ZdvHYGMi+Q6NxUm9RN/WwUCktNInEvrFKO/LjRR f8rH+IWkstRqopK+7KOIIbME1tNBgtTWc322AeyQpMuMAoqOKvCoEhBpPxFDX9niSXhe AcVOcOhfL6MH/M6zaf2BLzj7MJLMXI5fDSew0Y0jzpRC6+FkowSKKAFnljaRY8gl6NjP RyeHIGwhuK7K5WeO5N5Jt2Y0JlYYPraZM8doZv2eI48SeasJrqKFHYIlDr61x/8Uqyp2 3wlLNFIpy/jNecLcVd35nbk2hZwN0Y7C4SV3I5Hihd+yjj22NkfkzSIhdI3qQpb1SC3q Dglw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=I4Pp5+jR; 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 e18-20020a170906081200b00987c203c563si1068509ejd.182.2023.07.20.13.34.49; Thu, 20 Jul 2023 13:34:50 -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=I4Pp5+jR; 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 DE71B68C527; Thu, 20 Jul 2023 23:34:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6FB9B68C068 for ; Thu, 20 Jul 2023 23:34:27 +0300 (EEST) Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-6b9cf1997c4so1011407a34.3 for ; Thu, 20 Jul 2023 13:34:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689885266; x=1690490066; 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=4Woo6NWXPVmwOcdBajMWfmZGZEJasZfMAnrPxYX0QUM=; b=I4Pp5+jRkh9PfbXnZplzc182AQ7oZlOEdSwOsyErvf4Ok9wnd125JJwDU5IYTqHW1X e72Kkgi5N4nTUBT8a+0qlRItlADtfwlURm4i7v6VKi+M63ZvJxDRbejigROAJBDjP6L3 h9/EM7FB/QBLOE2ysN9FTRJoY2w2bEiBJ0r0/kZNCNsRsOyU5YdSU0JVGbhn9KU9AW5W L7hmVA5qqMyCxui20diKOswA13ynwPpph2eRNFyw0ThPrOCtXhU19X9gV3CSW+g65dxR m6GKo043IVo+0R00dS8A6aCjNmNYLwmtIi4cxEhMv552ve1lP3OYEvxai6w5AoOHYYF8 jWWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689885266; x=1690490066; 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=4Woo6NWXPVmwOcdBajMWfmZGZEJasZfMAnrPxYX0QUM=; b=LA7rustFML0GUSHVRRuoydZ+ExKgC6A8U56oW5eER3HGlDm7FCumpJHqLspZDHE+oH eJ8jRkR7PihH8LmcTFo89GHEi4lyK+Xc0+EAIbAy4P8hrhq5GcXMjbT6U9IXAeuHy5hO DE07bWcxsgXFmzQmbBro4larFiMWw+LfQ98ysF8NhZu/cNlmIm7exS4FfrZXqVfbbpTX P8cN2a94zmJwPpdna1O6ON3UgAZepQFpAENegESyz9PggLy3MYr7aA75+mg0yK8r3JPQ 9tYsKbMnXHZ94WfNFFgmhcGv/7otDhX1C/b8bM9y82NlExBBWLFSsjyQYSSLxWnsFOLL Keww== X-Gm-Message-State: ABy/qLag9WUwCZHfQxS9E8qoubuUsJWP1Im6nRzK4rrY+1ZuIRgHd0lK KWVazjZ7YsZLKfGGEceo0tFhJPmq5I8= X-Received: by 2002:a05:6870:f153:b0:1b0:344b:a09f with SMTP id l19-20020a056870f15300b001b0344ba09fmr595050oac.16.1689885265603; Thu, 20 Jul 2023 13:34:25 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id m24-20020a0568301e7800b006b95e17fcc7sm800094otr.49.2023.07.20.13.34.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 13:34:25 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2023 17:34:04 -0300 Message-ID: <20230720203415.41757-2-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720203415.41757-1-jamrial@gmail.com> References: <20230720203415.41757-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/13] 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: Ol0v/pp9uY+I Signed-off-by: James Almer --- libavcodec/codec_par.c | 36 ++++++++++++++++++++++++++++++++++++ libavcodec/codec_par.h | 6 ++++++ 2 files changed, 42 insertions(+) diff --git a/libavcodec/codec_par.c b/libavcodec/codec_par.c index 775c187073..c113cfcd80 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_free_side_data_set(&par->side_data_set); memset(par, 0, sizeof(*par)); @@ -72,6 +74,29 @@ void avcodec_parameters_free(AVCodecParameters **ppar) av_freep(ppar); } +static int codec_parameters_copy_side_data(AVPacketSideDataSet *dst, + const AVPacketSideDataSet *src) +{ + if (!src->nb_side_data) + return 0; + + dst->side_data = av_calloc(src->nb_side_data, sizeof(*dst->side_data)); + if (!dst->side_data) + return AVERROR(ENOMEM); + + for (int i = 0; i < src->nb_side_data; i++) { + uint8_t *data = av_memdup(src->side_data[i].data, src->side_data[i].size); + if (!data) + return AVERROR(ENOMEM); + dst->side_data[i].type = src->side_data[i].type; + dst->side_data[i].size = src->side_data[i].size; + dst->side_data[i].data = data; + dst->nb_side_data++; + } + + return 0; +} + int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src) { int ret; @@ -89,6 +114,10 @@ int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src memcpy(dst->extradata, src->extradata, src->extradata_size); dst->extradata_size = src->extradata_size; } + memset(&dst->side_data_set, 0, sizeof(dst->side_data_set)); + ret = codec_parameters_copy_side_data(&dst->side_data_set, &src->side_data_set); + if (ret < 0) + return ret; ret = av_channel_layout_copy(&dst->ch_layout, &src->ch_layout); if (ret < 0) @@ -177,6 +206,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_set, &codec->side_data_set); + if (ret < 0) + return ret; return 0; } @@ -261,6 +293,10 @@ FF_ENABLE_DEPRECATION_WARNINGS memcpy(codec->extradata, par->extradata, par->extradata_size); codec->extradata_size = par->extradata_size; } + av_packet_free_side_data_set(&codec->side_data_set); + ret = codec_parameters_copy_side_data(&codec->side_data_set, &par->side_data_set); + if (ret < 0) + return ret; return 0; } diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h index add90fdb1e..06e9d54615 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_set; } AVCodecParameters; /**