|
|
|
@ -1831,6 +1831,10 @@ void HostBridge::encodeDMRAudioFrame(uint8_t* pcm, uint32_t forcedSrcId, uint32_
|
|
|
|
if (forcedDstId > 0 && forcedDstId != m_dstId)
|
|
|
|
if (forcedDstId > 0 && forcedDstId != m_dstId)
|
|
|
|
dstId = forcedDstId;
|
|
|
|
dstId = forcedDstId;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// never allow a source ID of 0
|
|
|
|
|
|
|
|
if (srcId == 0U)
|
|
|
|
|
|
|
|
srcId = m_srcId;
|
|
|
|
|
|
|
|
|
|
|
|
uint8_t* data = nullptr;
|
|
|
|
uint8_t* data = nullptr;
|
|
|
|
m_dmrN = (uint8_t)(m_dmrSeqNo % 6);
|
|
|
|
m_dmrN = (uint8_t)(m_dmrSeqNo % 6);
|
|
|
|
if (m_ambeCount == AMBE_PER_SLOT) {
|
|
|
|
if (m_ambeCount == AMBE_PER_SLOT) {
|
|
|
|
@ -2646,6 +2650,10 @@ void HostBridge::encodeP25AudioFrame(uint8_t* pcm, uint32_t forcedSrcId, uint32_
|
|
|
|
if (forcedDstId > 0 && forcedDstId != m_dstId)
|
|
|
|
if (forcedDstId > 0 && forcedDstId != m_dstId)
|
|
|
|
dstId = forcedDstId;
|
|
|
|
dstId = forcedDstId;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// never allow a source ID of 0
|
|
|
|
|
|
|
|
if (srcId == 0U)
|
|
|
|
|
|
|
|
srcId = m_srcId;
|
|
|
|
|
|
|
|
|
|
|
|
lc::LC lc = lc::LC();
|
|
|
|
lc::LC lc = lc::LC();
|
|
|
|
lc.setLCO(LCO::GROUP);
|
|
|
|
lc.setLCO(LCO::GROUP);
|
|
|
|
lc.setGroup(true);
|
|
|
|
lc.setGroup(true);
|
|
|
|
|