lavc/vorbisdsp: use ptrdiff_t rather than intptr_t

... for a difference between pointers.

Rémi Denis-Courmont committed 4 years ago

Commit b5203421 parent bbf045a7 files · +8 −8Browse files

Unified · Split

7 files

libavcodec/aarch64/vorbisdsp_init.c +1 −1
libavcodec/arm/vorbisdsp_init_arm.c +1 −1
libavcodec/ppc/vorbisdsp_altivec.c +1 −1
libavcodec/vorbis.h +1 −1
libavcodec/vorbisdec.c +1 −1
libavcodec/vorbisdsp.h +2 −2
libavcodec/x86/vorbisdsp_init.c +1 −1

libavcodec/aarch64/vorbisdsp_init.c+1−1

@@ -22,7 +22,7 @@ · 21 unmodified lines
22	#include "libavcodec/vorbisdsp.h"	22	#include "libavcodec/vorbisdsp.h"
23		23
24	void ff_vorbis_inverse_coupling_neon(float mag, float ang,	24	void ff_vorbis_inverse_coupling_neon(float mag, float ang,
25	intptr_t blocksize);	25	ptrdiff_t blocksize);
26		26
27	av_cold void ff_vorbisdsp_init_aarch64(VorbisDSPContext *c)	27	av_cold void ff_vorbisdsp_init_aarch64(VorbisDSPContext *c)
28	{	28	{

libavcodec/arm/vorbisdsp_init_arm.c+1−1

@@ -25,7 +25,7 @@ · 24 unmodified lines
25	#include "libavcodec/vorbisdsp.h"	25	#include "libavcodec/vorbisdsp.h"
26		26
27	void ff_vorbis_inverse_coupling_neon(float mag, float ang,	27	void ff_vorbis_inverse_coupling_neon(float mag, float ang,
28	intptr_t blocksize);	28	ptrdiff_t blocksize);
29		29
30	av_cold void ff_vorbisdsp_init_arm(VorbisDSPContext *c)	30	av_cold void ff_vorbisdsp_init_arm(VorbisDSPContext *c)
31	{	31	{

libavcodec/ppc/vorbisdsp_altivec.c+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29		29
30	#if HAVE_ALTIVEC	30	#if HAVE_ALTIVEC
31	static void vorbis_inverse_coupling_altivec(float mag, float ang,	31	static void vorbis_inverse_coupling_altivec(float mag, float ang,
32	intptr_t blocksize)	32	ptrdiff_t blocksize)
33	{	33	{
34	vector float m, a;	34	vector float m, a;
35	vector bool int t0, t1;	35	vector bool int t0, t1;

libavcodec/vorbis.h+1−1

@@ -45,7 +45,7 @@ int ff_vorbis_len2vlc(uint8_t bits, uint32_t codes, unsigned num); · 44 unmodified lines
45	void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,	45	void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,
46	uint16_t y_list, int flag,	46	uint16_t y_list, int flag,
47	int multiplier, float * out, int samples);	47	int multiplier, float * out, int samples);
48	void ff_vorbis_inverse_coupling(float mag, float ang, intptr_t blocksize);	48	void ff_vorbis_inverse_coupling(float mag, float ang, ptrdiff_t blocksize);
49		49
50	#define ilog(i) av_log2(2*(i))	50	#define ilog(i) av_log2(2*(i))
51		51

libavcodec/vorbisdec.c+1−1

@@ -1579,7 +1579,7 @@ static inline int vorbis_residue_decode(vorbis_context vc, vorbis_residue vr, · 1578 unmodified lines
1579	}	1579	}
1580	}	1580	}
1581		1581
1582	void ff_vorbis_inverse_coupling(float mag, float ang, intptr_t blocksize)	1582	void ff_vorbis_inverse_coupling(float mag, float ang, ptrdiff_t blocksize)
1583	{	1583	{
1584	for (ptrdiff_t i = 0; i < blocksize; i++) {	1584	for (ptrdiff_t i = 0; i < blocksize; i++) {
1585	if (mag[i] > 0.0) {	1585	if (mag[i] > 0.0) {

libavcodec/vorbisdsp.h+2−2

@@ -19,12 +19,12 @@ · 18 unmodified lines
19	#ifndef AVCODEC_VORBISDSP_H	19	#ifndef AVCODEC_VORBISDSP_H
20	#define AVCODEC_VORBISDSP_H	20	#define AVCODEC_VORBISDSP_H
21		21
22	#include <stdint.h>	22	#include <stddef.h>
23		23
24	typedef struct VorbisDSPContext {	24	typedef struct VorbisDSPContext {
25	/* assume len is a multiple of 4, and arrays are 16-byte aligned */	25	/* assume len is a multiple of 4, and arrays are 16-byte aligned */
26	void (vorbis_inverse_coupling)(float mag, float *ang,	26	void (vorbis_inverse_coupling)(float mag, float *ang,
27	intptr_t blocksize);	27	ptrdiff_t blocksize);
28	} VorbisDSPContext;	28	} VorbisDSPContext;
29		29
30	void ff_vorbisdsp_init(VorbisDSPContext *dsp);	30	void ff_vorbisdsp_init(VorbisDSPContext *dsp);

libavcodec/x86/vorbisdsp_init.c+1−1

@@ -25,7 +25,7 @@ · 24 unmodified lines
25	#include "libavcodec/vorbisdsp.h"	25	#include "libavcodec/vorbisdsp.h"
26		26
27	void ff_vorbis_inverse_coupling_sse(float mag, float ang,	27	void ff_vorbis_inverse_coupling_sse(float mag, float ang,
28	intptr_t blocksize);	28	ptrdiff_t blocksize);
29		29
30	av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp)	30	av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp)
31	{	31	{