Skip to content

Commit 7ba6571

Browse files
author
eagleychen
committed
加大缓存pcm吞吐量
1 parent 1b7a9cf commit 7ba6571

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ PODS:
3030
- TXLiteAVSDK_TRTC (= 8.0.9644)
3131
- YYModel (= 1.0.4)
3232
- TIoTLinkKit_FLV (2.2.3)
33-
- TIoTLinkKit_GVoiceSE (1.1.0)
33+
- TIoTLinkKit_GVoiceSE (1.1.1)
3434
- TIoTLinkKit_IJKPlayer (2.0.16-beta.202502200213)
3535
- TIoTLinkKit_SoundTouch (1.0.0)
3636
- TIoTLinkKit_TPNS (1.0.1)
@@ -39,7 +39,7 @@ PODS:
3939
- TIoTLinkVideo (1.0.0):
4040
- CocoaAsyncSocket (= 7.6.5)
4141
- TIoTLinkKit_FLV (= 2.2.3)
42-
- TIoTLinkKit_GVoiceSE (>= 1.0.9)
42+
- TIoTLinkKit_GVoiceSE (>= 1.1.1)
4343
- TIoTLinkKit_SoundTouch (= 1.0.0)
4444
- TIoTLinkKit_XP2P (= 2.4.53)
4545
- TPCircularBuffer (= 1.6.1)
@@ -128,13 +128,13 @@ SPEC CHECKSUMS:
128128
Tencent-MapSDK: 6dfbee53b46131deb4c4bb02b3edc5ce7fb630dc
129129
TIoTLinkKit: 0386fb583c61765a02ad5cca810c7661d5a0bc53
130130
TIoTLinkKit_FLV: aec2b2ec9664990ec6c5b9f760fc1a9043d5a9a5
131-
TIoTLinkKit_GVoiceSE: cd43b03fd7b6f923987352452a82680d7c14ba68
131+
TIoTLinkKit_GVoiceSE: a5babede5cb5963ad639e2ed33895539984fcd45
132132
TIoTLinkKit_IJKPlayer: f69a63ee19daaab5838e193dee2d785ad5c0b0e5
133133
TIoTLinkKit_SoundTouch: cf79ae182b6c2349ff65bac7a338974bc538fa77
134134
TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
135135
TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
136136
TIoTLinkKit_XP2P: 731eba7755f80c6a9a98ec872e78947ae5df1272
137-
TIoTLinkVideo: c5b7a6a397f4d724650ead8d4eed5922380feb6b
137+
TIoTLinkVideo: 973a291e35b577e1bbf4eeab0a869a5f604a04b6
138138
TPCircularBuffer: c13243556527551c4d320709c7b14a6d20cdc30a
139139
TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
140140
TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d

Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ - (void)getDeviceStatusWithType:(NSString *)singleType qualityType:(NSString *)q
287287
static int tt_pitch = -6;
288288
TIoTCoreAudioConfig *audio_config = [TIoTCoreAudioConfig new];
289289
audio_config.refreshSession = YES;
290-
audio_config.sampleRate = TIoTAVCaptionFLVAudio_8;
290+
audio_config.sampleRate = TIoTAVCaptionFLVAudio_16;
291291
audio_config.channels = 1;
292292
audio_config.isEchoCancel = YES;
293293
audio_config.pitch = 0;//tt_pitch; // -6声音会变粗一点; 6声音会变细一点

Source/SDK/LinkVideo/FLV/TIoTAVCaptionFLV.mm

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,8 @@ - (void)setRemoteAudioFrame:(void *)pcmdata len:(int)pcmlen {
377377
[self.pcmRecord addData:&circularBuf_gvoice_pcm :pcmdata :pcmlen];
378378
}
379379

380-
static uint8_t pcm_buffer_origin[640];
381-
static uint8_t pcm_buffer_gvoice[640];
380+
static uint8_t pcm_buffer_origin[1280];
381+
static uint8_t pcm_buffer_gvoice[1280];
382382
static uint8_t pcm_buffer_result[8192];
383383

384384
TPCircularBuffer circularBuf_gvoice_pcm;
@@ -391,23 +391,23 @@ static void record_callback(uint8_t *buffer, int size, void *u)
391391
// dispatch_async(vc.audioEncodeQueue, ^{
392392

393393
//1. get origin pcm
394-
memset(pcm_buffer_origin, 0, 640);
395-
UInt32 len = [vc.pcmRecord getData:&pcm_circularBuffer :pcm_buffer_origin :640];
396-
if (len < 640) {
394+
memset(pcm_buffer_origin, 0, 1280);
395+
UInt32 len = [vc.pcmRecord getData:&pcm_circularBuffer :pcm_buffer_origin :1280];
396+
if (len < 1280) {
397397
return;
398398
}
399399

400400
//2. =>aec pcm
401-
memset(pcm_buffer_gvoice, 0, 640);
402-
[vc.pcmRecord getData:&circularBuf_gvoice_pcm :pcm_buffer_gvoice :640];
401+
memset(pcm_buffer_gvoice, 0, 1280);
402+
[vc.pcmRecord getData:&circularBuf_gvoice_pcm :pcm_buffer_gvoice :1280];
403403

404404
//trae gvoice inout pcm_buffer_origin
405405
if (vc.isEchoCancel && vc.trae_is_valid == 0) {
406-
[GVoiceSE voice_handle_process:(char *)pcm_buffer_origin ref:(char *)pcm_buffer_gvoice];
406+
[GVoiceSE voice_handle_process:(char *)pcm_buffer_origin ref:(char *)pcm_buffer_gvoice len:1280];
407407
}
408408

409409
//3. pcm=>aac
410-
[vc.pcmRecord addData:&circularBuf_result_pcm :pcm_buffer_origin :640];
410+
[vc.pcmRecord addData:&circularBuf_result_pcm :pcm_buffer_origin :1280];
411411

412412
static int tmpChannelDataLen = 2048;//vc.pcmRecord.pcmStreamDescription.mChannelsPerFrame * 2048;
413413
UInt32 aaclen = [vc.pcmRecord getData:&circularBuf_result_pcm :pcm_buffer_result :tmpChannelDataLen];
@@ -569,8 +569,8 @@ -(BOOL) startCapture {
569569
// [fileManager createFileAtPath:h264File contents:nil attributes:nil];
570570
// _fileHandle = [NSFileHandle fileHandleForWritingAtPath:h264File];
571571

572-
[self.pcmRecord Init_buffer:&circularBuf_gvoice_pcm :1920];
573-
[self.pcmRecord Init_buffer:&circularBuf_result_pcm :1920];
572+
[self.pcmRecord Init_buffer:&circularBuf_gvoice_pcm :2560];
573+
[self.pcmRecord Init_buffer:&circularBuf_result_pcm :2560];
574574
flv_init_load();
575575
if (self.videoConfig.isExternal) {
576576
return YES;//走外部采集数据发送

TIoTLinkKit.xcodeproj/xcshareddata/xcschemes/LinkSDKDemo.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<EnvironmentVariable
5656
key = "OS_ACTIVITY_MODE"
5757
value = "disable"
58-
isEnabled = "YES">
58+
isEnabled = "NO">
5959
</EnvironmentVariable>
6060
</EnvironmentVariables>
6161
</LaunchAction>

TIoTLinkVideo.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
2323
s.dependency 'TIoTLinkKit_FLV', '2.2.3'
2424
s.dependency 'CocoaAsyncSocket', '7.6.5'
2525
s.dependency 'TIoTLinkKit_SoundTouch', '1.0.0'
26-
s.dependency 'TIoTLinkKit_GVoiceSE', '>= 1.0.9'
26+
s.dependency 'TIoTLinkKit_GVoiceSE', '>= 1.1.1'
2727
s.dependency 'TPCircularBuffer', '1.6.1'
2828

2929
s.pod_target_xcconfig = {

0 commit comments

Comments
 (0)