avcodec/bit_depth_template: Remove empty macro INIT_CLIP

Zhao Zhili committed 1 year ago

Commit d157e1f1 parent 66e98884 files · +0 −17Browse files

Showing the changes to libavcodec (4 of 4 files). Show all

Unified · Split

4 files

libavcodec/bit_depth_template.c +0 −3
libavcodec/h264pred_template.c +0 −3
libavcodec/h264qpel_template.c +0 −9
libavcodec/mips/h264qpel_mmi.c +0 −2

@@ -30,7 +30,6 @@ · 29 unmodified lines
30	30	# undef pixel4
31	31	# undef dctcoef
32	32	# undef idctin
33		−# undef INIT_CLIP
34	33	# undef no_rnd_avg_pixel4
35	34	# undef rnd_avg_pixel4
36	35	# undef AV_RN2P
@@ -64,7 +63,6 @@ · 27 unmodified lines
64	63	# define idctin int16_t
65	64	#endif
66	65
67		−# define INIT_CLIP
68	66	# define no_rnd_avg_pixel4 no_rnd_avg64
69	67	# define rnd_avg_pixel4 rnd_avg64
70	68	# define AV_RN2P AV_RN32
@@ -84,7 +82,6 @@ · 13 unmodified lines
84	82	# define dctcoef int16_t
85	83	# define idctin int16_t
86	84
87		−# define INIT_CLIP
88	85	# define no_rnd_avg_pixel4 no_rnd_avg32
89	86	# define rnd_avg_pixel4 rnd_avg32
90	87	# define AV_RN2P AV_RN16

libavcodec/h264pred_template.c+0−3

