mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-11-17 13:51:47 -05:00
DATV demod: apply commit 2ac274f77e6cb6ad6d2a81c9f94f05ea00ea4833 Customize MER for QAM constellations too.
This commit is contained in:
parent
85bbcd0c68
commit
953079668f
@ -664,15 +664,15 @@ struct cstln_lut : cstln_base
|
||||
}
|
||||
case QAM16:
|
||||
amp_max = 0;
|
||||
make_qam(16);
|
||||
make_qam(16, mer);
|
||||
break;
|
||||
case QAM64:
|
||||
amp_max = 1;
|
||||
make_qam(64);
|
||||
make_qam(64, mer);
|
||||
break;
|
||||
case QAM256:
|
||||
amp_max = 1;
|
||||
make_qam(256);
|
||||
make_qam(256, mer);
|
||||
break;
|
||||
default:
|
||||
fail("Constellation not implemented");
|
||||
@ -733,7 +733,7 @@ struct cstln_lut : cstln_base
|
||||
}
|
||||
}
|
||||
|
||||
void make_qam(int n)
|
||||
void make_qam(int n, float mer)
|
||||
{
|
||||
nrotations = 4;
|
||||
nsymbols = n;
|
||||
@ -762,7 +762,7 @@ struct cstln_lut : cstln_base
|
||||
}
|
||||
}
|
||||
|
||||
make_lut_from_symbols(20); // TBD
|
||||
make_lut_from_symbols(mer);
|
||||
}
|
||||
|
||||
result lut[R][R];
|
||||
|
Loading…
Reference in New Issue
Block a user