Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
f2e9d44a
Commit
f2e9d44a
authored
Apr 20, 2013
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x86: Drop unnecessary ff_ name prefixes from static functions
parent
383fd4d4
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
60 additions
and
53 deletions
+60
-53
cavsdsp.c
libavcodec/x86/cavsdsp.c
+17
-15
h264_qpel.c
libavcodec/x86/h264_qpel.c
+7
-2
h264dsp_init.c
libavcodec/x86/h264dsp_init.c
+6
-6
hpeldsp_avg_template.c
libavcodec/x86/hpeldsp_avg_template.c
+16
-16
hpeldsp_init.c
libavcodec/x86/hpeldsp_init.c
+14
-14
No files found.
libavcodec/x86/cavsdsp.c
View file @
f2e9d44a
...
...
@@ -413,22 +413,22 @@ static void OPNAME ## cavs_qpel16_h_ ## MMX(uint8_t *dst, uint8_t *src, int dstS
}\
#define CAVS_MC(OPNAME, SIZE, MMX) \
static void
ff_ ##
OPNAME ## cavs_qpel ## SIZE ## _mc20_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
static void OPNAME ## cavs_qpel ## SIZE ## _mc20_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
{\
OPNAME ## cavs_qpel ## SIZE ## _h_ ## MMX(dst, src, stride, stride);\
}\
\
static void
ff_ ##
OPNAME ## cavs_qpel ## SIZE ## _mc01_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
static void OPNAME ## cavs_qpel ## SIZE ## _mc01_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
{\
OPNAME ## cavs_qpel ## SIZE ## _v1_ ## MMX(dst, src, stride, stride);\
}\
\
static void
ff_ ##
OPNAME ## cavs_qpel ## SIZE ## _mc02_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
static void OPNAME ## cavs_qpel ## SIZE ## _mc02_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
{\
OPNAME ## cavs_qpel ## SIZE ## _v2_ ## MMX(dst, src, stride, stride);\
}\
\
static void
ff_ ##
OPNAME ## cavs_qpel ## SIZE ## _mc03_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
static void OPNAME ## cavs_qpel ## SIZE ## _mc03_ ## MMX(uint8_t *dst, uint8_t *src, ptrdiff_t stride)\
{\
OPNAME ## cavs_qpel ## SIZE ## _v3_ ## MMX(dst, src, stride, stride);\
}\
...
...
@@ -460,10 +460,10 @@ static av_cold void cavsdsp_init_mmx(CAVSDSPContext *c,
#endif
/* HAVE_MMX_INLINE */
#define DSPFUNC(PFX, IDX, NUM, EXT) \
c->PFX ## _cavs_qpel_pixels_tab[IDX][ 2] =
ff_ ##
PFX ## _cavs_qpel ## NUM ## _mc20_ ## EXT; \
c->PFX ## _cavs_qpel_pixels_tab[IDX][ 4] =
ff_ ##
PFX ## _cavs_qpel ## NUM ## _mc01_ ## EXT; \
c->PFX ## _cavs_qpel_pixels_tab[IDX][ 8] =
ff_ ##
PFX ## _cavs_qpel ## NUM ## _mc02_ ## EXT; \
c->PFX ## _cavs_qpel_pixels_tab[IDX][12] =
ff_ ##
PFX ## _cavs_qpel ## NUM ## _mc03_ ## EXT; \
c->PFX ## _cavs_qpel_pixels_tab[IDX][ 2] = PFX ## _cavs_qpel ## NUM ## _mc20_ ## EXT; \
c->PFX ## _cavs_qpel_pixels_tab[IDX][ 4] = PFX ## _cavs_qpel ## NUM ## _mc01_ ## EXT; \
c->PFX ## _cavs_qpel_pixels_tab[IDX][ 8] = PFX ## _cavs_qpel ## NUM ## _mc02_ ## EXT; \
c->PFX ## _cavs_qpel_pixels_tab[IDX][12] = PFX ## _cavs_qpel ## NUM ## _mc03_ ## EXT; \
#if HAVE_MMXEXT_INLINE
QPEL_CAVS
(
put_
,
PUT_OP
,
mmxext
)
...
...
@@ -474,7 +474,7 @@ CAVS_MC(put_, 16, mmxext)
CAVS_MC
(
avg_
,
8
,
mmxext
)
CAVS_MC
(
avg_
,
16
,
mmxext
)
static
av_cold
void
ff_
cavsdsp_init_mmxext
(
CAVSDSPContext
*
c
,
static
av_cold
void
cavsdsp_init_mmxext
(
CAVSDSPContext
*
c
,
AVCodecContext
*
avctx
)
{
DSPFUNC
(
put
,
0
,
16
,
mmxext
);
...
...
@@ -493,7 +493,7 @@ CAVS_MC(put_, 16,3dnow)
CAVS_MC
(
avg_
,
8
,
3
dnow
)
CAVS_MC
(
avg_
,
16
,
3
dnow
)
static
av_cold
void
ff_
cavsdsp_init_3dnow
(
CAVSDSPContext
*
c
,
static
av_cold
void
cavsdsp_init_3dnow
(
CAVSDSPContext
*
c
,
AVCodecContext
*
avctx
)
{
DSPFUNC
(
put
,
0
,
16
,
3
dnow
);
...
...
@@ -512,9 +512,11 @@ av_cold void ff_cavsdsp_init_x86(CAVSDSPContext *c, AVCodecContext *avctx)
cavsdsp_init_mmx
(
c
,
avctx
);
#endif
/* HAVE_MMX_INLINE */
#if HAVE_MMXEXT_INLINE
if
(
mm_flags
&
AV_CPU_FLAG_MMXEXT
)
ff_cavsdsp_init_mmxext
(
c
,
avctx
);
if
(
mm_flags
&
AV_CPU_FLAG_MMXEXT
)
cavsdsp_init_mmxext
(
c
,
avctx
);
#endif
/* HAVE_MMXEXT_INLINE */
#if HAVE_AMD3DNOW_INLINE
if
(
mm_flags
&
AV_CPU_FLAG_3DNOW
)
ff_cavsdsp_init_3dnow
(
c
,
avctx
);
if
(
mm_flags
&
AV_CPU_FLAG_3DNOW
)
cavsdsp_init_3dnow
(
c
,
avctx
);
#endif
/* HAVE_AMD3DNOW_INLINE */
}
libavcodec/x86/h264_qpel.c
View file @
f2e9d44a
...
...
@@ -206,7 +206,12 @@ static av_always_inline void ff_ ## OPNAME ## h264_qpel16_v_lowpass_ ## MMX(uint
ff_ ## OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(dst+8, src+8, dstStride, srcStride, 16);\
}
static
av_always_inline
void
ff_put_h264_qpel8or16_hv1_lowpass_sse2
(
int16_t
*
tmp
,
uint8_t
*
src
,
int
tmpStride
,
int
srcStride
,
int
size
){
static
av_always_inline
void
put_h264_qpel8or16_hv1_lowpass_sse2
(
int16_t
*
tmp
,
uint8_t
*
src
,
int
tmpStride
,
int
srcStride
,
int
size
)
{
int
w
=
(
size
+
8
)
>>
3
;
src
-=
2
*
srcStride
+
2
;
while
(
w
--
){
...
...
@@ -218,7 +223,7 @@ static av_always_inline void ff_put_h264_qpel8or16_hv1_lowpass_sse2(int16_t *tmp
#define QPEL_H264_HV_XMM(OPNAME, OP, MMX)\
static av_always_inline void ff_ ## OPNAME ## h264_qpel8or16_hv_lowpass_ ## MMX(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride, int size){\
ff_
put_h264_qpel8or16_hv1_lowpass_sse2(tmp, src, tmpStride, srcStride, size);\
put_h264_qpel8or16_hv1_lowpass_sse2(tmp, src, tmpStride, srcStride, size);\
ff_ ## OPNAME ## h264_qpel8or16_hv2_lowpass_ ## MMX(dst, tmp, dstStride, tmpStride, size);\
}\
static av_always_inline void ff_ ## OPNAME ## h264_qpel8_hv_lowpass_ ## MMX(uint8_t *dst, int16_t *tmp, uint8_t *src, int dstStride, int tmpStride, int srcStride){\
...
...
libavcodec/x86/h264dsp_init.c
View file @
f2e9d44a
...
...
@@ -132,7 +132,7 @@ LF_FUNCS(uint16_t, 10)
#if ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL
LF_FUNC
(
v8
,
luma
,
8
,
mmxext
)
static
void
ff_
deblock_v_luma_8_mmxext
(
uint8_t
*
pix
,
int
stride
,
int
alpha
,
static
void
deblock_v_luma_8_mmxext
(
uint8_t
*
pix
,
int
stride
,
int
alpha
,
int
beta
,
int8_t
*
tc0
)
{
if
((
tc0
[
0
]
&
tc0
[
1
])
>=
0
)
...
...
@@ -141,7 +141,7 @@ static void ff_deblock_v_luma_8_mmxext(uint8_t *pix, int stride, int alpha,
ff_deblock_v8_luma_8_mmxext
(
pix
+
8
,
stride
,
alpha
,
beta
,
tc0
+
2
);
}
LF_IFUNC
(
v8
,
luma_intra
,
8
,
mmxext
)
static
void
ff_
deblock_v_luma_intra_8_mmxext
(
uint8_t
*
pix
,
int
stride
,
static
void
deblock_v_luma_intra_8_mmxext
(
uint8_t
*
pix
,
int
stride
,
int
alpha
,
int
beta
)
{
ff_deblock_v8_luma_intra_8_mmxext
(
pix
+
0
,
stride
,
alpha
,
beta
);
...
...
@@ -247,9 +247,9 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
c
->
h264_h_loop_filter_chroma_intra
=
ff_deblock_h_chroma_intra_8_mmxext
;
}
#if ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL
c
->
h264_v_loop_filter_luma
=
ff_
deblock_v_luma_8_mmxext
;
c
->
h264_v_loop_filter_luma
=
deblock_v_luma_8_mmxext
;
c
->
h264_h_loop_filter_luma
=
ff_deblock_h_luma_8_mmxext
;
c
->
h264_v_loop_filter_luma_intra
=
ff_
deblock_v_luma_intra_8_mmxext
;
c
->
h264_v_loop_filter_luma_intra
=
deblock_v_luma_intra_8_mmxext
;
c
->
h264_h_loop_filter_luma_intra
=
ff_deblock_h_luma_intra_8_mmxext
;
#endif
/* ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL */
c
->
weight_h264_pixels_tab
[
0
]
=
ff_h264_weight_16_mmxext
;
...
...
libavcodec/x86/hpeldsp_avg_template.c
View file @
f2e9d44a
...
...
@@ -25,7 +25,7 @@
*/
//FIXME the following could be optimized too ...
static
void
DEF
(
ff_
put_no_rnd_pixels16_x2
)(
uint8_t
*
block
,
static
void
DEF
(
put_no_rnd_pixels16_x2
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
ptrdiff_t
line_size
,
int
h
)
{
...
...
@@ -33,14 +33,14 @@ static void DEF(ff_put_no_rnd_pixels16_x2)(uint8_t *block,
DEF
(
ff_put_no_rnd_pixels8_x2
)(
block
+
8
,
pixels
+
8
,
line_size
,
h
);
}
static
void
DEF
(
ff_
put_pixels16_y2
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
static
void
DEF
(
put_pixels16_y2
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
ptrdiff_t
line_size
,
int
h
)
{
DEF
(
ff_put_pixels8_y2
)(
block
,
pixels
,
line_size
,
h
);
DEF
(
ff_put_pixels8_y2
)(
block
+
8
,
pixels
+
8
,
line_size
,
h
);
}
static
void
DEF
(
ff_
put_no_rnd_pixels16_y2
)(
uint8_t
*
block
,
static
void
DEF
(
put_no_rnd_pixels16_y2
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
ptrdiff_t
line_size
,
int
h
)
{
...
...
@@ -48,28 +48,28 @@ static void DEF(ff_put_no_rnd_pixels16_y2)(uint8_t *block,
DEF
(
ff_put_no_rnd_pixels8_y2
)(
block
+
8
,
pixels
+
8
,
line_size
,
h
);
}
static
void
DEF
(
ff_
avg_pixels16
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
static
void
DEF
(
avg_pixels16
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
ptrdiff_t
line_size
,
int
h
)
{
DEF
(
ff_avg_pixels8
)(
block
,
pixels
,
line_size
,
h
);
DEF
(
ff_avg_pixels8
)(
block
+
8
,
pixels
+
8
,
line_size
,
h
);
}
static
void
DEF
(
ff_
avg_pixels16_x2
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
static
void
DEF
(
avg_pixels16_x2
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
ptrdiff_t
line_size
,
int
h
)
{
DEF
(
ff_avg_pixels8_x2
)(
block
,
pixels
,
line_size
,
h
);
DEF
(
ff_avg_pixels8_x2
)(
block
+
8
,
pixels
+
8
,
line_size
,
h
);
}
static
void
DEF
(
ff_
avg_pixels16_y2
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
static
void
DEF
(
avg_pixels16_y2
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
ptrdiff_t
line_size
,
int
h
)
{
DEF
(
ff_avg_pixels8_y2
)(
block
,
pixels
,
line_size
,
h
);
DEF
(
ff_avg_pixels8_y2
)(
block
+
8
,
pixels
+
8
,
line_size
,
h
);
}
static
void
DEF
(
ff_
avg_pixels16_xy2
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
static
void
DEF
(
avg_pixels16_xy2
)(
uint8_t
*
block
,
const
uint8_t
*
pixels
,
ptrdiff_t
line_size
,
int
h
)
{
DEF
(
ff_avg_pixels8_xy2
)(
block
,
pixels
,
line_size
,
h
);
...
...
libavcodec/x86/hpeldsp_init.c
View file @
f2e9d44a
...
...
@@ -226,11 +226,11 @@ static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags, int mm_flags)
{
#if HAVE_YASM
c
->
put_pixels_tab
[
0
][
1
]
=
ff_put_pixels16_x2_mmxext
;
c
->
put_pixels_tab
[
0
][
2
]
=
ff_
put_pixels16_y2_mmxext
;
c
->
put_pixels_tab
[
0
][
2
]
=
put_pixels16_y2_mmxext
;
c
->
avg_pixels_tab
[
0
][
0
]
=
ff_
avg_pixels16_mmxext
;
c
->
avg_pixels_tab
[
0
][
1
]
=
ff_
avg_pixels16_x2_mmxext
;
c
->
avg_pixels_tab
[
0
][
2
]
=
ff_
avg_pixels16_y2_mmxext
;
c
->
avg_pixels_tab
[
0
][
0
]
=
avg_pixels16_mmxext
;
c
->
avg_pixels_tab
[
0
][
1
]
=
avg_pixels16_x2_mmxext
;
c
->
avg_pixels_tab
[
0
][
2
]
=
avg_pixels16_y2_mmxext
;
c
->
put_pixels_tab
[
1
][
1
]
=
ff_put_pixels8_x2_mmxext
;
c
->
put_pixels_tab
[
1
][
2
]
=
ff_put_pixels8_y2_mmxext
;
...
...
@@ -240,12 +240,12 @@ static void hpeldsp_init_mmxext(HpelDSPContext *c, int flags, int mm_flags)
c
->
avg_pixels_tab
[
1
][
2
]
=
ff_avg_pixels8_y2_mmxext
;
if
(
!
(
flags
&
CODEC_FLAG_BITEXACT
))
{
c
->
put_no_rnd_pixels_tab
[
0
][
1
]
=
ff_
put_no_rnd_pixels16_x2_mmxext
;
c
->
put_no_rnd_pixels_tab
[
0
][
2
]
=
ff_
put_no_rnd_pixels16_y2_mmxext
;
c
->
put_no_rnd_pixels_tab
[
0
][
1
]
=
put_no_rnd_pixels16_x2_mmxext
;
c
->
put_no_rnd_pixels_tab
[
0
][
2
]
=
put_no_rnd_pixels16_y2_mmxext
;
c
->
put_no_rnd_pixels_tab
[
1
][
1
]
=
ff_put_no_rnd_pixels8_x2_mmxext
;
c
->
put_no_rnd_pixels_tab
[
1
][
2
]
=
ff_put_no_rnd_pixels8_y2_mmxext
;
c
->
avg_pixels_tab
[
0
][
3
]
=
ff_
avg_pixels16_xy2_mmxext
;
c
->
avg_pixels_tab
[
0
][
3
]
=
avg_pixels16_xy2_mmxext
;
c
->
avg_pixels_tab
[
1
][
3
]
=
ff_avg_pixels8_xy2_mmxext
;
}
...
...
@@ -260,11 +260,11 @@ static void hpeldsp_init_3dnow(HpelDSPContext *c, int flags, int mm_flags)
{
#if HAVE_YASM
c
->
put_pixels_tab
[
0
][
1
]
=
ff_put_pixels16_x2_3dnow
;
c
->
put_pixels_tab
[
0
][
2
]
=
ff_
put_pixels16_y2_3dnow
;
c
->
put_pixels_tab
[
0
][
2
]
=
put_pixels16_y2_3dnow
;
c
->
avg_pixels_tab
[
0
][
0
]
=
ff_
avg_pixels16_3dnow
;
c
->
avg_pixels_tab
[
0
][
1
]
=
ff_
avg_pixels16_x2_3dnow
;
c
->
avg_pixels_tab
[
0
][
2
]
=
ff_
avg_pixels16_y2_3dnow
;
c
->
avg_pixels_tab
[
0
][
0
]
=
avg_pixels16_3dnow
;
c
->
avg_pixels_tab
[
0
][
1
]
=
avg_pixels16_x2_3dnow
;
c
->
avg_pixels_tab
[
0
][
2
]
=
avg_pixels16_y2_3dnow
;
c
->
put_pixels_tab
[
1
][
1
]
=
ff_put_pixels8_x2_3dnow
;
c
->
put_pixels_tab
[
1
][
2
]
=
ff_put_pixels8_y2_3dnow
;
...
...
@@ -274,12 +274,12 @@ static void hpeldsp_init_3dnow(HpelDSPContext *c, int flags, int mm_flags)
c
->
avg_pixels_tab
[
1
][
2
]
=
ff_avg_pixels8_y2_3dnow
;
if
(
!
(
flags
&
CODEC_FLAG_BITEXACT
)){
c
->
put_no_rnd_pixels_tab
[
0
][
1
]
=
ff_
put_no_rnd_pixels16_x2_3dnow
;
c
->
put_no_rnd_pixels_tab
[
0
][
2
]
=
ff_
put_no_rnd_pixels16_y2_3dnow
;
c
->
put_no_rnd_pixels_tab
[
0
][
1
]
=
put_no_rnd_pixels16_x2_3dnow
;
c
->
put_no_rnd_pixels_tab
[
0
][
2
]
=
put_no_rnd_pixels16_y2_3dnow
;
c
->
put_no_rnd_pixels_tab
[
1
][
1
]
=
ff_put_no_rnd_pixels8_x2_3dnow
;
c
->
put_no_rnd_pixels_tab
[
1
][
2
]
=
ff_put_no_rnd_pixels8_y2_3dnow
;
c
->
avg_pixels_tab
[
0
][
3
]
=
ff_
avg_pixels16_xy2_3dnow
;
c
->
avg_pixels_tab
[
0
][
3
]
=
avg_pixels16_xy2_3dnow
;
c
->
avg_pixels_tab
[
1
][
3
]
=
ff_avg_pixels8_xy2_3dnow
;
}
...
...
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