Skip to content

Commit ac0eba4

Browse files
chriszeng87chriszeng87
authored
Merge pull request #73 from ksvc/v4.0.1
V4.0.1
2 parents a8badbe + 04363f2 commit ac0eba4

25 files changed

+1071
-100
lines changed

‎README.asciidoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= 金山云直播推流Android SDK使用说明
22
:numbered:
3-
:toc: left
3+
//:toc: left
44
:icons: font
55
:source-highlighter: pygments
66

@@ -165,12 +165,12 @@ mStreamer.setTargetResolution(480, 0);
165165
mStreamer.setPreviewFps(15);
166166
// 设置推流帧率，当预览帧率大于推流帧率时，编码模块会自动丢帧以适应设定的推流帧率
167167
mStreamer.setTargetFps(15);
168-
// 设置视频码率，分别为初始平均码率、最高平均码率、最低平均码率，单位为bps
169-
mStreamer.setVideoBitrate(600 * 1000, 800 * 1000, 400 * 1000);
168+
// 设置视频码率，分别为初始平均码率、最高平均码率、最低平均码率，单位为kbps，另有setVideoBitrate接口，单位为bps
169+
mStreamer.setVideoKBitrate(600, 800, 400);
170170
// 设置音频采样率
171171
mStreamer.setAudioSampleRate(44100);
172-
// 设置音频码率，单位为bps
173-
mStreamer.setAudioBitrate(48 * 1000);
172+
// 设置音频码率，单位为kbps，另有setAudioBitrate接口，单位为bps
173+
mStreamer.setAudioKBitrate(48);
174174
/**
175175
* 设置编码模式(软编、硬编):
176176
* StreamerConstants.ENCODE_METHOD_SOFTWARE

‎demo/.idea/misc.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/.idea/workspace.xml

Lines changed: 144 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/demo.iml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@
5959
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
6060
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6161
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
62-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
63-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7062
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7163
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7264
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -75,6 +67,14 @@
7567
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7878
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

‎demo/libs/armeabi-v7a/libksystreamer.so

0 Bytes
Binary file not shown.

‎demo/libs/ksylive4.0.jar

3.63 KB
Binary file not shown.

‎demo/src/com/ksyun/media/streamer/demo/CameraActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,12 @@ protected void onCreate(Bundle savedInstanceState) {
188188

189189
int videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
190190
if (videoBitrate > 0) {
191-
videoBitrate *= 1000;
192-
mStreamer.setVideoBitrate(videoBitrate * 3 / 4, videoBitrate, videoBitrate / 4);
191+
mStreamer.setVideoKBitrate(videoBitrate * 3 / 4, videoBitrate, videoBitrate / 4);
193192
}
194193

195194
int audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
196195
if (audioBitrate > 0) {
197-
mStreamer.setAudioBitrate(audioBitrate * 1000);
196+
mStreamer.setAudioKBitrate(audioBitrate);
198197
}
199198

200199
int videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);

‎docs/reference/classes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ <h2 id="letter_G">G</h2>
421421

422422
<tr class=" api apilevel-" >
423423
<td class="jd-linkcol"><a href="./com/ksyun/media/streamer/util/gles/GLRender.GLRenderListener.html">GLRender.GLRenderListener</a></td>
424-
<td class="jd-descrcol" width="100%">&nbsp;</td>
424+
<td class="jd-descrcol" width="100%">GLRender listener interface.&nbsp;</td>
425425
</tr>
426426

427427

‎docs/reference/com/ksyun/media/streamer/encoder/AVCodecAudioEncoder.html

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,28 @@ <h2>Summary</h2>
532532
</tr>
533533

534534

535+
<tr class=" api apilevel-" >
536+
<td class="jd-typecol">
537+
protected
538+
539+
540+
Handler</td>
541+
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#mEncodeHandler">mEncodeHandler</a></td>
542+
<td class="jd-descrcol" width="100%"></td>
543+
</tr>
544+
545+
546+
<tr class="alt-color api apilevel-" >
547+
<td class="jd-typecol">
548+
protected
549+
550+
551+
HandlerThread</td>
552+
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#mEncodeThread">mEncodeThread</a></td>
553+
<td class="jd-descrcol" width="100%"></td>
554+
</tr>
555+
556+
535557
<tr class=" api apilevel-" >
536558
<td class="jd-typecol">
537559
protected

‎docs/reference/com/ksyun/media/streamer/encoder/AVCodecSurfaceEncoder.html

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,28 @@ <h2>Summary</h2>
532532
</tr>
533533

534534

535+
<tr class=" api apilevel-" >
536+
<td class="jd-typecol">
537+
protected
538+
539+
540+
Handler</td>
541+
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#mEncodeHandler">mEncodeHandler</a></td>
542+
<td class="jd-descrcol" width="100%"></td>
543+
</tr>
544+
545+
546+
<tr class="alt-color api apilevel-" >
547+
<td class="jd-typecol">
548+
protected
549+
550+
551+
HandlerThread</td>
552+
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#mEncodeThread">mEncodeThread</a></td>
553+
<td class="jd-descrcol" width="100%"></td>
554+
</tr>
555+
556+
535557
<tr class=" api apilevel-" >
536558
<td class="jd-typecol">
537559
protected
@@ -669,6 +691,22 @@ <h2>Summary</h2>
669691

670692

671693

694+
void
695+
</td>
696+
<td class="jd-linkcol" width="100%">
697+
<span class="sympad"><a href="../../../../../com/ksyun/media/streamer/encoder/AVCodecSurfaceEncoder.html#queueEvent(java.lang.Runnable)">queueEvent</a></span>(Runnable r)
698+
699+
</td></tr>
700+
701+
702+
703+
<tr class="alt-color api apilevel-" >
704+
<td class="jd-typecol">
705+
706+
707+
708+
709+
672710
void
673711
</td>
674712
<td class="jd-linkcol" width="100%">
@@ -677,6 +715,38 @@ <h2>Summary</h2>
677715
</td></tr>
678716

679717

718+
719+
<tr class=" api apilevel-" >
720+
<td class="jd-typecol">
721+
722+
723+
724+
725+
726+
void
727+
</td>
728+
<td class="jd-linkcol" width="100%">
729+
<span class="sympad"><a href="../../../../../com/ksyun/media/streamer/encoder/AVCodecSurfaceEncoder.html#requestRender()">requestRender</a></span>()
730+
731+
</td></tr>
732+
733+
734+
735+
<tr class="alt-color api apilevel-" >
736+
<td class="jd-typecol">
737+
738+
739+
740+
741+
742+
void
743+
</td>
744+
<td class="jd-linkcol" width="100%">
745+
<span class="sympad"><a href="../../../../../com/ksyun/media/streamer/encoder/AVCodecSurfaceEncoder.html#setGLRenderListener(com.ksyun.media.streamer.util.gles.GLRender.GLRenderListener)">setGLRenderListener</a></span>(<a href="../../../../../com/ksyun/media/streamer/util/gles/GLRender.GLRenderListener.html">GLRender.GLRenderListener</a> listener)
746+
747+
</td></tr>
748+
749+
680750

681751
</table>
682752

@@ -1533,6 +1603,37 @@ <h4 class="jd-details-title">
15331603
</div>
15341604

15351605

1606+
<a id="queueEvent(java.lang.Runnable)"></a>
1607+
1608+
<div class="jd-details api apilevel-">
1609+
<h4 class="jd-details-title">
1610+
<span class="normal">
1611+
public
1612+
1613+
1614+
1615+
1616+
void
1617+
</span>
1618+
<span class="sympad">queueEvent</span>
1619+
<span class="normal">(Runnable r)</span>
1620+
</h4>
1621+
<div class="api-level">
1622+
<div>
1623+
1624+
</div>
1625+
1626+
1627+
1628+
</div>
1629+
<div class="jd-details-descr">
1630+
1631+
<div class="jd-tagdata jd-tagdescr"><p></p></div>
1632+
1633+
</div>
1634+
</div>
1635+
1636+
15361637
<a id="release()"></a>
15371638

15381639
<div class="jd-details api apilevel-">
@@ -1564,6 +1665,68 @@ <h4 class="jd-details-title">
15641665
</div>
15651666

15661667

1668+
<a id="requestRender()"></a>
1669+
1670+
<div class="jd-details api apilevel-">
1671+
<h4 class="jd-details-title">
1672+
<span class="normal">
1673+
public
1674+
1675+
1676+
1677+
1678+
void
1679+
</span>
1680+
<span class="sympad">requestRender</span>
1681+
<span class="normal">()</span>
1682+
</h4>
1683+
<div class="api-level">
1684+
<div>
1685+
1686+
</div>
1687+
1688+
1689+
1690+
</div>
1691+
<div class="jd-details-descr">
1692+
1693+
<div class="jd-tagdata jd-tagdescr"><p></p></div>
1694+
1695+
</div>
1696+
</div>
1697+
1698+
1699+
<a id="setGLRenderListener(com.ksyun.media.streamer.util.gles.GLRender.GLRenderListener)"></a>
1700+
1701+
<div class="jd-details api apilevel-">
1702+
<h4 class="jd-details-title">
1703+
<span class="normal">
1704+
public
1705+
1706+
1707+
1708+
1709+
void
1710+
</span>
1711+
<span class="sympad">setGLRenderListener</span>
1712+
<span class="normal">(<a href="../../../../../com/ksyun/media/streamer/util/gles/GLRender.GLRenderListener.html">GLRender.GLRenderListener</a> listener)</span>
1713+
</h4>
1714+
<div class="api-level">
1715+
<div>
1716+
1717+
</div>
1718+
1719+
1720+
1721+
</div>
1722+
<div class="jd-details-descr">
1723+
1724+
<div class="jd-tagdata jd-tagdescr"><p></p></div>
1725+
1726+
</div>
1727+
</div>
1728+
1729+
15671730

15681731

15691732

‎docs/reference/com/ksyun/media/streamer/encoder/AVCodecVideoEncoder.html

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,28 @@ <h2>Summary</h2>
532532
</tr>
533533

534534

535+
<tr class=" api apilevel-" >
536+
<td class="jd-typecol">
537+
protected
538+
539+
540+
Handler</td>
541+
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#mEncodeHandler">mEncodeHandler</a></td>
542+
<td class="jd-descrcol" width="100%"></td>
543+
</tr>
544+
545+
546+
<tr class="alt-color api apilevel-" >
547+
<td class="jd-typecol">
548+
protected
549+
550+
551+
HandlerThread</td>
552+
<td class="jd-linkcol"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#mEncodeThread">mEncodeThread</a></td>
553+
<td class="jd-descrcol" width="100%"></td>
554+
</tr>
555+
556+
535557
<tr class=" api apilevel-" >
536558
<td class="jd-typecol">
537559
protected

0 commit comments

Comments
 (0)