From patchwork Wed Mar 17 23:59:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26435 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 8DC4344A940 for ; Thu, 18 Mar 2021 02:00:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6700E689A15; Thu, 18 Mar 2021 02:00:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7760C689A01 for ; Thu, 18 Mar 2021 02:00:25 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id b9so1106939ejc.11 for ; Wed, 17 Mar 2021 17:00:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=Zz/Ux4tH594wqVXRHssQUqIpIIcJe7l1HMuRKwUEOuY=; b=QWS6Vf/VxH2kfuV1Onpyco3FWzaw9e82NJTwdJfgyotgjnm1x4H+u46T4B0WYhMwni gL4YaCNm2oabvzwqb5qFzM8+WJ5QT4ZgM1IyFYnc4C5vdXa9Sq5zA52NRvgawQuHE48N UGUQmOSHNWxFyZO/Gu0ULelJs+kMfSaFjUdo+ycym3Sg5tF2sUhBghLyOifk6HLDkasD FPKLdVZjjUUaunGruEFcmzF/hwfIyU8Mkhp2Q2LPvbXQmJcuh1W8wJiAF2wukOhxRyeT OnvUi5qSo2pikTf6bbYfKjxNBll5QdIE/F8moqLndh7Elep723clXZ/SmUIpMEQebKmK 4NvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=Zz/Ux4tH594wqVXRHssQUqIpIIcJe7l1HMuRKwUEOuY=; b=oQG0Oglj7CMzPAkAtoI4CksCU8PfsRG376JDhKHvvRNwNd7c2tt9+0EXSW3+JBUcRc iu+xSRoPiwfLWd4/BgzkVpkCA4zIP+lBDrwr23oQ7M+TaztZURWocauBiKsJ/1sJOmlk QRLayI1pednsK4C1c9HEUmcvrqXSR3IGww0N7zzcKf6ihPmcRgkOxf+lUoEkU40KqebH 4Kv3macp7XWSD4YlY3gXJ7mmNlfu/P6QGCZ23bqqOK+puFUuO1dI3VwHI3dMFrht3sGM VnMGrChEWJIDDoLJ/29lHxR6ZYhfKpzvDVpAvaXadmx6JT7XIdx9SFCyYjee4cWyAwDF SBlg== X-Gm-Message-State: AOAM5307W2Nj7msMxWThDe/zb8d5R42/iNrwmSxgbhTnDvXu90521aMZ O/K/vzFr+yVi67We71WqjIbK5Fx5UvKH3w== X-Google-Smtp-Source: ABdhPJwobgDMds/0ztZjIvG8eA83iUC78HasTNveVbOflt5Rq4vqaoAdAU9TzThpM+FmRqmbGZGSlA== X-Received: by 2002:a17:906:d8d3:: with SMTP id re19mr38390091ejb.440.1616025623705; Wed, 17 Mar 2021 17:00:23 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id u24sm326881ejn.5.2021.03.17.17.00.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 17:00:23 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Mar 2021 00:59:55 +0100 Message-Id: <20210317235958.1308987-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210317235958.1308987-1-andreas.rheinhardt@gmail.com> References: <20210317235958.1308987-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/packet: Also change av_packet_pack/unpack_dictionary 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" These are auxiliary side-data functions, so they should have been switched to size_t in d79e0fe65c51491f9bf8a470bbe36fb09f3e1280, but this has been forgotten. Signed-off-by: Andreas Rheinhardt --- libavcodec/avpacket.c | 13 +++++++++++++ libavcodec/packet.h | 10 +++++++++- libavdevice/decklink_dec.cpp | 2 +- libavdevice/lavfi.c | 2 +- libavformat/concatdec.c | 2 +- libavformat/img2dec.c | 3 ++- libavformat/oggdec.h | 2 +- 7 files changed, 28 insertions(+), 6 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 8f0850fb00..b5bac5c5f2 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -507,7 +507,11 @@ int av_packet_split_side_data(AVPacket *pkt){ } #endif +#if FF_API_BUFFER_SIZE_T uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size) +#else +uint8_t *av_packet_pack_dictionary(AVDictionary *dict, size_t *size) +#endif { uint8_t *data = NULL; *size = 0; @@ -526,7 +530,11 @@ uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size) if (pass) memcpy(data + total_length, str, len); +#if FF_API_BUFFER_SIZE_T else if (len > INT_MAX - total_length) +#else + else if (len > SIZE_MAX - total_length) +#endif return NULL; total_length += len; } @@ -542,7 +550,12 @@ uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size) return data; } +#if FF_API_BUFFER_SIZE_T int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict) +#else +int av_packet_unpack_dictionary(const uint8_t *data, size_t size, + AVDictionary **dict) +#endif { const uint8_t *end; int ret; diff --git a/libavcodec/packet.h b/libavcodec/packet.h index da4377e09f..ca18ae631f 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -647,7 +647,11 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type); * @param size pointer to store the size of the returned data * @return pointer to data if successful, NULL otherwise */ +#if FF_API_BUFFER_SIZE_T uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size); +#else +uint8_t *av_packet_pack_dictionary(AVDictionary *dict, size_t *size); +#endif /** * Unpack a dictionary from side_data. * @@ -656,8 +660,12 @@ uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size); * @param dict the metadata storage dictionary * @return 0 on success, < 0 on failure */ +#if FF_API_BUFFER_SIZE_T int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict); - +#else +int av_packet_unpack_dictionary(const uint8_t *data, size_t size, + AVDictionary **dict); +#endif /** * Convenience function to free all the side data stored. diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 40c3dae968..79d96cd620 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -922,7 +922,6 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( const char *tc = av_timecode_make_string(&tcr, tcstr, 0); if (tc) { AVDictionary* metadata_dict = NULL; - int metadata_len; uint8_t* packed_metadata; if (av_cmp_q(ctx->video_st->r_frame_rate, av_make_q(60, 1)) < 1) { @@ -937,6 +936,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( } if (av_dict_set(&metadata_dict, "timecode", tc, 0) >= 0) { + buffer_size_t metadata_len; packed_metadata = av_packet_pack_dictionary(metadata_dict, &metadata_len); av_dict_free(&metadata_dict); if (packed_metadata) { diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 94ad03268a..fdadff3f7f 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -446,7 +446,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) frame_metadata = frame->metadata; if (frame_metadata) { - int size; + buffer_size_t size; uint8_t *metadata = av_packet_pack_dictionary(frame_metadata, &size); if (!metadata) { diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 6d5b9914f9..32d4a99010 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -626,7 +626,7 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base)); if (cat->cur_file->metadata) { - int metadata_len; + buffer_size_t metadata_len; char* packed_metadata = av_packet_pack_dictionary(cat->cur_file->metadata, &metadata_len); if (!packed_metadata) return AVERROR(ENOMEM); diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 6c78dada8c..be7149bb2f 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -381,9 +381,10 @@ int ff_img_read_header(AVFormatContext *s1) * as a dictionary, so it can be used by filters like 'drawtext'. */ static int add_filename_as_pkt_side_data(char *filename, AVPacket *pkt) { - int metadata_len, ret; AVDictionary *d = NULL; char *packed_metadata = NULL; + buffer_size_t metadata_len; + int ret; av_dict_set(&d, "lavf.image2dec.source_path", filename, 0); av_dict_set(&d, "lavf.image2dec.source_basename", av_basename(filename), 0); diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 629a1d6262..bf982bfe1c 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -87,7 +87,7 @@ struct ogg_stream { int start_trimming; ///< set the number of packets to drop from the start int end_trimming; ///< set the number of packets to drop from the end uint8_t *new_metadata; - unsigned int new_metadata_size; + buffer_size_t new_metadata_size; void *private; };