From 1ac2340f684bf8c0b05fb571f5994b0755050671 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期四, 29 一月 2026 15:22:04 +0800
Subject: [PATCH] 更新删除输出第一通道后有电平无声音的情况
---
src/tg/tg_scene.h | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/tg/tg_scene.h b/src/tg/tg_scene.h
index 61a7047..5815a22 100644
--- a/src/tg/tg_scene.h
+++ b/src/tg/tg_scene.h
@@ -13,11 +13,7 @@
#include "../protocol.h"
#include "module_def.h"
-<<<<<<< HEAD
#pragma pack (1)
-=======
-
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
typedef struct {
unsigned short magic;
unsigned short nmds;
@@ -28,13 +24,7 @@
tag_input input; //1362
-<<<<<<< HEAD
tag_module in1[MAX_INPUT_NUM]; //4352
-=======
- tag_input input;//1282
-
- tag_module in1[MAX_INPUT_NUM];
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
tag_module in2[MAX_INPUT_NUM];
tag_module in3[MAX_INPUT_NUM];
tag_module in4[MAX_INPUT_NUM];
@@ -62,11 +52,15 @@
{
private:
tag_parameters parameters; //预设参数由ARM下发
+ s32 **chin_mid, **chout_mid; //chin_mid[i][0]、chout_mid[i][0]为输入输出ID，算法模块ID第二维从1开始; i表示通道，从0开始
+ std::vector<void *> paramPtr;
+ s32 input_num, output_num;
//更新动态模块level_num和tag. 非动态模块已经静态固定.
s32 update_dynmodule_tag(s32 proc_type,struct proc_field* proc);
public:
tgScene(hw_adapter_t* adapter);
+ ~tgScene();
void module_def(s32 proc_type, void* param_ptr);
void tgScene_param_default(ptag_parameters p);
@@ -77,6 +71,12 @@
virtual uvoid* get_module_param_ptr(s32 mType, uvoid *param, s32 fixed) override;
+ virtual void* get_parameters() override { return ¶meters; }
+
+ virtual s32** get_chin_mid() override { return chin_mid; }
+ virtual s32** get_chout_mid() override { return chout_mid; }
+ virtual s32 get_input_num() override { return input_num; }
+ virtual s32 get_output_num() override { return output_num; }
// virtual u32 get_module_id(u32 mid, s32 mtype ,u32 pid) override;
};
--
Gitblit v1.9.3