@@ -414,7 +414,6 @@ static inline void FUNCC(pred16x16_plane_compat)(uint8_t *_src, · 413 unmodified lines
414	414	{
415	415	int i, j, k;
416	416	int a;
417		− INIT_CLIP
418	417	pixel src = (pixel)_src;
419	418	int stride = _stride>>(sizeof(pixel)-1);
420	419	const pixel * const src0 = src +7-stride;
@@ -748,7 +747,6 @@ static void FUNCC(pred8x8_plane)(uint8_t *_src, ptrdiff_t _stride) · 327 unmodified lines
748	747	{
749	748	int j, k;
750	749	int a;
751		− INIT_CLIP
752	750	pixel src = (pixel)_src;
753	751	int stride = _stride>>(sizeof(pixel)-1);
754	752	const pixel * const src0 = src +3-stride;
@@ -784,7 +782,6 @@ static void FUNCC(pred8x16_plane)(uint8_t *_src, ptrdiff_t _stride) · 29 unmodified lines
784	782	{
785	783	int j, k;
786	784	int a;
787		− INIT_CLIP
788	785	pixel src = (pixel)_src;
789	786	int stride = _stride>>(sizeof(pixel)-1);
790	787	const pixel * const src0 = src +3-stride;

libavcodec/h264qpel_template.c+0−9

@@ -78,7 +78,6 @@ static inline void FUNC(copy_block16)(uint8_t dst, const uint8_t restrict src, · 77 unmodified lines
78	78	static av_unused void FUNC(OPNAME ## h264_qpel2_h_lowpass)(uint8_t p_dst, const uint8_t restrict p_src, int dstStride, int srcStride)\
79	79	{\
80	80	const int h=2;\
81		− INIT_CLIP\
82	81	int i;\
83	82	pixel dst = (pixel)p_dst;\
84	83	const pixel restrict src = (const pixel)p_src;\
@@ -96,7 +95,6 @@ static av_unused void FUNC(OPNAME ## h264_qpel2_h_lowpass)(uint8_t *p_dst, const · 11 unmodified lines
96	95	static av_unused void FUNC(OPNAME ## h264_qpel2_v_lowpass)(uint8_t _dst, const uint8_t restrict _src, int dstStride, int srcStride)\
97	96	{\
98	97	const int w=2;\
99		− INIT_CLIP\
100	98	int i;\
101	99	pixel dst = (pixel)_dst;\
102	100	const pixel restrict src = (const pixel)_src;\
@@ -123,7 +121,6 @@ static av_unused void FUNC(OPNAME ## h264_qpel2_hv_lowpass)(uint8_t *_dst, pixel · 20 unmodified lines
123	121	const int h=2;\
124	122	const int w=2;\
125	123	const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
126		− INIT_CLIP\
127	124	int i;\
128	125	pixel dst = (pixel)_dst;\
129	126	const pixel restrict src = (const pixel)_src;\
@@ -156,7 +153,6 @@ static av_unused void FUNC(OPNAME ## h264_qpel2_hv_lowpass)(uint8_t *_dst, pixel · 26 unmodified lines
156	153	static void FUNC(OPNAME ## h264_qpel4_h_lowpass)(uint8_t _dst, const uint8_t restrict _src, int dstStride, int srcStride)\
157	154	{\
158	155	const int h=4;\
159		− INIT_CLIP\
160	156	int i;\
161	157	pixel dst = (pixel)_dst;\
162	158	const pixel restrict src = (const pixel)_src;\
@@ -176,7 +172,6 @@ static void FUNC(OPNAME ## h264_qpel4_h_lowpass)(uint8_t _dst, const uint8_t r · 13 unmodified lines
176	172	static void FUNC(OPNAME ## h264_qpel4_v_lowpass)(uint8_t _dst, const uint8_t restrict _src, int dstStride, int srcStride)\
177	173	{\
178	174	const int w=4;\
179		− INIT_CLIP\
180	175	int i;\
181	176	pixel dst = (pixel)_dst;\
182	177	const pixel restrict src = (const pixel)_src;\
@@ -207,7 +202,6 @@ static void FUNC(OPNAME ## h264_qpel4_hv_lowpass)(uint8_t _dst, pixeltmp tmp, · 24 unmodified lines
207	202	const int h=4;\
208	203	const int w=4;\
209	204	const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
210		− INIT_CLIP\
211	205	int i;\
212	206	pixel dst = (pixel)_dst;\
213	207	const pixel restrict src = (const pixel)_src;\
@@ -247,7 +241,6 @@ static void FUNC(OPNAME ## h264_qpel4_hv_lowpass)(uint8_t _dst, pixeltmp tmp, · 33 unmodified lines
247	241	static void FUNC(OPNAME ## h264_qpel8_h_lowpass)(uint8_t _dst, const uint8_t restrict _src, int dstStride, int srcStride)\
248	242	{\
249	243	const int h=8;\
250		− INIT_CLIP\
251	244	int i;\
252	245	pixel dst = (pixel)_dst;\
253	246	const pixel restrict src = (const pixel)_src;\
@@ -271,7 +264,6 @@ static void FUNC(OPNAME ## h264_qpel8_h_lowpass)(uint8_t _dst, const uint8_t r · 17 unmodified lines
271	264	static void FUNC(OPNAME ## h264_qpel8_v_lowpass)(uint8_t _dst, const uint8_t restrict _src, int dstStride, int srcStride)\
272	265	{\
273	266	const int w=8;\
274		− INIT_CLIP\
275	267	int i;\
276	268	pixel dst = (pixel)_dst;\
277	269	const pixel restrict src = (const pixel)_src;\
@@ -310,7 +302,6 @@ static void FUNC(OPNAME ## h264_qpel8_hv_lowpass)(uint8_t _dst, pixeltmp tmp, · 32 unmodified lines
310	302	const int h=8;\
311	303	const int w=8;\
312	304	const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
313		− INIT_CLIP\
314	305	int i;\
315	306	pixel dst = (pixel)_dst;\
316	307	const pixel restrict src = (const pixel)_src;\

libavcodec/mips/h264qpel_mmi.c+0−2

@@ -1258,7 +1258,6 @@ static void avg_h264_qpel16_v_lowpass_mmi(uint8_t dst, const uint8_t src, · 1257 unmodified lines
1258	1258	static void put_h264_qpel4_hv_lowpass_mmi(uint8_t dst, const uint8_t src,
1259	1259	int dstStride, int srcStride)
1260	1260	{
1261		− INIT_CLIP
1262	1261	int i;
1263	1262	int16_t _tmp[36];
1264	1263	int16_t *tmp = _tmp;
@@ -1822,7 +1821,6 @@ static void put_pixels16_l2_shift5_mmi(uint8_t dst, int16_t src16, · 557 unmodified lines
1822	1821	static void avg_h264_qpel4_hv_lowpass_mmi(uint8_t dst, const uint8_t src,
1823	1822	int dstStride, int srcStride)
1824	1823	{
1825		− INIT_CLIP
1826	1824	int i;
1827	1825	int16_t _tmp[36];
1828	1826	int16_t *tmp = _tmp;

avcodec/bit_depth_template: Remove empty macro INIT_CLIP

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code