From patchwork Thu Jul 20 20:34:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42862 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:672f:b0:130:ccc6:6c4b with SMTP id q47csp76772pzh; Thu, 20 Jul 2023 13:34:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlHt3PfZzDCK1HWgwdGNJ8TYjgcScF0AnlKCzLpJ+w6BFsq5qiBQStctMRhJsU4OEdsIcY4/ X-Received: by 2002:aa7:d4c9:0:b0:51d:f3b2:87b8 with SMTP id t9-20020aa7d4c9000000b0051df3b287b8mr14252edr.0.1689885279047; Thu, 20 Jul 2023 13:34:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689885279; cv=none; d=google.com; s=arc-20160816; b=Kz4uctVsJAFAeJPBQ+XEke1Y3d0FL4kM6x94/RhSr1Q1i5lWZkTbF8pJrG8fXbQTBP Rwr4QfXxiIoyaLiXnhMOVvVHHIv4550rKRm47PkkMKrPR/Fj9XwItYTxRo3FzTEOQW4A bZ6zjyxfOM6zVUGqPDuSYvsK6hzXvfvgq5kIwZT6oLt0e1hP3f1d43LwoE3SH0uNaAoL zTwBr0k3B3hOIK/8i/gYmaHK/xloh3KwRBjyRzY77uyy/YBgm4wNIs9dHZb0BFdpbm21 TgOfOHAu1563aXBe6CY/vvAfJLwXh48F0+f9A5ESUb/RTitDNHKwCz5QmV81jZqg9twj QMpQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=EsWw3j7J4hjPEgyqI3OvgSmBbLS8vRNUFOaW272Fm+w=; fh=J3zlMo7rVW2t2IQYogliBcMNuBh6YQg7NRChcrschf4=; b=l/49wMYYnvSXQMkbontfqCDJxUMbnXtsum+jsedp1qqfhUlLt7d/RkOKhflm0QjVSD 5A/ien9iTXqEWLIbZQrl1U0eKvaFmD8pwO7knbt3k0QqKjXbldLt5RDsNOiMocjoOhNL uhtuHnCpRhLCMXh47Oqu/D0YSznufUim/mJgmX4I1xGGmCnXJMFTafFHxlif4nKOnoxy MZ0O27ca/lnhygiw6UKRwbxINISdWdCjsLVvqPbxXYgyTDxnrvwdYm1mDCYmrJP7Y3bf 793180i2i51AEMIiijSPJwfO4Uk8M6y3rAGFT4z6CpON1J7JXQd4NEofZG8XAjfmBVZ4 fquQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=gGzxMRro; 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 n10-20020aa7d04a000000b005217412e3b1si1241147edo.463.2023.07.20.13.34.37; Thu, 20 Jul 2023 13:34:39 -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=gGzxMRro; 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 C195C68C068; Thu, 20 Jul 2023 23:34:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B4E168C068 for ; Thu, 20 Jul 2023 23:34:26 +0300 (EEST) Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-6b9cf7e6ab2so998326a34.1 for ; Thu, 20 Jul 2023 13:34:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689885265; x=1690490065; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=9xCeNcnEhyzbJEVDdWpuGi37lJLL48w6bn/yMPudYes=; b=gGzxMRroaFKK2fY0EqATf3Zp51AE0ZQDosO91SM4djMb7zBTeGxddzJYPqO3JBCLwq d8lfLp9slyJv4I/z0/XIw4ycrnMS5caxf2GOS+AZOAqJfRFYGkXxYCNA53oeiT3j11+2 MT30oAmtKasx1zbPT7n2/b4phpywk1NEhyXEQIokoiBtT3k7mnaWvg/rAVg4puuDBXrI dBLTPfVjxAXb1NuBliQTVzxLX1BwOEdGYuCMjroVJpvTXSSGclbRMjVQpS0HgSpaikLc /pWnTtxy4W5dtZR6FJ50aLxm0v2XWSGAmsgDPXXm631dIy7SHPD2IP9RWur26X0zpsC7 rysA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689885265; x=1690490065; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9xCeNcnEhyzbJEVDdWpuGi37lJLL48w6bn/yMPudYes=; b=ggkNCldDuKRx0xyALYEJ6UGsLqO0FWMjiIJoXELLNjmMCWuHwhy+qI2eXNtEwkUZpV Aq/uGmw9A5i0C+dE5oGFLK7Xe9kS4RZCOtf9k+bbo2H4Z4BN4hVHL577gQivjiSxXByt 1/91OD1VsCfURT38FikONzZu2EH8+ZIu7LZV+RZVbslXR2lyZ16kgZxTyYXMS6g3bsbH n5pSTG433LBrS1PwJkoZdGsbZDt+MSuraCQN60SLY/7HLoFQczZEWZcEPNZ4T9eF+E2b xppojCqyjpqeYa9jwenoXM7WdM2R915QzFbWshiUh5hCgRIK4/lblmasLb9LOnp69U4b hEBQ== X-Gm-Message-State: ABy/qLY5y1VRHcrlvUtbMKg7tdNXjV2YCL+vKaYPzFRIdZRHV/dWApJn 7b2KRTmy88GIdp8keo/nyfwm4vnVQek= X-Received: by 2002:a9d:7cc2:0:b0:6b9:9018:6ea with SMTP id r2-20020a9d7cc2000000b006b9901806eamr1022770otn.20.1689885264524; Thu, 20 Jul 2023 13:34:24 -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.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 13:34:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2023 17:34:03 -0300 Message-ID: <20230720203415.41757-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/13] avcodec/avcodec: add side data to AVCodecContext 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: Xc1uxi8LjRuv Signed-off-by: James Almer --- libavcodec/avcodec.c | 2 ++ libavcodec/avcodec.h | 8 +++++ libavcodec/avpacket.c | 84 +++++++++++++++++++++++++++++++++++++++++++ libavcodec/packet.h | 54 ++++++++++++++++++++++++++++ 4 files changed, 148 insertions(+) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 340abe830e..16869e97f2 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -467,6 +467,8 @@ av_cold int avcodec_close(AVCodecContext *avctx) av_freep(&avctx->internal); } + av_packet_free_side_data_set(&avctx->side_data_set); + for (i = 0; i < avctx->nb_coded_side_data; i++) av_freep(&avctx->coded_side_data[i].data); av_freep(&avctx->coded_side_data); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fe41ecc3c9..2902ecf6cb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2102,6 +2102,14 @@ typedef struct AVCodecContext { * an error. */ int64_t frame_num; + + /** + * Additional data associated with the entire stream. + * + * - decoding: set by user + * - encoding: unused + */ + AVPacketSideDataSet side_data_set; } AVCodecContext; /** diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 5fef65e97a..f569731403 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -645,3 +645,87 @@ int ff_side_data_set_prft(AVPacket *pkt, int64_t timestamp) return 0; } + +AVPacketSideData *av_packet_get_side_data_from_set(const AVPacketSideDataSet *set, + enum AVPacketSideDataType type) +{ + for (int i = 0; i < set->nb_side_data; i++) + if (set->side_data[i].type == type) + return &set->side_data[i]; + + return NULL; +} + +static int add_side_data_to_set(AVPacketSideDataSet *set, + AVPacketSideData **psd, + enum AVPacketSideDataType type, + uint8_t *data, size_t size) +{ + AVPacketSideData *sd, *tmp; + + for (int i = 0; i < set->nb_side_data; i++) { + sd = &set->side_data[i]; + + if (sd->type == type) { + av_freep(&sd->data); + sd->data = data; + sd->size = size; + *psd = sd; + return 0; + } + } + + if (set->nb_side_data + 1U > FFMIN(INT_MAX, SIZE_MAX / sizeof(*tmp))) + return AVERROR(ERANGE); + + tmp = av_realloc_array(set->side_data, set->nb_side_data + 1, sizeof(*tmp)); + if (!tmp) + return AVERROR(ENOMEM); + + set->side_data = tmp; + set->nb_side_data++; + + sd = &set->side_data[set->nb_side_data - 1]; + sd->type = type; + sd->data = data; + sd->size = size; + *psd = sd; + + return 0; +} + +int av_packet_add_side_data_to_set(AVPacketSideDataSet *set, + enum AVPacketSideDataType type, + uint8_t *data, size_t size) +{ + AVPacketSideData *sd; + + return add_side_data_to_set(set, &sd, type, data, size); +} + +AVPacketSideData *av_packet_new_side_data_to_set(AVPacketSideDataSet *set, + enum AVPacketSideDataType type, + size_t size) +{ + AVPacketSideData *sd = NULL; + uint8_t *data = av_malloc(size); + int ret; + + if (!data) + return NULL; + + ret = add_side_data_to_set(set, &sd, type, data, size); + if (ret < 0) + av_freep(&data); + + return sd; +} + +void av_packet_free_side_data_set(AVPacketSideDataSet *set) +{ + int i; + for (i = 0; i < set->nb_side_data; i++) + av_freep(&set->side_data[i].data); + av_freep(&set->side_data); + set->nb_side_data = 0; +} diff --git a/libavcodec/packet.h b/libavcodec/packet.h index f28e7e7011..590c2bf15a 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -318,6 +318,14 @@ typedef struct AVPacketSideData { enum AVPacketSideDataType type; } AVPacketSideData; +/** + * Structure to hold a set of AVPacketSideDataSet + */ +typedef struct AVPacketSideDataSet { + AVPacketSideData *side_data; + int nb_side_data; +} 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 +732,52 @@ 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 + * @return pointer to freshly allocated side data entry or NULL otherwise. + */ +AVPacketSideData *av_packet_new_side_data_to_set(AVPacketSideDataSet *set, + enum AVPacketSideDataType type, + size_t size); + +/** + * 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 information type + * @param data the side data array. It must be allocated with the av_malloc() + * family of functions. The ownership of the data is transferred to + * pkt. + * @param size side information size + * @return a non-negative number on success, a negative AVERROR code on + * failure. On failure, the set is unchanged and the data remains + * owned by the caller. + */ +int av_packet_add_side_data_to_set(AVPacketSideDataSet *set, + enum AVPacketSideDataType type, + uint8_t *data, size_t size); + +/** + * 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_get_side_data_from_set(const AVPacketSideDataSet *set, + enum AVPacketSideDataType type); + +/** + * Convenience function to free all the side data stored in a set. + * + * @param set a set + */ +void av_packet_free_side_data_set(AVPacketSideDataSet *set); + /** * @} */