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
a5195839
Commit
a5195839
authored
Oct 12, 2012
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swscale: x86: Hide arch-specific initialization details
Also give consistent names to init functions.
parent
a64f6a04
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
19 additions
and
19 deletions
+19
-19
rgb2rgb.c
libswscale/rgb2rgb.c
+1
-1
swscale.c
libswscale/swscale.c
+2
-2
swscale_internal.h
libswscale/swscale_internal.h
+2
-2
Makefile
libswscale/x86/Makefile
+3
-3
swscale.c
libswscale/x86/swscale.c
+5
-5
swscale_template.c
libswscale/x86/swscale_template.c
+1
-1
yuv2rgb.c
libswscale/x86/yuv2rgb.c
+3
-3
yuv2rgb.c
libswscale/yuv2rgb.c
+2
-2
No files found.
libswscale/rgb2rgb.c
View file @
a5195839
...
@@ -129,7 +129,7 @@ void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
...
@@ -129,7 +129,7 @@ void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
av_cold
void
sws_rgb2rgb_init
(
void
)
av_cold
void
sws_rgb2rgb_init
(
void
)
{
{
rgb2rgb_init_c
();
rgb2rgb_init_c
();
if
(
HAVE_MMX
)
if
(
ARCH_X86
)
rgb2rgb_init_x86
();
rgb2rgb_init_x86
();
}
}
...
...
libswscale/swscale.c
View file @
a5195839
...
@@ -772,8 +772,8 @@ SwsFunc ff_getSwsFunc(SwsContext *c)
...
@@ -772,8 +772,8 @@ SwsFunc ff_getSwsFunc(SwsContext *c)
{
{
sws_init_swScale_c
(
c
);
sws_init_swScale_c
(
c
);
if
(
HAVE_MMX
)
if
(
ARCH_X86
)
ff_sws_init_sw
Scale_mmx
(
c
);
ff_sws_init_sw
scale_x86
(
c
);
if
(
HAVE_ALTIVEC
)
if
(
HAVE_ALTIVEC
)
ff_sws_init_swScale_altivec
(
c
);
ff_sws_init_swScale_altivec
(
c
);
...
...
libswscale/swscale_internal.h
View file @
a5195839
...
@@ -570,7 +570,7 @@ void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4],
...
@@ -570,7 +570,7 @@ void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4],
void
updateMMXDitherTables
(
SwsContext
*
c
,
int
dstY
,
int
lumBufIndex
,
int
chrBufIndex
,
void
updateMMXDitherTables
(
SwsContext
*
c
,
int
dstY
,
int
lumBufIndex
,
int
chrBufIndex
,
int
lastInLumBuf
,
int
lastInChrBuf
);
int
lastInLumBuf
,
int
lastInChrBuf
);
SwsFunc
ff_yuv2rgb_init_
mmx
(
SwsContext
*
c
);
SwsFunc
ff_yuv2rgb_init_
x86
(
SwsContext
*
c
);
SwsFunc
ff_yuv2rgb_init_vis
(
SwsContext
*
c
);
SwsFunc
ff_yuv2rgb_init_vis
(
SwsContext
*
c
);
SwsFunc
ff_yuv2rgb_init_altivec
(
SwsContext
*
c
);
SwsFunc
ff_yuv2rgb_init_altivec
(
SwsContext
*
c
);
SwsFunc
ff_yuv2rgb_get_func_ptr_bfin
(
SwsContext
*
c
);
SwsFunc
ff_yuv2rgb_get_func_ptr_bfin
(
SwsContext
*
c
);
...
@@ -754,6 +754,6 @@ void ff_sws_init_output_funcs(SwsContext *c,
...
@@ -754,6 +754,6 @@ void ff_sws_init_output_funcs(SwsContext *c,
yuv2packedX_fn
*
yuv2packedX
,
yuv2packedX_fn
*
yuv2packedX
,
yuv2anyX_fn
*
yuv2anyX
);
yuv2anyX_fn
*
yuv2anyX
);
void
ff_sws_init_swScale_altivec
(
SwsContext
*
c
);
void
ff_sws_init_swScale_altivec
(
SwsContext
*
c
);
void
ff_sws_init_sw
Scale_mmx
(
SwsContext
*
c
);
void
ff_sws_init_sw
scale_x86
(
SwsContext
*
c
);
#endif
/* SWSCALE_SWSCALE_INTERNAL_H */
#endif
/* SWSCALE_SWSCALE_INTERNAL_H */
libswscale/x86/Makefile
View file @
a5195839
OBJS-$(CONFIG_XMM_CLOBBER_TEST)
+=
x86/w64xmmtest.o
OBJS
+=
x86/rgb2rgb.o
\
MMX-OBJS
+=
x86/rgb2rgb.o
\
x86/swscale.o
\
x86/swscale.o
\
x86/yuv2rgb.o
\
x86/yuv2rgb.o
\
OBJS-$(CONFIG_XMM_CLOBBER_TEST)
+=
x86/w64xmmtest.o
YASM-OBJS
+=
x86/input.o
\
YASM-OBJS
+=
x86/input.o
\
x86/output.o
\
x86/output.o
\
x86/scale.o
\
x86/scale.o
\
libswscale/x86/swscale.c
View file @
a5195839
...
@@ -302,18 +302,18 @@ INPUT_FUNCS(sse2);
...
@@ -302,18 +302,18 @@ INPUT_FUNCS(sse2);
INPUT_FUNCS
(
ssse3
);
INPUT_FUNCS
(
ssse3
);
INPUT_FUNCS
(
avx
);
INPUT_FUNCS
(
avx
);
av_cold
void
ff_sws_init_sw
Scale_mmx
(
SwsContext
*
c
)
av_cold
void
ff_sws_init_sw
scale_x86
(
SwsContext
*
c
)
{
{
int
cpu_flags
=
av_get_cpu_flags
();
int
cpu_flags
=
av_get_cpu_flags
();
#if HAVE_
INLINE_ASM
#if HAVE_
MMX_INLINE
if
(
cpu_flags
&
AV_CPU_FLAG_MMX
)
if
(
cpu_flags
&
AV_CPU_FLAG_MMX
)
sws_init_swScale_MMX
(
c
);
sws_init_swscale_MMX
(
c
);
#endif
#if HAVE_MMXEXT_INLINE
#if HAVE_MMXEXT_INLINE
if
(
cpu_flags
&
AV_CPU_FLAG_MMXEXT
)
if
(
cpu_flags
&
AV_CPU_FLAG_MMXEXT
)
sws_init_sw
S
cale_MMXEXT
(
c
);
sws_init_sw
s
cale_MMXEXT
(
c
);
#endif
#endif
#endif
/* HAVE_INLINE_ASM */
#define ASSIGN_SCALE_FUNC2(hscalefn, filtersize, opt1, opt2) do { \
#define ASSIGN_SCALE_FUNC2(hscalefn, filtersize, opt1, opt2) do { \
if (c->srcBpc == 8) { \
if (c->srcBpc == 8) { \
...
...
libswscale/x86/swscale_template.c
View file @
a5195839
...
@@ -1555,7 +1555,7 @@ static void RENAME(hcscale_fast)(SwsContext *c, int16_t *dst1, int16_t *dst2,
...
@@ -1555,7 +1555,7 @@ static void RENAME(hcscale_fast)(SwsContext *c, int16_t *dst1, int16_t *dst2,
}
}
#endif
/* COMPILE_TEMPLATE_MMXEXT */
#endif
/* COMPILE_TEMPLATE_MMXEXT */
static
av_cold
void
RENAME
(
sws_init_sw
S
cale
)(
SwsContext
*
c
)
static
av_cold
void
RENAME
(
sws_init_sw
s
cale
)(
SwsContext
*
c
)
{
{
enum
AVPixelFormat
dstFormat
=
c
->
dstFormat
;
enum
AVPixelFormat
dstFormat
=
c
->
dstFormat
;
...
...
libswscale/x86/yuv2rgb.c
View file @
a5195839
...
@@ -69,9 +69,9 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL;
...
@@ -69,9 +69,9 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL;
#endif
/* HAVE_INLINE_ASM */
#endif
/* HAVE_INLINE_ASM */
av_cold
SwsFunc
ff_yuv2rgb_init_
mmx
(
SwsContext
*
c
)
av_cold
SwsFunc
ff_yuv2rgb_init_
x86
(
SwsContext
*
c
)
{
{
#if HAVE_
INLINE_ASM
#if HAVE_
MMX_INLINE
int
cpu_flags
=
av_get_cpu_flags
();
int
cpu_flags
=
av_get_cpu_flags
();
if
(
c
->
srcFormat
!=
AV_PIX_FMT_YUV420P
&&
if
(
c
->
srcFormat
!=
AV_PIX_FMT_YUV420P
&&
...
@@ -111,7 +111,7 @@ av_cold SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c)
...
@@ -111,7 +111,7 @@ av_cold SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c)
case
AV_PIX_FMT_RGB555
:
return
yuv420_rgb15_MMX
;
case
AV_PIX_FMT_RGB555
:
return
yuv420_rgb15_MMX
;
}
}
}
}
#endif
/* HAVE_
INLINE_ASM
*/
#endif
/* HAVE_
MMX_INLINE
*/
return
NULL
;
return
NULL
;
}
}
libswscale/yuv2rgb.c
View file @
a5195839
...
@@ -560,8 +560,8 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
...
@@ -560,8 +560,8 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
{
{
SwsFunc
t
=
NULL
;
SwsFunc
t
=
NULL
;
if
(
HAVE_MMX
)
if
(
ARCH_X86
)
t
=
ff_yuv2rgb_init_
mmx
(
c
);
t
=
ff_yuv2rgb_init_
x86
(
c
);
else
if
(
HAVE_VIS
)
else
if
(
HAVE_VIS
)
t
=
ff_yuv2rgb_init_vis
(
c
);
t
=
ff_yuv2rgb_init_vis
(
c
);
else
if
(
HAVE_ALTIVEC
)
else
if
(
HAVE_ALTIVEC
)
...
...
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