From patchwork Sat Mar 6 19:42:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26220 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A307F44B9AF for ; Sat, 6 Mar 2021 21:43:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9153E68A91A; Sat, 6 Mar 2021 21:43:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 068EF68A329 for ; Sat, 6 Mar 2021 21:43:12 +0200 (EET) Received: by mail-qv1-f44.google.com with SMTP id d9so2736222qvo.3 for ; Sat, 06 Mar 2021 11:43:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AX1UMC80XdUbc4d7Afdvs3JXLd35it2or6Up4VPzuos=; b=U0X8XdBcRQPTIuf5LLUASsUlt+jsVnumDLQFVqh6362QO4W1aTLyNrEdpV4dbWgR6H HwrO8klkHjDSJS35fguVWfTW32RvK7+unPgQM2GRNzUBRjposGaFGI6kdncFoIppGVF9 2BtW944jacnanqOfmsLgFSgXpV+Dr8/UeSpe9nfrBpHfcrrLU6v5k9iV2rL2n6HhsFdO MJbW8qMPPky+PiL/Y7vaScFiM0MYWIKSpkTXaIavKWJ37fSrp8b/tc6Nl+bktVaNA1Ah A4G/HjL6mGuZyXSXu34hzbRGPiT/2Mkkl1inqoFtQT9kYvbd7kQqvYtDalu3zVqqBLpJ ryRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AX1UMC80XdUbc4d7Afdvs3JXLd35it2or6Up4VPzuos=; b=StJAJg/nZxSy5T+shEznH+fGwNkAVHvoWRGPO2AWraLrOAYoDPNoHX4hYaCYDmFP5f npX3cr/a8xiAF3k9w0p3R+U5z01Bk9QHQ3Y8k1fg6Cmz6HRMPmGnOrPsEmBuABmiAGnc qJTYUS6cwJ82uU9UWCj5OwN7obALE/Y5wN4eryk1+br/bCv2WNy5wBkpbJGFgpZxGabs yDi00JNsPVcXx6DaNNfur8Mr26SFLFT5dvNSeQ0d1/bzbDRZ6Q6ah1T7ie7dp4wqd1zA 3JDW+5M0B5dfXx6JT+ZrLGnVCJptGluLOAiYwKKz//EBg9AM+5RKFs0HavQem2/K0Ps9 pr+A== X-Gm-Message-State: AOAM532hVVnD3v37Za2MJH/AzZERYqrA9tOvfnGypu5D2UFbUOY1SczS GmZAZIvliObQ+IX2LlG6wmjwcbJCeo7oLg== X-Google-Smtp-Source: ABdhPJxzw6h6U8pHT+/SAj5MXm2+uQlmw8reIbCSXkr4/8iAjdpJGGZrdV/7udhyb958ruLQRFtm/w== X-Received: by 2002:a0c:b611:: with SMTP id f17mr14242907qve.42.1615059790485; Sat, 06 Mar 2021 11:43:10 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id s19sm4376601qks.130.2021.03.06.11.43.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 11:43:10 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Mar 2021 16:42:37 -0300 Message-Id: <20210306194243.14931-3-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210306194243.14931-1-jamrial@gmail.com> References: <20210306194243.14931-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/9 v2] avcodec/packet: change side data related public function and struct size types to size_t X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" av_packet_add_side_data() already defines size as a size_t, so this makes it consistent across all side data functions. Signed-off-by: James Almer --- Changes since v1 is using the buffer_size_t typedef. doc/APIchanges | 4 ++++ libavcodec/avpacket.c | 10 +++++++--- libavcodec/packet.h | 16 ++++++++++++++++ libavcodec/version.h | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index d2d107de78..34b15605e6 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2017-10-21 API changes, most recent first: +2021-03-xx - xxxxxxxxxx - lavc 58.130.100 - packet.h + Change AVBufferRef related AVPacket function and struct size + parameter and fields type to size_t at next major bump. + 2021-03-xx - xxxxxxxxxx - lavu 56.68.100 - buffer.h frame.h Change AVBufferRef and relevant AVFrame function and struct size parameter and fields type to size_t at next major bump. diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index e4ba403cf6..291c778d95 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -330,12 +330,16 @@ int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, - int size) + buffer_size_t size) { int ret; uint8_t *data; +#if FF_API_BUFFER_SIZE_T if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) +#else + if (size > SIZE_MAX - AV_INPUT_BUFFER_PADDING_SIZE) +#endif return NULL; data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); if (!data) @@ -351,7 +355,7 @@ uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, } uint8_t *av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type, - int *size) + buffer_size_t *size) { int i; @@ -554,7 +558,7 @@ int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **di } int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, - int size) + buffer_size_t size) { int i; diff --git a/libavcodec/packet.h b/libavcodec/packet.h index b9d4c9c2c8..3d9013d783 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -305,7 +305,11 @@ enum AVPacketSideDataType { typedef struct AVPacketSideData { uint8_t *data; +#if FF_API_BUFFER_SIZE_T int size; +#else + size_t size; +#endif enum AVPacketSideDataType type; } AVPacketSideData; @@ -559,7 +563,11 @@ void av_free_packet(AVPacket *pkt); * @return pointer to fresh allocated data or NULL otherwise */ uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, +#if FF_API_BUFFER_SIZE_T int size); +#else + size_t size); +#endif /** * Wrap an existing array as a packet side data. @@ -586,7 +594,11 @@ int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, * @return 0 on success, < 0 on failure */ int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, +#if FF_API_BUFFER_SIZE_T int size); +#else + size_t size); +#endif /** * Get side information from packet. @@ -598,7 +610,11 @@ int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, * @return pointer to data if present or NULL otherwise */ uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type, +#if FF_API_BUFFER_SIZE_T int *size); +#else + size_t *size); +#endif #if FF_API_MERGE_SD_API attribute_deprecated diff --git a/libavcodec/version.h b/libavcodec/version.h index 169c763e8a..3124ec8061 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 129 +#define LIBAVCODEC_VERSION_MINOR 130 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \