swresample/rematrix: Constify

Andreas Rheinhardt committed 1 year ago

Commit 2db60f91 parent 589f1e53 files · +11 −8Browse files

Unified · Split

3 files

libswresample/rematrix.c +1 −1
libswresample/rematrix_template.c +7 −4
libswresample/swresample_internal.h +3 −3

@@ -581,7 +581,7 @@ int swri_rematrix(SwrContext s, AudioData out, AudioData *in, int len, int mus · 580 unmodified lines
581	581	int off = 0;
582	582
583	583	if(s->mix_any_f) {
584		− s->mix_any_f(out->ch, (const uint8_t **)in->ch, s->native_matrix, len);
	584	+ s->mix_any_f(out->ch, (const uint8_t const )in->ch, s->native_matrix, len);
585	585	return 0;
586	586	}
587	587

libswresample/rematrix_template.c+7−4

@@ -50,7 +50,7 @@ · 49 unmodified lines
50	50	#endif
51	51
52	52	static void RENAME(sum2)(void out_, const void in1_, const void *in2_,
53		− void *coeffp_, integer index1, integer index2, integer len)
	53	+ const void *coeffp_, integer index1, integer index2, integer len)
54	54	{
55	55	const SAMPLE in1 = in1_, in2 = in2_;
56	56	const COEFF *coeffp = coeffp_;
@@ -63,7 +63,8 @@ static void RENAME(sum2)(void out_, const void in1_, const void *in2_, · 6 unmodified lines
63	63	out[i] = R(coeff1in1[i] + coeff2in2[i]);
64	64	}
65	65
66		−static void RENAME(copy)(void out_, const void in_, void *coeffp_, integer index, integer len)
	66	+static void RENAME(copy)(void out_, const void in_, const void *coeffp_,
	67	+ integer index, integer len)
67	68	{
68	69	const COEFF *coeffp = coeffp_;
69	70	const SAMPLE *in = in_;
@@ -74,7 +75,8 @@ static void RENAME(copy)(void out_, const void in_, void *coeffp_, integer ind · 4 unmodified lines
74	75	out[i] = R(coeff*in[i]);
75	76	}
76	77
77		−static void RENAME(mix6to2)(uint8_t out_, const uint8_t in_, void *coeffp_, integer len)
	78	+static void RENAME(mix6to2)(uint8_t const out_, const uint8_t const in_,
	79	+ const void *coeffp_, integer len)
78	80	{
79	81	const SAMPLE const const in = (const SAMPLE const )in_;
80	82	SAMPLE const const out = (SAMPLE const)out_;
@@ -88,7 +90,8 @@ static void RENAME(mix6to2)(uint8_t out_, const uint8_t in_, void *coeffp_, · 7 unmodified lines
88	90	}
89	91	}
90	92
91		−static void RENAME(mix8to2)(uint8_t out_, const uint8_t in_, void *coeffp_, integer len)
	93	+static void RENAME(mix8to2)(uint8_t const out_, const uint8_t const in_,
	94	+ const void *coeffp_, integer len)
92	95	{
93	96	const SAMPLE const const in = (const SAMPLE const )in_;
94	97	SAMPLE const const out = (SAMPLE const)out_;

libswresample/swresample_internal.h+3−3

@@ -37,10 +37,10 @@ typedef int64_t integer; · 36 unmodified lines
37	37	typedef int integer;
38	38	#endif
39	39
40		−typedef void (mix_1_1_func_type)(void out, const void in, void *coeffp, integer index, integer len);
41		−typedef void (mix_2_1_func_type)(void out, const void in1, const void in2, void coeffp, integer index1, integer index2, integer len);
	40	+typedef void (mix_1_1_func_type)(void out, const void in, const void *coeffp, integer index, integer len);
	41	+typedef void (mix_2_1_func_type)(void out, const void in1, const void in2, const void coeffp, integer index1, integer index2, integer len);
42	42
43		−typedef void (mix_any_func_type)(uint8_t out, const uint8_t in1, void *coeffp, integer len);
	43	+typedef void (mix_any_func_type)(uint8_t const out, const uint8_t const in1, const void *coeffp, integer len);
44	44
45	45	typedef struct AudioData{
46	46	uint8_t *ch[SWR_CH_MAX]; ///< samples buffer per channel

swresample/rematrix: Constify

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code