Skip to content

Commit

Permalink
update to v2.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Franken Zeng committed Jan 14, 2018
1 parent ebc6dc8 commit e371309
Show file tree
Hide file tree
Showing 108 changed files with 6,408 additions and 5,156 deletions.
4 changes: 2 additions & 2 deletions demo/KSYLiveDemo/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.8.0</string>
<string>2.9.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2.8.0.1</string>
<string>2.9.0.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down
4 changes: 2 additions & 2 deletions demo/KSYLiveDemo/KSYDemoUI/KSYBgpStreamerVC.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ -(void)imagePickerController:(UIImagePickerController *)picker
_kit.bgPic = nil;
}
//设置输出图像的像素格式
_kit.bgPic = [[GPUImagePicture alloc] initWithImage:image];
_kit.gpuOutputPixelFormat = kCVPixelFormatType_32BGRA;
_kit.bgPicRotate = [[_kit class] getRotationMode:image];
//校正图片朝向
_kit.bgPic = [[GPUImagePicture alloc] initWithImage:image];
_kit.bgPicRotate = [[_kit class] getRotationMode:image];
if (image.imageOrientation == UIImageOrientationLeft || image.imageOrientation == UIImageOrientationRight){
_kit.previewDimension = CGSizeMake(_kit.bgPic.outputImageSize.height, _kit.bgPic.outputImageSize.width);
}else{
Expand Down
2 changes: 1 addition & 1 deletion doc/docset-installed.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Documentation set was installed to Xcode!

Path: /Users/ksvc/Library/Developer/Shared/Documentation/DocSets/com.ksyun.KSYLive_iOS.docset
Time: 2017-09-28 13:02:18 +0000
Time: 2017-10-20 08:49:57 +0000
147 changes: 147 additions & 0 deletions doc/docset/Contents/Resources/Documents/Classes/KSYAudioMixer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ <h1 id="library-title">

<option value="//api/name/getMixVolume:">- getMixVolume:</option>

<option value="//api/name/getMixVolume:rightVolume:of:">- getMixVolume:rightVolume:of:</option>

<option value="//api/name/getTrackEnable:">- getTrackEnable:</option>

<option value="//api/name/processAudioData:nbSample:withFormat:timeinfo:of:">- processAudioData:nbSample:withFormat:timeinfo:of:</option>
Expand All @@ -92,6 +94,8 @@ <h1 id="library-title">

<option value="//api/name/setMixVolume:of:">- setMixVolume:of:</option>

<option value="//api/name/setMixVolume:rightVolume:of:">- setMixVolume:rightVolume:of:</option>

<option value="//api/name/setTrack:enable:">- setTrack:enable:</option>

</optgroup>
Expand Down Expand Up @@ -256,6 +260,80 @@ <h4 class="method-subtitle">Discussion</h4>



<div class="method-subsection declared-in-section">
<h4 class="method-subtitle">Declared In</h4>
<p><code class="declared-in-ref">KSYAudioMixer.h</code></p>
</div>


</div>
</div>
</div><div class="section-method">
<a name="//api/name/setMixVolume:rightVolume:of:" title="setMixVolume:rightVolume:of:"></a>
<h3 class="method-title"><code><a href="#//api/name/setMixVolume:rightVolume:of:">&ndash;&nbsp;setMixVolume:rightVolume:of:</a></code>
</h3>

<div class="method-info">
<div class="pointy-thing"></div>

<div class="method-info-container">


<div class="method-subsection brief-description">
<p>设置立体声混音音量（默认音量为1.0)，如果设置的单声道输出，则使用leftVolume进行处理</p>
</div>



<div class="method-subsection method-declaration"><code>- (BOOL)setMixVolume:(float)<em>leftVolume</em> rightVolume:(float)<em>rightVolume</em> of:(int)<em>trackId</em></code></div>



<div class="method-subsection arguments-section parameters">
<h4 class="method-subtitle parameter-title">Parameters</h4>
<table class="argument-def parameter-def">

