github-starred/CocoaSplit
2
0
Fork 0
mirror of https://github.com/zakk4223/CocoaSplit.git synced 2026-07-11 22:00:18 -06:00
Code Issues 32 Projects Packages Wiki Activity Actions

Fix more warnings.

Browse source 
Don't constantly rebuild the x264 format extensions every frame; only rebuild if compressor values have changed
This commit is contained in:
Zakk 2018-08-04 19:38:26 -04:00
parent 4883820f07
commit e4762d2c48
5 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CapturePlugins/CSImageCapturePlugin/CSImageCapturePlugin/ImageCapture.m
View file

@ -360,7 +360,7 @@
dispatch_async(dispatch_get_main_queue(), ^{
[self updateLayersWithFramedataBlock:^(CALayer *layer) {
layer.contents = (__bridge id _Nullable)(_singleImage);
layer.contents = (__bridge id _Nullable)(self->_singleImage);
[layer removeAnimationForKey:@"gifIndex"];
}];
});

28
CocoaSplit/CaptureController.m
View file

@ -3589,33 +3589,7 @@
{
return NSDragOperationMove;
NSPasteboard *pBoard = [draggingInfo draggingPasteboard];
NSData *indexSave = [pBoard dataForType:@"cocoasplit.layout"];
NSIndexSet *indexes = [NSKeyedUnarchiver unarchiveObjectWithData:indexSave];
NSInteger draggedItemIdx = [indexes firstIndex];
NSInteger useIdx = *proposedDropIndex;
if (*proposedDropIndex > draggedItemIdx)
{
useIdx--;
}
if (useIdx < 0)
{
useIdx = 0;
}
if (*proposedDropIndex == -1 || labs(draggedItemIdx - useIdx) < 1)
{
return NSDragOperationNone;
}
return NSDragOperationMove;
}

44
CocoaSplit/Compressor/x264Compressor.m
View file

@ -533,24 +533,56 @@
return;
}
_av_codec_ctx->rc_max_rate = self.vbv_maxrate*1000;
bool needRebuild = NO;
int64_t new_rc_rate = self.vbv_maxrate*1000;
if (new_rc_rate != _av_codec_ctx->rc_max_rate)
{
needRebuild = YES;
_av_codec_ctx->rc_max_rate = self.vbv_maxrate*1000;
}
int new_rc_buffer = 0;
if (self.vbv_buffer > 0)
{
_av_codec_ctx->rc_buffer_size = self.vbv_buffer*1000;
new_rc_buffer = self.vbv_buffer*1000;
} else {
_av_codec_ctx->rc_buffer_size = self.vbv_maxrate*1000;
new_rc_buffer = self.vbv_maxrate*1000;
}
if (new_rc_buffer != _av_codec_ctx->rc_buffer_size)
{
needRebuild = YES;
_av_codec_ctx->rc_buffer_size = new_rc_buffer;
}
if (!self.use_cbr)
{
av_opt_set(_av_codec_ctx->priv_data, "crf", [[NSString stringWithFormat:@"%d", self.crf] UTF8String], 0);
int64_t cur_crf = 0;
av_opt_get_int(_av_codec_ctx->priv_data, "crf", 0, &cur_crf);
if (cur_crf != self.crf)
{
needRebuild = YES;
av_opt_set(_av_codec_ctx->priv_data, "crf", [[NSString stringWithFormat:@"%d", self.crf] UTF8String], 0);
}
} else {
_av_codec_ctx->bit_rate = self.vbv_maxrate*1000;
int64_t new_bit_rate = self.vbv_maxrate*1000;
if (new_bit_rate != _av_codec_ctx->bit_rate)
{
needRebuild = YES;
_av_codec_ctx->bit_rate = self.vbv_maxrate*1000;
}
}
if (needRebuild)
{
[self buildFormatExtensions];
}
[self buildFormatExtensions];
}

2
StreamServicePlugins/CSMixerStreamServicePlugin/CSMixerStreamServicePlugin/CSMixerStreamService.m
View file

@ -286,7 +286,7 @@
return;
}
NSError *jsonError;
NSDictionary *ingest_response = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&jsonError];
NSArray *ingest_response = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&jsonError];
dispatch_async(dispatch_get_main_queue(), ^{self.ingests = ingest_response; });

1
StreamServicePlugins/CSYoutubeStreamServicePlugin/CSYoutubeStreamServicePlugin/CSYoutubeStreamService.h
View file

@ -31,7 +31,6 @@
+(NSImage *)serviceImage;
@property (assign) bool isReady;
@property (strong) NSString *accountName;
@property (strong) CSOauth2Authenticator *oauthObject;