Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
68712ce8
Commit
68712ce8
authored
12 years ago
by
Michael Niedermayer
Browse files
Options
Downloads
Patches
Plain Diff
swr/x86: 16bit integer mix functions need SSE2 not SSE
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
3245c8b6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libswresample/x86/rematrix.asm
+2
-0
2 additions, 0 deletions
libswresample/x86/rematrix.asm
libswresample/x86/swresample_x86.c
+4
-4
4 additions, 4 deletions
libswresample/x86/swresample_x86.c
with
6 additions
and
4 deletions
libswresample/x86/rematrix.asm
+
2
−
0
View file @
68712ce8
...
...
@@ -236,6 +236,8 @@ MIX2_FLT u
MIX2_FLT
a
MIX1_FLT
u
MIX1_FLT
a
INIT_XMM
ss
e2
MIX1_INT16
u
MIX1_INT16
a
MIX2_INT16
u
...
...
This diff is collapsed.
Click to expand it.
libswresample/x86/swresample_x86.c
+
4
−
4
View file @
68712ce8
...
...
@@ -146,7 +146,7 @@ mix_2_1_func_type ff_mix_2_1_a_## type ## _ ## simd;
D
(
float
,
sse
)
D
(
float
,
avx
)
D
(
int16
,
mmx
)
D
(
int16
,
sse
)
D
(
int16
,
sse
2
)
void
swri_rematrix_init_x86
(
struct
SwrContext
*
s
){
...
...
@@ -164,9 +164,9 @@ void swri_rematrix_init_x86(struct SwrContext *s){
s
->
mix_1_1_simd
=
ff_mix_1_1_a_int16_mmx
;
s
->
mix_2_1_simd
=
ff_mix_2_1_a_int16_mmx
;
}
if
(
mm_flags
&
AV_CPU_FLAG_SSE
)
{
s
->
mix_1_1_simd
=
ff_mix_1_1_a_int16_sse
;
s
->
mix_2_1_simd
=
ff_mix_2_1_a_int16_sse
;
if
(
mm_flags
&
AV_CPU_FLAG_SSE
2
)
{
s
->
mix_1_1_simd
=
ff_mix_1_1_a_int16_sse
2
;
s
->
mix_2_1_simd
=
ff_mix_2_1_a_int16_sse
2
;
}
s
->
native_simd_matrix
=
av_mallocz
(
2
*
num
*
sizeof
(
int16_t
));
for
(
i
=
0
;
i
<
nb_out
;
i
++
){
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment