summaryrefslogtreecommitdiffstats
path: root/apps/codecs/libspeex/cb_search.c
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2007-11-24 19:14:29 +0000
committerThom Johansen <thomj@rockbox.org>2007-11-24 19:14:29 +0000
commit929443cca52e53696d776661af42d5737a0af10d (patch)
treefe118429b9c1467b721fe2e1cab5b7ae4a0fa873 /apps/codecs/libspeex/cb_search.c
parentd6e22443c4406d94038fdf19955371d38e2ab71f (diff)
downloadrockbox-929443cca52e53696d776661af42d5737a0af10d.tar.gz
rockbox-929443cca52e53696d776661af42d5737a0af10d.zip
Sync to SVN.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15792 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libspeex/cb_search.c')
-rw-r--r--apps/codecs/libspeex/cb_search.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/apps/codecs/libspeex/cb_search.c b/apps/codecs/libspeex/cb_search.c
index a3857c3afa..d280757e59 100644
--- a/apps/codecs/libspeex/cb_search.c
+++ b/apps/codecs/libspeex/cb_search.c
@@ -149,8 +149,7 @@ int update_target
ALLOC(e, nsf, spx_sig_t);
/* FIXME: Do we still need to copy the target? */
- for (i=0;i<nsf;i++)
- t[i]=target[i];
+ SPEEX_COPY(t, target, nsf);
compute_weighted_codebook(shape_cb, r, resp, resp2, E, shape_cb_size, subvect_size, stack);
@@ -344,11 +343,10 @@ int update_target
oind[i]=itmp+(2*i+1)*nb_subvect;
}
- for (i=0;i<nsf;i++)
- t[i]=target[i];
+ SPEEX_COPY(t, target, nsf);
for (j=0;j<N;j++)
- speex_move(&ot[j][0], t, nsf*sizeof(spx_word16_t));
+ SPEEX_COPY(&ot[j][0], t, nsf);
/* Pre-compute codewords response and energy */
compute_weighted_codebook(shape_cb, r, resp, resp2, E, shape_cb_size, subvect_size, stack);
@@ -597,8 +595,7 @@ int update_target
for (i=0;i<nsf;i++)
exc[i]+=SHL32(EXTEND32(tmp[i]),8);
- for (i=0;i<nsf;i++)
- target[i]=0;
+ SPEEX_MEMSET(target, 0, nsf);
}
#endif /* SPEEX_DISABLE_ENCODER */