change: HaveTranscodable{Ambe,Data}

unstable
Tom Early 4 years ago
parent 2407b20798
commit 2d3ad98503

@ -35,7 +35,7 @@ public:
// identity // identity
EProtocol GetProtocol(void) const { return EProtocol::ulx; } EProtocol GetProtocol(void) const { return EProtocol::ulx; }
int GetProtocolRevision(void) const { return XLX_PROTOCOL_REVISION_2; } int GetProtocolRevision(void) const { return XLX_PROTOCOL_REVISION_2; }
const char *GetProtocolName(void) const { return "ULX"; } const char *GetProtocolName(void) const { return "XLX"; }
ECodecType GetCodec(void) const { return ECodecType::dmr; } ECodecType GetCodec(void) const { return ECodecType::dmr; }
bool IsPeer(void) const { return true; } bool IsPeer(void) const { return true; }

@ -55,7 +55,7 @@ public:
// identity // identity
bool IsDvFrame(void) const { return true; } bool IsDvFrame(void) const { return true; }
bool HasTranscodableAmbe(void) const { return true; } bool HasTranscodableData(void) const { return true; }
// get // get
const STCPacket *GetCodecPacket() const { return &m_TCPack; } const STCPacket *GetCodecPacket() const { return &m_TCPack; }

@ -44,9 +44,7 @@ CDvLastFramePacket::CDvLastFramePacket(const uint8_t *ambe, uint16_t sid, uint8_
// urf constructor // urf constructor
CDvLastFramePacket::CDvLastFramePacket CDvLastFramePacket::CDvLastFramePacket
(uint16_t sid, (uint16_t sid, uint8_t dstarpid, const uint8_t *dstarambe, const uint8_t *dstardvdata, uint8_t dmrpid, uint8_t dprspid, const uint8_t *dmrambe, const uint8_t *dmrsync, ECodecType type, const uint8_t *codec2, const uint8_t *nonce)
uint8_t dstarpid, const uint8_t *dstarambe, const uint8_t *dstardvdata,
uint8_t dmrpid, uint8_t dprspid, const uint8_t *dmrambe, const uint8_t *dmrsync, ECodecType type, const uint8_t *codec2, const uint8_t *nonce)
: CDvFramePacket(sid, dstarpid, dstarambe, dstardvdata, dmrpid, dprspid, dmrambe, dmrsync, type, codec2, nonce) : CDvFramePacket(sid, dstarpid, dstarambe, dstardvdata, dmrpid, dprspid, dmrambe, dmrsync, type, codec2, nonce)
{ {
} }

@ -50,5 +50,5 @@ public:
// identity // identity
bool IsLastPacket(void) const { return true; } bool IsLastPacket(void) const { return true; }
bool HasTranscodableAmbe(void) const { return false; } bool HasTranscodableData(void) const { return false; }
}; };

@ -47,7 +47,7 @@ public:
virtual bool IsDvHeader(void) const { return false; } virtual bool IsDvHeader(void) const { return false; }
virtual bool IsDvFrame(void) const { return false; } virtual bool IsDvFrame(void) const { return false; }
virtual bool IsLastPacket(void) const { return false; } virtual bool IsLastPacket(void) const { return false; }
virtual bool HasTranscodableAmbe(void) const { return false; } virtual bool HasTranscodableData(void) const { return false; }
// get // get
virtual bool IsValid(void) const { return true; } virtual bool IsValid(void) const { return true; }

@ -88,7 +88,7 @@ void CPacketStream::Push(std::unique_ptr<CPacket> Packet)
m_CodecStream->Lock(); m_CodecStream->Lock();
{ {
// transcoder ready & frame need transcoding ? // transcoder ready & frame need transcoding ?
if (Packet->HasTranscodableAmbe()) if (Packet->HasTranscodableData())
{ {
// yes, push packet to trancoder queue // yes, push packet to trancoder queue
// trancoder will push it after transcoding // trancoder will push it after transcoding

@ -34,7 +34,7 @@ public:
// identity // identity
EProtocol GetProtocol(void) const { return EProtocol::ulx; } EProtocol GetProtocol(void) const { return EProtocol::ulx; }
const char *GetProtocolName(void) const { return "ULX"; } const char *GetProtocolName(void) const { return "XLX"; }
// revision helper // revision helper
static int GetProtocolRevision(const CVersion &); static int GetProtocolRevision(const CVersion &);

Loading…
Cancel
Save

Powered by TurnKey Linux.