<tr>
<th scope="row" class="argument-name"><code>leftVolume</code></th>
<td><p>左声道音量比例（0.0~2.0） (&lt;1.0 为缩小, > 1.0为放大)</p></td>
</tr>

<tr>
<th scope="row" class="argument-name"><code>rightVolume</code></th>
<td><p>右声道音量比例（0.0~2.0） (&lt;1.0 为缩小, > 1.0为放大)</p></td>
</tr>

<tr>
<th scope="row" class="argument-name"><code>trackId</code></th>
<td><p>设置对应track的</p></td>
</tr>

</table>
</div>



<div class="method-subsection return">
<h4 class="method-subtitle parameter-title">Return Value</h4>
<p>NO为设置失败，如track不存在，或vol超出范围</p>
</div>





<div class="method-subsection discussion-section">
<h4 class="method-subtitle">Discussion</h4>
<div class="warning"><p><strong>Warning:</strong> 设置放大的音量可能会出现爆音, 请注意
*</p></div>
</div>







<div class="method-subsection declared-in-section">
<h4 class="method-subtitle">Declared In</h4>
<p><code class="declared-in-ref">KSYAudioMixer.h</code></p>
Expand Down Expand Up @@ -315,6 +393,75 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>



<div class="method-subsection declared-in-section">
<h4 class="method-subtitle">Declared In</h4>
<p><code class="declared-in-ref">KSYAudioMixer.h</code></p>
</div>


</div>
</div>
</div><div class="section-method">
<a name="//api/name/getMixVolume:rightVolume:of:" title="getMixVolume:rightVolume:of:"></a>
<h3 class="method-title"><code><a href="#//api/name/getMixVolume:rightVolume:of:">&ndash;&nbsp;getMixVolume:rightVolume:of:</a></code>
</h3>

<div class="method-info">
<div class="pointy-thing"></div>

<div class="method-info-container">


<div class="method-subsection brief-description">
<p>查询track的音量，</p>
</div>



<div class="method-subsection method-declaration"><code>- (void)getMixVolume:(float *)<em>leftVolume</em> rightVolume:(float *)<em>rightVolume</em> of:(int)<em>trackId</em></code></div>



<div class="method-subsection arguments-section parameters">
<h4 class="method-subtitle parameter-title">Parameters</h4>
<table class="argument-def parameter-def">

<tr>
<th scope="row" class="argument-name"><code>leftVolume</code></th>
<td><p>左声道音量比例</p></td>
</tr>

<tr>
<th scope="row" class="argument-name"><code>rightVolume</code></th>
<td><p>右音量比例</p></td>
</tr>

<tr>
<th scope="row" class="argument-name"><code>trackId</code></th>
<td><p>设置对应track的</p></td>
</tr>

</table>
</div>



<div class="method-subsection return">
<h4 class="method-subtitle parameter-title">Return Value</h4>
<p>负数为查询失败，如track不存在
*</p>
</div>











<div class="method-subsection declared-in-section">
<h4 class="method-subtitle">Declared In</h4>
<p><code class="declared-in-ref">KSYAudioMixer.h</code></p>
Expand Down
48 changes: 48 additions & 0 deletions doc/docset/Contents/Resources/Documents/Classes/KSYClipWriter.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ <h1 id="library-title">

<option value="//api/name/maxKeyInterval">maxKeyInterval</option>

<option value="//api/name/mp4FastStart">mp4FastStart</option>

<option value="//api/name/recScene">recScene</option>

<option value="//api/name/shouldEnableKSYDropModule">shouldEnableKSYDropModule</option>
Expand Down Expand Up @@ -932,6 +934,52 @@ <h3 class="method-title"><code><a href="#//api/name/bWithAudio">&nbsp;&nbsp;bWit



