From patchwork Sat Mar 6 19:42:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26219 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 A843444B9AF for ; Sat, 6 Mar 2021 21:43:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 907D168A5E4; Sat, 6 Mar 2021 21:43:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA010687F30 for ; Sat, 6 Mar 2021 21:43:10 +0200 (EET) Received: by mail-qk1-f180.google.com with SMTP id g185so5551049qkf.6 for ; Sat, 06 Mar 2021 11:43:10 -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=RMFUw8p3mKZQFpcUaBl+Ik75iha13lTcn//40UhB4KI=; b=cVhv3sTc25M3YeLqFjmnSp2FCguzAehJphBkXyD3aY4RC7DSz5Y2blNPB+J5y9UHrF uxTTt7CbhNEYbHC1MEqIAOSnMHcFckIBAtrIS7JE5mHn56QTQcOLXnvhYIeZD7AjaA+l HQ78Eq1wpBc5h+ZfuJLIOwz1hAWfe+A1OpKEiTaB41J+olo4qoiB1VL4QxYovve+bG29 t6c1bJT4T9+ad7ZGiniL8UNSxI6sdpBqHtHNOcS1ii7FU4ZAJt4C1x9Kuvc7c+h0Nvp5 Mcl+jXZ9ZwMwPH6znuSVgrdo3ci0vZlKuawF4zoTkVbknURBB9OkQbSqZz09BMbYrQUt ywrA== 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=RMFUw8p3mKZQFpcUaBl+Ik75iha13lTcn//40UhB4KI=; b=B8PIG8ARXK88zthvUw+SrVW68O5SZZEKOPmE3Y7U9yW9jVPauBqDf9sLd4H3qIACZt IwGAMz4vBzOTuGlXQv+B5oC4SdI6tqiLgqQGbueTgD4GtM9xWD37GeemoaxItI3oQQC/ QLWNCX5yBGrtLS7UZmPmF6sGd8UiSzMNkasHVF8pxs07FXBnfRfsMq3hF+KjNAo5SJCg Yf9kTSsjVmUh1kh5v3VFlYs7gOvApabH2/ENbkd17JcvDdN55P4cEyq2fI6NxQB9lyCi YR3gp8ts7o7/qRa0wCxQo4Dftzc5jmOifeLlJ25bZ271kKDWI0vlMJtuhnvYA6irNPSA qlIg== X-Gm-Message-State: AOAM532e6rFOGTPkPPgLi0ahvIPAHFXlFjOyAfm3v8r4wMnqrz6Dvwqq 1TR4FPCEzpaX5svr5WyBPbyslkKzHeNR6A== X-Google-Smtp-Source: ABdhPJwSxRf99W7SitC6gAoyg1dJPTla1XpR0w974oct2j4n/K0pc/qJTpGkzIulJwVyu4zieGcLxQ== X-Received: by 2002:a37:a855:: with SMTP id r82mr14298016qke.230.1615059789284; Sat, 06 Mar 2021 11:43:09 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id s19sm4376601qks.130.2021.03.06.11.43.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 11:43:08 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Mar 2021 16:42:36 -0300 Message-Id: <20210306194243.14931-2-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 2/9 v3] avutil/frame: change av_frame_new_side_data() size parameter type 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" Signed-off-by: James Almer --- Changes since v2 is using the buffer_size_t typedef. doc/APIchanges | 6 +++--- libavutil/frame.c | 2 +- libavutil/frame.h | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 7abc320db2..d2d107de78 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,9 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: -2021-03-xx - xxxxxxxxxx - lavu 56.68.100 - buffer.h - Change AVBufferRef related 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. 2021-03-04 - xxxxxxxxxx - lavc 58.128.101 - avcodec.h Enable err_recognition to be set for encoders. diff --git a/libavutil/frame.c b/libavutil/frame.c index eab51b6a32..75e347bf2f 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -725,7 +725,7 @@ AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, AVFrameSideData *av_frame_new_side_data(AVFrame *frame, enum AVFrameSideDataType type, - int size) + buffer_size_t size) { AVFrameSideData *ret; AVBufferRef *buf = av_buffer_alloc(size); diff --git a/libavutil/frame.h b/libavutil/frame.h index 1aeafef6de..7d1f8e2935 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -220,7 +220,11 @@ enum AVActiveFormatDescription { typedef struct AVFrameSideData { enum AVFrameSideDataType type; uint8_t *data; +#if FF_API_BUFFER_SIZE_T int size; +#else + size_t size; +#endif AVDictionary *metadata; AVBufferRef *buf; } AVFrameSideData; @@ -913,7 +917,11 @@ AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane); */ AVFrameSideData *av_frame_new_side_data(AVFrame *frame, enum AVFrameSideDataType type, +#if FF_API_BUFFER_SIZE_T int size); +#else + size_t size); +#endif /** * Add a new side data to a frame from an existing AVBufferRef