History

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
  1. libavcodec/bit_depth_template.c +0 −3
  2. libavcodec/h264pred_template.c +0 −3
  3. libavcodec/h264qpel_template.c +0 −9
  4. libavcodec/mips/h264qpel_mmi.c +0 −2
libavcodec/bit_depth_template.c+0−3
@@ -30,7 +30,6 @@ · 29 unmodified lines
30# undef pixel430# undef pixel4
31# undef dctcoef31# undef dctcoef
32# undef idctin32# undef idctin
33# undef INIT_CLIP
34# undef no_rnd_avg_pixel433# undef no_rnd_avg_pixel4
35# undef rnd_avg_pixel434# undef rnd_avg_pixel4
36# undef AV_RN2P35# undef AV_RN2P
@@ -64,7 +63,6 @@ · 27 unmodified lines
64# define idctin int16_t63# define idctin int16_t
65#endif64#endif
66 65
67# define INIT_CLIP
68# define no_rnd_avg_pixel4 no_rnd_avg6466# define no_rnd_avg_pixel4 no_rnd_avg64
69# define rnd_avg_pixel4 rnd_avg6467# define rnd_avg_pixel4 rnd_avg64
70# define AV_RN2P AV_RN3268# define AV_RN2P AV_RN32
@@ -84,7 +82,6 @@ · 13 unmodified lines
84# define dctcoef int16_t82# define dctcoef int16_t
85# define idctin int16_t83# define idctin int16_t
86 84
87# define INIT_CLIP
88# define no_rnd_avg_pixel4 no_rnd_avg3285# define no_rnd_avg_pixel4 no_rnd_avg32
89# define rnd_avg_pixel4 rnd_avg3286# define rnd_avg_pixel4 rnd_avg32
90# define AV_RN2P AV_RN1687# 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 int i, j, k;415 int i, j, k;
416 int a;416 int a;
417 INIT_CLIP
418 pixel *src = (pixel*)_src;417 pixel *src = (pixel*)_src;
419 int stride = _stride>>(sizeof(pixel)-1);418 int stride = _stride>>(sizeof(pixel)-1);
420 const pixel * const src0 = src +7-stride;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 int j, k;748 int j, k;
750 int a;749 int a;
751 INIT_CLIP
752 pixel *src = (pixel*)_src;750 pixel *src = (pixel*)_src;
753 int stride = _stride>>(sizeof(pixel)-1);751 int stride = _stride>>(sizeof(pixel)-1);
754 const pixel * const src0 = src +3-stride;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 int j, k;783 int j, k;
786 int a;784 int a;
787 INIT_CLIP
788 pixel *src = (pixel*)_src;785 pixel *src = (pixel*)_src;
789 int stride = _stride>>(sizeof(pixel)-1);786 int stride = _stride>>(sizeof(pixel)-1);
790 const pixel * const src0 = src +3-stride;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
78static av_unused void FUNC(OPNAME ## h264_qpel2_h_lowpass)(uint8_t *p_dst, const uint8_t *restrict p_src, int dstStride, int srcStride)\78static 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 const int h=2;\80 const int h=2;\
81 INIT_CLIP\
82 int i;\81 int i;\
83 pixel *dst = (pixel*)p_dst;\82 pixel *dst = (pixel*)p_dst;\
84 const pixel *restrict src = (const pixel*)p_src;\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
96static av_unused void FUNC(OPNAME ## h264_qpel2_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\95static av_unused void FUNC(OPNAME ## h264_qpel2_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\
97{\96{\
98 const int w=2;\97 const int w=2;\
99 INIT_CLIP\
100 int i;\98 int i;\
101 pixel *dst = (pixel*)_dst;\99 pixel *dst = (pixel*)_dst;\
102 const pixel *restrict src = (const pixel*)_src;\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 const int h=2;\121 const int h=2;\
124 const int w=2;\122 const int w=2;\
125 const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\123 const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
126 INIT_CLIP\
127 int i;\124 int i;\
128 pixel *dst = (pixel*)_dst;\125 pixel *dst = (pixel*)_dst;\
129 const pixel *restrict src = (const pixel*)_src;\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
156static void FUNC(OPNAME ## h264_qpel4_h_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\153static void FUNC(OPNAME ## h264_qpel4_h_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\
157{\154{\
158 const int h=4;\155 const int h=4;\
159 INIT_CLIP\
160 int i;\156 int i;\
161 pixel *dst = (pixel*)_dst;\157 pixel *dst = (pixel*)_dst;\
162 const pixel *restrict src = (const pixel*)_src;\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
176static void FUNC(OPNAME ## h264_qpel4_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\172static void FUNC(OPNAME ## h264_qpel4_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\
177{\173{\
178 const int w=4;\174 const int w=4;\
179 INIT_CLIP\
180 int i;\175 int i;\
181 pixel *dst = (pixel*)_dst;\176 pixel *dst = (pixel*)_dst;\
182 const pixel *restrict src = (const pixel*)_src;\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 const int h=4;\202 const int h=4;\
208 const int w=4;\203 const int w=4;\
209 const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\204 const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
210 INIT_CLIP\
211 int i;\205 int i;\
212 pixel *dst = (pixel*)_dst;\206 pixel *dst = (pixel*)_dst;\
213 const pixel *restrict src = (const pixel*)_src;\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
247static void FUNC(OPNAME ## h264_qpel8_h_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\241static void FUNC(OPNAME ## h264_qpel8_h_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\
248{\242{\
249 const int h=8;\243 const int h=8;\
250 INIT_CLIP\
251 int i;\244 int i;\
252 pixel *dst = (pixel*)_dst;\245 pixel *dst = (pixel*)_dst;\
253 const pixel *restrict src = (const pixel*)_src;\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
271static void FUNC(OPNAME ## h264_qpel8_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\264static void FUNC(OPNAME ## h264_qpel8_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\
272{\265{\
273 const int w=8;\266 const int w=8;\
274 INIT_CLIP\
275 int i;\267 int i;\
276 pixel *dst = (pixel*)_dst;\268 pixel *dst = (pixel*)_dst;\
277 const pixel *restrict src = (const pixel*)_src;\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 const int h=8;\302 const int h=8;\
311 const int w=8;\303 const int w=8;\
312 const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\304 const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
313 INIT_CLIP\
314 int i;\305 int i;\
315 pixel *dst = (pixel*)_dst;\306 pixel *dst = (pixel*)_dst;\
316 const pixel *restrict src = (const pixel*)_src;\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
1258static void put_h264_qpel4_hv_lowpass_mmi(uint8_t *dst, const uint8_t *src,1258static void put_h264_qpel4_hv_lowpass_mmi(uint8_t *dst, const uint8_t *src,
1259 int dstStride, int srcStride)1259 int dstStride, int srcStride)
1260{1260{
1261 INIT_CLIP
1262 int i;1261 int i;
1263 int16_t _tmp[36];1262 int16_t _tmp[36];
1264 int16_t *tmp = _tmp;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
1822static void avg_h264_qpel4_hv_lowpass_mmi(uint8_t *dst, const uint8_t *src,1821static void avg_h264_qpel4_hv_lowpass_mmi(uint8_t *dst, const uint8_t *src,
1823 int dstStride, int srcStride)1822 int dstStride, int srcStride)
1824{1823{
1825 INIT_CLIP
1826 int i;1824 int i;
1827 int16_t _tmp[36];1825 int16_t _tmp[36];
1828 int16_t *tmp = _tmp;1826 int16_t *tmp = _tmp;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t