From 7534dda3b69026df6dc40b3d907b825a0078617b Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期四, 21 八月 2025 20:14:01 +0800
Subject: [PATCH] Signed-off-by: chenlh <2008get@163.com>
---
src/tob.cpp | 192 +++++++++++++----------------------------------
1 files changed, 53 insertions(+), 139 deletions(-)
diff --git a/src/tob.cpp b/src/tob.cpp
index 22f4e44..e0eecab 100644
--- a/src/tob.cpp
+++ b/src/tob.cpp
@@ -6,6 +6,7 @@
*/
#include <stdlib.h>
#include <stdio.h>
+#include <heapnew>
#include "tob.h"
#include "crc.h"
#include "config.h"
@@ -13,7 +14,7 @@
#include "IModule.h"
#include "f2f.h"
#include "../drv/memory.h"
-#include "param_ctrl.h"
+
//#define DEBUG
#ifdef DEBUG
@@ -39,14 +40,15 @@
frames = NULL;
processed = ufalse;
mModuleNum =0;
- mLevelPacketNum =0;
mModuleIndex.resize(0);
+ paramset = new(SRAM_DDR) tg_param_ctrl_t();
}
ToB::~ToB()
{
toClear();
tob = NULL;
+ delete paramset;
}
uvoid ToB::SetMute(ubool mute)
@@ -140,7 +142,7 @@
mList.push_back(m);
if(pmod->mID >= mModuleIndex.size()) {
- mModuleIndex.resize(pmod->mID + 1,0);
+ mModuleIndex.resize(pmod->mID + 1, 0);
}
mModuleIndex[pmod->mID] = ++mModuleNum ;
@@ -195,8 +197,8 @@
FlowChartHead* head = (FlowChartHead*)bin;
u32 size = sizeof(FlowChartHead);
u16 nPhyInput[IntDataType::COUNT] = { 0,0,0 }, nPhyOutput[IntDataType::COUNT] = { 0,0,0 };
-
- frames = new Frames(head->dsp_buffer_num[dsp_index]);
+ s32 len =0;
+ frames = new Frames(head->dsp_buffer_num[dsp_index]); // C H G
do {
const Module* pmod = (Module*)(bin+ size); size += sizeof(Module);
@@ -223,22 +225,25 @@
if (pmod->mDsp != dsp_index) continue;
#ifdef DEBUG
- dbg_printf("Module ID %d type %d rxnum %d txnum %d. \n",pmod->mID ,pmod->mType, pmod->mRxNum,pmod->mTxNum);
+ printf("Module ID %d type %d rxnum %d txnum %d tag %d. \n",pmod->mID ,pmod->mType, pmod->mRxNum,pmod->mTxNum,pmod->mTag);
#endif
IModule* m = CreateBaseModule(pmod->mType,pmod->mTag, mRxNum,mTxNum);
if(!m) {
dbg_printf("Module ID Create fail.\n", pmod->mID);
continue;
}
+
m->SetModuleInfo(pmod->mID ,pmod->mType,pmod->mTag);
mList.push_back(m);
if(pmod->mID >= mModuleIndex.size()) {
- mModuleIndex.resize(pmod->mID + 1,0);
+ mModuleIndex.resize(pmod->mID + 1, 0);
}
mModuleIndex[pmod->mID] = ++mModuleNum ;
+// printf("Module id:%d, Tx buffer id:", pmod->mID);
for (size_t i = 0; i < mTxNum && !bOutput; i++){
+// printf("bid %d", mTxbufID[i]);
if (mTxbufID[i] > 0) {
Frame* pcm = frames->GetFrame(mTxbufID[i]-1 );
m->SetOutputChannelDataPtr(i, pcm);
@@ -248,13 +253,16 @@
nPhyInput[mPhyID[i].mIntType] = mPhyID[i].mPhyID;
m->SetInputChannelDataPtr(i, pcm);
SetRxChannelPtr(static_cast<IntDataType>(mPhyID[i].mIntType), mPhyID[i].mPhyID-1, pcm->Data());
+// printf("phy_id %d", mPhyID[i].mPhyID);
}
}
else {
m->SetOutputChannelDataPtr(i, 0);
}
}
+// printf(";Rx buffer id:");
for (size_t i = 0; i < mRxNum && !bInput; i++) {
+// printf("bid %d", mRxbufID[i]);
if (mRxbufID[i] > 0) {
Frame* pcm = frames->GetFrame(mRxbufID[i]-1 );
m->SetInputChannelDataPtr(i, pcm);
@@ -266,14 +274,17 @@
pcm = frames->AllocFrame();
m->SetOutputChannelDataPtr(i, pcm);
SetTxChannelPtr(static_cast<IntDataType>(mPhyID[i].mIntType), mPhyID[i].mPhyID-1, pcm->Data());
+// printf("phy_id %d", mPhyID[i].mPhyID);
}
}
else {
m->SetInputChannelDataPtr(i, 0);
}
}
+// printf("\n");
m->Init();
+ //paramset->GetParamEntry(m->GetModuleType())(m, (uvoid*)pmod->mParamaddr, len);
} while (size < nbytes);
if (size != nbytes) {
@@ -284,6 +295,12 @@
SetNumOfChannels(static_cast<IntDataType>(i) , nPhyInput[i], nPhyOutput[i]);
}
+ /*for (auto pt = mList.begin(); pt < mList.end(); pt++) {
+ IModule *p = *pt._Myptr;
+ static int i = 0;
+ printf("%d, id %d, type %d\n",i++, p->GetModuleID(), p->GetModuleType());
+ }*/
+
return ErrStatus::SUCCESS;
}
ErrStatus ToB::toAnalysis(const u8* bin, u32 nbytes)
@@ -291,14 +308,14 @@
FlowChartHead* head = (FlowChartHead*)bin;
ErrStatus ret = ErrStatus::ERR_METHOD;
//check crc
- u32 tmp_crc ,crc = head->crcLsb|(head->crcMsb<<16);
- head->crcLsb = head->crcMsb = 0;
+ s32 tmp_crc;
+ s32 crc = head->crc;
+ head->crc = 0;
tmp_crc = CRC::crc32(bin, nbytes);
if (tmp_crc != crc) {
- //dbg_printf("flowchar crc check fail.\n");
+ printf("flowchar crc check fail.\n");
return ErrStatus::ERR_PARAM;
}
-
processed = ufalse;
if(head->version == 0) {
@@ -307,16 +324,22 @@
else if(head->version == 1) {
ret = CreateModuleV1(bin, nbytes);
}
-
+ processed = utrue;
return ret;
}
ErrStatus ToB::toProc()
{
if(processed) {
- for (auto iter = mList.begin();
- iter != mList.end() ;iter++) {
- (*iter)->Proc();
+ for (auto iter = mList.begin(); iter < mList.end(); iter++) {
+// if ((*iter)->GetModuleID() == 166)
+// continue;
+
+ if((*iter)->GetModuleType() <= 5) {
+ printf("%d ", (*iter)->GetModuleID());
+ (*iter)->Proc();
+ }
}
+// printf("\n");
}
else {
MuteOutput();
@@ -344,7 +367,8 @@
IModule* m = mList[mModuleIndex[mID]-1];
if( m != NULL) {
- m->Ctrl(pID, val, num);
+ //m->Ctrl(pID, val, num);
+ paramset->GetCtrlEntry(m->GetModuleType())(m, pID, (s16*)val);
}
return ErrStatus::SUCCESS;
@@ -355,11 +379,11 @@
FlowChartHead* head = (FlowChartHead*)bin;
//check crc
- u32 tmp_crc ,crc = head->crcLsb|(head->crcMsb<<16);
- head->crcLsb = head->crcMsb = 0;
+ u32 tmp_crc ,crc = head->crc;
+ head->crc =0;
tmp_crc = CRC::crc32(bin, nbytes);
if (tmp_crc != crc) {
- //dbg_printf("flowchar crc check fail.\n");
+ dbg_printf("flowchar crc check fail.\n");
return ErrStatus::ERR_PARAM;
}
@@ -375,137 +399,27 @@
}
if(size != nbytes) {
- //dbg_printf("check preset has some error!\n");
+ dbg_printf("check preset has some error!\n");
}
processed = utrue;
return ErrStatus::SUCCESS;
}
-u32 ToB::GetLevels(Message* handle , MSG* pmsg)
+
+u32 ToB::GetLevels(s16* buffer)
{
- u32 n =0,len =0;
- s8 buffer[MSG_DATA_LEN];
- u32 packetNo =0;
+ u32 n =0,size =0;
if( !processed ) {
return 0;
}
-//
-// for (std::vector<IModule*>::iterator iter = mList.begin();
-// iter != mList.end() ; iter++) {
-// IModule* m = *iter;
-//
-// u32 ID = m->GetModuleID();
-//
-// struct Level* p = (struct Level*)buffer;
-//
-// n = sizeof(struct Level);
-// p->mID = ID;
-//
-// /*graydon-230905: 多通道模块会出现电平数量超出1024，比如32通道32点反馈抑制,
-// * ps: 讨论决定多通道模块在界面做数量限制且过多多通道不符合应用需求.
-// */
-// p->num = m->GetLevel((s16*)(buffer + n));
-// if(p->num == 0) continue;
-//
-// n += p->num*sizeof(s16);
-//
-// //过去的电平数量+当前的电平数量是否大于MSG_DATA_LEN
-// if(len + n > MSG_DATA_LEN) {
-// pmsg->pktNo = packetNo++;
-// pmsg->totalPkts = mLevelPacketNum;
-// pmsg->Enc(MsgType::MSG_LEVEL_GET_RES, 0, len);
-// handle->Send(pmsg);//入队列
-// len = 0;
-// }
-// memcpy(pmsg->data+len, p , n);
-// len += n;
-// }
-//
-// if(len > 0) {
-// pmsg->pktNo = packetNo++;
-// pmsg->totalPkts = mLevelPacketNum;
-// pmsg->Enc(MsgType::MSG_LEVEL_GET_RES, 0, len);
-// handle->Send(pmsg);
-// }
-//
-// if(packetNo > 0){
-// mLevelPacketNum = packetNo;
-// }
-// return n;
- return 0;
-}
-
-
-//cpu = time*SAMPLE_RATE/SAMPLE_NUM
-//cpu *1000 -> s32
-//cpu * 100 -> percent.
-u32 ToB::GetModuleCPU(Message* handle , MSG* pmsg)
-{
-// u32 n =0;
-// const ufloat period_s = SAMPLE_NUM*1.f/SAMPLE_RATE;
-// const u32 percent = 100000;
-// ufloat module_cpu ;
-// u32* data = (u32*)pmsg->data;
-//
-// if( !processed ) {
-// return 0;
-// }
-//
-// for (std::vector<IModule*>::iterator iter = mList.begin();
-// iter != mList.end() ; iter++) {
-// IModule* m = *iter;
-// ufloat time = m->GetRuntime();
-// ModuleType type = (ModuleType)m->GetModuleType();
-// u32 tag = m->GetModuleTag();
-// u16 rxNum = m->GetModuleInputNum();
-// u16 txNum = m->GetModuleOutputNum();
-// u32 ID = m->GetModuleID();
-//
-//
-// switch(type) {
-// case ModuleType::Mixer:
-// case ModuleType::SupperMatrix:
-// time = time / rxNum ;
-// module_cpu = time / period_s ;
-// break;
-// case ModuleType::GEQ:
-// case ModuleType::EQ:
-// case ModuleType::NHS:
-// time = time / (tag * rxNum) ;
-// module_cpu = time / period_s ;
-// break;
-// case ModuleType::SignalGenerator:
-// case ModuleType::Ducker:
-// case ModuleType::ContinuitySPL:
-// time = time / txNum ;
-// module_cpu = time / period_s ;
-// break;
-// case ModuleType::AEC:
-// module_cpu = time / 0.01f ;//aec 10ms处理一次.
-// break;
-// default:
-// time = time / rxNum ;
-// module_cpu = time / period_s ;
-// break;
-// }
-// data[n++] = ID;
-// data[n++] = (u32)(module_cpu* percent);
-//
-// if(n*sizeof(u32) >= MSG_DATA_LEN) {
-// pmsg->Enc(MsgType::MSG_MODULE_CPU_RES, 0, MSG_DATA_LEN);
-// handle->Send(pmsg);
-// n = 0;
-// }
-// }
-//
-// if(n > 0) {
-// pmsg->Enc(MsgType::MSG_MODULE_CPU_RES, 0, n*sizeof(u32));
-// handle->Send(pmsg);
-// }
-
- return 0;
+ for (std::vector<IModule*>::iterator iter = mList.begin();
+ iter != mList.end() ; iter++) {
+ size = (*iter)->GetLevel(buffer + n );
+ n += size;
+ }
+ return n;
}
--
Gitblit v1.9.3