From patchwork Wed Sep 6 17:44:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43595 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp86760pzh; Wed, 6 Sep 2023 10:45:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQ5KDT6OiUjCKc7/BdHFfF0zy6IpeWmWG34TirZsfnWo+PVACpzsPzVLAUXIRWC9kGrN2j X-Received: by 2002:a17:906:210a:b0:9a1:ddb9:6546 with SMTP id 10-20020a170906210a00b009a1ddb96546mr3353945ejt.61.1694022306095; Wed, 06 Sep 2023 10:45:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694022306; cv=none; d=google.com; s=arc-20160816; b=UFLK/8bkvXqtFwTUsF3yN+klmb11NELWf2VwMfsF6/SmcBQvcGyfm4PGndZzN0Pzgp dZxZl+VCxtPDhpL/46klQasOFiB2tmbDsCUzaNldCJpYo2KvtnjG1t8tly4Yvp04SozH 7kdnUFbwu405y0yfcO6tBC1ah0M5Tlz3BtMi1Bukev+aDlPk7wKAIqZ34G2Zre5LBV7W sySbNtkxbX4haWioYBm6R3HCxj1Cj3QorXlsqhm7OMbLDKpo1h7fTZQvSbVVXYKK99Fg 2pjl8jjAohIKKjLEhABfnR2mghYEHWmyn7kIfKGVCNcKf48rMbIrUX6xarLDTSxYlpcw LuMw== 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=reZVwz6v2taP26AK1hDbnGu/lQSjztQmy/IyDuNDZ/o=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=k74B6eusYzGklhdJOoNXMvR3HwqENyln++atyzZ4RiwP/1At1wOO3J2hQ0DOuOroKk FSyQm3GzmwcnW3Z8aTICkXfaM/bMtV2OqJJDjnTrcnULHuhGrfIMEiscRRBm9tdZ7V8Q BFqXa1FO2K9/i6swPjpaUdO7FvqWGgPUbceHYIGk0qQd6pUvkmww067+tNwkNOE5D+yq iBqZffIsSbFLfslkKdiaTCUVirksnLrduv/Uxd9frKkl+QSNU/7eOfLAUA0EVe/TyKvM kDcbbUCfm1572AggAsdWd6J3a9sQCaPNPgRcOZUwvQKT99LNwYwvH++1/VHlQvWkgwRY vwww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=A+WeB65I; 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 qx14-20020a170906fcce00b0099cc36c4680si9569334ejb.134.2023.09.06.10.45.05; Wed, 06 Sep 2023 10:45:06 -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=A+WeB65I; 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 D578368C7CF; Wed, 6 Sep 2023 20:44:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40A6668C6E0 for ; Wed, 6 Sep 2023 20:44:46 +0300 (EEST) Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-6bf04263dc8so99686a34.3 for ; Wed, 06 Sep 2023 10:44:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694022284; x=1694627084; 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=B8kI+4Bk1svpbZgoUhHD88FXRaCaGjtjxh7ADIx3OBY=; b=A+WeB65Ihk7SUyvZzdn2hLAxLM9+ks64xf1Nt2qfbIM0JPuD315kO/yFyxsZyltBjW NfvibnIGg8mnK8Se5oBb8A8wPA5q8YQleC1hfZuDPEJTQ5p8LTWlHI0f7dtWq5O4etKP QJvJZWWuKKPQ2qq/1yTtUnUCyGQtasoyI7gXJpu3OyBZGnTkINwuHbNwZxAiutsmISYI +d7PKkFDUcXfeQ/UhIZzwOjUt4XFrYkRgXDPFW0PS+AD5aXGagkp26g2rHPaMOcUysQ8 Eht3ZJLg3Dm/G03+wluF0dYaLOwMErEjp4usUaVWAoIpvzxVQH8t3TtwFge/3bsiHWVj AqIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694022284; x=1694627084; 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=B8kI+4Bk1svpbZgoUhHD88FXRaCaGjtjxh7ADIx3OBY=; b=TYaWjmx6m2eON/AxGnpIh47oBfxviefUeripeByc1so6TJbNNgVbtQbc59bvh2J5BZ zz3agtLseXscfVYE5yHaX+FvuxYZt36rFD+7mnLDQsRiB79mjzU3JYmQzVmwHgjaQ9vs NnWY6pf0CSjwE5ZaqzRE2lEbkqh1Osr5DVLw/xhBz2FxU/N8dwjjtlVQnxnw1VI0CYyH 7TE1hKvpOU6ayelMKVyAvGp9xfVGSpUZ5FFhuKP0fmf1BtoWe9+a+IIz0Z10suS2n8Tq igSJkFhfe8bdUIel67C7dPAr89I4Yn3XdGIiOYtpKYgViPH/PjkpfnZn2s9juj0t7Xc7 ++pQ== X-Gm-Message-State: AOJu0Yx/k9efejlMaNDH4KJBGKvLy0yJbwTw/Ju+AWWMSvPB1qCFdvM8 fzpgvcA4nkibJ3gEy8IkSUlfqMaiqXs= X-Received: by 2002:a05:6870:239f:b0:1c7:ebf5:b6cb with SMTP id e31-20020a056870239f00b001c7ebf5b6cbmr19408656oap.25.1694022284324; Wed, 06 Sep 2023 10:44:44 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id v5-20020a0568301bc500b006b99f66444bsm6561309ota.71.2023.09.06.10.44.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 10:44:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Sep 2023 14:44:21 -0300 Message-ID: <20230906174431.45558-2-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230906174431.45558-1-jamrial@gmail.com> References: <20230906174431.45558-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/10] avcodec/packet: add side data set struct and helpers 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: aaHo3ET8x5Iq This will be useful in the following commits. Signed-off-by: James Almer --- libavcodec/avpacket.c | 99 +++++++++++++++++++++++++++++++++++++++++++ libavcodec/packet.h | 74 ++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 5fef65e97a..5b133c5d8a 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -645,3 +645,102 @@ int ff_side_data_set_prft(AVPacket *pkt, int64_t timestamp) return 0; } + +AVPacketSideData *av_packet_side_data_set_get(const AVPacketSideDataSet *set, + enum AVPacketSideDataType type) +{ + for (int i = 0; i < set->nb_sd; i++) + if (set->sd[i]->type == type) + return set->sd[i]; + + return NULL; +} + +static AVPacketSideData *add_side_data_to_set(AVPacketSideDataSet *set, + enum AVPacketSideDataType type, + uint8_t *data, size_t size) +{ + AVPacketSideData *sd, **tmp; + + for (int i = 0; i < set->nb_sd; i++) { + sd = set->sd[i]; + if (sd->type != type) + continue; + + av_freep(&sd->data); + sd->data = data; + sd->size = size; + return sd; + } + + if (set->nb_sd + 1U > INT_MAX) + return NULL; + + tmp = av_realloc_array(set->sd, set->nb_sd + 1, sizeof(*tmp)); + if (!tmp) + return NULL; + + set->sd = tmp; + + sd = av_mallocz(sizeof(*sd)); + if (!sd) + return NULL; + + sd->type = type; + sd->data = data; + sd->size = size; + + set->sd[set->nb_sd++] = sd; + + return sd; +} + +AVPacketSideData *av_packet_side_data_set_add(AVPacketSideDataSet *set, + enum AVPacketSideDataType type, + uint8_t *data, size_t size, + int flags) +{ + return add_side_data_to_set(set, type, data, size); +} + +AVPacketSideData *av_packet_side_data_set_new(AVPacketSideDataSet *set, + enum AVPacketSideDataType type, + size_t size, int flags) +{ + AVPacketSideData *sd = NULL; + uint8_t *data = av_malloc(size); + + if (!data) + return NULL; + + sd = add_side_data_to_set(set, type, data, size); + if (!sd) + av_freep(&data); + + return sd; +} + +void av_packet_side_data_set_remove(AVPacketSideDataSet *set, + enum AVPacketSideDataType type) +{ + for (int i = set->nb_sd - 1; i >= 0; i--) { + AVPacketSideData *sd = set->sd[i]; + if (sd->type != type) + continue; + av_free(set->sd[i]->data); + av_free(set->sd[i]); + set->sd[i] = set->sd[--set->nb_sd]; + break; + } +} + +void av_packet_side_data_set_free(AVPacketSideDataSet *set) +{ + for (int i = 0; i < set->nb_sd; i++) { + av_free(set->sd[i]->data); + av_free(set->sd[i]); + } + set->nb_sd = 0; + + av_freep(&set->sd); +} diff --git a/libavcodec/packet.h b/libavcodec/packet.h index f28e7e7011..87720ab909 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -318,6 +318,20 @@ typedef struct AVPacketSideData { enum AVPacketSideDataType type; } AVPacketSideData; +/** + * Structure to hold a set of AVPacketSideData + * + * @see av_packet_side_data_set_new + * @see av_packet_side_data_set_add + * @see av_packet_side_data_set_get + * @see av_packet_side_data_set_remove + * @see av_packet_side_data_set_free + */ +typedef struct AVPacketSideDataSet { + AVPacketSideData **sd; + int nb_sd; +} AVPacketSideDataSet; + /** * This structure stores compressed data. It is typically exported by demuxers * and then passed as input to decoders, or received as output from encoders and @@ -724,6 +738,66 @@ int av_packet_make_writable(AVPacket *pkt); */ void av_packet_rescale_ts(AVPacket *pkt, AVRational tb_src, AVRational tb_dst); +/** + * Allocate a new side data entry into to a set. + * + * @param set a set to which the side data should be added + * @param type side data type + * @param size side data size + * @param flags currently unused + * @return pointer to freshly allocated side data entry on success, or NULL + * otherwise. + */ +AVPacketSideData *av_packet_side_data_set_new(AVPacketSideDataSet *set, + enum AVPacketSideDataType type, + size_t size, int flags); + +/** + * Wrap an existing array as a packet side data into a set. + * + * @param set a set to which the side data should be added + * @param type side data type + * @param data a data array. It must be allocated with the av_malloc() family + * of functions. The ownership of the data is transferred to the + * set on success + * @param size size of the data array + * @param flags currently unused + * @return pointer to freshly allocated side data entry on success, or NULL + * otherwise. On failure, the set is unchanged and the data remains + * owned by the caller. + */ +AVPacketSideData *av_packet_side_data_set_add(AVPacketSideDataSet *set, + enum AVPacketSideDataType type, + uint8_t *data, size_t size, + int flags); + +/** + * Remove side data of the given type from a set. + * + * @param set a set from which the side data should be removed + * @param type side information type + */ +void av_packet_side_data_set_remove(AVPacketSideDataSet *set, + enum AVPacketSideDataType type); + +/** + * Get side information from set. + * + * @param set a set from which the side data should be fetched + * @param type desired side information type + * + * @return pointer to side data if present or NULL otherwise + */ +AVPacketSideData *av_packet_side_data_set_get(const AVPacketSideDataSet *set, + enum AVPacketSideDataType type); + +/** + * Convenience function to free all the side data stored in a set. + * + * @param set the set to free + */ +void av_packet_side_data_set_free(AVPacketSideDataSet *set); + /** * @} */