<div class="method-subsection declared-in-section">
<h4 class="method-subtitle">Declared In</h4>
<p><code class="declared-in-ref">KSYClipWriter.h</code></p>
</div>


</div>
</div>
</div><div class="section-method">
<a name="//api/name/mp4FastStart" title="mp4FastStart"></a>
<h3 class="method-title"><code><a href="#//api/name/mp4FastStart">&nbsp;&nbsp;mp4FastStart</a></code>
</h3>

<div class="method-info">
<div class="pointy-thing"></div>

<div class="method-info-container">


<div class="method-subsection brief-description">
<p>mp4文件允许快速启动 (默认YES)</p>
</div>



<div class="method-subsection method-declaration"><code>@property (nonatomic, assign) BOOL mp4FastStart</code></div>









<div class="method-subsection discussion-section">
<h4 class="method-subtitle">Discussion</h4>
<p>mp4格式的文件中将moov等index信息放到文件开头</p><div class="warning"><p><strong>Warning:</strong> 启用此开关会在结束是对文件进行处理, 如果要长时间录制,请关闭本选项</p></div>
</div>







<div class="method-subsection declared-in-section">
<h4 class="method-subtitle">Declared In</h4>
<p><code class="declared-in-ref">KSYClipWriter.h</code></p>
Expand Down
96 changes: 0 additions & 96 deletions doc/docset/Contents/Resources/Documents/Classes/KSYGPUBgpStreamerKit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ <h1 id="library-title">

<option value="//api/name/streamerBase">streamerBase</option>

<option value="//api/name/vPreviewMixer">vPreviewMixer</option>

<option value="//api/name/vStreamMixer">vStreamMixer</option>

<option value="//api/name/videoFPS">videoFPS</option>

<option value="//api/name/videoProcessingCallback">videoProcessingCallback</option>
Expand Down Expand Up @@ -351,98 +347,6 @@ <h4 class="method-subtitle">Discussion</h4>



<div class="method-subsection declared-in-section">
<h4 class="method-subtitle">Declared In</h4>
<p><code class="declared-in-ref">KSYGPUBgpStreamerKit.h</code></p>
</div>


</div>
</div>
</div><div class="section-method">
<a name="//api/name/vPreviewMixer" title="vPreviewMixer"></a>
<h3 class="method-title"><code><a href="#//api/name/vPreviewMixer">&nbsp;&nbsp;vPreviewMixer</a></code>
</h3>

<div class="method-info">
<div class="pointy-thing"></div>

<div class="method-info-container">


<div class="method-subsection brief-description">
<p>图像混合器 for 预览</p>
</div>



<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) KSYGPUPicMixer *vPreviewMixer</code></div>









<div class="method-subsection discussion-section">
<h4 class="method-subtitle">Discussion</h4>
<p>将多图层的内容叠加</p>
</div>







<div class="method-subsection declared-in-section">
<h4 class="method-subtitle">Declared In</h4>
<p><code class="declared-in-ref">KSYGPUBgpStreamerKit.h</code></p>
</div>


</div>
</div>
</div><div class="section-method">
<a name="//api/name/vStreamMixer" title="vStreamMixer"></a>
<h3 class="method-title"><code><a href="#//api/name/vStreamMixer">&nbsp;&nbsp;vStreamMixer</a></code>
</h3>

<div class="method-info">
<div class="pointy-thing"></div>

<div class="method-info-container">


<div class="method-subsection brief-description">
<p>图像混合器 for 推流</p>
</div>



<div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) KSYGPUPicMixer *vStreamMixer</code></div>









<div class="method-subsection discussion-section">
<h4 class="method-subtitle">Discussion</h4>
<p>将多图层的内容叠加</p>
</div>







<div class="method-subsection declared-in-section">
<h4 class="method-subtitle">Declared In</h4>
<p><code class="declared-in-ref">KSYGPUBgpStreamerKit.h</code></p>
Expand Down
Loading

0 comments on commit e371309

Please sign in to comment.