op25
/
op25-legacy
Archived
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Trivial mods. 

git-svn-id: http://op25.osmocom.org/svn/trunk@164 65a5c917-d112-43f1-993d-58c26a4786be
This commit is contained in:
stevie 2009-08-30 12:41:32 +00:00
parent 3d2ad91012
commit 4af24ac4f3
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
imbe/imbe.cc
View File

@ -1653,13 +1653,14 @@ software_imbe_decoder::synth_voiced()
int ell, en;
if( L > OldL) { MaxL = L; } else { MaxL = OldL; }
if( L > OldL) {
MaxL = L;
} else {
MaxL = OldL;
}
psi1 = psi1 +(Oldw0 + w0) * 80;
#if 1
psi1 = remainderf(psi1, 2 * M_PI); // ToDo decide if its 2pi or pi^2
#endif
psi1 = remainderf(psi1, 2 * M_PI); // ToDo: decide if its 2pi or pi^2
for(ell = 1; ell <= L/4; ell++) {
phi[ell][ New] = psi1 * ell;
@ -1669,14 +1670,27 @@ software_imbe_decoder::synth_voiced()
phi[ell][ New] = psi1 * ell + Tmp * PhzNz[ell];
}
for(en = 0; en <= 159; en++) { sv[en] = 0; }
for(en = 0; en <= 159; en++) {
sv[en] = 0;
}
for(ell = 1; ell <= MaxL; ell++) {
if(ell > L) { MNew = 0; } else { MNew = M[ell][ New]; } //128
if(ell > OldL) { MOld = 0; } else { MOld = M[ell][ Old]; } //129
if(ell > L) {
MNew = 0;
} else {
MNew = M[ell][ New];
}
if(ell > OldL) {
MOld = 0;
} else {
MOld = M[ell][ Old];
}
if(vee[ell][ New]) {
if ( vee[ell][ Old]) {
if(ell < 8 & fabsf(w0 - Oldw0) < .1 * w0) { //134(fine transition)
if(ell < 8 & fabsf(w0 - Oldw0) < .1 * w0) { // (fine transition)
const double PI_SQUARED = M_PI * M_PI;
const double INV_PI_SQUARED = 1.0 / PI_SQUARED;
Dpl = phi[ell][ New] - phi[ell][ Old] -(Oldw0 + w0) * ell * 80;
@ -1684,39 +1698,31 @@ software_imbe_decoder::synth_voiced()
THa = (Oldw0 * (float)ell + Dwl);
THb = (w0 - Oldw0) * ell * .003125;
Mb = .00625 *(MNew - MOld);
// FOR en = 0 TO 159
for(en = 0; en <= 159; en++) {
sv[en] = sv[en] +(MOld + en * Mb) * cos(phi[ell][ Old] +(THa + THb * en) * en);
}
} else { //133(coarse transition)
// FOR en = 0 TO 55
} else { // (coarse transition)
for(en = 0; en <= 55; en++) {
sv[en] = sv[en] + ws[en+105] * MOld * cos(Oldw0 * en * ell + phi[ell] [ Old]);
}
// FOR en = 56 TO 105
for(en = 56; en <= 105; en++) {
sv[en] = sv[en] + ws[en+105] * MOld * cos(Oldw0 * en * ell + phi[ell][ Old]);
sv[en] = sv[en] + ws[en-55] * MNew * cos(w0 *(en - 160) * ell + phi[ell][ New]);
}
// FOR en = 106 TO 159
for(en = 106; en <= 159; en++) {
sv[en] = sv[en] + ws[en-55] * MNew * cos(w0 *(en - 160) * ell + phi[ell][ New]);
}
}
} else { //132
// FOR en = 56 TO 159
} else {
for(en = 56; en <= 159; en++) {
sv[en] = sv[en] + ws[en-55] * MNew * cos(w0 *(en - 160) * ell + phi[ell][ New]);
}
}
} else {
if( vee[ell][ Old]) { //131
// FOR en = 0 TO 105
if( vee[ell][Old]) {
for(en = 0; en <= 105; en++) {
sv[en] = sv[en] + ws[en+105] * MOld * cos(Oldw0 * en * ell + phi[ell][ Old]);
}
//ELSE '130
// FOR en = 0 TO 159: sv(en) = sv(en) + 0: NEXT en
}
}
}

4
imbe/imbe.h
View File

@ -33,8 +33,8 @@ public:
virtual void decode(uint8_t *buf);
private:
//NOTE: Single-letter variable names are upper case only;
// Lower case if needed is spelled. e.g. L, ell
//NOTE: Single-letter variable names are upper case only; Lower
// case if needed is spelled. e.g. L, ell
// global Seq ER ?

6
imbe/main.cc
View File

@ -2,10 +2,14 @@
#include <cstdlib>
#include <imbe.h>
#include <boost/scoped_ptr.hpp>
using namespace boost;
int
main(int ac, char **av)
{
op25_imbe *imbe = new op25_imbe();
scoped_ptr<software_imbe_decoder> imbe(new software_imbe_decoder());
while(--ac) {
FILE *fp = fopen(*++av, "r");
if(fp) {