提交 d3c4c892 编写于 作者: X Xinzheng Zhang

ios/hudview: add cache statistic and make hud info adjust font size automatically

上级 fc2d8e89
...@@ -183,7 +183,7 @@ void IJKFFIOStatCompleteRegister(void (*cb)(const char *url, ...@@ -183,7 +183,7 @@ void IJKFFIOStatCompleteRegister(void (*cb)(const char *url,
_scalingMode = IJKMPMovieScalingModeAspectFit; _scalingMode = IJKMPMovieScalingModeAspectFit;
_shouldAutoplay = YES; _shouldAutoplay = YES;
memset(&_asyncStat, 0, sizeof(_asyncStat)); memset(&_asyncStat, 0, sizeof(_asyncStat));
memset(&_cacheStat, 0, sizeof(_cacheStat));
_monitor = [[IJKFFMonitor alloc] init]; _monitor = [[IJKFFMonitor alloc] init];
// init media resource // init media resource
...@@ -671,8 +671,8 @@ inline static NSString *formatedDurationBytesAndBitrate(int64_t bytes, int64_t b ...@@ -671,8 +671,8 @@ inline static NSString *formatedDurationBytesAndBitrate(int64_t bytes, int64_t b
} }
inline static NSString *formatedSize(int64_t bytes) { inline static NSString *formatedSize(int64_t bytes) {
if (bytes >= 100 * 1000) { if (bytes >= 100 * 1024) {
return [NSString stringWithFormat:@"%.2f MB", ((float)bytes) / 1000 / 1000]; return [NSString stringWithFormat:@"%.2f MB", ((float)bytes) / 1000 / 1024];
} else if (bytes >= 100) { } else if (bytes >= 100) {
return [NSString stringWithFormat:@"%.1f KB", ((float)bytes) / 1000]; return [NSString stringWithFormat:@"%.1f KB", ((float)bytes) / 1000];
} else { } else {
...@@ -748,6 +748,12 @@ inline static NSString *formatedSpeed(int64_t bytes, int64_t elapsed_milli) { ...@@ -748,6 +748,12 @@ inline static NSString *formatedSpeed(int64_t bytes, int64_t elapsed_milli) {
[_glView setHudValue:[NSString stringWithFormat:@"%.3f %.3f", avdelay, -avdiff] forKey:@"delay"]; [_glView setHudValue:[NSString stringWithFormat:@"%.3f %.3f", avdelay, -avdiff] forKey:@"delay"];
int64_t bitRate = ijkmp_get_property_int64(_mediaPlayer, FFP_PROP_INT64_BIT_RATE, 0); int64_t bitRate = ijkmp_get_property_int64(_mediaPlayer, FFP_PROP_INT64_BIT_RATE, 0);
[_glView setHudValue:[NSString stringWithFormat:@"-%@, %@",
formatedSize(_cacheStat.cache_buf_forwards),
formatedDurationBytesAndBitrate(_cacheStat.cache_buf_forwards, bitRate)] forKey:@"cache-forwards"];
[_glView setHudValue:formatedSize(_cacheStat.cache_physical_pos) forKey:@"cache-physical-pos"];
[_glView setHudValue:formatedSize(_cacheStat.cache_file_pos) forKey:@"cache-file-pos"];
[_glView setHudValue:formatedSize(_cacheStat.cache_count_bytes) forKey:@"cache-bytes"];
[_glView setHudValue:[NSString stringWithFormat:@"-%@, %@", [_glView setHudValue:[NSString stringWithFormat:@"-%@, %@",
formatedSize(_asyncStat.buf_backwards), formatedSize(_asyncStat.buf_backwards),
formatedDurationBytesAndBitrate(_asyncStat.buf_backwards, bitRate)] formatedDurationBytesAndBitrate(_asyncStat.buf_backwards, bitRate)]
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
_column[i] = [[UILabel alloc] init]; _column[i] = [[UILabel alloc] init];
_column[i].textColor = [UIColor whiteColor]; _column[i].textColor = [UIColor whiteColor];
_column[i].font = [UIFont fontWithName:@"Menlo" size:9]; _column[i].font = [UIFont fontWithName:@"Menlo" size:9];
_column[i].adjustsFontSizeToFitWidth = YES;
_column[i].numberOfLines = 1;
_column[i].minimumScaleFactor = 0.5;
[self.contentView addSubview:_column[i]]; [self.contentView addSubview:_column[i]];
} }
} }
...@@ -53,7 +55,7 @@ ...@@ -53,7 +55,7 @@
CGFloat nextX = CELL_MARGIN; CGFloat nextX = CELL_MARGIN;
newFrame.origin.x = nextX; newFrame.origin.x = nextX;
newFrame.size.width = parentFrame.size.width * 0.2; newFrame.size.width = parentFrame.size.width * 0.3;
_column[0].frame = newFrame; _column[0].frame = newFrame;
nextX = newFrame.origin.x + newFrame.size.width + CELL_MARGIN; nextX = newFrame.origin.x + newFrame.size.width + CELL_MARGIN;
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{ {
return 20.f; return 16.f;
} }
@end @end
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册