LX3JL/xlxd
1
0
Fork 0
mirror of https://github.com/LX3JL/xlxd.git synced 2025-12-06 07:42:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #216 from narspt/patch-17

Browse source 
fix ambed to allow use by multiple xlxd and minor improvements
This commit is contained in:
LX3JL 2023-12-12 13:27:39 +01:00 committed by GitHub
parent 136ccff0fe f9a46808a3
commit 414ed796e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ambed/ccontroller.cpp
View file

@ -134,7 +134,7 @@ void CController::Task(void)
// crack packet // crack packet
if ( IsValidOpenstreamPacket(Buffer, &Callsign, &CodecIn, &CodecOut) ) if ( IsValidOpenstreamPacket(Buffer, &Callsign, &CodecIn, &CodecOut) )
{ {
std::cout << "Stream Open from " << Callsign << std::endl; std::cout << "Stream Open from " << Callsign << " at " << Ip << std::endl;
// try create the stream // try create the stream
Stream = OpenStream(Callsign, Ip, CodecIn, CodecOut); Stream = OpenStream(Callsign, Ip, CodecIn, CodecOut);

6
ambed/cstream.cpp
View file

@ -126,7 +126,7 @@ bool CStream::Init(uint16 uiPort)
} }
else else
{ {
std::cout << "Error opening socket on port UDP" << uiPort << " on ip " << m_Ip << std::endl; std::cout << "Error opening socket on port UDP" << uiPort << " on ip " << g_AmbeServer.GetListenIp() << std::endl;
} }
// done // done
@ -174,7 +174,7 @@ void CStream::Thread(CStream *This)
void CStream::Task(void) void CStream::Task(void)
{ {
CBuffer Buffer; CBuffer Buffer;
static CIp Ip; CIp Ip;
uint8 uiPid; uint8 uiPid;
uint8 Ambe[AMBE_FRAME_SIZE]; uint8 Ambe[AMBE_FRAME_SIZE];
CAmbePacket *packet; CAmbePacket *packet;
@ -207,7 +207,7 @@ void CStream::Task(void)
queue->pop(); queue->pop();
// send it to client // send it to client
EncodeDvFramePacket(&Buffer, packet->GetPid(), packet->GetAmbe()); EncodeDvFramePacket(&Buffer, packet->GetPid(), packet->GetAmbe());
m_Socket.Send(Buffer, Ip, m_uiPort); m_Socket.Send(Buffer, m_Ip, m_uiPort);
// and done // and done
delete packet; delete packet;
} }

7
ambed/cusb3xxxinterface.cpp
View file

@ -402,7 +402,12 @@ bool CUsb3xxxInterface::ReadDeviceVersion(void)
ok = (len > 0); ok = (len > 0);
//we succeed in reading a packet, print it out //we succeed in reading a packet, print it out
std::cout << "ReadDeviceVersion : "; std::cout << "ReadDeviceVersion : ";
for ( i = 4; i < len+4 ; i++ ) for ( i = 5; (i < len+4) && (rxpacket[i] != 0x00); i++ )
{
std::cout << (char)(rxpacket[i] & 0x00ff);
}
std::cout << " ";
for ( i = i+2; (i < len+4) && (rxpacket[i] != 0x00); i++ )
{ {
std::cout << (char)(rxpacket[i] & 0x00ff); std::cout << (char)(rxpacket[i] & 0x00ff);
} }

8
ambed/cvocodecchannel.cpp
View file

@ -62,8 +62,8 @@ bool CVocodecChannel::Open(void)
ok = true; ok = true;
PurgeAllQueues(); PurgeAllQueues();
std::cout << "Vocodec channel " << std::cout << "Vocodec channel " <<
m_InterfaceIn->GetName() << ":" << (int)m_iChannelIn << " -> " << m_InterfaceIn->GetName() << ":" << m_InterfaceIn->GetSerial() << ":" << (int)m_iChannelIn << " -> " <<
m_InterfaceOut->GetName() << ":" << (int)m_iChannelOut << " open" << std::endl; m_InterfaceOut->GetName() << ":" << m_InterfaceOut->GetSerial() << ":" << (int)m_iChannelOut << " open" << std::endl;
} }
return ok; return ok;
} }
@ -75,8 +75,8 @@ void CVocodecChannel::Close(void)
m_bOpen = false; m_bOpen = false;
PurgeAllQueues(); PurgeAllQueues();
std::cout << "Vocodec channel " << std::cout << "Vocodec channel " <<
m_InterfaceIn->GetName() << ":" << (int)m_iChannelIn << " -> " << m_InterfaceIn->GetName() << ":" << m_InterfaceIn->GetSerial() << ":" << (int)m_iChannelIn << " -> " <<
m_InterfaceOut->GetName() << ":" << (int)m_iChannelOut << " closed" << std::endl; m_InterfaceOut->GetName() << ":" << m_InterfaceOut->GetSerial() << ":" << (int)m_iChannelOut << " closed" << std::endl;
} }
} }

1
ambed/cvocodecinterface.h
View file

@ -46,6 +46,7 @@ public:
// get // get
virtual const char *GetName(void) const { return ""; } virtual const char *GetName(void) const { return ""; }
virtual const char *GetSerial(void) const { return ""; }
// manage channels // manage channels
virtual int GetNbChannels(void) const { return 0; } virtual int GetNbChannels(void) const { return 0; }

1
ambed/cvocodecs.cpp
View file

@ -289,6 +289,7 @@ bool CVocodecs::DiscoverFtdiDevices(void)
list[i].Description, list[i].SerialNumber); list[i].Description, list[i].SerialNumber);
m_FtdiDeviceDescrs.push_back(descr); m_FtdiDeviceDescrs.push_back(descr);
} }
std::cout << std::endl;
} }
else else
{ {

2
ambed/main.h
View file

@ -59,8 +59,6 @@
// Transcoder server -------------------------------------------- // Transcoder server --------------------------------------------
#define TRANSCODER_PORT 10100 // UDP port #define TRANSCODER_PORT 10100 // UDP port
#define TRANSCODER_KEEPALIVE_PERIOD 5 // in seconds
#define TRANSCODER_KEEPALIVE_TIMEOUT 30 // in seconds
// Codecs ------------------------------------------------------- // Codecs -------------------------------------------------------
#define CODEC_NONE 0 #define CODEC_NONE 0