Commit b2aa4cc62fd3a6ab1dcd40f236bda256e4a7484b
Merge remote-tracking branch 'origin/master'
Conflicts: app/libs/libcnlivestream.jar
Showing
3 changed files
with
1 additions
and
13 deletions
app/libs/libcnliveutil.jar
No preview for this file type
app/src/main/java/com/cnlive/demo/stream/MainActivity.java
| 1 | 1 | package com.cnlive.demo.stream; |
| 2 | 2 | |
| 3 | -import android.content.Intent; | |
| 4 | -import android.support.v7.app.AppCompatActivity; | |
| 5 | 3 | import android.os.Bundle; |
| 6 | -import android.text.InputType; | |
| 4 | +import android.support.v7.app.AppCompatActivity; | |
| 7 | 5 | import android.text.TextUtils; |
| 8 | 6 | import android.view.View; |
| 9 | 7 | import android.widget.Button; |
| 10 | 8 | import android.widget.EditText; |
| 11 | 9 | import android.widget.RadioButton; |
| 12 | 10 | |
| 13 | -import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE; | |
| 14 | -import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_SOFTWARE; | |
| 15 | -import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT; | |
| 16 | -import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P; | |
| 17 | -import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_480P; | |
| 18 | -import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_540P; | |
| 19 | -import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_720P; | |
| 20 | - | |
| 21 | 11 | public class MainActivity extends AppCompatActivity implements View.OnClickListener { |
| 22 | 12 | |
| 23 | 13 | private static final String TAG = MainActivity.class.getSimpleName(); | ... | ... |
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
| ... | ... | @@ -30,8 +30,6 @@ import com.cnlive.libs.stream.Streamer; |
| 30 | 30 | import com.cnlive.libs.stream.base.IStreamer; |
| 31 | 31 | import com.cnlive.libs.stream.model.ActivityConfig; |
| 32 | 32 | |
| 33 | -import java.util.Timer; | |
| 34 | - | |
| 35 | 33 | import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE; |
| 36 | 34 | import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P; |
| 37 | 35 | import static com.cnlive.libs.stream.model.Filters.BEAUTY_DISABLE; | ... | ... |