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
46bacb5c
Commit
46bacb5c
authored
Jan 13, 2014
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x86: Consistently use cpu flag detection macros in places that still miss it
parent
7151c5d0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
mpegaudiodsp.c
libavcodec/x86/mpegaudiodsp.c
+1
-1
swscale.c
libswscale/x86/swscale.c
+2
-2
yuv2rgb.c
libswscale/x86/yuv2rgb.c
+3
-2
No files found.
libavcodec/x86/mpegaudiodsp.c
View file @
46bacb5c
...
@@ -243,7 +243,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
...
@@ -243,7 +243,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
}
}
#if HAVE_SSE2_INLINE
#if HAVE_SSE2_INLINE
if
(
cpu_flags
&
AV_CPU_FLAG_SSE2
)
{
if
(
INLINE_SSE2
(
cpu_flags
)
)
{
s
->
apply_window_float
=
apply_window_mp3
;
s
->
apply_window_float
=
apply_window_mp3
;
}
}
#endif
/* HAVE_SSE2_INLINE */
#endif
/* HAVE_SSE2_INLINE */
...
...
libswscale/x86/swscale.c
View file @
46bacb5c
...
@@ -307,11 +307,11 @@ av_cold void ff_sws_init_swscale_x86(SwsContext *c)
...
@@ -307,11 +307,11 @@ av_cold void ff_sws_init_swscale_x86(SwsContext *c)
int
cpu_flags
=
av_get_cpu_flags
();
int
cpu_flags
=
av_get_cpu_flags
();
#if HAVE_MMX_INLINE
#if HAVE_MMX_INLINE
if
(
cpu_flags
&
AV_CPU_FLAG_MMX
)
if
(
INLINE_MMX
(
cpu_flags
)
)
sws_init_swscale_mmx
(
c
);
sws_init_swscale_mmx
(
c
);
#endif
#endif
#if HAVE_MMXEXT_INLINE
#if HAVE_MMXEXT_INLINE
if
(
cpu_flags
&
AV_CPU_FLAG_MMXEXT
)
if
(
INLINE_MMXEXT
(
cpu_flags
)
)
sws_init_swscale_mmxext
(
c
);
sws_init_swscale_mmxext
(
c
);
#endif
#endif
...
...
libswscale/x86/yuv2rgb.c
View file @
46bacb5c
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#include "libswscale/swscale_internal.h"
#include "libswscale/swscale_internal.h"
#include "libavutil/attributes.h"
#include "libavutil/attributes.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "libavutil/cpu.h"
#include "libavutil/cpu.h"
#if HAVE_INLINE_ASM
#if HAVE_INLINE_ASM
...
@@ -79,7 +80,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
...
@@ -79,7 +80,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
return
NULL
;
return
NULL
;
#if HAVE_MMXEXT_INLINE
#if HAVE_MMXEXT_INLINE
if
(
cpu_flags
&
AV_CPU_FLAG_MMXEXT
)
{
if
(
INLINE_MMXEXT
(
cpu_flags
)
)
{
switch
(
c
->
dstFormat
)
{
switch
(
c
->
dstFormat
)
{
case
AV_PIX_FMT_RGB24
:
case
AV_PIX_FMT_RGB24
:
return
yuv420_rgb24_mmxext
;
return
yuv420_rgb24_mmxext
;
...
@@ -89,7 +90,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
...
@@ -89,7 +90,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
}
}
#endif
#endif
if
(
cpu_flags
&
AV_CPU_FLAG_MMX
)
{
if
(
INLINE_MMX
(
cpu_flags
)
)
{
switch
(
c
->
dstFormat
)
{
switch
(
c
->
dstFormat
)
{
case
AV_PIX_FMT_RGB32
:
case
AV_PIX_FMT_RGB32
:
if
(
c
->
srcFormat
==
AV_PIX_FMT_YUVA420P
)
{
if
(
c
->
srcFormat
==
AV_PIX_FMT_YUVA420P
)
{
...
...
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