Skip to content

Commit

Permalink
Merge pull request #221 from ksvc/v4.3.2-14244
Browse files Browse the repository at this point in the history 
update to v4.3.2-14244
  • Loading branch information
@chriszeng87
chriszeng87 committed Aug 3, 2017
2 parents 4dac9ec + 694c7b0 commit 4f3626a
Show file tree
Hide file tree
Showing 15 changed files with 279 additions and 14 deletions.
Binary file modified demo/libs/arm64-v8a/libksylive.so
View file
Binary file not shown.
Binary file modified demo/libs/armeabi-v7a/libksylive.so
View file
Binary file not shown.
Binary file modified demo/libs/armeabi/libksylive.so
View file
Binary file not shown.
Binary file modified demo/libs/ksylive.jar
View file
Binary file not shown.
Binary file modified demo/libs/x86/libksylive.so
View file
Binary file not shown.
14 changes: 14 additions & 0 deletions docs/reference/com/ksyun/media/streamer/encoder/AVCodecAudioEncoder.html
View file
Expand Up @@ -467,6 +467,20 @@ <h2>Summary</h2>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHED">ENCODER_STATE_FLUSHED</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class="alt-color api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHING">ENCODER_STATE_FLUSHING</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_IDLE">ENCODER_STATE_IDLE</a></td>
Expand Down
14 changes: 14 additions & 0 deletions docs/reference/com/ksyun/media/streamer/encoder/AVCodecSurfaceEncoder.html
View file
Expand Up @@ -467,6 +467,20 @@ <h2>Summary</h2>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHED">ENCODER_STATE_FLUSHED</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class="alt-color api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHING">ENCODER_STATE_FLUSHING</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_IDLE">ENCODER_STATE_IDLE</a></td>
Expand Down
14 changes: 14 additions & 0 deletions docs/reference/com/ksyun/media/streamer/encoder/AVCodecVideoEncoder.html
View file
Expand Up @@ -467,6 +467,20 @@ <h2>Summary</h2>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHED">ENCODER_STATE_FLUSHED</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class="alt-color api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHING">ENCODER_STATE_FLUSHING</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_IDLE">ENCODER_STATE_IDLE</a></td>
Expand Down
94 changes: 94 additions & 0 deletions docs/reference/com/ksyun/media/streamer/encoder/Encoder.html
View file
Expand Up @@ -545,6 +545,20 @@ <h2>Summary</h2>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHED">ENCODER_STATE_FLUSHED</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class="alt-color api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHING">ENCODER_STATE_FLUSHING</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_IDLE">ENCODER_STATE_IDLE</a></td>
Expand Down Expand Up @@ -1729,6 +1743,86 @@ <h4 class="jd-details-title">



<a id="ENCODER_STATE_FLUSHED"></a>

<div class="jd-details api apilevel-">
<h4 class="jd-details-title">
<span class="normal">
public
static
final
int
</span>
ENCODER_STATE_FLUSHED
</h4>
<div class="api-level">






</div>
<div class="jd-details-descr">

<div class="jd-tagdata jd-tagdescr"><p></p></div>


<div class="jd-tagdata">
<span class="jd-tagtitle">Constant Value: </span>
<span>

5
(0x00000005)

</span>
</div>

</div>
</div>



<a id="ENCODER_STATE_FLUSHING"></a>

<div class="jd-details api apilevel-">
<h4 class="jd-details-title">
<span class="normal">
public
static
final
int
</span>
ENCODER_STATE_FLUSHING
</h4>
<div class="api-level">






</div>
<div class="jd-details-descr">

<div class="jd-tagdata jd-tagdescr"><p></p></div>


<div class="jd-tagdata">
<span class="jd-tagtitle">Constant Value: </span>
<span>

4
(0x00000004)

</span>
</div>

</div>
</div>



<a id="ENCODER_STATE_IDLE"></a>

<div class="jd-details api apilevel-">
Expand Down
14 changes: 14 additions & 0 deletions docs/reference/com/ksyun/media/streamer/encoder/MediaCodecAudioEncoder.html
View file
Expand Up @@ -491,6 +491,20 @@ <h2>Summary</h2>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHED">ENCODER_STATE_FLUSHED</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class="alt-color api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHING">ENCODER_STATE_FLUSHING</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_IDLE">ENCODER_STATE_IDLE</a></td>
Expand Down
14 changes: 14 additions & 0 deletions docs/reference/com/ksyun/media/streamer/encoder/MediaCodecEncoderBase.html
View file
Expand Up @@ -507,6 +507,20 @@ <h2>Summary</h2>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHED">ENCODER_STATE_FLUSHED</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class="alt-color api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHING">ENCODER_STATE_FLUSHING</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_IDLE">ENCODER_STATE_IDLE</a></td>
Expand Down
14 changes: 14 additions & 0 deletions docs/reference/com/ksyun/media/streamer/encoder/MediaCodecSurfaceEncoder.html
View file
Expand Up @@ -494,6 +494,20 @@ <h2>Summary</h2>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHED">ENCODER_STATE_FLUSHED</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class="alt-color api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_FLUSHING">ENCODER_STATE_FLUSHING</a></td>
<td class="jd-descrcol" width="100%"></td>
</tr>


<tr class=" api apilevel-" >
<td class="jd-typecol">int</td>
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#ENCODER_STATE_IDLE">ENCODER_STATE_IDLE</a></td>
Expand Down

0 comments on commit 4f3626a

Please sign in to comment.