Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guillaume Martres
aom-rav1e
Commits
7ca651a3
Commit
7ca651a3
authored
May 30, 2013
by
Yaowu Xu
Committed by
Gerrit Code Review
May 30, 2013
Browse files
Merge "Changed to use a new variant of WHT" into experimental
parents
c9718556
042e70e4
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_idct.c
View file @
7ca651a3
...
...
@@ -32,20 +32,17 @@ void vp9_short_iwalsh4x4_add_c(int16_t *input, uint8_t *dest, int dest_stride) {
c1
=
ip
[
1
]
>>
WHT_UPSCALE_FACTOR
;
d1
=
ip
[
2
]
>>
WHT_UPSCALE_FACTOR
;
b1
=
ip
[
3
]
>>
WHT_UPSCALE_FACTOR
;
c1
=
a1
-
c1
;
b1
+=
d1
;
e1
=
(
c1
-
b1
)
>>
1
;
a1
-=
e1
;
d1
+=
e1
;
b1
=
a1
-
b1
;
c1
-=
d1
;
a1
+=
c1
;
d1
-=
b1
;
e1
=
(
a1
-
d1
)
>>
1
;
b1
=
e1
-
b1
;
c1
=
e1
-
c1
;
a1
-=
b1
;
d1
+=
c1
;
op
[
0
]
=
a1
;
op
[
1
]
=
b1
;
op
[
2
]
=
c1
;
op
[
3
]
=
d1
;
ip
+=
4
;
op
+=
4
;
}
...
...
@@ -56,15 +53,13 @@ void vp9_short_iwalsh4x4_add_c(int16_t *input, uint8_t *dest, int dest_stride) {
c1
=
ip
[
4
*
1
];
d1
=
ip
[
4
*
2
];
b1
=
ip
[
4
*
3
];
c1
=
a1
-
c1
;
b1
+=
d1
;
e1
=
(
c1
-
b1
)
>>
1
;
a1
-=
e1
;
d1
+=
e1
;
b1
=
a1
-
b1
;
c1
-=
d1
;
a1
+=
c1
;
d1
-=
b1
;
e1
=
(
a1
-
d1
)
>>
1
;
b1
=
e1
-
b1
;
c1
=
e1
-
c1
;
a1
-=
b1
;
d1
+=
c1
;
dest
[
dest_stride
*
0
]
=
clip_pixel
(
dest
[
dest_stride
*
0
]
+
a1
);
dest
[
dest_stride
*
1
]
=
clip_pixel
(
dest
[
dest_stride
*
1
]
+
b1
);
dest
[
dest_stride
*
2
]
=
clip_pixel
(
dest
[
dest_stride
*
2
]
+
c1
);
...
...
@@ -84,16 +79,17 @@ void vp9_short_iwalsh4x4_1_add_c(int16_t *in, uint8_t *dest, int dest_stride) {
a1
=
ip
[
0
]
>>
WHT_UPSCALE_FACTOR
;
e1
=
a1
>>
1
;
op
[
0
]
=
op
[
1
]
=
op
[
2
]
=
a1
-
e1
;
op
[
3
]
=
e1
;
a1
-=
e1
;
op
[
0
]
=
a1
;
op
[
1
]
=
op
[
2
]
=
op
[
3
]
=
e1
;
ip
=
tmp
;
for
(
i
=
0
;
i
<
4
;
i
++
)
{
e1
=
ip
[
0
]
>>
1
;
a1
=
ip
[
0
]
-
e1
;
dest
[
dest_stride
*
0
]
=
clip_pixel
(
dest
[
dest_stride
*
0
]
+
a1
);
dest
[
dest_stride
*
1
]
=
clip_pixel
(
dest
[
dest_stride
*
1
]
+
a
1
);
dest
[
dest_stride
*
2
]
=
clip_pixel
(
dest
[
dest_stride
*
2
]
+
a
1
);
dest
[
dest_stride
*
1
]
=
clip_pixel
(
dest
[
dest_stride
*
1
]
+
e
1
);
dest
[
dest_stride
*
2
]
=
clip_pixel
(
dest
[
dest_stride
*
2
]
+
e
1
);
dest
[
dest_stride
*
3
]
=
clip_pixel
(
dest
[
dest_stride
*
3
]
+
e1
);
ip
++
;
dest
++
;
...
...
vp9/common/vp9_idct.h
View file @
7ca651a3
...
...
@@ -17,6 +17,7 @@
#include "vpx/vpx_integer.h"
#include "vp9/common/vp9_common.h"
// Constants and Macros used by all idct/dct functions
#define DCT_CONST_BITS 14
#define DCT_CONST_ROUNDING (1 << (DCT_CONST_BITS - 1))
...
...
vp9/encoder/vp9_dct.c
View file @
7ca651a3
...
...
@@ -606,14 +606,13 @@ void vp9_short_walsh4x4_c(short *input, short *output, int pitch) {
c1
=
ip
[
2
*
pitch_short
];
d1
=
ip
[
3
*
pitch_short
];
b1
=
a1
-
b1
;
c1
+=
d1
;
e1
=
(
c1
-
b1
)
>>
1
;
a1
+=
e1
;
d1
-=
e1
;
c1
=
a1
-
c1
;
b1
-=
d1
;
a1
+=
b1
;
d1
=
d1
-
c1
;
e1
=
(
a1
-
d1
)
>>
1
;
b1
=
e1
-
b1
;
c1
=
e1
-
c1
;
a1
-=
c1
;
d1
+=
b1
;
op
[
0
]
=
a1
;
op
[
4
]
=
c1
;
op
[
8
]
=
d1
;
...
...
@@ -631,14 +630,13 @@ void vp9_short_walsh4x4_c(short *input, short *output, int pitch) {
c1
=
ip
[
2
];
d1
=
ip
[
3
];
b1
=
a1
-
b1
;
c1
+=
d1
;
e1
=
(
c1
-
b1
)
>>
1
;
a1
+=
e1
;
d1
-=
e1
;
c1
=
a1
-
c1
;
b1
-=
d1
;
a1
+=
b1
;
d1
-=
c1
;
e1
=
(
a1
-
d1
)
>>
1
;
b1
=
e1
-
b1
;
c1
=
e1
-
c1
;
a1
-=
c1
;
d1
+=
b1
;
op
[
0
]
=
a1
<<
WHT_UPSCALE_FACTOR
;
op
[
1
]
=
c1
<<
WHT_UPSCALE_FACTOR
;
op
[
2
]
=
d1
<<
WHT_UPSCALE_FACTOR
;
...
...
Write
Preview
Supports
Markdown
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