mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 10:37:26 -05:00
#130 MPT-1327 Decoder Filter issue resolved. Converts the post-demodulation filter from a band pass filter to a low-pass filter with 60 dB attenuation and a cutoff of 3200 Hz. This is then followed by a high-pass filter at the decimated channel rate, internal to the decoder that performs DC removal and removes any CTCSS tones prior to the FSK decoder.
This commit is contained in:
@@ -545,29 +545,29 @@ public class Metadata
|
|||||||
*/
|
*/
|
||||||
private void determineRecordable()
|
private void determineRecordable()
|
||||||
{
|
{
|
||||||
mRecordable = false;
|
mRecordable = true;
|
||||||
|
|
||||||
if(mPrimaryAddressTo.hasAlias() && mPrimaryAddressTo.getAlias().isRecordable())
|
if(mPrimaryAddressTo.hasAlias() && !mPrimaryAddressTo.getAlias().isRecordable())
|
||||||
{
|
{
|
||||||
mRecordable = true;
|
mRecordable = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(mPrimaryAddressFrom.hasAlias() && mPrimaryAddressFrom.getAlias().isRecordable())
|
if(mPrimaryAddressFrom.hasAlias() && !mPrimaryAddressFrom.getAlias().isRecordable())
|
||||||
{
|
{
|
||||||
mRecordable = true;
|
mRecordable = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(mSecondaryAddressTo.hasAlias() && mSecondaryAddressTo.getAlias().isRecordable())
|
if(mSecondaryAddressTo.hasAlias() && !mSecondaryAddressTo.getAlias().isRecordable())
|
||||||
{
|
{
|
||||||
mRecordable = true;
|
mRecordable = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(mSecondaryAddressFrom.hasAlias() && mSecondaryAddressFrom.getAlias().isRecordable())
|
if(mSecondaryAddressFrom.hasAlias() && !mSecondaryAddressFrom.getAlias().isRecordable())
|
||||||
{
|
{
|
||||||
mRecordable = true;
|
mRecordable = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -217,11 +217,14 @@ public class ChannelProcessingManager implements ChannelEventListener
|
|||||||
MessageActivityModel messageModel = new MessageActivityModel(messageFilter);
|
MessageActivityModel messageModel = new MessageActivityModel(messageFilter);
|
||||||
processingChain.setMessageActivityModel(messageModel);
|
processingChain.setMessageActivityModel(messageModel);
|
||||||
|
|
||||||
//Override recordable flag in metadata if user has specified audio recording
|
//Set the recordable flag to false in metadata if we don't have a record configuration, or if the user
|
||||||
if(channel.getRecordConfiguration() != null &&
|
//has not specified audio recording. Note: the metadata class sets recordable to true by default if no
|
||||||
channel.getRecordConfiguration().getRecorders().contains(RecorderType.AUDIO))
|
//setting has been specified. This flag is subsequently turned off if any of the primary or secondary
|
||||||
|
//identifiers are designated as non-recordable.
|
||||||
|
if(channel.getRecordConfiguration() == null ||
|
||||||
|
!channel.getRecordConfiguration().getRecorders().contains(RecorderType.AUDIO))
|
||||||
{
|
{
|
||||||
processingChain.getChannelState().getMutableMetadata().setRecordable(true);
|
processingChain.getChannelState().getMutableMetadata().setRecordable(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Inject channel metadata that will be inserted into audio packets for recorder manager and streaming
|
//Inject channel metadata that will be inserted into audio packets for recorder manager and streaming
|
||||||
|
|||||||
Reference in New Issue
Block a user