From 953079668f1d493916292bcfcd922907cc48f7d3 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 21 Apr 2020 01:35:37 +0200 Subject: [PATCH] DATV demod: apply commit 2ac274f77e6cb6ad6d2a81c9f94f05ea00ea4833 Customize MER for QAM constellations too. --- plugins/channelrx/demoddatv/leansdr/sdr.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/channelrx/demoddatv/leansdr/sdr.h b/plugins/channelrx/demoddatv/leansdr/sdr.h index f658df9da..17c6c1f6c 100644 --- a/plugins/channelrx/demoddatv/leansdr/sdr.h +++ b/plugins/channelrx/demoddatv/leansdr/sdr.h @@ -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];