removed is_second from CPacket

This commit is contained in:
Tom Early committed 2021-12-27 20:04:52 -07:00
1 parent bd62197312
commit b641b74cd8
5 files changed
+2 -8

No files matched your search

-1
View File
@@ -151,7 +151,6 @@ void CDvFramePacket::SetTCParams(uint32_t seq)
{
m_TCPack.sequence = seq;
m_TCPack.streamid = m_uiStreamId;
m_TCPack.is_second = m_bIsSecond;
m_TCPack.is_last = m_bLastPacket;
m_TCPack.module = m_cModule;
m_TCPack.rt_timer.start();
+1 -1
View File
@@ -236,7 +236,7 @@ void CM17Protocol::HandleQueue(void)
m_StreamsCache[module].m_dvHeader = CDvHeaderPacket((const CDvHeaderPacket &)*packet.get());
m_StreamsCache[module].m_iSeqCounter = 0;
}
else if ( packet->IsDvFrame() && (packet->IsSecond() || packet->IsLastPacket()))
else if ( packet->IsDvFrame() && ((1 == m_StreamsCache[module].m_iSeqCounter % 2) || packet->IsLastPacket()))
{
// encode it
SM17Frame frame;
-3
View File
@@ -153,7 +153,4 @@ void CPacket::UpdatePids(const uint32_t pid)
// frames are every 20 milliseconds, so the m17 data will come every 40 milliseconds
m_uiM17FrameNumber = (pid / 2) % 0x8000U;
}
// set the Is Second member used for M17 clients
m_bIsSecond = (1 == pid % 2);
}
-2
View File
@@ -60,7 +60,6 @@ public:
uint8_t GetYsfPacketFrameId(void) const { return m_uiYsfPacketFrameId; }
char GetPacketModule(void) const { return m_cModule; }
bool IsLocalOrigin(void) const { return (m_eOrigin == EOrigin::local); }
bool IsSecond(void) const { return m_bIsSecond; }
ECodecType GetCodecIn(void) const { return m_eCodecIn; }
// set
@@ -75,7 +74,6 @@ protected:
ECodecType m_eCodecIn;
EOrigin m_eOrigin;
bool m_bLastPacket;
bool m_bIsSecond;
char m_cModule;
uint16_t m_uiStreamId;
uint32_t m_uiM17FrameNumber;
+1 -1
View File
@@ -29,7 +29,7 @@ using STCPacket = struct tcpacket_tag {
CTimer rt_timer;
uint32_t sequence;
char module;
bool is_second, is_last;
bool is_last;
uint16_t streamid;
ECodecType codec_in;
uint8_t dstar[9];