Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

优化更新LFLiveKit中的部分注释错误、添加LFDebug类的description方法 #129

Merged
merged 1 commit into from
Nov 9, 2016
+14 −10
Merged

优化更新LFLiveKit中的部分注释错误、添加LFDebug类的description方法 #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions LFLiveKit/configuration/LFLiveAudioConfiguration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#import <Foundation/Foundation.h>

/// 音频码率
/// 音频码率 (默认96Kbps)
typedef NS_ENUM (NSUInteger, LFLiveAudioBitRate) {
/// 32Kbps 音频码率
LFLiveAudioBitRate_32Kbps = 32000,
Expand All @@ -18,33 +18,33 @@ 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,
/// 44.1KHz 采样率
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
};

Expand All @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions LFLiveKit/objects/LFLiveDebug.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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