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
3e2efacd
Commit
3e2efacd
authored
Feb 15, 2012
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libavcodec: Prefix fdct_ifast, fdct_ifast248
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
9cf0841e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
10 deletions
+10
-10
dct-test.c
libavcodec/dct-test.c
+1
-1
dsputil.c
libavcodec/dsputil.c
+2
-2
dsputil.h
libavcodec/dsputil.h
+2
-2
jfdctfst.c
libavcodec/jfdctfst.c
+2
-2
mpegvideo_enc.c
libavcodec/mpegvideo_enc.c
+3
-3
No files found.
libavcodec/dct-test.c
View file @
3e2efacd
...
...
@@ -87,7 +87,7 @@ static int cpu_flags;
static
const
struct
algo
fdct_tab
[]
=
{
{
"REF-DBL"
,
ff_ref_fdct
,
NO_PERM
},
{
"FAAN"
,
ff_faandct
,
FAAN_SCALE
},
{
"IJG-AAN-INT"
,
f
dct_ifast
,
SCALE_PERM
},
{
"IJG-AAN-INT"
,
f
f_fdct_ifast
,
SCALE_PERM
},
{
"IJG-LLM-INT"
,
ff_jpeg_fdct_islow_8
,
NO_PERM
},
#if HAVE_MMX
...
...
libavcodec/dsputil.c
View file @
3e2efacd
...
...
@@ -2796,8 +2796,8 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
c
->
fdct248
=
ff_fdct248_islow_10
;
}
else
{
if
(
avctx
->
dct_algo
==
FF_DCT_FASTINT
)
{
c
->
fdct
=
fdct_ifast
;
c
->
fdct248
=
fdct_ifast248
;
c
->
fdct
=
f
f_f
dct_ifast
;
c
->
fdct248
=
f
f_f
dct_ifast248
;
}
else
if
(
avctx
->
dct_algo
==
FF_DCT_FAAN
)
{
c
->
fdct
=
ff_faandct
;
...
...
libavcodec/dsputil.h
View file @
3e2efacd
...
...
@@ -38,8 +38,8 @@
/* dct code */
typedef
short
DCTELEM
;
void
fdct_ifast
(
DCTELEM
*
data
);
void
fdct_ifast248
(
DCTELEM
*
data
);
void
f
f_f
dct_ifast
(
DCTELEM
*
data
);
void
f
f_f
dct_ifast248
(
DCTELEM
*
data
);
void
ff_jpeg_fdct_islow_8
(
DCTELEM
*
data
);
void
ff_jpeg_fdct_islow_10
(
DCTELEM
*
data
);
void
ff_fdct248_islow_8
(
DCTELEM
*
data
);
...
...
libavcodec/jfdctfst.c
View file @
3e2efacd
...
...
@@ -205,7 +205,7 @@ static av_always_inline void row_fdct(DCTELEM * data){
*/
GLOBAL
(
void
)
fdct_ifast
(
DCTELEM
*
data
)
f
f_f
dct_ifast
(
DCTELEM
*
data
)
{
int
tmp0
,
tmp1
,
tmp2
,
tmp3
,
tmp4
,
tmp5
,
tmp6
,
tmp7
;
int
tmp10
,
tmp11
,
tmp12
,
tmp13
;
...
...
@@ -271,7 +271,7 @@ fdct_ifast (DCTELEM * data)
*/
GLOBAL
(
void
)
fdct_ifast248
(
DCTELEM
*
data
)
f
f_f
dct_ifast248
(
DCTELEM
*
data
)
{
int
tmp0
,
tmp1
,
tmp2
,
tmp3
,
tmp4
,
tmp5
,
tmp6
,
tmp7
;
int
tmp10
,
tmp11
,
tmp12
,
tmp13
;
...
...
libavcodec/mpegvideo_enc.c
View file @
3e2efacd
...
...
@@ -89,7 +89,7 @@ void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64],
qmat
[
qscale
][
i
]
=
(
int
)((
UINT64_C
(
1
)
<<
QMAT_SHIFT
)
/
(
qscale
*
quant_matrix
[
j
]));
}
}
else
if
(
dsp
->
fdct
==
fdct_ifast
}
else
if
(
dsp
->
fdct
==
f
f_f
dct_ifast
#ifndef FAAN_POSTSCALE
||
dsp
->
fdct
==
ff_faandct
#endif
...
...
@@ -132,7 +132,7 @@ void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64],
for
(
i
=
intra
;
i
<
64
;
i
++
)
{
int64_t
max
=
8191
;
if
(
dsp
->
fdct
==
fdct_ifast
if
(
dsp
->
fdct
==
f
f_f
dct_ifast
#ifndef FAAN_POSTSCALE
||
dsp
->
fdct
==
ff_faandct
#endif
...
...
@@ -3370,7 +3370,7 @@ static int dct_quantize_trellis_c(MpegEncContext *s,
int
dct_coeff
=
FFABS
(
block
[
scantable
[
i
]
]);
int
best_score
=
256
*
256
*
256
*
120
;
if
(
s
->
dsp
.
fdct
==
fdct_ifast
if
(
s
->
dsp
.
fdct
==
f
f_f
dct_ifast
#ifndef FAAN_POSTSCALE
||
s
->
dsp
.
fdct
==
ff_faandct
#endif
...
...
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