Skip to content

pidan / FuSiLive

Go to a project
Commit 3b5e57c3 by pierce
Options

修复一些UI bug

parent 29e06b39
Expand all
Inline Side-by-side
Showing with 17 additions and 29 deletions
FuSiLive/AppDelegate.m
...@@ -687,9 +687,9 @@ static dispatch_queue_t get_status_queue() { ...@@ -687,9 +687,9 @@ static dispatch_queue_t get_status_queue() {
kLivePushConfigCodeModeKey:@"0", kLivePushConfigCodeModeKey:@"0",
kLivePushConfigFPSKey:@"18", kLivePushConfigFPSKey:@"18",
kLivePushConfigBeautyEnableKey:@"1", kLivePushConfigBeautyEnableKey:@"1",
kLivePushConfigMaxBitrateKey:@"1500", kLivePushConfigMaxBitrateKey:@"4000",
kLivePushConfigMinBitrateKey:@"500", kLivePushConfigMinBitrateKey:@"1000",
kLivePushConfigTargetBitrateKey:@"1000", kLivePushConfigTargetBitrateKey:@"2000",
kLivePushConfigResolutionKey:@"2", kLivePushConfigResolutionKey:@"2",
} forKey:LIVE_PUSH_CONFIG]; } forKey:LIVE_PUSH_CONFIG];
} }
......
FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_invite_mic_btn.imageset/Contents.json
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "live_room_card_invite_mic_btn@2x.png", "filename" : "上麦@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "live_room_card_invite_mic_btn@3x.png", "filename" : "上麦@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
FuSiLive/Assets.xcassets/Live/UserInfoCard/live_room_card_invite_mic_btn_pressed.imageset/Contents.json
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "live_room_card_invite_mic_btn_pressed@2x.png", "filename" : "上麦@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "live_room_card_invite_mic_btn_pressed@3x.png", "filename" : "上麦@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FunctionViews/FUSVideoChatUserInfoView.m
...@@ -396,6 +396,8 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\ ...@@ -396,6 +396,8 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
_richImageView.centerX = _faceImageView.centerX; _richImageView.centerX = _faceImageView.centerX;
_richImageView.centerY = _faceImageView.bottom; _richImageView.centerY = _faceImageView.bottom;
// _richWearImageView.center = _faceImageView.center; // _richWearImageView.center = _faceImageView.center;
[_bgView addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight withRadii:CGSizeMake(16, 16)];
} }
- (void)fus_initBgView { - (void)fus_initBgView {
...@@ -775,7 +777,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\ ...@@ -775,7 +777,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
- (void)pd_setupRoomControlView { - (void)pd_setupRoomControlView {
_roomControlView = [[UIView alloc] initWithFrame:CGRectMake(0, _buttomBtnBgView.bottom, _bgView.width, ROOM_CONTROL_VIEW_HEIGHT())]; _roomControlView = [[UIView alloc] initWithFrame:CGRectMake(0, _buttomBtnBgView.bottom, _bgView.width, ROOM_CONTROL_VIEW_HEIGHT())];
_roomControlView.backgroundColor = [UIColor colorWithHex:@"#242A36"]; _roomControlView.backgroundColor = [UIColor colorWithHex:@"#F1F0F0"];
[_bgView addSubview:_roomControlView]; [_bgView addSubview:_roomControlView];
CGFloat bottonHeight = _roomControlView.height; CGFloat bottonHeight = _roomControlView.height;
if (@available(iOS 11.0, *)) { if (@available(iOS 11.0, *)) {
......
FuSiLive/Classes/NewLive/Main/View/StreamView/FUSByteStreamCaptureHelper.m
...@@ -50,9 +50,6 @@ ...@@ -50,9 +50,6 @@
@end @end
@implementation FUSByteStreamCaptureHelper @implementation FUSByteStreamCaptureHelper
{
long long captureTimeCount;
}
#pragma mark - Init #pragma mark - Init
...@@ -295,6 +292,10 @@ ...@@ -295,6 +292,10 @@
{ {
videoSize = CGSizeMake(720, 1280); videoSize = CGSizeMake(720, 1280);
} }
case 4:// 1080P
{
videoSize = CGSizeMake(1080, 1920);
}
break; break;
default:// 默认 540 default:// 默认 540
videoSize = CGSizeMake(540, 960); videoSize = CGSizeMake(540, 960);
...@@ -341,9 +342,9 @@ ...@@ -341,9 +342,9 @@
// 视频帧率 // 视频帧率
_liveConfig.videoFPS = fps; _liveConfig.videoFPS = fps;
// 视频码率 // 视频码率
_liveConfig.bitrate = targetBitrate; _liveConfig.bitrate = targetBitrate * 1000;;
_liveConfig.minBitrate = minBitrate; _liveConfig.minBitrate = minBitrate * 1000;;
_liveConfig.maxBitrate = maxBitrate; _liveConfig.maxBitrate = maxBitrate * 1000;;
_liveConfig.outputSize = videoSize; _liveConfig.outputSize = videoSize;
...@@ -427,13 +428,10 @@ ...@@ -427,13 +428,10 @@
if (![FUSBeautyHelper shareInstance].beautyEngineEnable) { if (![FUSBeautyHelper shareInstance].beautyEngineEnable) {
// 没有美颜正在运行或者当前开关处于关闭状态 // 没有美颜正在运行或者当前开关处于关闭状态
// 声网采集协议正在运行 // 声网采集协议正在运行
if (self.agoraVideoSourceRuning) {
captureTimeCount += 1;
// 声网采集协议正在运行 // 声网采集协议正在运行
if (self.videoFrameCallBackHandler) { if (self.videoFrameCallBackHandler) {
self.videoFrameCallBackHandler(buffer, pts, 0); self.videoFrameCallBackHandler(buffer, pts, 0);
} }
}
[_capture pushVideoBuffer:buffer andCMTime:pts]; [_capture pushVideoBuffer:buffer andCMTime:pts];
return; return;
...@@ -441,18 +439,11 @@ ...@@ -441,18 +439,11 @@
CVPixelBufferRef targetPixelBuffer = [[FUSBeautyHelper shareInstance] renderBeautyWithPixelBuffer:buffer timeStamp:(pts.value / pts.timescale)]; CVPixelBufferRef targetPixelBuffer = [[FUSBeautyHelper shareInstance] renderBeautyWithPixelBuffer:buffer timeStamp:(pts.value / pts.timescale)];
// 声网采集协议正在运行
if (self.agoraVideoSourceRuning) {
captureTimeCount++;
//CMTimeMake(captureTimeCount, 600)
// 声网采集协议正在运行 // 声网采集协议正在运行
if (self.videoFrameCallBackHandler) { if (self.videoFrameCallBackHandler) {
self.videoFrameCallBackHandler(buffer, pts, 0); self.videoFrameCallBackHandler(buffer, pts, 0);
} }
}
[_capture pushVideoBuffer:targetPixelBuffer andCMTime:pts]; [_capture pushVideoBuffer:targetPixelBuffer andCMTime:pts];
} }
...@@ -542,8 +533,6 @@ ...@@ -542,8 +533,6 @@
/** /**
重新开始推理，不停止原来的推流 重新开始推理，不停止原来的推流
@param completion 完成回调
*/ */
- (void)fus_reloadPush - (void)fus_reloadPush
{ {
......
FuSiLive/Classes/NewLive/Main/View/StreamView/FUSStreamCaptureHelper.h
...@@ -57,9 +57,6 @@ typedef NS_ENUM(NSInteger, FUSStreamSessionState) ...@@ -57,9 +57,6 @@ typedef NS_ENUM(NSInteger, FUSStreamSessionState)
CMTime pts, CMTime pts,
int rotation); int rotation);
// 声网自定义视频源是否正在运行中
@property (nonatomic, assign) BOOL agoraVideoSourceRuning;
+ (FUSStreamCaptureHelper *)fus_captureHepler; + (FUSStreamCaptureHelper *)fus_captureHepler;
#pragma mark - Public Method #pragma mark - Public Method
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment