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
c16bfb14
Commit
c16bfb14
authored
Nov 21, 2013
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swscale: x86: Consistently use lowercase function name suffixes
parent
56c23370
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
24 deletions
+30
-24
rgb2rgb.c
libswscale/x86/rgb2rgb.c
+8
-8
swscale.c
libswscale/x86/swscale.c
+4
-4
yuv2rgb.c
libswscale/x86/yuv2rgb.c
+18
-12
No files found.
libswscale/x86/rgb2rgb.c
View file @
c16bfb14
...
...
@@ -92,21 +92,21 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL;
//MMX versions
#undef RENAME
#define RENAME(a) a ## _
MMX
#define RENAME(a) a ## _
mmx
#include "rgb2rgb_template.c"
// MMXEXT versions
#undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT
#define COMPILE_TEMPLATE_MMXEXT 1
#define RENAME(a) a ## _
MMXEXT
#define RENAME(a) a ## _
mmxext
#include "rgb2rgb_template.c"
//SSE2 versions
#undef RENAME
#undef COMPILE_TEMPLATE_SSE2
#define COMPILE_TEMPLATE_SSE2 1
#define RENAME(a) a ## _
SSE
2
#define RENAME(a) a ## _
sse
2
#include "rgb2rgb_template.c"
//3DNOW versions
...
...
@@ -117,7 +117,7 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL;
#define COMPILE_TEMPLATE_MMXEXT 0
#define COMPILE_TEMPLATE_SSE2 0
#define COMPILE_TEMPLATE_AMD3DNOW 1
#define RENAME(a) a ## _3
DNOW
#define RENAME(a) a ## _3
dnow
#include "rgb2rgb_template.c"
/*
...
...
@@ -135,12 +135,12 @@ av_cold void rgb2rgb_init_x86(void)
int
cpu_flags
=
av_get_cpu_flags
();
if
(
INLINE_MMX
(
cpu_flags
))
rgb2rgb_init_
MMX
();
rgb2rgb_init_
mmx
();
if
(
INLINE_AMD3DNOW
(
cpu_flags
))
rgb2rgb_init_3
DNOW
();
rgb2rgb_init_3
dnow
();
if
(
INLINE_MMXEXT
(
cpu_flags
))
rgb2rgb_init_
MMXEXT
();
rgb2rgb_init_
mmxext
();
if
(
INLINE_SSE2
(
cpu_flags
))
rgb2rgb_init_
SSE
2
();
rgb2rgb_init_
sse
2
();
#endif
/* HAVE_INLINE_ASM */
}
libswscale/x86/swscale.c
View file @
c16bfb14
...
...
@@ -74,7 +74,7 @@ DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL;
#if HAVE_MMX_INLINE
#undef RENAME
#define COMPILE_TEMPLATE_MMXEXT 0
#define RENAME(a) a ## _
MMX
#define RENAME(a) a ## _
mmx
#include "swscale_template.c"
#endif
...
...
@@ -83,7 +83,7 @@ DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL;
#undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT
#define COMPILE_TEMPLATE_MMXEXT 1
#define RENAME(a) a ## _
MMXEXT
#define RENAME(a) a ## _
mmxext
#include "swscale_template.c"
#endif
...
...
@@ -308,11 +308,11 @@ av_cold void ff_sws_init_swscale_x86(SwsContext *c)
#if HAVE_MMX_INLINE
if
(
cpu_flags
&
AV_CPU_FLAG_MMX
)
sws_init_swscale_
MMX
(
c
);
sws_init_swscale_
mmx
(
c
);
#endif
#if HAVE_MMXEXT_INLINE
if
(
cpu_flags
&
AV_CPU_FLAG_MMXEXT
)
sws_init_swscale_
MMXEXT
(
c
);
sws_init_swscale_
mmxext
(
c
);
#endif
#define ASSIGN_SCALE_FUNC2(hscalefn, filtersize, opt1, opt2) do { \
...
...
libswscale/x86/yuv2rgb.c
View file @
c16bfb14
...
...
@@ -54,7 +54,7 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL;
#undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT
#define COMPILE_TEMPLATE_MMXEXT 0
#define RENAME(a) a ## _
MMX
#define RENAME(a) a ## _
mmx
#include "yuv2rgb_template.c"
#endif
/* HAVE_MMX_INLINE */
...
...
@@ -63,7 +63,7 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL;
#undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT
#define COMPILE_TEMPLATE_MMXEXT 1
#define RENAME(a) a ## _
MMXEXT
#define RENAME(a) a ## _
mmxext
#include "yuv2rgb_template.c"
#endif
/* HAVE_MMXEXT_INLINE */
...
...
@@ -82,9 +82,9 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
if
(
cpu_flags
&
AV_CPU_FLAG_MMXEXT
)
{
switch
(
c
->
dstFormat
)
{
case
AV_PIX_FMT_RGB24
:
return
yuv420_rgb24_
MMXEXT
;
return
yuv420_rgb24_
mmxext
;
case
AV_PIX_FMT_BGR24
:
return
yuv420_bgr24_
MMXEXT
;
return
yuv420_bgr24_
mmxext
;
}
}
#endif
...
...
@@ -94,21 +94,27 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
case
AV_PIX_FMT_RGB32
:
if
(
c
->
srcFormat
==
AV_PIX_FMT_YUVA420P
)
{
#if HAVE_7REGS && CONFIG_SWSCALE_ALPHA
return
yuva420_rgb32_
MMX
;
return
yuva420_rgb32_
mmx
;
#endif
break
;
}
else
return
yuv420_rgb32_MMX
;
}
else
return
yuv420_rgb32_mmx
;
case
AV_PIX_FMT_BGR32
:
if
(
c
->
srcFormat
==
AV_PIX_FMT_YUVA420P
)
{
#if HAVE_7REGS && CONFIG_SWSCALE_ALPHA
return
yuva420_bgr32_
MMX
;
return
yuva420_bgr32_
mmx
;
#endif
break
;
}
else
return
yuv420_bgr32_MMX
;
case
AV_PIX_FMT_RGB24
:
return
yuv420_rgb24_MMX
;
case
AV_PIX_FMT_BGR24
:
return
yuv420_bgr24_MMX
;
case
AV_PIX_FMT_RGB565
:
return
yuv420_rgb16_MMX
;
case
AV_PIX_FMT_RGB555
:
return
yuv420_rgb15_MMX
;
}
else
return
yuv420_bgr32_mmx
;
case
AV_PIX_FMT_RGB24
:
return
yuv420_rgb24_mmx
;
case
AV_PIX_FMT_BGR24
:
return
yuv420_bgr24_mmx
;
case
AV_PIX_FMT_RGB565
:
return
yuv420_rgb16_mmx
;
case
AV_PIX_FMT_RGB555
:
return
yuv420_rgb15_mmx
;
}
}
#endif
/* HAVE_MMX_INLINE */
...
...
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