Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
6fd0929f
Commit
6fd0929f
authored
Jul 18, 2012
by
Yaowu Xu
Committed by
Gerrit Code Review
Jul 18, 2012
Browse files
Options
Browse Files
Download
Plain Diff
Merge "removed floating point version 8x8 fdct" into experimental
parents
df35f6b3
d632bf8c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
100 deletions
+0
-100
configure
configure
+0
-1
vp8/encoder/dct.c
vp8/encoder/dct.c
+0
-86
vp8/encoder/encodemb.c
vp8/encoder/encodemb.c
+0
-13
No files found.
configure
View file @
6fd0929f
...
...
@@ -224,7 +224,6 @@ EXPERIMENT_LIST="
newupdate
superblocks
expanded_coef_context
int_8x8fdct
newintramodes
adaptive_entropy
pred_filter
...
...
vp8/encoder/dct.c
View file @
6fd0929f
...
...
@@ -13,8 +13,6 @@
#include "vpx_ports/config.h"
#include "vp8/common/idct.h"
#if CONFIG_INT_8X8FDCT
static
const
int
xC1S7
=
16069
;
static
const
int
xC2S6
=
15137
;
static
const
int
xC3S5
=
13623
;
...
...
@@ -252,90 +250,6 @@ void vp8_short_fdct8x8_c(short *InputData, short *OutputData, int pitch) {
op
++
;
}
}
#else
void
vp8_short_fdct8x8_c
(
short
*
block
,
short
*
coefs
,
int
pitch
)
{
int
j1
,
i
,
j
,
k
;
float
b
[
8
];
float
b1
[
8
];
float
d
[
8
][
8
];
float
f0
=
(
float
)
.
7071068
;
float
f1
=
(
float
)
.
4903926
;
float
f2
=
(
float
)
.
4619398
;
float
f3
=
(
float
)
.
4157348
;
float
f4
=
(
float
)
.
3535534
;
float
f5
=
(
float
)
.
2777851
;
float
f6
=
(
float
)
.
1913417
;
float
f7
=
(
float
)
.
0975452
;
pitch
=
pitch
/
2
;
for
(
i
=
0
,
k
=
0
;
i
<
8
;
i
++
,
k
+=
pitch
)
{
for
(
j
=
0
;
j
<
8
;
j
++
)
{
b
[
j
]
=
(
float
)(
block
[
k
+
j
]
<<
3
);
}
/* Horizontal transform */
for
(
j
=
0
;
j
<
4
;
j
++
)
{
j1
=
7
-
j
;
b1
[
j
]
=
b
[
j
]
+
b
[
j1
];
b1
[
j1
]
=
b
[
j
]
-
b
[
j1
];
}
b
[
0
]
=
b1
[
0
]
+
b1
[
3
];
b
[
1
]
=
b1
[
1
]
+
b1
[
2
];
b
[
2
]
=
b1
[
1
]
-
b1
[
2
];
b
[
3
]
=
b1
[
0
]
-
b1
[
3
];
b
[
4
]
=
b1
[
4
];
b
[
5
]
=
(
b1
[
6
]
-
b1
[
5
])
*
f0
;
b
[
6
]
=
(
b1
[
6
]
+
b1
[
5
])
*
f0
;
b
[
7
]
=
b1
[
7
];
d
[
i
][
0
]
=
(
b
[
0
]
+
b
[
1
])
*
f4
;
d
[
i
][
4
]
=
(
b
[
0
]
-
b
[
1
])
*
f4
;
d
[
i
][
2
]
=
b
[
2
]
*
f6
+
b
[
3
]
*
f2
;
d
[
i
][
6
]
=
b
[
3
]
*
f6
-
b
[
2
]
*
f2
;
b1
[
4
]
=
b
[
4
]
+
b
[
5
];
b1
[
7
]
=
b
[
7
]
+
b
[
6
];
b1
[
5
]
=
b
[
4
]
-
b
[
5
];
b1
[
6
]
=
b
[
7
]
-
b
[
6
];
d
[
i
][
1
]
=
b1
[
4
]
*
f7
+
b1
[
7
]
*
f1
;
d
[
i
][
5
]
=
b1
[
5
]
*
f3
+
b1
[
6
]
*
f5
;
d
[
i
][
7
]
=
b1
[
7
]
*
f7
-
b1
[
4
]
*
f1
;
d
[
i
][
3
]
=
b1
[
6
]
*
f3
-
b1
[
5
]
*
f5
;
}
/* Vertical transform */
for
(
i
=
0
;
i
<
8
;
i
++
)
{
for
(
j
=
0
;
j
<
4
;
j
++
)
{
j1
=
7
-
j
;
b1
[
j
]
=
d
[
j
][
i
]
+
d
[
j1
][
i
];
b1
[
j1
]
=
d
[
j
][
i
]
-
d
[
j1
][
i
];
}
b
[
0
]
=
b1
[
0
]
+
b1
[
3
];
b
[
1
]
=
b1
[
1
]
+
b1
[
2
];
b
[
2
]
=
b1
[
1
]
-
b1
[
2
];
b
[
3
]
=
b1
[
0
]
-
b1
[
3
];
b
[
4
]
=
b1
[
4
];
b
[
5
]
=
(
b1
[
6
]
-
b1
[
5
])
*
f0
;
b
[
6
]
=
(
b1
[
6
]
+
b1
[
5
])
*
f0
;
b
[
7
]
=
b1
[
7
];
d
[
0
][
i
]
=
(
b
[
0
]
+
b
[
1
])
*
f4
;
d
[
4
][
i
]
=
(
b
[
0
]
-
b
[
1
])
*
f4
;
d
[
2
][
i
]
=
b
[
2
]
*
f6
+
b
[
3
]
*
f2
;
d
[
6
][
i
]
=
b
[
3
]
*
f6
-
b
[
2
]
*
f2
;
b1
[
4
]
=
b
[
4
]
+
b
[
5
];
b1
[
7
]
=
b
[
7
]
+
b
[
6
];
b1
[
5
]
=
b
[
4
]
-
b
[
5
];
b1
[
6
]
=
b
[
7
]
-
b
[
6
];
d
[
1
][
i
]
=
b1
[
4
]
*
f7
+
b1
[
7
]
*
f1
;
d
[
5
][
i
]
=
b1
[
5
]
*
f3
+
b1
[
6
]
*
f5
;
d
[
7
][
i
]
=
b1
[
7
]
*
f7
-
b1
[
4
]
*
f1
;
d
[
3
][
i
]
=
b1
[
6
]
*
f3
-
b1
[
5
]
*
f5
;
}
for
(
i
=
0
;
i
<
8
;
i
++
)
{
for
(
j
=
0
;
j
<
8
;
j
++
)
{
*
(
coefs
+
j
+
i
*
8
)
=
(
short
)
floor
(
d
[
i
][
j
]
+
0
.
5
);
}
}
return
;
}
#endif
void
vp8_short_fhaar2x2_c
(
short
*
input
,
short
*
output
,
int
pitch
)
{
// pitch = 8
/* [1 1; 1 -1] orthogonal transform */
...
...
vp8/encoder/encodemb.c
View file @
6fd0929f
...
...
@@ -209,10 +209,6 @@ static void transform_mby(MACROBLOCK *x) {
void
vp8_transform_mbuv_8x8
(
MACROBLOCK
*
x
)
{
int
i
;
#if !CONFIG_INT_8X8FDCT
vp8_clear_system_state
();
#endif
for
(
i
=
16
;
i
<
24
;
i
+=
4
)
{
x
->
vp8_short_fdct8x8
(
&
x
->
block
[
i
].
src_diff
[
0
],
&
x
->
block
[
i
].
coeff
[
0
],
16
);
...
...
@@ -222,9 +218,6 @@ void vp8_transform_mbuv_8x8(MACROBLOCK *x) {
void
vp8_transform_intra_mby_8x8
(
MACROBLOCK
*
x
)
{
// changed
int
i
;
#if !CONFIG_INT_8X8FDCT
vp8_clear_system_state
();
#endif
for
(
i
=
0
;
i
<
9
;
i
+=
8
)
{
x
->
vp8_short_fdct8x8
(
&
x
->
block
[
i
].
src_diff
[
0
],
&
x
->
block
[
i
].
coeff
[
0
],
32
);
...
...
@@ -246,9 +239,6 @@ void vp8_transform_intra_mby_8x8(MACROBLOCK *x) { // changed
void
vp8_transform_mb_8x8
(
MACROBLOCK
*
x
)
{
int
i
;
#if !CONFIG_INT_8X8FDCT
vp8_clear_system_state
();
#endif
for
(
i
=
0
;
i
<
9
;
i
+=
8
)
{
x
->
vp8_short_fdct8x8
(
&
x
->
block
[
i
].
src_diff
[
0
],
&
x
->
block
[
i
].
coeff
[
0
],
32
);
...
...
@@ -275,9 +265,6 @@ void vp8_transform_mb_8x8(MACROBLOCK *x) {
void
vp8_transform_mby_8x8
(
MACROBLOCK
*
x
)
{
int
i
;
#if !CONFIG_INT_8X8FDCT
vp8_clear_system_state
();
#endif
for
(
i
=
0
;
i
<
9
;
i
+=
8
)
{
x
->
vp8_short_fdct8x8
(
&
x
->
block
[
i
].
src_diff
[
0
],
&
x
->
block
[
i
].
coeff
[
0
],
32
);
...
...
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