1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-07 16:22:27 -04:00

DATV demod: apply commit 2ac274f77e6cb6ad6d2a81c9f94f05ea00ea4833 Customize MER for QAM constellations too.

This commit is contained in:
f4exb 2020-04-21 01:35:37 +02:00
parent 85bbcd0c68
commit 953079668f

View File

@ -664,15 +664,15 @@ struct cstln_lut : cstln_base
} }
case QAM16: case QAM16:
amp_max = 0; amp_max = 0;
make_qam(16); make_qam(16, mer);
break; break;
case QAM64: case QAM64:
amp_max = 1; amp_max = 1;
make_qam(64); make_qam(64, mer);
break; break;
case QAM256: case QAM256:
amp_max = 1; amp_max = 1;
make_qam(256); make_qam(256, mer);
break; break;
default: default:
fail("Constellation not implemented"); 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; nrotations = 4;
nsymbols = n; 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]; result lut[R][R];