From patchwork Mon Jun 1 17:25:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20064 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 E6CB844B694 for ; Mon, 1 Jun 2020 20:26:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFA9068AA6E; Mon, 1 Jun 2020 20:26:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3800068A8AA for ; Mon, 1 Jun 2020 20:26:32 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id i16so1677010qtr.7 for ; Mon, 01 Jun 2020 10:26:32 -0700 (PDT) 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=EwHOubWQIGw3dO0h5Vz+zHyLb+VFN/ELIp+o79cTC9k=; b=HcJqdiCWc3C1UeVksVDXX1cqLNc9njlH7Mz+qYnN9hOdimeJ4BOHVoASdfs/32yz1w p5Kn9f4VOnbrlmK81PqBXZSLAu32Tq5R1B0M/p5OErFif8a8+E22aHUBEUgp4zwyX2h0 pfe7J9VX9FkSPA+8S4FP6Ce9XagdGMaqB0XIZl9EDEN7mvjS4SzjJp4YlpCRKZw+/Xiz nIYnl9QXDzfnOo11P4tzNM1Q+lfFWU1eTlmkDuhOX55ZD4MSp2SG6FpsLJkTG5flnhc2 GZjET89zGZ5zLrjF5UQKHdDjEvBlerfqca1WxvrNTheeY7JEpToYf+4fRS9J43H+eoj8 cw9Q== 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=EwHOubWQIGw3dO0h5Vz+zHyLb+VFN/ELIp+o79cTC9k=; b=VsOoVU9f72XIi91zIca8/urB4Dg9/SXIYm5EfSu2W9wH9fh8/1QmXtcqGDQ0DXMUyt +v8m887omqTDDD4QGD7Sli/v7a1287bInMJ/EIAt3tAfISgmEMl4Cev/S7OJj40dOZDi PFg6UO3qVT8j0YLr0eduLKoDbw6XvCZ5FJ4m4Zv5cMoBHHpyUWZ/P4YhPPc2GBV6Mr5l LknbTui4EbW1Vk7gzFQPPEWSz3t4ORqhEdPU7Z27FgnE+O8o8CEEqqtHmZyqlex2V0O5 FKw2wnDrnu+R9c2qhLoXcHXorLRBwVOc495SbXYySZbAzL8KgIIZGGtcA/wfiYeLc96p OOJw== X-Gm-Message-State: AOAM532W/qkmo4O/cWj4IfrO8j0W7l9NX5rPXGsUCUGYd+4IDSSKJ1+K zE+L/UHLtvZLw7zLH59X59/F5+RZ X-Google-Smtp-Source: ABdhPJz8wX/S6l7mX/icYd+1uIu32UqEc0xDskRLb2Y6w9Tu/gPipMuxmW3zPDzJO3tGebhJB0D+HQ== X-Received: by 2002:ac8:7b5a:: with SMTP id m26mr24268509qtu.381.1591032390603; Mon, 01 Jun 2020 10:26:30 -0700 (PDT) Received: from localhost.localdomain ([181.23.72.208]) by smtp.gmail.com with ESMTPSA id g132sm1839473qkb.78.2020.06.01.10.26.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 10:26:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jun 2020 14:25:38 -0300 Message-Id: <20200601172539.17081-3-jamrial@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601172539.17081-1-jamrial@gmail.com> References: <20200601172539.17081-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] 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 --- I could either add ifdeffery to every size argument used in av_packet_get_side_data() calls within the libraries, add an internal typedef that goes int -> size_t depending on FF_API_BUFFER_SIZE_T and use that, or just not bother with them right now and change them after the bump in the same commit that removes FF_API_BUFFER_SIZE_T. In this patch i went the ifdef route for ff_side_data_set_encoder_stats() and ff_side_data_set_prft(). doc/APIchanges | 4 ++-- libavcodec/avpacket.c | 28 ++++++++++++++++++++++++++++ libavcodec/packet.h | 4 ++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index dbf21c1d1e..d616594ff6 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -16,8 +16,8 @@ libavutil: 2017-10-21 API changes, most recent first: 2020-06-xx - xxxxxxxxxx - Change AVBufferRef and relevant AVFrameSideData function and struct size - parameter and fields type to size_t at next major bump. + Change AVBufferRef and relevant AVFrameSideData and AVPacketSideData function and + struct size parameter and fields type to size_t at next major bump. 2020-xx-xx - xxxxxxxxxx - lavc 58.88.100 - avcodec.h codec.h Move AVCodec-related public API to new header codec.h. diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 033f2d8f26..db9c947b62 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -329,12 +329,20 @@ int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type, 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 { 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) @@ -350,7 +358,11 @@ 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, +#if FF_API_BUFFER_SIZE_T int *size) +#else + size_t *size) +#endif { int i; @@ -552,7 +564,11 @@ int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **di } int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type, +#if FF_API_BUFFER_SIZE_T int size) +#else + size_t size) +#endif { int i; @@ -587,7 +603,11 @@ FF_ENABLE_DEPRECATION_WARNINGS dst->side_data_elems = 0; for (i = 0; i < src->side_data_elems; i++) { enum AVPacketSideDataType type = src->side_data[i].type; +#if FF_API_BUFFER_SIZE_T int size = src->side_data[i].size; +#else + size_t size = src->side_data[i].size; +#endif uint8_t *src_data = src->side_data[i].data; uint8_t *dst_data = av_packet_new_side_data(dst, type, size); @@ -727,7 +747,11 @@ FF_ENABLE_DEPRECATION_WARNINGS int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type) { uint8_t *side_data; +#if FF_API_BUFFER_SIZE_T int side_data_size; +#else + size_t side_data_size; +#endif int i; side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_QUALITY_STATS, &side_data_size); @@ -753,7 +777,11 @@ int ff_side_data_set_prft(AVPacket *pkt, int64_t timestamp) { AVProducerReferenceTime *prft; uint8_t *side_data; +#if FF_API_BUFFER_SIZE_T int side_data_size; +#else + size_t side_data_size; +#endif side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_PRFT, &side_data_size); if (!side_data) { diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 41485f4527..5b98ae812e 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -297,7 +297,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;