Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
6ce93757
Commit
6ce93757
authored
Sep 09, 2016
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ppc: Update #endif comments
parent
caccb3a0
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
44 additions
and
45 deletions
+44
-45
apedsp_altivec.c
libavcodec/ppc/apedsp_altivec.c
+2
-2
audiodsp.c
libavcodec/ppc/audiodsp.c
+1
-1
fdctdsp.c
libavcodec/ppc/fdctdsp.c
+2
-2
fmtconvert_altivec.c
libavcodec/ppc/fmtconvert_altivec.c
+2
-2
h264chroma_init.c
libavcodec/ppc/h264chroma_init.c
+2
-2
h264dsp.c
libavcodec/ppc/h264dsp.c
+2
-2
h264qpel.c
libavcodec/ppc/h264qpel.c
+2
-2
h264qpel_template.c
libavcodec/ppc/h264qpel_template.c
+3
-3
hpeldsp_altivec.c
libavcodec/ppc/hpeldsp_altivec.c
+2
-2
huffyuvdsp_altivec.c
libavcodec/ppc/huffyuvdsp_altivec.c
+2
-2
idctdsp.c
libavcodec/ppc/idctdsp.c
+2
-2
me_cmp.c
libavcodec/ppc/me_cmp.c
+2
-2
mpegaudiodsp_altivec.c
libavcodec/ppc/mpegaudiodsp_altivec.c
+2
-2
mpegvideo_altivec.c
libavcodec/ppc/mpegvideo_altivec.c
+2
-2
mpegvideodsp.c
libavcodec/ppc/mpegvideodsp.c
+2
-2
mpegvideoencdsp.c
libavcodec/ppc/mpegvideoencdsp.c
+2
-2
pixblockdsp.c
libavcodec/ppc/pixblockdsp.c
+2
-2
svq1enc_altivec.c
libavcodec/ppc/svq1enc_altivec.c
+2
-2
vc1dsp_altivec.c
libavcodec/ppc/vc1dsp_altivec.c
+2
-2
vorbisdsp_altivec.c
libavcodec/ppc/vorbisdsp_altivec.c
+2
-2
vp3dsp_altivec.c
libavcodec/ppc/vp3dsp_altivec.c
+2
-2
vp8dsp_altivec.c
libavcodec/ppc/vp8dsp_altivec.c
+2
-3
No files found.
libavcodec/ppc/apedsp_altivec.c
View file @
6ce93757
...
...
@@ -69,7 +69,7 @@ static int32_t scalarproduct_and_madd_int16_altivec(int16_t *v1,
return
ires
;
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_apedsp_init_ppc
(
APEDSPContext
*
c
)
{
...
...
@@ -78,5 +78,5 @@ av_cold void ff_apedsp_init_ppc(APEDSPContext *c)
return
;
c
->
scalarproduct_and_madd_int16
=
scalarproduct_and_madd_int16_altivec
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/audiodsp.c
View file @
6ce93757
...
...
@@ -59,7 +59,7 @@ static int32_t scalarproduct_int16_altivec(const int16_t *v1, const int16_t *v2,
return
ires
;
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
#if HAVE_VSX
...
...
libavcodec/ppc/fdctdsp.c
View file @
6ce93757
...
...
@@ -460,7 +460,7 @@ void ff_fdct_altivec(int16_t *block)
/* }}} */
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_fdctdsp_init_ppc
(
FDCTDSPContext
*
c
,
AVCodecContext
*
avctx
,
unsigned
high_bit_depth
)
...
...
@@ -475,5 +475,5 @@ av_cold void ff_fdctdsp_init_ppc(FDCTDSPContext *c, AVCodecContext *avctx,
c
->
fdct
=
ff_fdct_altivec
;
}
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/fmtconvert_altivec.c
View file @
6ce93757
...
...
@@ -52,7 +52,7 @@ static void int32_to_float_fmul_scalar_altivec(float *dst, const int32_t *src,
}
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_fmt_convert_init_ppc
(
FmtConvertContext
*
c
,
AVCodecContext
*
avctx
)
...
...
@@ -62,5 +62,5 @@ av_cold void ff_fmt_convert_init_ppc(FmtConvertContext *c,
return
;
c
->
int32_to_float_fmul_scalar
=
int32_to_float_fmul_scalar_altivec
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/h264chroma_init.c
View file @
6ce93757
...
...
@@ -46,7 +46,7 @@
#undef OP_U8_ALTIVEC
#undef PREFIX_h264_chroma_mc8_altivec
#undef PREFIX_h264_chroma_mc8_num
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_h264chroma_init_ppc
(
H264ChromaContext
*
c
,
int
bit_depth
)
{
...
...
@@ -60,5 +60,5 @@ av_cold void ff_h264chroma_init_ppc(H264ChromaContext *c, int bit_depth)
c
->
put_h264_chroma_pixels_tab
[
0
]
=
put_h264_chroma_mc8_altivec
;
c
->
avg_h264_chroma_pixels_tab
[
0
]
=
avg_h264_chroma_mc8_altivec
;
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/h264dsp.c
View file @
6ce93757
...
...
@@ -746,7 +746,7 @@ static void biweight_h264_pixels ## W ## _altivec(uint8_t *dst, uint8_t *src, in
H264_WEIGHT
(
16
)
H264_WEIGHT
(
8
)
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_h264dsp_init_ppc
(
H264DSPContext
*
c
,
const
int
bit_depth
,
const
int
chroma_format_idc
)
...
...
@@ -773,5 +773,5 @@ av_cold void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth,
c
->
biweight_h264_pixels_tab
[
0
]
=
biweight_h264_pixels16_altivec
;
c
->
biweight_h264_pixels_tab
[
1
]
=
biweight_h264_pixels8_altivec
;
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/h264qpel.c
View file @
6ce93757
...
...
@@ -282,7 +282,7 @@ static inline void avg_pixels16_l2_altivec( uint8_t * dst, const uint8_t * src1,
H264_MC
(
put_
,
16
,
altivec
)
H264_MC
(
avg_
,
16
,
altivec
)
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_h264qpel_init_ppc
(
H264QpelContext
*
c
,
int
bit_depth
)
{
...
...
@@ -315,5 +315,5 @@ av_cold void ff_h264qpel_init_ppc(H264QpelContext *c, int bit_depth)
dspfunc
(
avg_h264_qpel
,
0
,
16
);
#undef dspfunc
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/h264qpel_template.c
View file @
6ce93757
...
...
@@ -167,7 +167,7 @@ static void PREFIX_h264_qpel16_h_lowpass_altivec(uint8_t *dst,
dst
+=
dstStride
;
}
}
#endif
#endif
/* PREFIX_h264_qpel16_h_lowpass_altivec */
/* this code assume stride % 16 == 0 */
#ifdef PREFIX_h264_qpel16_v_lowpass_altivec
...
...
@@ -277,7 +277,7 @@ static void PREFIX_h264_qpel16_v_lowpass_altivec(uint8_t *dst,
dst
+=
dstStride
;
}
}
#endif
#endif
/* PREFIX_h264_qpel16_v_lowpass_altivec */
/* this code assume stride % 16 == 0 *and* tmp is properly aligned */
#ifdef PREFIX_h264_qpel16_hv_lowpass_altivec
...
...
@@ -514,4 +514,4 @@ static void PREFIX_h264_qpel16_hv_lowpass_altivec(uint8_t *dst, int16_t *tmp,
dst
+=
dstStride
;
}
}
#endif
#endif
/* PREFIX_h264_qpel16_hv_lowpass_altivec */
libavcodec/ppc/hpeldsp_altivec.c
View file @
6ce93757
...
...
@@ -445,7 +445,7 @@ static void avg_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdi
pixels
+=
line_size
;
}
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_hpeldsp_init_ppc
(
HpelDSPContext
*
c
,
int
flags
)
{
...
...
@@ -464,5 +464,5 @@ av_cold void ff_hpeldsp_init_ppc(HpelDSPContext *c, int flags)
c
->
put_no_rnd_pixels_tab
[
0
][
0
]
=
ff_put_pixels16_altivec
;
c
->
put_no_rnd_pixels_tab
[
1
][
3
]
=
put_no_rnd_pixels8_xy2_altivec
;
c
->
put_no_rnd_pixels_tab
[
0
][
3
]
=
put_no_rnd_pixels16_xy2_altivec
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/huffyuvdsp_altivec.c
View file @
6ce93757
...
...
@@ -49,7 +49,7 @@ static void add_bytes_altivec(uint8_t *dst, uint8_t *src, int w)
for
(;
i
<
w
;
i
++
)
dst
[
i
]
=
src
[
i
];
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_huffyuvdsp_init_ppc
(
HuffYUVDSPContext
*
c
)
{
...
...
@@ -58,5 +58,5 @@ av_cold void ff_huffyuvdsp_init_ppc(HuffYUVDSPContext *c)
return
;
c
->
add_bytes
=
add_bytes_altivec
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/idctdsp.c
View file @
6ce93757
...
...
@@ -225,7 +225,7 @@ static void idct_add_altivec(uint8_t *dest, int stride, int16_t *blk)
ADD
(
dest
,
vx7
,
perm1
);
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_idctdsp_init_ppc
(
IDCTDSPContext
*
c
,
AVCodecContext
*
avctx
,
unsigned
high_bit_depth
)
...
...
@@ -242,5 +242,5 @@ av_cold void ff_idctdsp_init_ppc(IDCTDSPContext *c, AVCodecContext *avctx,
c
->
perm_type
=
FF_IDCT_PERM_TRANSPOSE
;
}
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/me_cmp.c
View file @
6ce93757
...
...
@@ -742,7 +742,7 @@ static int hadamard8_diff16_altivec(MpegEncContext *s, uint8_t *dst,
}
return
score
;
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_me_cmp_init_ppc
(
MECmpContext
*
c
,
AVCodecContext
*
avctx
)
{
...
...
@@ -763,5 +763,5 @@ av_cold void ff_me_cmp_init_ppc(MECmpContext *c, AVCodecContext *avctx)
c
->
hadamard8_diff
[
0
]
=
hadamard8_diff16_altivec
;
c
->
hadamard8_diff
[
1
]
=
hadamard8_diff8x8_altivec
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/mpegaudiodsp_altivec.c
View file @
6ce93757
...
...
@@ -128,7 +128,7 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out,
*
out
=
sum
;
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_mpadsp_init_ppc
(
MPADSPContext
*
s
)
{
...
...
@@ -137,5 +137,5 @@ av_cold void ff_mpadsp_init_ppc(MPADSPContext *s)
return
;
s
->
apply_window_float
=
apply_window_mp3
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/mpegvideo_altivec.c
View file @
6ce93757
...
...
@@ -113,7 +113,7 @@ static void dct_unquantize_h263_altivec(MpegEncContext *s,
}
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_mpv_common_init_ppc
(
MpegEncContext
*
s
)
{
...
...
@@ -126,5 +126,5 @@ av_cold void ff_mpv_common_init_ppc(MpegEncContext *s)
s
->
dct_unquantize_h263_intra
=
dct_unquantize_h263_altivec
;
s
->
dct_unquantize_h263_inter
=
dct_unquantize_h263_altivec
;
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/mpegvideodsp.c
View file @
6ce93757
...
...
@@ -123,11 +123,11 @@ static void gmc1_altivec(uint8_t *dst /* align 8 */, uint8_t *src /* align1 */,
src
+=
stride
;
}
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_mpegvideodsp_init_ppc
(
MpegVideoDSPContext
*
c
)
{
#if HAVE_ALTIVEC && HAVE_BIGENDIAN
c
->
gmc1
=
gmc1_altivec
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/mpegvideoencdsp.c
View file @
6ce93757
...
...
@@ -88,7 +88,7 @@ static int pix_sum_altivec(uint8_t *pix, int line_size)
return
s
;
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_mpegvideoencdsp_init_ppc
(
MpegvideoEncDSPContext
*
c
,
AVCodecContext
*
avctx
)
...
...
@@ -99,5 +99,5 @@ av_cold void ff_mpegvideoencdsp_init_ppc(MpegvideoEncDSPContext *c,
c
->
pix_norm1
=
pix_norm1_altivec
;
c
->
pix_sum
=
pix_sum_altivec
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/pixblockdsp.c
View file @
6ce93757
...
...
@@ -131,7 +131,7 @@ static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1,
}
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
#if HAVE_VSX
static
void
get_pixels_vsx
(
int16_t
*
restrict
block
,
const
uint8_t
*
pixels
,
...
...
@@ -180,7 +180,7 @@ av_cold void ff_pixblockdsp_init_ppc(PixblockDSPContext *c,
if
(
!
high_bit_depth
)
{
c
->
get_pixels
=
get_pixels_altivec
;
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
#if HAVE_VSX
if
(
!
PPC_VSX
(
av_get_cpu_flags
()))
...
...
libavcodec/ppc/svq1enc_altivec.c
View file @
6ce93757
...
...
@@ -72,7 +72,7 @@ static int ssd_int8_vs_int16_altivec(const int8_t *pix1, const int16_t *pix2,
return
u
.
score
[
3
];
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_svq1enc_init_ppc
(
SVQ1EncContext
*
c
)
{
...
...
@@ -81,5 +81,5 @@ av_cold void ff_svq1enc_init_ppc(SVQ1EncContext *c)
return
;
c
->
ssd_int8_vs_int16
=
ssd_int8_vs_int16_altivec
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/vc1dsp_altivec.c
View file @
6ce93757
...
...
@@ -340,7 +340,7 @@ static void vc1_inv_trans_8x4_altivec(uint8_t *dest, int stride, int16_t *block)
#undef OP_U8_ALTIVEC
#undef PREFIX_no_rnd_vc1_chroma_mc8_altivec
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_vc1dsp_init_ppc
(
VC1DSPContext
*
dsp
)
{
...
...
@@ -352,5 +352,5 @@ av_cold void ff_vc1dsp_init_ppc(VC1DSPContext *dsp)
dsp
->
vc1_inv_trans_8x4
=
vc1_inv_trans_8x4_altivec
;
dsp
->
put_no_rnd_vc1_chroma_pixels_tab
[
0
]
=
put_no_rnd_vc1_chroma_mc8_altivec
;
dsp
->
avg_no_rnd_vc1_chroma_pixels_tab
[
0
]
=
avg_no_rnd_vc1_chroma_mc8_altivec
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/vorbisdsp_altivec.c
View file @
6ce93757
...
...
@@ -50,7 +50,7 @@ static void vorbis_inverse_coupling_altivec(float *mag, float *ang,
vec_stl
(
m
,
0
,
mag
+
i
);
}
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_vorbisdsp_init_ppc
(
VorbisDSPContext
*
c
)
{
...
...
@@ -59,5 +59,5 @@ av_cold void ff_vorbisdsp_init_ppc(VorbisDSPContext *c)
return
;
c
->
vorbis_inverse_coupling
=
vorbis_inverse_coupling_altivec
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
libavcodec/ppc/vp3dsp_altivec.c
View file @
6ce93757
...
...
@@ -175,7 +175,7 @@ static void vp3_idct_add_altivec(uint8_t *dst, ptrdiff_t stride, int16_t block[6
memset
(
block
,
0
,
sizeof
(
*
block
)
*
64
);
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
av_cold
void
ff_vp3dsp_init_ppc
(
VP3DSPContext
*
c
,
int
flags
)
{
...
...
@@ -185,5 +185,5 @@ av_cold void ff_vp3dsp_init_ppc(VP3DSPContext *c, int flags)
c
->
idct_put
=
vp3_idct_put_altivec
;
c
->
idct_add
=
vp3_idct_add_altivec
;
#endif
#endif
/* HAVE_ALTIVEC && HAVE_BIGENDIAN */
}
libavcodec/ppc/vp8dsp_altivec.c
View file @
6ce93757
...
...
@@ -310,8 +310,7 @@ static void put_vp8_pixels16_altivec(uint8_t *dst, ptrdiff_t dstride, uint8_t *s
}
}
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC && HAVE_BIGENDIAN */
av_cold
void
ff_vp78dsp_init_ppc
(
VP8DSPContext
*
c
)
{
...
...
@@ -343,5 +342,5 @@ av_cold void ff_vp78dsp_init_ppc(VP8DSPContext *c)
c
->
put_vp8_epel_pixels_tab
[
2
][
1
][
1
]
=
put_vp8_epel4_h4v4_altivec
;
c
->
put_vp8_epel_pixels_tab
[
2
][
1
][
2
]
=
put_vp8_epel4_h6v4_altivec
;
c
->
put_vp8_epel_pixels_tab
[
2
][
2
][
1
]
=
put_vp8_epel4_h4v6_altivec
;
#endif
/* HAVE_ALTIVEC */
#endif
/* HAVE_ALTIVEC
&& HAVE_BIGENDIAN
*/
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment