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
d23e8f53
Commit
d23e8f53
authored
Oct 28, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swr: use 64bit index/len for x86_64 mix
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
2aecfd4f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
8 deletions
+15
-8
rematrix_template.c
libswresample/rematrix_template.c
+5
-5
swresample_internal.h
libswresample/swresample_internal.h
+10
-3
No files found.
libswresample/rematrix_template.c
View file @
d23e8f53
...
@@ -18,9 +18,9 @@
...
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
typedef
void
(
RENAME
(
mix_any_func_type
))(
SAMPLE
**
out
,
const
SAMPLE
**
in1
,
COEFF
*
coeffp
,
int
len
);
typedef
void
(
RENAME
(
mix_any_func_type
))(
SAMPLE
**
out
,
const
SAMPLE
**
in1
,
COEFF
*
coeffp
,
int
eger
len
);
static
void
RENAME
(
sum2
)(
SAMPLE
*
out
,
const
SAMPLE
*
in1
,
const
SAMPLE
*
in2
,
COEFF
*
coeffp
,
int
index1
,
int
index2
,
int
len
){
static
void
RENAME
(
sum2
)(
SAMPLE
*
out
,
const
SAMPLE
*
in1
,
const
SAMPLE
*
in2
,
COEFF
*
coeffp
,
int
eger
index1
,
integer
index2
,
integer
len
){
int
i
;
int
i
;
COEFF
coeff1
=
coeffp
[
index1
];
COEFF
coeff1
=
coeffp
[
index1
];
COEFF
coeff2
=
coeffp
[
index2
];
COEFF
coeff2
=
coeffp
[
index2
];
...
@@ -29,14 +29,14 @@ static void RENAME(sum2)(SAMPLE *out, const SAMPLE *in1, const SAMPLE *in2, COEF
...
@@ -29,14 +29,14 @@ static void RENAME(sum2)(SAMPLE *out, const SAMPLE *in1, const SAMPLE *in2, COEF
out
[
i
]
=
R
(
coeff1
*
in1
[
i
]
+
coeff2
*
in2
[
i
]);
out
[
i
]
=
R
(
coeff1
*
in1
[
i
]
+
coeff2
*
in2
[
i
]);
}
}
static
void
RENAME
(
copy
)(
SAMPLE
*
out
,
const
SAMPLE
*
in
,
COEFF
*
coeffp
,
int
index
,
int
len
){
static
void
RENAME
(
copy
)(
SAMPLE
*
out
,
const
SAMPLE
*
in
,
COEFF
*
coeffp
,
int
eger
index
,
integer
len
){
int
i
;
int
i
;
COEFF
coeff
=
coeffp
[
index
];
COEFF
coeff
=
coeffp
[
index
];
for
(
i
=
0
;
i
<
len
;
i
++
)
for
(
i
=
0
;
i
<
len
;
i
++
)
out
[
i
]
=
R
(
coeff
*
in
[
i
]);
out
[
i
]
=
R
(
coeff
*
in
[
i
]);
}
}
static
void
RENAME
(
mix6to2
)(
SAMPLE
**
out
,
const
SAMPLE
**
in
,
COEFF
*
coeffp
,
int
len
){
static
void
RENAME
(
mix6to2
)(
SAMPLE
**
out
,
const
SAMPLE
**
in
,
COEFF
*
coeffp
,
int
eger
len
){
int
i
;
int
i
;
for
(
i
=
0
;
i
<
len
;
i
++
)
{
for
(
i
=
0
;
i
<
len
;
i
++
)
{
...
@@ -46,7 +46,7 @@ static void RENAME(mix6to2)(SAMPLE **out, const SAMPLE **in, COEFF *coeffp, int
...
@@ -46,7 +46,7 @@ static void RENAME(mix6to2)(SAMPLE **out, const SAMPLE **in, COEFF *coeffp, int
}
}
}
}
static
void
RENAME
(
mix8to2
)(
SAMPLE
**
out
,
const
SAMPLE
**
in
,
COEFF
*
coeffp
,
int
len
){
static
void
RENAME
(
mix8to2
)(
SAMPLE
**
out
,
const
SAMPLE
**
in
,
COEFF
*
coeffp
,
int
eger
len
){
int
i
;
int
i
;
for
(
i
=
0
;
i
<
len
;
i
++
)
{
for
(
i
=
0
;
i
<
len
;
i
++
)
{
...
...
libswresample/swresample_internal.h
View file @
d23e8f53
...
@@ -23,13 +23,20 @@
...
@@ -23,13 +23,20 @@
#include "swresample.h"
#include "swresample.h"
#include "libavutil/audioconvert.h"
#include "libavutil/audioconvert.h"
#include "config.h"
#define SQRT3_2 1.22474487139158904909
/* sqrt(3/2) */
#define SQRT3_2 1.22474487139158904909
/* sqrt(3/2) */
typedef
void
(
mix_1_1_func_type
)(
void
*
out
,
const
void
*
in
,
void
*
coeffp
,
int
index
,
int
len
);
#if ARCH_X86_64
typedef
void
(
mix_2_1_func_type
)(
void
*
out
,
const
void
*
in1
,
const
void
*
in2
,
void
*
coeffp
,
int
index1
,
int
index2
,
int
len
);
typedef
int64_t
integer
;
#else
typedef
int
integer
;
#endif
typedef
void
(
mix_1_1_func_type
)(
void
*
out
,
const
void
*
in
,
void
*
coeffp
,
integer
index
,
integer
len
);
typedef
void
(
mix_2_1_func_type
)(
void
*
out
,
const
void
*
in1
,
const
void
*
in2
,
void
*
coeffp
,
integer
index1
,
integer
index2
,
integer
len
);
typedef
void
(
mix_any_func_type
)(
uint8_t
**
out
,
const
uint8_t
**
in1
,
void
*
coeffp
,
int
len
);
typedef
void
(
mix_any_func_type
)(
uint8_t
**
out
,
const
uint8_t
**
in1
,
void
*
coeffp
,
int
eger
len
);
typedef
struct
AudioData
{
typedef
struct
AudioData
{
uint8_t
*
ch
[
SWR_CH_MAX
];
///< samples buffer per channel
uint8_t
*
ch
[
SWR_CH_MAX
];
///< samples buffer per channel
...
...
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