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
6c5ef7f6
Commit
6c5ef7f6
authored
Apr 15, 2015
by
ZhouXiaoyong
Committed by
Michael Niedermayer
Apr 25, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/mips: disable assembly not supported for Loongson-3
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
d4921078
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
2 deletions
+16
-2
aacsbr_mips.h
libavcodec/mips/aacsbr_mips.h
+2
-2
iirfilter_mips.c
libavcodec/mips/iirfilter_mips.c
+4
-0
mpegaudiodsp_mips_float.c
libavcodec/mips/mpegaudiodsp_mips_float.c
+6
-0
sbrdsp_mips.c
libavcodec/mips/sbrdsp_mips.c
+4
-0
No files found.
libavcodec/mips/aacsbr_mips.h
View file @
6c5ef7f6
...
@@ -149,7 +149,7 @@ static void sbr_qmf_analysis_mips(AVFloatDSPContext *fdsp, FFTContext *mdct,
...
@@ -149,7 +149,7 @@ static void sbr_qmf_analysis_mips(AVFloatDSPContext *fdsp, FFTContext *mdct,
}
}
}
}
#if
HAVE_MIPSFPU
#if
(HAVE_MIPSFPU && !HAVE_LOONGSON3)
static
void
sbr_qmf_synthesis_mips
(
FFTContext
*
mdct
,
static
void
sbr_qmf_synthesis_mips
(
FFTContext
*
mdct
,
SBRDSPContext
*
sbrdsp
,
AVFloatDSPContext
*
fdsp
,
SBRDSPContext
*
sbrdsp
,
AVFloatDSPContext
*
fdsp
,
float
*
out
,
float
X
[
2
][
38
][
64
],
float
*
out
,
float
X
[
2
][
38
][
64
],
...
@@ -488,7 +488,7 @@ static void sbr_qmf_synthesis_mips(FFTContext *mdct,
...
@@ -488,7 +488,7 @@ static void sbr_qmf_synthesis_mips(FFTContext *mdct,
#define sbr_qmf_analysis sbr_qmf_analysis_mips
#define sbr_qmf_analysis sbr_qmf_analysis_mips
#define sbr_qmf_synthesis sbr_qmf_synthesis_mips
#define sbr_qmf_synthesis sbr_qmf_synthesis_mips
#endif
/*
HAVE_MIPSFPU
*/
#endif
/*
(HAVE_MIPSFPU && !HAVE_LOONGSON3)
*/
#endif
/* HAVE_INLINE_ASM */
#endif
/* HAVE_INLINE_ASM */
#endif
/* AVCODEC_MIPS_AACSBR_FLOAT_H */
#endif
/* AVCODEC_MIPS_AACSBR_FLOAT_H */
libavcodec/mips/iirfilter_mips.c
View file @
6c5ef7f6
...
@@ -55,6 +55,7 @@
...
@@ -55,6 +55,7 @@
#include "libavcodec/iirfilter.h"
#include "libavcodec/iirfilter.h"
#if HAVE_INLINE_ASM
#if HAVE_INLINE_ASM
#if !HAVE_LOONGSON3
typedef
struct
FFIIRFilterCoeffs
{
typedef
struct
FFIIRFilterCoeffs
{
int
order
;
int
order
;
float
gain
;
float
gain
;
...
@@ -195,10 +196,13 @@ static void ff_iir_filter_flt_mips(const struct FFIIRFilterCoeffs *c,
...
@@ -195,10 +196,13 @@ static void ff_iir_filter_flt_mips(const struct FFIIRFilterCoeffs *c,
}
}
}
}
}
}
#endif
/* !HAVE_LOONGSON3 */
#endif
/* HAVE_INLINE_ASM */
#endif
/* HAVE_INLINE_ASM */
void
ff_iir_filter_init_mips
(
FFIIRFilterContext
*
f
)
{
void
ff_iir_filter_init_mips
(
FFIIRFilterContext
*
f
)
{
#if HAVE_INLINE_ASM
#if HAVE_INLINE_ASM
#if !HAVE_LOONGSON3
f
->
filter_flt
=
ff_iir_filter_flt_mips
;
f
->
filter_flt
=
ff_iir_filter_flt_mips
;
#endif
/* !HAVE_LOONGSON3 */
#endif
/* HAVE_INLINE_ASM */
#endif
/* HAVE_INLINE_ASM */
}
}
libavcodec/mips/mpegaudiodsp_mips_float.c
View file @
6c5ef7f6
...
@@ -278,6 +278,7 @@ static void ff_mpadsp_apply_window_mips_float(float *synth_buf, float *window,
...
@@ -278,6 +278,7 @@ static void ff_mpadsp_apply_window_mips_float(float *synth_buf, float *window,
);
);
}
}
#if !HAVE_LOONGSON3
static
void
ff_dct32_mips_float
(
float
*
out
,
const
float
*
tab
)
static
void
ff_dct32_mips_float
(
float
*
out
,
const
float
*
tab
)
{
{
float
val0
,
val1
,
val2
,
val3
,
val4
,
val5
,
val6
,
val7
,
float
val0
,
val1
,
val2
,
val3
,
val4
,
val5
,
val6
,
val7
,
...
@@ -786,6 +787,7 @@ static void ff_dct32_mips_float(float *out, const float *tab)
...
@@ -786,6 +787,7 @@ static void ff_dct32_mips_float(float *out, const float *tab)
out
[
15
]
=
val30
+
val17
;
out
[
15
]
=
val30
+
val17
;
out
[
31
]
=
val31
;
out
[
31
]
=
val31
;
}
}
#endif
/* !HAVE_LOONGSON3 */
static
void
imdct36_mips_float
(
float
*
out
,
float
*
buf
,
float
*
in
,
float
*
win
)
static
void
imdct36_mips_float
(
float
*
out
,
float
*
buf
,
float
*
in
,
float
*
win
)
{
{
...
@@ -1224,6 +1226,7 @@ static void imdct36_mips_float(float *out, float *buf, float *in, float *win)
...
@@ -1224,6 +1226,7 @@ static void imdct36_mips_float(float *out, float *buf, float *in, float *win)
);
);
}
}
#if !HAVE_LOONGSON3
static
void
ff_imdct36_blocks_mips_float
(
float
*
out
,
float
*
buf
,
float
*
in
,
static
void
ff_imdct36_blocks_mips_float
(
float
*
out
,
float
*
buf
,
float
*
in
,
int
count
,
int
switch_point
,
int
block_type
)
int
count
,
int
switch_point
,
int
block_type
)
{
{
...
@@ -1242,10 +1245,13 @@ static void ff_imdct36_blocks_mips_float(float *out, float *buf, float *in,
...
@@ -1242,10 +1245,13 @@ static void ff_imdct36_blocks_mips_float(float *out, float *buf, float *in,
out
++
;
out
++
;
}
}
}
}
#endif
/* !HAVE_LOONGSON3 */
void
ff_mpadsp_init_mipsfpu
(
MPADSPContext
*
s
)
void
ff_mpadsp_init_mipsfpu
(
MPADSPContext
*
s
)
{
{
s
->
apply_window_float
=
ff_mpadsp_apply_window_mips_float
;
s
->
apply_window_float
=
ff_mpadsp_apply_window_mips_float
;
#if !HAVE_LOONGSON3
s
->
imdct36_blocks_float
=
ff_imdct36_blocks_mips_float
;
s
->
imdct36_blocks_float
=
ff_imdct36_blocks_mips_float
;
s
->
dct32_float
=
ff_dct32_mips_float
;
s
->
dct32_float
=
ff_dct32_mips_float
;
#endif
/* !HAVE_LOONGSON3 */
}
}
libavcodec/mips/sbrdsp_mips.c
View file @
6c5ef7f6
...
@@ -438,6 +438,7 @@ static void sbr_qmf_deint_bfly_mips(float *v, const float *src0, const float *sr
...
@@ -438,6 +438,7 @@ static void sbr_qmf_deint_bfly_mips(float *v, const float *src0, const float *sr
}
}
}
}
#if !HAVE_LOONGSON3
static
void
sbr_autocorrelate_mips
(
const
float
x
[
40
][
2
],
float
phi
[
3
][
2
][
2
])
static
void
sbr_autocorrelate_mips
(
const
float
x
[
40
][
2
],
float
phi
[
3
][
2
][
2
])
{
{
int
i
;
int
i
;
...
@@ -606,6 +607,7 @@ static void sbr_autocorrelate_mips(const float x[40][2], float phi[3][2][2])
...
@@ -606,6 +607,7 @@ static void sbr_autocorrelate_mips(const float x[40][2], float phi[3][2][2])
:
"memory"
:
"memory"
);
);
}
}
#endif
/* !HAVE_LOONGSON3 */
static
void
sbr_hf_gen_mips
(
float
(
*
X_high
)[
2
],
const
float
(
*
X_low
)[
2
],
static
void
sbr_hf_gen_mips
(
float
(
*
X_high
)[
2
],
const
float
(
*
X_low
)[
2
],
const
float
alpha0
[
2
],
const
float
alpha1
[
2
],
const
float
alpha0
[
2
],
const
float
alpha1
[
2
],
...
@@ -894,7 +896,9 @@ void ff_sbrdsp_init_mips(SBRDSPContext *s)
...
@@ -894,7 +896,9 @@ void ff_sbrdsp_init_mips(SBRDSPContext *s)
s
->
sum64x5
=
sbr_sum64x5_mips
;
s
->
sum64x5
=
sbr_sum64x5_mips
;
s
->
sum_square
=
sbr_sum_square_mips
;
s
->
sum_square
=
sbr_sum_square_mips
;
s
->
qmf_deint_bfly
=
sbr_qmf_deint_bfly_mips
;
s
->
qmf_deint_bfly
=
sbr_qmf_deint_bfly_mips
;
#if !HAVE_LOONGSON3
s
->
autocorrelate
=
sbr_autocorrelate_mips
;
s
->
autocorrelate
=
sbr_autocorrelate_mips
;
#endif
/* !HAVE_LOONGSON3 */
s
->
hf_gen
=
sbr_hf_gen_mips
;
s
->
hf_gen
=
sbr_hf_gen_mips
;
s
->
hf_g_filt
=
sbr_hf_g_filt_mips
;
s
->
hf_g_filt
=
sbr_hf_g_filt_mips
;
...
...
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