From a8a160324e006461daa73a694612f396779329fd Mon Sep 17 00:00:00 2001 From: ftao Date: Mon, 31 Oct 2016 11:33:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0LFLiveKit?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=83=A8=E5=88=86=E6=B3=A8=E9=87=8A=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E3=80=81=E6=B7=BB=E5=8A=A0LFDebug=E7=9A=84description?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/LFLiveAudioConfiguration.h | 20 +++++++++---------- LFLiveKit/objects/LFLiveDebug.m | 4 ++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/LFLiveKit/configuration/LFLiveAudioConfiguration.h b/LFLiveKit/configuration/LFLiveAudioConfiguration.h index 7db22ab3..812dd55c 100755 --- a/LFLiveKit/configuration/LFLiveAudioConfiguration.h +++ b/LFLiveKit/configuration/LFLiveAudioConfiguration.h @@ -8,7 +8,7 @@ #import -/// 音频码率 +/// 音频码率 (默认96Kbps) typedef NS_ENUM (NSUInteger, LFLiveAudioBitRate) { /// 32Kbps 音频码率 LFLiveAudioBitRate_32Kbps = 32000, @@ -18,11 +18,11 @@ typedef NS_ENUM (NSUInteger, LFLiveAudioBitRate) { LFLiveAudioBitRate_96Kbps = 96000, /// 128Kbps 音频码率 LFLiveAudioBitRate_128Kbps = 128000, - /// 默认音频码率,默认为 64Kbps + /// 默认音频码率,默认为 96Kbps LFLiveAudioBitRate_Default = LFLiveAudioBitRate_96Kbps }; -/// 采样率 (默认44.1Hz) +/// 音频采样率 (默认44.1KHz) typedef NS_ENUM (NSUInteger, LFLiveAudioSampleRate){ /// 16KHz 采样率 LFLiveAudioSampleRate_16000Hz = 16000, @@ -30,21 +30,21 @@ typedef NS_ENUM (NSUInteger, LFLiveAudioSampleRate){ LFLiveAudioSampleRate_44100Hz = 44100, /// 48KHz 采样率 LFLiveAudioSampleRate_48000Hz = 48000, - /// 默认音频码率,默认为 64Kbps + /// 默认音频采样率,默认为 44.1KHz LFLiveAudioSampleRate_Default = LFLiveAudioSampleRate_44100Hz }; /// Audio Live quality(音频质量) typedef NS_ENUM (NSUInteger, LFLiveAudioQuality){ - /// 高音频质量 audio sample rate: 16KHz audio bitrate: numberOfChannels 1 : 32Kbps 2 : 64Kbps + /// 低音频质量 audio sample rate: 16KHz audio bitrate: numberOfChannels 1 : 32Kbps 2 : 64Kbps LFLiveAudioQuality_Low = 0, - /// 高音频质量 audio sample rate: 44KHz audio bitrate: 96Kbps + /// 中音频质量 audio sample rate: 44.1KHz audio bitrate: 96Kbps LFLiveAudioQuality_Medium = 1, - /// 高音频质量 audio sample rate: 44MHz audio bitrate: 128Kbps + /// 高音频质量 audio sample rate: 44.1MHz audio bitrate: 128Kbps LFLiveAudioQuality_High = 2, - /// 高音频质量 audio sample rate: 48MHz, audio bitrate: 128Kbps + /// 超高音频质量 audio sample rate: 48KHz, audio bitrate: 128Kbps LFLiveAudioQuality_VeryHigh = 3, - /// 默认音频质量 audio sample rate: 44MHz, audio bitrate: 96Kbps + /// 默认音频质量 audio sample rate: 44.1KHz, audio bitrate: 96Kbps LFLiveAudioQuality_Default = LFLiveAudioQuality_High }; @@ -63,7 +63,7 @@ typedef NS_ENUM (NSUInteger, LFLiveAudioQuality){ @property (nonatomic, assign) NSUInteger numberOfChannels; /// 采样率 @property (nonatomic, assign) LFLiveAudioSampleRate audioSampleRate; -// 码率 +/// 码率 @property (nonatomic, assign) LFLiveAudioBitRate audioBitrate; /// flv编码音频头 44100 为0x12 0x10 @property (nonatomic, assign, readonly) char *asc; diff --git a/LFLiveKit/objects/LFLiveDebug.m b/LFLiveKit/objects/LFLiveDebug.m index cae6195e..15210b30 100644 --- a/LFLiveKit/objects/LFLiveDebug.m +++ b/LFLiveKit/objects/LFLiveDebug.m @@ -10,5 +10,9 @@ @implementation LFLiveDebug +- (NSString *)description { + return [NSString stringWithFormat:@"丢掉的帧数:%ld 总帧数:%ld 上次的音频捕获个数:%d 上次的视频捕获个数:%d 未发送个数:%ld 总流量:%0.f",_dropFrame,_totalFrame,_currentCapturedAudioCount,_currentCapturedVideoCount,_unSendCount,_dataFlow]; +} + @end