CNLive Android Team / CNStreamDemo · Commits

Commit 009251fb19c7727ff569337bbcd962479b415ec5

Authored by 王琳
1 parent bdd94fd6

将编码格式改为软编兼容模式

Inline Side-by-side
Showing 3 changed files with 6 additions and 3 deletions
app/src/main/java/com/cnlive/demo/stream/AudioActivity.java
  View file @009251f
@@ -19,6 +19,7 @@ import com.cnlive.libs.stream.model.ActivityConfig; @@ -19,6 +19,7 @@ import com.cnlive.libs.stream.model.ActivityConfig;
19 19
20 20
21 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE; 21 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE;
  22 +import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT;
22 import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P; 23 import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P;
23 24
24 /** 25 /**
@@ -92,7 +93,7 @@ public class AudioActivity extends AppCompatActivity implements View.OnClickList @@ -92,7 +93,7 @@ public class AudioActivity extends AppCompatActivity implements View.OnClickList
92 // //设置音频编码码率 93 // //设置音频编码码率
93 mStreamer.setAudioKBitrate(48); 94 mStreamer.setAudioKBitrate(48);
94 //设置编码模式（硬编/软编/软编兼容） 95 //设置编码模式（硬编/软编/软编兼容）
95 - mStreamer.setEncodeMethod(ENCODE_METHOD_HARDWARE); 96 + mStreamer.setEncodeMethod(ENCODE_METHOD_SOFTWARE_COMPAT);
96 //设置纯音频推流 97 //设置纯音频推流
97 mStreamer.setAudioOnly(true); 98 mStreamer.setAudioOnly(true);
98 // //设置自动重连(是否开启重连/重连次数/重连时间间隔) 99 // //设置自动重连(是否开启重连/重连次数/重连时间间隔)
app/src/main/java/com/cnlive/demo/stream/CNStreamActivity.java
  View file @009251f
@@ -21,6 +21,7 @@ import com.cnlive.libs.stream.base.IStreamer; @@ -21,6 +21,7 @@ import com.cnlive.libs.stream.base.IStreamer;
21 import com.cnlive.libs.stream.model.ActivityConfig; 21 import com.cnlive.libs.stream.model.ActivityConfig;
22 22
23 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE; 23 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE;
  24 +import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT;
24 import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P; 25 import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P;
25 26
26 /** 27 /**
@@ -96,7 +97,7 @@ public class CNStreamActivity extends AppCompatActivity implements View.OnClickL @@ -96,7 +97,7 @@ public class CNStreamActivity extends AppCompatActivity implements View.OnClickL
96 mStreamer.setPreviewResolution(VIDEO_RESOLUTION_360P); 97 mStreamer.setPreviewResolution(VIDEO_RESOLUTION_360P);
97 mStreamer.setTargetResolution(VIDEO_RESOLUTION_360P); 98 mStreamer.setTargetResolution(VIDEO_RESOLUTION_360P);
98 //设置编码模式（硬编/软编/软编兼容） 99 //设置编码模式（硬编/软编/软编兼容）
99 - mStreamer.setEncodeMethod(ENCODE_METHOD_HARDWARE); 100 + mStreamer.setEncodeMethod(ENCODE_METHOD_SOFTWARE_COMPAT);
100 // //开启自动重连(是否自动重连/重试次数/重试时间间隔) 101 // //开启自动重连(是否自动重连/重试次数/重试时间间隔)
101 // mStreamer.setEnableAutoRestart(true, 3, 3000); 102 // mStreamer.setEnableAutoRestart(true, 3, 3000);
102 //设置预览View 103 //设置预览View
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
  View file @009251f
@@ -41,6 +41,7 @@ import com.ksyun.media.player.IMediaPlayer; @@ -41,6 +41,7 @@ import com.ksyun.media.player.IMediaPlayer;
41 import java.util.List; 41 import java.util.List;
42 42
43 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE; 43 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE;
  44 +import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT;
44 import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P; 45 import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P;
45 import static com.cnlive.libs.stream.model.Filters.BEAUTY_DISABLE; 46 import static com.cnlive.libs.stream.model.Filters.BEAUTY_DISABLE;
46 import static com.cnlive.libs.stream.model.Filters.BEAUTY_ILLUSION; 47 import static com.cnlive.libs.stream.model.Filters.BEAUTY_ILLUSION;
@@ -213,7 +214,7 @@ public class StreamActivity extends Activity { @@ -213,7 +214,7 @@ public class StreamActivity extends Activity {
213 mStreamer.setPreviewResolution(VIDEO_RESOLUTION_360P); 214 mStreamer.setPreviewResolution(VIDEO_RESOLUTION_360P);
214 mStreamer.setTargetResolution(VIDEO_RESOLUTION_360P); 215 mStreamer.setTargetResolution(VIDEO_RESOLUTION_360P);
215 //设置编码模式（硬编/软编/软编兼容） 216 //设置编码模式（硬编/软编/软编兼容）
216 - mStreamer.setEncodeMethod(ENCODE_METHOD_HARDWARE); 217 + mStreamer.setEncodeMethod(ENCODE_METHOD_SOFTWARE_COMPAT);
217 218
218 //设置横竖屏方向 219 //设置横竖屏方向
219 mStreamer.setRotateDegrees(mIsLandscape ? 90 : 0);//设置屏幕旋转角度 220 mStreamer.setRotateDegrees(mIsLandscape ? 90 : 0);//设置屏幕旋转角度