Commit 7a91d21d authored by Jim Bankoski's avatar Jim Bankoski

libvpx: vpx_add_plane_noise make c match assembly

This change makes the c match the assembly and removes the todo's
associated with getting this to work.

Change-Id: Ie32e9ebb584a9d60399662d8bcb71b74fbd19d1e
parent 34d5aff7
......@@ -144,8 +144,7 @@ TEST_P(AddNoiseTest, CheckNoiseAdded) {
vpx_free(s);
}
// TODO(jimbankoski): Make the c work like assembly so we can enable this.
TEST_P(AddNoiseTest, DISABLED_CheckCvsAssembly) {
TEST_P(AddNoiseTest, CheckCvsAssembly) {
DECLARE_ALIGNED(16, char, blackclamp[16]);
DECLARE_ALIGNED(16, char, whiteclamp[16]);
DECLARE_ALIGNED(16, char, bothclamp[16]);
......@@ -167,8 +166,10 @@ TEST_P(AddNoiseTest, DISABLED_CheckCvsAssembly) {
memset(s, 99, image_size);
memset(d, 99, image_size);
srand(0);
ASM_REGISTER_STATE_CHECK(GetParam()(s, noise, blackclamp, whiteclamp,
bothclamp, width, height, width));
srand(0);
ASM_REGISTER_STATE_CHECK(vpx_plane_add_noise_c(d, noise, blackclamp,
whiteclamp, bothclamp,
width, height, width));
......
......@@ -23,21 +23,18 @@ void vpx_plane_add_noise_c(uint8_t *start, char *noise,
unsigned int width, unsigned int height, int pitch) {
unsigned int i, j;
// TODO(jbb): why does simd code use both but c doesn't, normalize and
// fix..
(void) bothclamp;
for (i = 0; i < height; i++) {
uint8_t *pos = start + i * pitch;
char *ref = (char *)(noise + (rand() & 0xff)); // NOLINT
for (j = 0; j < width; j++) {
if (pos[j] < blackclamp[0])
pos[j] = blackclamp[0];
int v = pos[j];
if (pos[j] > 255 - whiteclamp[0])
pos[j] = 255 - whiteclamp[0];
v = clamp(v - blackclamp[0], 0, 255);
v = clamp(v + bothclamp[0], 0, 255);
v = clamp(v - whiteclamp[0], 0, 255);
pos[j] += ref[j];
pos[j] = v + ref[j];
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment