添加调试对讲8khz采样

tonychanchen · tonychanchen · commit c31dbc7b48c9 · 2021-10-19T17:38:06.000+08:00
Change-Id: I2e9ff0c8304403d0f92c92b885ce57cdcd7ed776
diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m
@@ -218,6 +218,10 @@ - (void)getDeviceStatusWithType:(NSString *)singleType qualityType:(NSString *)q
 //                config.channelCount = 1;
 //                config.sampleSize = 16;
 //                config.sampleRate = 44100;
+                
+                //设置会话 withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker | AVAudioSessionCategoryOptionMixWithOthers | AVAudioSessionCategoryOptionAllowBluetooth
+//                [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDuckOthers error:nil];
+//                [[AVAudioSession sharedInstance] setActive:YES error:nil];
                 [[TIoTCoreXP2PBridge sharedInstance] sendVoiceToServer:self.deviceName?:@"" channel:channel audioConfig:config];
             }
             
diff --git a/Source/SDK/LinkVideo/AudioFLV/AWAACEncoder.h b/Source/SDK/LinkVideo/AudioFLV/AWAACEncoder.h
@@ -5,12 +5,11 @@
 #import <AudioToolbox/AudioToolbox.h>
 
 @interface AWAACEncoder : NSObject
+@property (nonatomic,assign) NSInteger sample_rate;
 
 @property (nonatomic) dispatch_queue_t encoderQueue;
 @property (nonatomic) dispatch_queue_t callbackQueue;
-@property (nonatomic, assign)Float64 sample_rate;
 
 - (void) encodeSampleBuffer:(CMSampleBufferRef)sampleBuffer completionBlock:(void (^)(NSData *encodedData, NSError* error))completionBlock;
 
-
 @end
diff --git a/Source/SDK/LinkVideo/AudioFLV/AWAACEncoder.m b/Source/SDK/LinkVideo/AudioFLV/AWAACEncoder.m
@@ -1,7 +1,6 @@
 
 
 #import "AWAACEncoder.h"
-
 @interface AWAACEncoder()
 @property (nonatomic) AudioConverterRef audioConverter;
 @property (nonatomic) uint8_t *aacBuffer;
@@ -39,15 +38,14 @@ - (id) init {
  */
 - (void) setupEncoderFromSampleBuffer:(CMSampleBufferRef)sampleBuffer {
     AudioStreamBasicDescription inAudioStreamBasicDescription = *CMAudioFormatDescriptionGetStreamBasicDescription((CMAudioFormatDescriptionRef)CMSampleBufferGetFormatDescription(sampleBuffer));
-    NSLog(@"pcm---samplerate-->%f, channel-->%d",inAudioStreamBasicDescription.mSampleRate, inAudioStreamBasicDescription.mChannelsPerFrame);
     
-    AudioStreamBasicDescription outAudioStreamBasicDescription = {0};
-    outAudioStreamBasicDescription.mSampleRate = _sample_rate;
-    outAudioStreamBasicDescription.mFormatID = kAudioFormatMPEG4AAC;
-    outAudioStreamBasicDescription.mFormatFlags = kMPEG4Object_AAC_LC;
-    outAudioStreamBasicDescription.mBytesPerPacket = 0;
-    outAudioStreamBasicDescription.mFramesPerPacket = 1024;
-    outAudioStreamBasicDescription.mBytesPerFrame = 0;
+    AudioStreamBasicDescription outAudioStreamBasicDescription = {0}; // 初始化输出流的结构体描述为0. 很重要。
+    outAudioStreamBasicDescription.mSampleRate = self.sample_rate;//inAudioStreamBasicDescription.mSampleRate; // 音频流，在正常播放情况下的帧率。如果是压缩的格式，这个属性表示解压缩后的帧率。帧率不能为0。
+    outAudioStreamBasicDescription.mFormatID = kAudioFormatMPEG4AAC; // 设置编码格式
+    outAudioStreamBasicDescription.mFormatFlags = kMPEG4Object_AAC_LC; // 无损编码 ，0表示没有
+    outAudioStreamBasicDescription.mBytesPerPacket = 0; // 每一个packet的音频数据大小。如果的动态大小，设置为0。动态大小的格式，需要用AudioStreamPacketDescription 来确定每个packet的大小。
+    outAudioStreamBasicDescription.mFramesPerPacket = 1024; // 每个packet的帧数。如果是未压缩的音频数据，值是1。动态码率格式，这个值是一个较大的固定数字，比如说AAC的1024。如果是动态大小帧数（比如Ogg格式）设置为0。
+    outAudioStreamBasicDescription.mBytesPerFrame = 0; //  每帧的大小。每一帧的起始点到下一帧的起始点。如果是压缩格式，设置为0 。
     outAudioStreamBasicDescription.mChannelsPerFrame = 1; // 声道数
     outAudioStreamBasicDescription.mBitsPerChannel = 0; // 压缩格式设置为0
     outAudioStreamBasicDescription.mReserved = 0; // 8字节对齐，填0.
@@ -68,7 +66,9 @@ - (void) setupEncoderFromSampleBuffer:(CMSampleBufferRef)sampleBuffer {
  编解码器（codec）指的是一个能够对一个信号或者一个数据流进行变换的设备或者程序。这里指的变换既包括将 信号或者数据流进行编码（通常是为了传输、存储或者加密）或者提取得到一个编码流的操作，也包括为了观察或者处理从这个编码流中恢复适合观察或操作的形式的操作。编解码器经常用在视频会议和流媒体等应用中。
  *  @return 指定编码器
  */
-- (AudioClassDescription *)getAudioClassDescriptionWithType:(UInt32)type fromManufacturer:(UInt32)manufacturer {
+- (AudioClassDescription *)getAudioClassDescriptionWithType:(UInt32)type
+                                           fromManufacturer:(UInt32)manufacturer
+{
     static AudioClassDescription desc;
     
     UInt32 encoderSpecifier = type;
@@ -117,14 +117,14 @@ OSStatus inInputDataProc(AudioConverterRef inAudioConverter, UInt32 *ioNumberDat
     AWAACEncoder *encoder = (__bridge AWAACEncoder *)(inUserData);
     UInt32 requestedPackets = *ioNumberDataPackets;
     
+//    *ioNumberDataPackets = (int)encoder.pcmBufferSize/2;
     size_t copiedSamples = [encoder copyPCMSamplesIntoBuffer:ioData];
     if (copiedSamples < requestedPackets) {
         //PCM 缓冲区还没满
         *ioNumberDataPackets = 0;
         return -1;
     }
     *ioNumberDataPackets = 1;
-    
     return noErr;
 }
 
@@ -176,6 +176,7 @@ - (void) encodeSampleBuffer:(CMSampleBufferRef)sampleBuffer completionBlock:(voi
             NSMutableData *fullData = [NSMutableData dataWithData:adtsHeader];
             [fullData appendData:rawAAC];
             data = fullData;
+//            data = rawAAC;
         } else {
             error = [NSError errorWithDomain:NSOSStatusErrorDomain code:status userInfo:nil];
         }
@@ -189,21 +190,23 @@ - (void) encodeSampleBuffer:(CMSampleBufferRef)sampleBuffer completionBlock:(voi
     });
 }
 
+
+
+#pragma mark - HEADER
 - (NSData*) adtsDataForPacketLength:(NSUInteger)packetLength {
     int adtsLength = 7;
     char *packet = malloc(sizeof(char) * adtsLength);
     // Variables Recycled by addADTStoPacket
     int profile = 2;  //AAC LC
     //39=MediaCodecInfo.CodecProfileLevel.AACObjectELD;
     int freqIdx = 4;  //44.1KHz
-//    if (_sample_rate == 44100) {
-//        freqIdx = 4;
-//    }else if (_sample_rate == 16000) {
-//        freqIdx = 8;
-//    }else if (_sample_rate == 8000) {
-//        freqIdx = 11;
-//    }
-//    int freqIdx = 11;  //44.1KHz
+    if (_sample_rate == 44100) {
+        freqIdx = 4;
+    }else if (_sample_rate == 16000) {
+        freqIdx = 8;
+    }else if (_sample_rate == 8000) {
+        freqIdx = 11;
+    }
     /* 其中，samplingFreguencyIndex 对应关系如下：
     0 - 96000
     1 - 88200
diff --git a/Source/SDK/LinkVideo/AudioFLV/AWAVCapture.m b/Source/SDK/LinkVideo/AudioFLV/AWAVCapture.m
@@ -4,6 +4,7 @@
 
 static aw_data *s_output_buf = NULL;
 __weak static AWAVCapture *sAWAVCapture = nil;
+NSFileHandle *flvAudioFileHandle;
 
 @interface AWAVCapture()
 //编码队列，发送队列
@@ -92,6 +93,11 @@ -(void) updateFps:(NSInteger) fps{
 }
 
 -(BOOL) startCapture {
+    NSString *audioFile = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject] stringByAppendingPathComponent:@"abcde.flv"];
+    [[NSFileManager defaultManager] removeItemAtPath:audioFile error:nil];
+    [[NSFileManager defaultManager] createFileAtPath:audioFile contents:nil attributes:nil];
+    flvAudioFileHandle = [NSFileHandle fileHandleForWritingAtPath:audioFile];
+    
     if (!self.audioConfig) {
         NSLog(@"one of videoConfig and audioConfig must be NON-NULL");
         return NO;
@@ -120,6 +126,9 @@ -(void) stopCapture{
         [self.sendSampleOpQueue cancelAllOperations];
         [self.sendSampleOpQueue waitUntilAllOperationsAreFinished];
     });
+    
+    [flvAudioFileHandle closeFile];
+    flvAudioFileHandle = NULL;
 }
 
 -(void) switchCamera{}
@@ -265,6 +274,8 @@ extern void aw_write_audio_header(){
     aw_data *ttt_output_buf = NULL;
     aw_write_flv_header(&ttt_output_buf);
     
+    NSData *rawFLV = [NSData dataWithBytes:ttt_output_buf->data length:ttt_output_buf->size];
+    [flvAudioFileHandle writeData:rawFLV];
     //send flv header
     [sAWAVCapture.delegate capture:ttt_output_buf->data len:ttt_output_buf->size];
 //   ttt_output_buf
@@ -304,6 +315,9 @@ static void aw_streamer_send_flv_tag_to_rtmp(aw_flv_common_tag *common_tag){
         }
     }
 
+    NSData *rawFLV = [NSData dataWithBytes:s_output_buf->data length:s_output_buf->size];
+    [flvAudioFileHandle writeData:rawFLV];
+
 //TODO send FLVBody
     [sAWAVCapture.delegate capture:s_output_buf->data len:s_output_buf->size];
     
diff --git a/Source/SDK/LinkVideo/AudioFLV/AWAVConfig.h b/Source/SDK/LinkVideo/AudioFLV/AWAVConfig.h
@@ -5,7 +5,7 @@
 @interface AWAudioConfig : NSObject<NSCopying>
 @property (nonatomic, unsafe_unretained) NSInteger bitrate;//可自由设置
 @property (nonatomic, unsafe_unretained) NSInteger channelCount;//可选 1 2
-@property (nonatomic, unsafe_unretained) NSInteger sampleRate;//可选 44100 22050 11025 5500
+@property (nonatomic, unsafe_unretained) NSInteger sampleRate;//可选 44100 16000 8000
 @property (nonatomic, unsafe_unretained) NSInteger sampleSize;//可选 16 8
 
 @property (nonatomic, readonly, unsafe_unretained) aw_faac_config faacConfig;
diff --git a/Source/SDK/LinkVideo/AudioFLV/AWHWAACEncoder.m b/Source/SDK/LinkVideo/AudioFLV/AWHWAACEncoder.m
@@ -76,8 +76,7 @@ -(aw_flv_audio_tag *)createAudioSpecificConfigFlvTag{
     }else if (self.audioConfig.sampleRate == 8000) {
         sampleRate = 11;
     }
-//    uint8_t sampleRate = 11; //44.1KHz
-    /* 其中，samplingFreguencyIndex 对应关系如下：
+/* 其中，samplingFreguencyIndex 对应关系如下：
     0 - 96000
     1 - 88200
     2 - 64000
@@ -111,6 +110,8 @@ -(aw_flv_audio_tag *)createAudioSpecificConfigFlvTag{
 }
 
 -(void)open{
+    _faacConfig = self.audioConfig.faacConfig;
+    /*
     //创建audio encode converter
     AudioStreamBasicDescription inputAudioDes = {
         .mFormatID = kAudioFormatLinearPCM,
@@ -149,14 +150,16 @@ -(void)open{
     self.aMaxOutputFrameSize = aMaxOutput;
     if (aMaxOutput == 0) {
         [self onErrorWithCode:AWEncoderErrorCodeAudioConverterGetMaxFrameSizeFailed des:@"AAC 获取最大frame size失败"];
-    }
+    }*/
 }
 
 -(void)close{
+    /*
     AudioConverterDispose(_aConverter);
     _aConverter = nil;
     self.curFramePcmData = nil;
     self.aMaxOutputFrameSize = 0;
+     */
 }
 
 @end
diff --git a/Source/SDK/LinkVideo/AudioFLV/AWSystemAVCapture.m b/Source/SDK/LinkVideo/AudioFLV/AWSystemAVCapture.m
@@ -62,10 +62,10 @@ -(void) createCaptureSession{
 }
 
 -(BOOL) startCapture {
-//    NSString *audioFile = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject] stringByAppendingPathComponent:@"abc.aac"];
-//    [[NSFileManager defaultManager] removeItemAtPath:audioFile error:nil];
-//    [[NSFileManager defaultManager] createFileAtPath:audioFile contents:nil attributes:nil];
-//    audioFileHandle = [NSFileHandle fileHandleForWritingAtPath:audioFile];
+    NSString *audioFile = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject] stringByAppendingPathComponent:@"abcde.aac"];
+    [[NSFileManager defaultManager] removeItemAtPath:audioFile error:nil];
+    [[NSFileManager defaultManager] createFileAtPath:audioFile contents:nil attributes:nil];
+    audioFileHandle = [NSFileHandle fileHandleForWritingAtPath:audioFile];
     
     [self.captureSession startRunning];
     return [super startCapture];
@@ -99,7 +99,7 @@ -(void) createOutput{
 -(void)captureOutput:(AVCaptureOutput *)captureOutput didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer fromConnection:(AVCaptureConnection *)connection{
     if (self.isCapturing) {
         [self.mAudioEncoder encodeSampleBuffer:sampleBuffer completionBlock:^(NSData *encodedData, NSError *error) {
-//            [self->audioFileHandle writeData:encodedData];
+            [self->audioFileHandle writeData:encodedData];
             [self sendAudioAACData:encodedData];
         }];
     }
diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm
@@ -173,9 +173,6 @@ - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_numbe
 }
 
 - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_number audioConfig:(AWAudioConfig *)audio_onfig{
-    //设置码率
-    [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker | AVAudioSessionCategoryOptionMixWithOthers | AVAudioSessionCategoryOptionAllowBluetooth error:nil];
-    [[AVAudioSession sharedInstance] setActive:YES error:nil];
     
     self.isSending = YES;
     

Original file line number	Diff line number	Diff line change
`@@ -173,9 +173,6 @@ - (void)sendVoiceToServer:(NSString )dev_name channel:(NSString )channel_numbe`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`- (void)sendVoiceToServer:(NSString )dev_name channel:(NSString )channel_number audioConfig:(AWAudioConfig *)audio_onfig{`
`176`		`- //设置码率`
`177`		`- [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionDefaultToSpeaker \| AVAudioSessionCategoryOptionMixWithOthers \| AVAudioSessionCategoryOptionAllowBluetooth error:nil];`
`178`		`- [[AVAudioSession sharedInstance] setActive:YES error:nil];`
`179`	`176`
`180`	`177`	`self.isSending = YES;`
`181`	`178`