From fd0b5f94939d30fe65a98f9111aee2987d12e41f Mon Sep 17 00:00:00 2001
From: qipp <2969964114@qq.com>
Date: 星期三, 18 三月 2026 17:46:42 +0800
Subject: [PATCH] 碧云祥定制代码提交
---
DSP180x_core/src/f2f.c | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/DSP180x_core/src/f2f.c b/DSP180x_core/src/f2f.c
index 7837283..0f1bb6e 100644
--- a/DSP180x_core/src/f2f.c
+++ b/DSP180x_core/src/f2f.c
@@ -147,19 +147,19 @@
if(codec->rx) {
s32* dataPtr = codec->dataPtr[blockIndex] ;
- for( j = 0; channel < mInputNum - 2 && j < codec->channel_num ;j ++,channel++) {
+ for( j = 0; channel < mInputNum && j < codec->channel_num ;j ++,channel++) {
// if(channel == (mInputNum - 2))
// channel++;
if(mRxChannel[channel] != NULL)
- floatData(mRxChannel[channel], dataPtr + ((j+1)&0x1),codec->slot_num, SAMPLE_NUM);
+ floatData(mRxChannel[channel], dataPtr + j,codec->slot_num, SAMPLE_NUM);
}
}
}
- if(mRxChannel[mInputNum - 1] != NULL){
- floatData(mRxChannel[mInputNum - 1], mAudioCodec[9].dataPtr[blockIndex] + 0, mAudioCodec[9].slot_num, SAMPLE_NUM);
- //memcpy(mRxChannel[mInputNum - 1], pcm, SAMPLE_NUM);
- }
+// if(mRxChannel[mInputNum - 1] != NULL){
+// floatData(mRxChannel[mInputNum - 1], mAudioCodec[9].dataPtr[blockIndex] + 0, mAudioCodec[9].slot_num, SAMPLE_NUM);
+// //memcpy(mRxChannel[mInputNum - 1], pcm, SAMPLE_NUM);
+// }
#else
// float pcm[SAMPLE_NUM];
//
@@ -297,23 +297,24 @@
if(codec->rx == ufalse) {
s32* dataPtr = codec->dataPtr[blockIndex] ;
- for( j = 0; channel < mOutputNum - 1 && j < codec->channel_num ;j ++,channel++) {
+ for( j = 0; channel < mOutputNum && j < codec->channel_num ;j ++,channel++) {
if(mTxChannel[channel] != NULL){
-// if(channel == 2 || channel == 3){
-// fixData(dataPtr + ((j+1)&0x1), mTxChannel[channel], codec->slot_num, SAMPLE_NUM);
-// }
-// else{
- fixData(dataPtr + ((j+1)&0x1), mTxChannel[channel], codec->slot_num, SAMPLE_NUM);
-// }
+ if(channel == 11){ //usb通道
+ fixData(dataPtr + 0, mTxChannel[channel], codec->slot_num, SAMPLE_NUM);
+ fixData(dataPtr + 1, mTxChannel[channel], codec->slot_num, SAMPLE_NUM);
+ }
+ else{
+ fixData(dataPtr + j, mTxChannel[channel], codec->slot_num, SAMPLE_NUM);
+ }
}
}
}
}
- if(mTxChannel[mOutputNum - 1] != NULL){
- fixData(mAudioCodec[8].dataPtr[blockIndex] + 0, mTxChannel[mOutputNum - 1], mAudioCodec[8].slot_num, SAMPLE_NUM);
- fixData(mAudioCodec[8].dataPtr[blockIndex] + 1, mTxChannel[mOutputNum - 1], mAudioCodec[8].slot_num, SAMPLE_NUM);
- }
+// if(mTxChannel[mOutputNum - 1] != NULL){
+// fixData(mAudioCodec[8].dataPtr[blockIndex] + 0, mTxChannel[mOutputNum - 1], mAudioCodec[8].slot_num, SAMPLE_NUM);
+// fixData(mAudioCodec[8].dataPtr[blockIndex] + 1, mTxChannel[mOutputNum - 1], mAudioCodec[8].slot_num, SAMPLE_NUM);
+// }
#endif
}
#else
--
Gitblit v1.9.3