Commit 8f4d702ebdb6ace01d39983aed47d08463b2d659
1 parent
b1eb967f
更新推流SDK;更新底层库;解决纯音频推流需要设置view问题;添加自动重连功能
Showing
9 changed files
with
3 additions
and
21 deletions
app/libs/libcnlivestream.jar
No preview for this file type
app/libs/libcnlivevideo.jar
No preview for this file type
app/src/main/java/com/cnlive/demo/stream/AudioActivity.java
| @@ -89,23 +89,11 @@ public class AudioActivity extends AppCompatActivity implements View.OnClickList | @@ -89,23 +89,11 @@ public class AudioActivity extends AppCompatActivity implements View.OnClickList | ||
| 89 | private void initStream() { | 89 | private void initStream() { |
| 90 | //初始化推流SDK | 90 | //初始化推流SDK |
| 91 | mStreamer = new Streamer(this); | 91 | mStreamer = new Streamer(this); |
| 92 | -// //设置预览编码帧率 | ||
| 93 | -// mStreamer.setPreviewFps(15); | ||
| 94 | -// //设置推流编码帧率 | ||
| 95 | -// mStreamer.setTargetFps(15); | ||
| 96 | -// //设置初始、最大、最小视频码率 | ||
| 97 | -// mStreamer.setVideoKBitrate(800 * 3 / 4, 800, 800 / 4); | ||
| 98 | // //设置音频编码码率 | 92 | // //设置音频编码码率 |
| 99 | mStreamer.setAudioKBitrate(48); | 93 | mStreamer.setAudioKBitrate(48); |
| 100 | -// //分别设置预览和推流分辨率 | ||
| 101 | -// mStreamer.setPreviewResolution(VIDEO_RESOLUTION_360P); | ||
| 102 | -// mStreamer.setTargetResolution(VIDEO_RESOLUTION_360P); | ||
| 103 | //设置编码模式(硬编/软编/软编兼容) | 94 | //设置编码模式(硬编/软编/软编兼容) |
| 104 | mStreamer.setEncodeMethod(ENCODE_METHOD_HARDWARE); | 95 | mStreamer.setEncodeMethod(ENCODE_METHOD_HARDWARE); |
| 105 | - | ||
| 106 | - //设置预览View | ||
| 107 | - mStreamer.setDisplayPreview(surfaceView); | ||
| 108 | - | 96 | + //设置纯音频推流 |
| 109 | mStreamer.setAudioOnly(true); | 97 | mStreamer.setAudioOnly(true); |
| 110 | //设置Info回调,可以收到相关通知信息 | 98 | //设置Info回调,可以收到相关通知信息 |
| 111 | mStreamer.setOnInfoListener(mOnInfoListener); | 99 | mStreamer.setOnInfoListener(mOnInfoListener); |
app/src/main/java/com/cnlive/demo/stream/CNStreamActivity.java
| @@ -97,7 +97,8 @@ public class CNStreamActivity extends AppCompatActivity implements View.OnClickL | @@ -97,7 +97,8 @@ public class CNStreamActivity extends AppCompatActivity implements View.OnClickL | ||
| 97 | mStreamer.setTargetResolution(VIDEO_RESOLUTION_360P); | 97 | mStreamer.setTargetResolution(VIDEO_RESOLUTION_360P); |
| 98 | //设置编码模式(硬编/软编/软编兼容) | 98 | //设置编码模式(硬编/软编/软编兼容) |
| 99 | mStreamer.setEncodeMethod(ENCODE_METHOD_HARDWARE); | 99 | mStreamer.setEncodeMethod(ENCODE_METHOD_HARDWARE); |
| 100 | - | 100 | +// //开启自动重连(是否自动重连/重试次数/重试时间间隔) |
| 101 | +// mStreamer.setEnableAutoRestart(true, 3, 3000); | ||
| 101 | //设置预览View | 102 | //设置预览View |
| 102 | mStreamer.setDisplayPreview(surfaceView); | 103 | mStreamer.setDisplayPreview(surfaceView); |
| 103 | //设置Info回调,可以收到相关通知信息 | 104 | //设置Info回调,可以收到相关通知信息 |
app/src/main/jniLibs/arm64-v8a/libksylive.so
No preview for this file type
app/src/main/jniLibs/armeabi-v7a/libksylive.so
No preview for this file type
app/src/main/jniLibs/armeabi/libksylive.so
No preview for this file type
app/src/main/jniLibs/x86/libksylive.so
No preview for this file type
app/src/main/res/layout/activity_audio.xml
| @@ -5,13 +5,6 @@ | @@ -5,13 +5,6 @@ | ||
| 5 | android:layout_height="match_parent" | 5 | android:layout_height="match_parent" |
| 6 | tools:context="com.cnlive.demo.stream.AudioActivity"> | 6 | tools:context="com.cnlive.demo.stream.AudioActivity"> |
| 7 | 7 | ||
| 8 | - <android.opengl.GLSurfaceView | ||
| 9 | - android:id="@+id/cnSurfaceView" | ||
| 10 | - android:layout_width="match_parent" | ||
| 11 | - android:layout_height="match_parent" | ||
| 12 | - android:background="#ffffff" /> | ||
| 13 | - | ||
| 14 | - | ||
| 15 | <LinearLayout | 8 | <LinearLayout |
| 16 | android:id="@+id/set_layout" | 9 | android:id="@+id/set_layout" |
| 17 | android:layout_width="match_parent" | 10 | android:layout_width="match_parent" |