KB8PMY
/
tcd
mirror of https://github.com/n7tae/tcd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use md380_vocoder for ambe+2 codec

Browse Source
main
Doug McLain 4 years ago
parent 528495bb78
commit 4ab1adf595
5 changed files with 127 additions and 36 deletions
Show Stats Download Patch File Download Diff File

133
Controller.cpp
Unescape View File

@ -21,6 +21,7 @@
#include <sstream>
#include <fstream>
#include <thread>
#include <md380_vocoder.h>
#include "TranscoderPacket.h"
#include "Controller.h"
@ -28,10 +29,23 @@
#define AMBE_GAIN 0 //Encoder gain in dB (I use 12 here)
#define AMBE2_GAIN 0 //Encoder gain in dB (I use -12 here)
int16_t calcGainVal(float db)
{
float ratio = powf(10.0, (db/20.0));
if(db < 0){
ratio = (1/ratio) * (-1);
}
return (int16_t)roundf(ratio);
}
CController::CController() : keep_running(true) {}
bool CController::Start()
{
swambe2 = true;
if (InitVocoders() || reader.Open(REF2TC))
{
keep_running = false;
@ -39,6 +53,7 @@ bool CController::Start()
}
reflectorFuture = std::async(std::launch::async, &CController::ReadReflectorThread, this);
c2Future = std::async(std::launch::async, &CController::ProcessC2Thread, this);
swambe2Future = std::async(std::launch::async, &CController::ProcessSWAMBE2Thread,this);
return false;
}
@ -124,8 +139,13 @@ bool CController::InitVocoders()
if (2 != deviceset.size())
{
std::cerr << "Could not find exactly two DVSI devices" << std::endl;
return true;
if(swambe2 && (deviceset.size() == 1)){
std::cout << "Using one DVSI device and md380_vocoder" << std::endl;
}
else{
std::cerr << "Could not find exactly two DVSI devices" << std::endl;
return true;
}
}
const auto desc(deviceset.front().second);
@ -162,38 +182,53 @@ bool CController::InitVocoders()
if (Edvtype::dv3000 == dvtype)
{
dstar_device = std::unique_ptr<CDVDevice>(new CDV3000(Encoding::dstar));
dmrsf_device = std::unique_ptr<CDVDevice>(new CDV3000(Encoding::dmrsf));
if(swambe2){
md380_init();
gain = calcGainVal(AMBE2_GAIN);
}
else
dmrsf_device = std::unique_ptr<CDVDevice>(new CDV3000(Encoding::dmrsf));
}
else
{
dstar_device = std::unique_ptr<CDVDevice>(new CDV3003(Encoding::dstar));
dmrsf_device = std::unique_ptr<CDVDevice>(new CDV3003(Encoding::dmrsf));
if(swambe2){
md380_init();
}
else
dmrsf_device = std::unique_ptr<CDVDevice>(new CDV3003(Encoding::dmrsf));
}
if (dstar_device && dmrsf_device)
if (dstar_device)
{
if (dstar_device->OpenDevice(deviceset.front().first, deviceset.front().second, dvtype, AMBE_GAIN))
if (dstar_device->OpenDevice(deviceset.front().first, deviceset.front().second, dvtype, calcGainVal(AMBE_GAIN)))
return true;
deviceset.pop_front();
if (dmrsf_device->OpenDevice(deviceset.front().first, deviceset.front().second, dvtype, AMBE2_GAIN))
}
else
{
std::cerr << "Could not create DVSI devices!" << std::endl;
return true;
}
if (!swambe2 && dmrsf_device)
{
if (dmrsf_device->OpenDevice(deviceset.front().first, deviceset.front().second, dvtype, calcGainVal(AMBE2_GAIN)))
return true;
deviceset.pop_front();
}
else
else if(!swambe2)
{
std::cerr << "Could not create DVSI devices!" << std::endl;
return true;
}
}
if (dstar_device->GetProductID().compare(dmrsf_device->GetProductID()))
{
std::cerr << "Both devices must have the same DVSI product ID: " << dstar_device->GetProductID() << " != " << dmrsf_device->GetProductID() << std::endl;
return true;
}
// and start them up!
// and start them (or it) up!
dstar_device->Start();
dmrsf_device->Start();
if(!swambe2)
dmrsf_device->Start();
deviceset.clear();
@ -220,7 +255,10 @@ void CController::ReadReflectorThread()
dstar_device->AddPacket(packet);
break;
case ECodecType::dmr:
dmrsf_device->AddPacket(packet);
if(swambe2)
swambe2_queue.push(packet);
else
dmrsf_device->AddPacket(packet);
break;
case ECodecType::c2_1600:
case ECodecType::c2_3200:
@ -338,6 +376,62 @@ void CController::ProcessC2Thread()
}
}
void CController::AudiotoSWAMBE2(std::shared_ptr<CTranscoderPacket> packet)
{
const auto m = packet->GetModule();
uint8_t ambe2[9];
int16_t tmp[160];
const int16_t *p = packet->GetAudioSamples();
const uint32_t g = abs(gain);
for(int i = 0; i < 160; ++i){
if(gain < 0){
tmp[i] = p[i] / g;
}
else{
tmp[i] = p[i] * g;
}
}
md380_encode_fec(ambe2, packet->GetAudioSamples());
packet->SetDMRData(ambe2);
// we might be all done...
send_mux.lock();
if (packet->AllCodecsAreSet() && packet->HasNotBeenSent()) SendToReflector(packet);
send_mux.unlock();
}
void CController::SWAMBE2toAudio(std::shared_ptr<CTranscoderPacket> packet)
{
int16_t tmp[160] = {0};
md380_decode_fec(packet->GetDMRData(), tmp);
packet->SetAudioSamples(tmp, false);
dstar_device->AddPacket(packet);
codec2_queue.push(packet);
}
void CController::ProcessSWAMBE2Thread()
{
while (keep_running)
{
auto packet = swambe2_queue.pop();
switch (packet->GetCodecIn())
{
case ECodecType::c2_1600:
case ECodecType::c2_3200:
case ECodecType::dstar:
AudiotoSWAMBE2(packet);
break;
case ECodecType::dmr:
SWAMBE2toAudio(packet);
break;
}
}
}
void CController::SendToReflector(std::shared_ptr<CTranscoderPacket> packet)
{
// open a socket to the reflector channel
@ -357,7 +451,10 @@ void CController::RouteDstPacket(std::shared_ptr<CTranscoderPacket> packet)
{
// codec_in is dstar, the audio has just completed, so now calc the M17 and DMR
codec2_queue.push(packet);
dmrsf_device->AddPacket(packet);
if(swambe2)
swambe2_queue.push(packet);
else
dmrsf_device->AddPacket(packet);
}
else
{

8
Controller.h
Unescape View File

@ -44,7 +44,7 @@ public:
protected:
std::atomic<bool> keep_running;
std::future<void> reflectorFuture, c2Future;
std::future<void> reflectorFuture, c2Future, swambe2Future;
std::unordered_map<char, int16_t[160]> audio_store;
std::unordered_map<char, uint8_t[8]> data_store;
CUnixDgramReader reader;
@ -53,14 +53,20 @@ protected:
std::unique_ptr<CDVDevice> dstar_device, dmrsf_device;
CPacketQueue codec2_queue;
CPacketQueue swambe2_queue;
std::mutex send_mux;
int16_t gain;
bool swambe2;
bool DiscoverFtdiDevices(std::list<std::pair<std::string, std::string>> &found);
bool InitVocoders();
// processing threads
void ReadReflectorThread();
void ProcessC2Thread();
void ProcessSWAMBE2Thread();
void Codec2toAudio(std::shared_ptr<CTranscoderPacket> packet);
void AudiotoCodec2(std::shared_ptr<CTranscoderPacket> packet);
void SWAMBE2toAudio(std::shared_ptr<CTranscoderPacket> packet);
void AudiotoSWAMBE2(std::shared_ptr<CTranscoderPacket> packet);
void SendToReflector(std::shared_ptr<CTranscoderPacket> packet);
};

16
DVSIDevice.cpp
Unescape View File

@ -36,17 +36,6 @@
#include "configure.h"
#include "Controller.h"
int16_t calcGainVal(float db)
{
float ratio = powf(10.0, (db/20.0));
if(db < 0){
ratio = (1/ratio) * (-1);
}
return (int16_t)roundf(ratio);
}
extern CController Controller;
CDVDevice::CDVDevice(Encoding t) : type(t), ftHandle(nullptr), buffer_depth(0), keep_running(true)
@ -151,7 +140,7 @@ bool CDVDevice::checkResponse(SDV_Packet &p, uint8_t response) const
return false;
}
bool CDVDevice::OpenDevice(const std::string &serialno, const std::string &desc, Edvtype dvtype, float dbgain)
bool CDVDevice::OpenDevice(const std::string &serialno, const std::string &desc, Edvtype dvtype, int16_t g)
{
auto status = FT_OpenEx((PVOID)serialno.c_str(), FT_OPEN_BY_SERIAL_NUMBER, &ftHandle);
if (FT_OK != status)
@ -160,7 +149,7 @@ bool CDVDevice::OpenDevice(const std::string &serialno, const std::string &desc,
return true;
}
gain = calcGainVal(dbgain);
gain = g;
std::this_thread::sleep_for(std::chrono::milliseconds(50));
FT_Purge(ftHandle, FT_PURGE_RX | FT_PURGE_TX );
std::this_thread::sleep_for(std::chrono::milliseconds(50));
@ -605,7 +594,6 @@ void CDVDevice::FeedDevice()
}
else
{
//SendAudio(index, packet->GetAudioSamples(), (Encoding::dstar==type) ? 4 : -4);
SendAudio(index, packet->GetAudioSamples(), gain);
}
buffer_depth++;

