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
b12a3617
Commit
b12a3617
authored
Jun 22, 2017
by
Clément Bœsch
Committed by
Clément Bœsch
Jun 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/aacpsdsp: use ptrdiff_t for stride in hybrid_analysis
parent
ff0ecef6
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
10 deletions
+13
-10
aacpsdsp.h
libavcodec/aacpsdsp.h
+3
-1
aacpsdsp_template.c
libavcodec/aacpsdsp_template.c
+1
-1
aacpsdsp_init_aarch64.c
libavcodec/aarch64/aacpsdsp_init_aarch64.c
+1
-1
aacpsdsp_neon.S
libavcodec/aarch64/aacpsdsp_neon.S
+0
-1
aacpsdsp_init_arm.c
libavcodec/arm/aacpsdsp_init_arm.c
+1
-1
aacpsdsp.asm
libavcodec/x86/aacpsdsp.asm
+2
-2
aacpsdsp_init.c
libavcodec/x86/aacpsdsp_init.c
+4
-2
aacpsdsp.c
tests/checkasm/aacpsdsp.c
+1
-1
No files found.
libavcodec/aacpsdsp.h
View file @
b12a3617
...
@@ -21,6 +21,8 @@
...
@@ -21,6 +21,8 @@
#ifndef AVCODEC_AACPSDSP_H
#ifndef AVCODEC_AACPSDSP_H
#define AVCODEC_AACPSDSP_H
#define AVCODEC_AACPSDSP_H
#include <stddef.h>
#include "aac_defines.h"
#include "aac_defines.h"
#define PS_QMF_TIME_SLOTS 32
#define PS_QMF_TIME_SLOTS 32
...
@@ -33,7 +35,7 @@ typedef struct PSDSPContext {
...
@@ -33,7 +35,7 @@ typedef struct PSDSPContext {
int
n
);
int
n
);
void
(
*
hybrid_analysis
)(
INTFLOAT
(
*
out
)[
2
],
INTFLOAT
(
*
in
)[
2
],
void
(
*
hybrid_analysis
)(
INTFLOAT
(
*
out
)[
2
],
INTFLOAT
(
*
in
)[
2
],
const
INTFLOAT
(
*
filter
)[
8
][
2
],
const
INTFLOAT
(
*
filter
)[
8
][
2
],
in
t
stride
,
int
n
);
ptrdiff_
t
stride
,
int
n
);
void
(
*
hybrid_analysis_ileave
)(
INTFLOAT
(
*
out
)[
32
][
2
],
INTFLOAT
L
[
2
][
38
][
64
],
void
(
*
hybrid_analysis_ileave
)(
INTFLOAT
(
*
out
)[
32
][
2
],
INTFLOAT
L
[
2
][
38
][
64
],
int
i
,
int
len
);
int
i
,
int
len
);
void
(
*
hybrid_synthesis_deint
)(
INTFLOAT
out
[
2
][
38
][
64
],
INTFLOAT
(
*
in
)[
32
][
2
],
void
(
*
hybrid_synthesis_deint
)(
INTFLOAT
out
[
2
][
38
][
64
],
INTFLOAT
(
*
in
)[
32
][
2
],
...
...
libavcodec/aacpsdsp_template.c
View file @
b12a3617
...
@@ -45,7 +45,7 @@ static void ps_mul_pair_single_c(INTFLOAT (*dst)[2], INTFLOAT (*src0)[2], INTFLO
...
@@ -45,7 +45,7 @@ static void ps_mul_pair_single_c(INTFLOAT (*dst)[2], INTFLOAT (*src0)[2], INTFLO
static
void
ps_hybrid_analysis_c
(
INTFLOAT
(
*
out
)[
2
],
INTFLOAT
(
*
in
)[
2
],
static
void
ps_hybrid_analysis_c
(
INTFLOAT
(
*
out
)[
2
],
INTFLOAT
(
*
in
)[
2
],
const
INTFLOAT
(
*
filter
)[
8
][
2
],
const
INTFLOAT
(
*
filter
)[
8
][
2
],
in
t
stride
,
int
n
)
ptrdiff_
t
stride
,
int
n
)
{
{
int
i
,
j
;
int
i
,
j
;
...
...
libavcodec/aarch64/aacpsdsp_init_aarch64.c
View file @
b12a3617
...
@@ -26,7 +26,7 @@ void ff_ps_mul_pair_single_neon(float (*dst)[2], float (*src0)[2],
...
@@ -26,7 +26,7 @@ void ff_ps_mul_pair_single_neon(float (*dst)[2], float (*src0)[2],
float
*
src1
,
int
n
);
float
*
src1
,
int
n
);
void
ff_ps_hybrid_analysis_neon
(
float
(
*
out
)[
2
],
float
(
*
in
)[
2
],
void
ff_ps_hybrid_analysis_neon
(
float
(
*
out
)[
2
],
float
(
*
in
)[
2
],
const
float
(
*
filter
)[
8
][
2
],
const
float
(
*
filter
)[
8
][
2
],
in
t
stride
,
int
n
);
ptrdiff_
t
stride
,
int
n
);
void
ff_ps_stereo_interpolate_neon
(
float
(
*
l
)[
2
],
float
(
*
r
)[
2
],
void
ff_ps_stereo_interpolate_neon
(
float
(
*
l
)[
2
],
float
(
*
r
)[
2
],
float
h
[
2
][
4
],
float
h_step
[
2
][
4
],
float
h
[
2
][
4
],
float
h_step
[
2
][
4
],
int
len
);
int
len
);
...
...
libavcodec/aarch64/aacpsdsp_neon.S
View file @
b12a3617
...
@@ -101,7 +101,6 @@ function ff_ps_stereo_interpolate_ipdopd_neon, export=1
...
@@ -101,7 +101,6 @@ function ff_ps_stereo_interpolate_ipdopd_neon, export=1
endfunc
endfunc
function ff_ps_hybrid_analysis_neon, export=1
function ff_ps_hybrid_analysis_neon, export=1
sxtw x3, w3
lsl x3, x3, #3
lsl x3, x3, #3
ld2 {v0.4S,v1.4S}, [x1], #32
ld2 {v0.4S,v1.4S}, [x1], #32
ld2 {v2.2S,v3.2S}, [x1], #16
ld2 {v2.2S,v3.2S}, [x1], #16
...
...
libavcodec/arm/aacpsdsp_init_arm.c
View file @
b12a3617
...
@@ -29,7 +29,7 @@ void ff_ps_mul_pair_single_neon(float (*dst)[2], float (*src0)[2],
...
@@ -29,7 +29,7 @@ void ff_ps_mul_pair_single_neon(float (*dst)[2], float (*src0)[2],
float
*
src1
,
int
n
);
float
*
src1
,
int
n
);
void
ff_ps_hybrid_analysis_neon
(
float
(
*
out
)[
2
],
float
(
*
in
)[
2
],
void
ff_ps_hybrid_analysis_neon
(
float
(
*
out
)[
2
],
float
(
*
in
)[
2
],
const
float
(
*
filter
)[
8
][
2
],
const
float
(
*
filter
)[
8
][
2
],
in
t
stride
,
int
n
);
ptrdiff_
t
stride
,
int
n
);
void
ff_ps_hybrid_analysis_ileave_neon
(
float
(
*
out
)[
32
][
2
],
float
L
[
2
][
38
][
64
],
void
ff_ps_hybrid_analysis_ileave_neon
(
float
(
*
out
)[
32
][
2
],
float
L
[
2
][
38
][
64
],
int
i
,
int
len
);
int
i
,
int
len
);
void
ff_ps_hybrid_synthesis_deint_neon
(
float
out
[
2
][
38
][
64
],
float
(
*
in
)[
32
][
2
],
void
ff_ps_hybrid_synthesis_deint_neon
(
float
out
[
2
][
38
][
64
],
float
(
*
in
)[
32
][
2
],
...
...
libavcodec/x86/aacpsdsp.asm
View file @
b12a3617
...
@@ -398,7 +398,7 @@ HYBRID_SYNTHESIS_DEINT
...
@@ -398,7 +398,7 @@ HYBRID_SYNTHESIS_DEINT
;*******************************************************************
;*******************************************************************
;void ff_ps_hybrid_analysis_<opt>(float (*out)[2], float (*in)[2],
;void ff_ps_hybrid_analysis_<opt>(float (*out)[2], float (*in)[2],
; const float (*filter)[8][2],
; const float (*filter)[8][2],
;
in
t stride, int n);
;
ptrdiff_
t stride, int n);
;*******************************************************************
;*******************************************************************
%macro
PS_HYBRID_ANALYSIS_LOOP
3
%macro
PS_HYBRID_ANALYSIS_LOOP
3
movu
%1
,
[
inq
+
mmsize
*
%3
]
movu
%1
,
[
inq
+
mmsize
*
%3
]
...
@@ -438,7 +438,7 @@ cglobal ps_hybrid_analysis, 5, 5, 8, out, in, filter, stride, n
...
@@ -438,7 +438,7 @@ cglobal ps_hybrid_analysis, 5, 5, 8, out, in, filter, stride, n
%else
%else
%define
MOVH
movlps
%define
MOVH
movlps
%endif
%endif
shl
stride
d
,
3
shl
stride
q
,
3
shl
nd
,
6
shl
nd
,
6
add
filterq
,
nq
add
filterq
,
nq
neg
nq
neg
nq
...
...
libavcodec/x86/aacpsdsp_init.c
View file @
b12a3617
...
@@ -18,6 +18,8 @@
...
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
#include <stddef.h>
#include "config.h"
#include "config.h"
#include "libavutil/x86/cpu.h"
#include "libavutil/x86/cpu.h"
...
@@ -30,10 +32,10 @@ void ff_ps_mul_pair_single_sse (float (*dst)[2], float (*src0)[2],
...
@@ -30,10 +32,10 @@ void ff_ps_mul_pair_single_sse (float (*dst)[2], float (*src0)[2],
float
*
src1
,
int
n
);
float
*
src1
,
int
n
);
void
ff_ps_hybrid_analysis_sse
(
float
(
*
out
)[
2
],
float
(
*
in
)[
2
],
void
ff_ps_hybrid_analysis_sse
(
float
(
*
out
)[
2
],
float
(
*
in
)[
2
],
const
float
(
*
filter
)[
8
][
2
],
const
float
(
*
filter
)[
8
][
2
],
in
t
stride
,
int
n
);
ptrdiff_
t
stride
,
int
n
);
void
ff_ps_hybrid_analysis_sse3
(
float
(
*
out
)[
2
],
float
(
*
in
)[
2
],
void
ff_ps_hybrid_analysis_sse3
(
float
(
*
out
)[
2
],
float
(
*
in
)[
2
],
const
float
(
*
filter
)[
8
][
2
],
const
float
(
*
filter
)[
8
][
2
],
in
t
stride
,
int
n
);
ptrdiff_
t
stride
,
int
n
);
void
ff_ps_stereo_interpolate_sse3
(
float
(
*
l
)[
2
],
float
(
*
r
)[
2
],
void
ff_ps_stereo_interpolate_sse3
(
float
(
*
l
)[
2
],
float
(
*
r
)[
2
],
float
h
[
2
][
4
],
float
h_step
[
2
][
4
],
float
h
[
2
][
4
],
float
h_step
[
2
][
4
],
int
len
);
int
len
);
...
...
tests/checkasm/aacpsdsp.c
View file @
b12a3617
...
@@ -81,7 +81,7 @@ static void test_hybrid_analysis(void)
...
@@ -81,7 +81,7 @@ static void test_hybrid_analysis(void)
declare_func
(
void
,
INTFLOAT
(
*
out
)[
2
],
INTFLOAT
(
*
in
)[
2
],
declare_func
(
void
,
INTFLOAT
(
*
out
)[
2
],
INTFLOAT
(
*
in
)[
2
],
const
INTFLOAT
(
*
filter
)[
8
][
2
],
const
INTFLOAT
(
*
filter
)[
8
][
2
],
in
t
stride
,
int
n
);
ptrdiff_
t
stride
,
int
n
);
randomize
((
INTFLOAT
*
)
in
,
12
*
2
);
randomize
((
INTFLOAT
*
)
in
,
12
*
2
);
randomize
((
INTFLOAT
*
)
filter
,
N
*
8
*
2
);
randomize
((
INTFLOAT
*
)
filter
,
N
*
8
*
2
);
...
...
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