update to v2.8.0

ksvc · Sep 28, 2017 · e5450fa · e5450fa
1 parent ec58b13
commit e5450fa
Show file tree

Hide file tree

Showing 273 changed files with 7,360 additions and 76,728 deletions.
diff --git a/demo/KSYLiveDemo/Info.plist b/demo/KSYLiveDemo/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.1</string>
+	<string>2.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.1.1</string>
+	<string>2.8.0.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/demo/KSYLiveDemo/KSYDemoUI/KSYFilterView.m b/demo/KSYLiveDemo/KSYDemoUI/KSYFilterView.m
@@ -37,7 +37,7 @@ @implementation KSYFilterView
 
 - (id)init{
     self = [super init];
-    _effectNames = [NSArray arrayWithObjects: @"1 小清新",  @"2 靓丽",
+    _effectNames = [NSArray arrayWithObjects: @"0 原图", @"1 小清新",  @"2 靓丽",
                     @"3 甜美可人",  @"4 怀旧",  @"5 蓝调",  @"6 老照片" ,
                     @"7 樱花", @"8 樱花（光线较暗）", @"9 红润（光线较暗）",
                     @"10 阳光（光线较暗）", @"11 红润", @"12 阳光", @"13 自然", nil];
@@ -110,6 +110,7 @@ - (id)init{
     _effectPicker.dataSource = self;
     _effectPicker.showsSelectionIndicator= YES;
     _effectPicker.backgroundColor = [UIColor colorWithWhite:0.8 alpha:0.3];
+    [_effectPicker selectRow:1 inComponent:0 animated:YES];
     return self;
 }
 - (void)layoutUI{
@@ -324,18 +325,19 @@ - (NSString *)pickerView:(UIPickerView *)pickerView
 - (void)pickerView:(UIPickerView *)pickerView
       didSelectRow:(NSInteger)row
        inComponent:(NSInteger)component {
-    _curEffectIdx = row+1;
+    _curEffectIdx = row;
     if ( [_curFilter isMemberOfClass:[GPUImageFilterGroup class]]){
         GPUImageFilterGroup * fg = (GPUImageFilterGroup *)_curFilter;
         KSYBuildInSpecialEffects * sf = (KSYBuildInSpecialEffects *)[fg filterAtIndex:1];
         UIImage *downloadImage = [self getGPUResourceImageAt:_effectResourceNames[_curEffectIdx]];
-        if (downloadImage) {
-            [sf setSpecialEffectsUIImage:downloadImage];
-        }
+        [sf setSpecialEffectsUIImage:downloadImage];
     }
 }
 
 -(UIImage *)getGPUResourceImageAt:(NSString *)effectName{
+    if ([effectName isEqualToString:@"null"]){
+        return nil;
+    }
     NSString * path = [[NSBundle mainBundle] pathForResource:@"KSYGPUResource" ofType:@"bundle"];
     path = [path stringByAppendingPathComponent:effectName];
     if ([UIImage imageWithContentsOfFile:path]) {

diff --git a/demo/KSYLiveDemo/KSYDemoUI/KSYPresetCfgView.m b/demo/KSYLiveDemo/KSYDemoUI/KSYPresetCfgView.m
@@ -69,7 +69,7 @@ - (id) init {
 
     _frameRateUI  = [self addSliderName:@"视频帧率fps" From:1.0 To:30.0 Init:15.0];
     _lblVideoCodecUI = [self addLable:@"视频编码器"];
-    _videoCodecUI = [self addSegCtrlWithItems:@[@"自动",@"软264",@"硬264",@"软265"]];
+    _videoCodecUI = [self addSegCtrlWithItems:@[@"自动",@"软264",@"硬264",@"软265", @"硬265"]];
     _lblAudioCodecUI = [self addLable:@"音频编码器"];
     _audioCodecUI = [self addSegCtrlWithItems:@[@"aache",@"aaclc",@"ATaaclc", @"aachev2"]];
     _videoKbpsUI  = [self addSliderName:@"视频码率kbps" From:100.0 To:1600.0 Init:800.0];
@@ -473,6 +473,8 @@ - (KSYVideoCodec) videoCodec {
             return  KSYVideoCodec_VT264;
         case 3:
             return  KSYVideoCodec_QY265;
+        case 4:
+            return KSYVideoCodec_VT265;
         default:
             return  KSYVideoCodec_AUTO;
     }

diff --git a/demo/export.plist b/demo/export.plist
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>provisioningProfiles</key>
+        <dict>
+            <key>com.ksyun.ios.KSYLiveDemo</key>
+            <string>KSYLiveDemoEnterprise_Dis_2017.9.26</string>
+        </dict>
+        <key>teamID</key>
+        <string>36PUU93BJ2</string>
+        <key>method</key>
+        <string>enterprise</string>
+</dict>
+</plist>
diff --git a/doc/docset-installed.txt b/doc/docset-installed.txt
@@ -1,4 +1,4 @@
 Documentation set was installed to Xcode!
 
-Path: /Users/ksyci/Library/Developer/Shared/Documentation/DocSets/com.ksyun.KSYLive_iOS.docset
-Time: 2017-09-21 09:51:33 +0000
+Path: /Users/ksvc/Library/Developer/Shared/Documentation/DocSets/com.ksyun.KSYLive_iOS.docset
+Time: 2017-09-28 10:50:33 +0000
diff --git a/doc/docset/Contents/Resources/Documents/Blocks/KSYNetworkReachability.html b/doc/docset/Contents/Resources/Documents/Blocks/KSYNetworkReachability.html
@@ -3,11 +3,11 @@
 <head>
 	<meta charset="utf-8">
 
-	<title>KSYNetworkReachability Block Reference</title>
+	<title></title>
 
 	<link rel="stylesheet" href="../css/style.css">
 	<meta name="viewport" content="initial-scale=1, maximum-scale=1.4">
-	<meta name="generator" content="appledoc 2.2.1 (build 1334)">
+
 </head>
 <body class="appledoc">
 	<header>
@@ -59,35 +59,15 @@ <h1 id="library-title">
 		<div id="overview_contents" class="container">
 			<div id="content">
 				<main role="main">
-					<h1 class="title">KSYNetworkReachability Block Reference</h1>
+					<h1 class="title"></h1>
 
 
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<th>Declared in</th>
-	<td>KSYReachability.h</td>
-</tr>
-						</tbody></table></div>
-
 
 
 
 
 
 
-
-
-          <a title="Block Definition" name="instance_methods"></a>
-          <h4 class="method-subtitle parameter-title">Block Definition</h4>
-          <h3 class="subsubtitle method-title">KSYNetworkReachability</h3>
-
-
-<code>typedef void (^KSYNetworkReachability) (KSYReachability *reachability, SCNetworkConnectionFlags flags)</code>
-
-
-
-
-
 				</main>
 
 				<footer>
@@ -96,8 +76,6 @@ <h3 class="subsubtitle method-title">KSYNetworkReachability</h3>
 						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
 
 
-						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
-
 					</div>
 				</footer>
 			</div>

diff --git a/doc/docset/Contents/Resources/Documents/Blocks/KSYNetworkReachable.html b/doc/docset/Contents/Resources/Documents/Blocks/KSYNetworkReachable.html
@@ -3,11 +3,11 @@
 <head>
 	<meta charset="utf-8">
 
-	<title>KSYNetworkReachable Block Reference</title>
+	<title></title>
 
 	<link rel="stylesheet" href="../css/style.css">
 	<meta name="viewport" content="initial-scale=1, maximum-scale=1.4">
-	<meta name="generator" content="appledoc 2.2.1 (build 1334)">
+
 </head>
 <body class="appledoc">
 	<header>
@@ -59,35 +59,15 @@ <h1 id="library-title">
 		<div id="overview_contents" class="container">
 			<div id="content">
 				<main role="main">
-					<h1 class="title">KSYNetworkReachable Block Reference</h1>
+					<h1 class="title"></h1>
 
 
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<th>Declared in</th>
-	<td>KSYReachability.h</td>
-</tr>
-						</tbody></table></div>
-
 
 
 
 
 
 
-
-
-          <a title="Block Definition" name="instance_methods"></a>
-          <h4 class="method-subtitle parameter-title">Block Definition</h4>
-          <h3 class="subsubtitle method-title">KSYNetworkReachable</h3>
-
-
-<code>typedef void (^KSYNetworkReachable) (KSYReachability *reachability)</code>
-
-
-
-
-
 				</main>
 
 				<footer>
@@ -96,8 +76,6 @@ <h3 class="subsubtitle method-title">KSYNetworkReachable</h3>
 						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
 
 
-						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
-
 					</div>
 				</footer>
 			</div>

diff --git a/doc/docset/Contents/Resources/Documents/Blocks/KSYNetworkUnreachable.html b/doc/docset/Contents/Resources/Documents/Blocks/KSYNetworkUnreachable.html
@@ -3,11 +3,11 @@
 <head>
 	<meta charset="utf-8">
 
-	<title>KSYNetworkUnreachable Block Reference</title>
+	<title></title>
 
 	<link rel="stylesheet" href="../css/style.css">
 	<meta name="viewport" content="initial-scale=1, maximum-scale=1.4">
-	<meta name="generator" content="appledoc 2.2.1 (build 1334)">
+
 </head>
 <body class="appledoc">
 	<header>
@@ -59,35 +59,15 @@ <h1 id="library-title">
 		<div id="overview_contents" class="container">
 			<div id="content">
 				<main role="main">
-					<h1 class="title">KSYNetworkUnreachable Block Reference</h1>
+					<h1 class="title"></h1>
 
 
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<th>Declared in</th>
-	<td>KSYReachability.h</td>
-</tr>
-						</tbody></table></div>
-
 
 
 
 
 
 
-
-
-          <a title="Block Definition" name="instance_methods"></a>
-          <h4 class="method-subtitle parameter-title">Block Definition</h4>
-          <h3 class="subsubtitle method-title">KSYNetworkUnreachable</h3>
-
-
-<code>typedef void (^KSYNetworkUnreachable) (KSYReachability *reachability)</code>
-
-
-
-
-
 				</main>
 
 				<footer>
@@ -96,8 +76,6 @@ <h3 class="subsubtitle method-title">KSYNetworkUnreachable</h3>
 						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
 
 
-						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
-
 					</div>
 				</footer>
 			</div>

diff --git a/doc/docset/Contents/Resources/Documents/Blocks/KSYPlyAudioDataBlock.html b/doc/docset/Contents/Resources/Documents/Blocks/KSYPlyAudioDataBlock.html
@@ -3,11 +3,11 @@
 <head>
 	<meta charset="utf-8">
 
-	<title>KSYPlyAudioDataBlock Block Reference</title>
+	<title></title>
 
 	<link rel="stylesheet" href="../css/style.css">
 	<meta name="viewport" content="initial-scale=1, maximum-scale=1.4">
-	<meta name="generator" content="appledoc 2.2.1 (build 1334)">
+
 </head>
 <body class="appledoc">
 	<header>
@@ -59,54 +59,15 @@ <h1 id="library-title">
 		<div id="overview_contents" class="container">
 			<div id="content">
 				<main role="main">
-					<h1 class="title">KSYPlyAudioDataBlock Block Reference</h1>
+					<h1 class="title"></h1>
 
 
-					<div class="section section-specification"><table cellspacing="0"><tbody>
-						<tr>
-	<th>Declared in</th>
-	<td>KSYMoviePlayerController.h</td>
-</tr>
-						</tbody></table></div>
-
 
 
 
 
 
 
-
-
-          <a title="Block Definition" name="instance_methods"></a>
-          <h4 class="method-subtitle parameter-title">Block Definition</h4>
-          <h3 class="subsubtitle method-title">KSYPlyAudioDataBlock</h3>
-
-
-<div class="method-subsection brief-description">
-  <p>音频数据回调</p>
-</div>
-
-
-
-<code>typedef void (^KSYPlyAudioDataBlock) (CMSampleBufferRef sampleBuffer)</code>
-
-
-
-
-
-
-
-
-
-
-
-  <div class="method-subsection declared-in-section">
-  <h4 class="method-subtitle">Declared In</h4>
-  <code class="declared-in-ref">KSYMoviePlayerController.h</code><br />
-  </div>
-
-
-
 				</main>
 
 				<footer>
@@ -115,8 +76,6 @@ <h4 class="method-subtitle">Declared In</h4>
 						<p class="copyright">Copyright &copy; 2017 Kingsoft. All rights reserved. </p>
 
 
-						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
-
 					</div>
 				</footer>
 			</div>