From patchwork Mon Sep 19 16:10:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 38053 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1337729pzh; Mon, 19 Sep 2022 09:11:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6lvAG8I+2xpu9ja0Zd+9QwMW1wa/WctbqkMqsEMu+PwYoNeFkQ0qoOG3lV0Hg16bsKHfK9 X-Received: by 2002:a05:6402:184:b0:442:fd54:2a21 with SMTP id r4-20020a056402018400b00442fd542a21mr15962822edv.129.1663603864370; Mon, 19 Sep 2022 09:11:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663603864; cv=none; d=google.com; s=arc-20160816; b=w6sD5swVblgj3Ch5pRHuZH2HMYJ73eLvoS+6nAROvuw8prtE5VuYE4jmGr8LenoHLh JsGtssDndAJzFRUny9MgvJK5/QgmNZTuL3dHTiAvmwMuwIIJccNn4NOeOEJ9kbH1vYeC CchppL6J9P0OZQ9nglSHyzWrCy1IpJcI3fhq6WwL+SzjOXe6BpKgOWSJ2F6UBtf9iozm 8ahM4EhmOKzfzb0Sq/zqqI7PdS/+KbQjo+YAfKlxzanKB24WHX2zbIAypZ5gG6Wn2Kc2 lKNOWfw7XshzIVILhOGEJ2DQqVvesWCNq3fEGxcW0rBZar4Wdx2VI81gGS7OrccERI5+ olxw== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=gF5rweKQ4kLd2ppPFK++8ZScvEAD6WUGKO/j0+f5BpA=; b=sB0gDv2C+0u6JKC4nYhuO2ikJk4ikJA2dv+50nPkKZQn0dhLuIGJyLqMLfloPgLUjv W3mtL1H52zi5NNcGkCNexf+XdFaDK+1Ckgn6A7DFH0ZVHl7DOuoyz31cmIkwpGP3A90l 0m1D0w3Xtm401fruDqsMTO/suNVnxVF1OOWyK+hI9wDhBJ2Ce6KQLeqMt/BkaFEYykMC Mqbt9OgLvhJtBt0Of4QZRio5iT/3H9DBCzwyWqYLY8ph6EQ/ScGY6ZGcnGdlRvYlZ2HU kOWmt/X1RyUbDgnEfufHO11RwG1xtM2wO8pZz3HMZvcdDZ+iUWVGS+Sn8wvVQqNa2ZQH fHsA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l6-20020a170906794600b0073dcc5ebf4asi29155415ejo.397.2022.09.19.09.11.02; Mon, 19 Sep 2022 09:11:04 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB1D468BCBE; Mon, 19 Sep 2022 19:10:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C36E68BCAF for ; Mon, 19 Sep 2022 19:10:45 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id F3DDDC0098 for ; Mon, 19 Sep 2022 19:10:44 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Sep 2022 19:10:43 +0300 Message-Id: <20220919161044.19545-2-remi@remlab.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <170537ff-c751-1f40-49aa-d1dfe8b77ce8@gmail.com> References: <170537ff-c751-1f40-49aa-d1dfe8b77ce8@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv3 2/3] lavc/vorbisdsp: use ptrdiff_t rather than intptr_t 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: LjY/8LkQHUiU From: Rémi Denis-Courmont ... for a difference between pointers. --- libavcodec/aarch64/vorbisdsp_init.c | 2 +- libavcodec/arm/vorbisdsp_init_arm.c | 2 +- libavcodec/ppc/vorbisdsp_altivec.c | 2 +- libavcodec/vorbis.h | 2 +- libavcodec/vorbisdec.c | 2 +- libavcodec/vorbisdsp.h | 4 ++-- libavcodec/x86/vorbisdsp_init.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/aarch64/vorbisdsp_init.c b/libavcodec/aarch64/vorbisdsp_init.c index c796f95e61..969343934b 100644 --- a/libavcodec/aarch64/vorbisdsp_init.c +++ b/libavcodec/aarch64/vorbisdsp_init.c @@ -22,7 +22,7 @@ #include "libavcodec/vorbisdsp.h" void ff_vorbis_inverse_coupling_neon(float *mag, float *ang, - intptr_t blocksize); + ptrdiff_t blocksize); av_cold void ff_vorbisdsp_init_aarch64(VorbisDSPContext *c) { diff --git a/libavcodec/arm/vorbisdsp_init_arm.c b/libavcodec/arm/vorbisdsp_init_arm.c index f4b3d80ef6..acda34f468 100644 --- a/libavcodec/arm/vorbisdsp_init_arm.c +++ b/libavcodec/arm/vorbisdsp_init_arm.c @@ -25,7 +25,7 @@ #include "libavcodec/vorbisdsp.h" void ff_vorbis_inverse_coupling_neon(float *mag, float *ang, - intptr_t blocksize); + ptrdiff_t blocksize); av_cold void ff_vorbisdsp_init_arm(VorbisDSPContext *c) { diff --git a/libavcodec/ppc/vorbisdsp_altivec.c b/libavcodec/ppc/vorbisdsp_altivec.c index c298d8cae3..8f301705e9 100644 --- a/libavcodec/ppc/vorbisdsp_altivec.c +++ b/libavcodec/ppc/vorbisdsp_altivec.c @@ -29,7 +29,7 @@ #if HAVE_ALTIVEC static void vorbis_inverse_coupling_altivec(float *mag, float *ang, - intptr_t blocksize) + ptrdiff_t blocksize) { vector float m, a; vector bool int t0, t1; diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h index f80187feee..270855da04 100644 --- a/libavcodec/vorbis.h +++ b/libavcodec/vorbis.h @@ -45,7 +45,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num); void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values, uint16_t *y_list, int *flag, int multiplier, float * out, int samples); -void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize); +void ff_vorbis_inverse_coupling(float *mag, float *ang, ptrdiff_t blocksize); #define ilog(i) av_log2(2*(i)) diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index bfc4be6fc6..10d187b82a 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1579,7 +1579,7 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, } } -void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize) +void ff_vorbis_inverse_coupling(float *mag, float *ang, ptrdiff_t blocksize) { for (ptrdiff_t i = 0; i < blocksize; i++) { if (mag[i] > 0.0) { diff --git a/libavcodec/vorbisdsp.h b/libavcodec/vorbisdsp.h index 7abec4e4b7..1775a92cf2 100644 --- a/libavcodec/vorbisdsp.h +++ b/libavcodec/vorbisdsp.h @@ -19,12 +19,12 @@ #ifndef AVCODEC_VORBISDSP_H #define AVCODEC_VORBISDSP_H -#include +#include typedef struct VorbisDSPContext { /* assume len is a multiple of 4, and arrays are 16-byte aligned */ void (*vorbis_inverse_coupling)(float *mag, float *ang, - intptr_t blocksize); + ptrdiff_t blocksize); } VorbisDSPContext; void ff_vorbisdsp_init(VorbisDSPContext *dsp); diff --git a/libavcodec/x86/vorbisdsp_init.c b/libavcodec/x86/vorbisdsp_init.c index da9f9e685e..08a3bb2965 100644 --- a/libavcodec/x86/vorbisdsp_init.c +++ b/libavcodec/x86/vorbisdsp_init.c @@ -25,7 +25,7 @@ #include "libavcodec/vorbisdsp.h" void ff_vorbis_inverse_coupling_sse(float *mag, float *ang, - intptr_t blocksize); + ptrdiff_t blocksize); av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp) {