2
DVSIDevice.h
Unescape View File

@ -32,7 +32,7 @@ public:
CDVDevice(Encoding t);
virtual ~CDVDevice();
bool OpenDevice(const std::string &serialno, const std::string &desc, Edvtype dvtype, float dbgain);
bool OpenDevice(const std::string &serialno, const std::string &desc, Edvtype dvtype, int16_t g);
void Start();
void CloseDevice();
void AddPacket(const std::shared_ptr<CTranscoderPacket> packet);

4
Makefile
Unescape View File

@ -14,7 +14,7 @@ else
CFLAGS = -W -Werror -Icodec2 -MMD -MD -std=c++11
endif
LDFLAGS = -lftd2xx -pthread
LDFLAGS = -lftd2xx -lmd380_vocoder -pthread
SRCS = $(wildcard *.cpp) $(wildcard codec2/*.cpp)
OBJS = $(SRCS:.cpp=.o)
@ -22,7 +22,7 @@ DEPS = $(SRCS:.cpp=.d)
EXE = tcd
$(EXE) : $(OBJS)
$(GCC) -o $@ $(OBJS) $(LDFLAGS)
$(GCC) $(OBJS) $(LDFLAGS) -o $@ -Xlinker --section-start=.firmware=0x0800C000 -Xlinker --section-start=.sram=0x20000000
%.o : %.cpp
$(GCC) $(CFLAGS) -c $< -o $@

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.