更新推流SDK

王琳
1 parent 11b75d90
Showing 5 changed files with 34 additions and 55 deletions
.idea/misc.xml
app/build.gradle
app/src/main/java/com/cnlive/demo/stream/CNStreamApplication.java
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
app/src/main/res/layout/titlebar.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -43,7 +43,8 @@ repositories {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-        compile 'com.cnlive:lib_cnlive:2.1.0'
+    compile 'com.cnlive:lib_cnlive:3.0'
+    compile 'com.cnlive:lib_cnutil:3.0.3'
     compile 'com.android.support:appcompat-v7:25.2.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.1'
@@ -14,7 +14,7 @@ public class CNStreamApplication extends Application {
     public void onCreate() {
         super.onCreate();
-        Config.init(this, "60_irn9gh9d49", "f7b6db55616d207fd5c07e2b580b5650c690aff58fb36d",true);
+        Config.init(this, "60_irn9gh9d49", "f7b6db55616d207fd5c07e2b580b5650c690aff58fb36d");
         // 初始化fresco库，用来支持动态水印功能
         Fresco.initialize(this);
@@ -38,11 +38,12 @@ import android.widget.Toast;
 import com.cnlive.libs.stream.Streamer;
 import com.cnlive.libs.stream.base.ICNAudioEffectFilter;
 import com.cnlive.libs.stream.base.IStreamer;
-import com.cnlive.libs.stream.base.ImgBeautyProFilter;
-import com.cnlive.libs.stream.base.ImgFilterBase;
+import com.cnlive.libs.stream.base.img.ICNImgFilterBase;
 import com.cnlive.libs.stream.filter.CNAudioEffectFilter;
 import com.cnlive.libs.stream.filter.CNAudioFilterBase;
 import com.cnlive.libs.stream.filter.CNAudioReverbFilter;
+import com.cnlive.libs.stream.filter.img.CNImgBeautyProFilter;
+import com.cnlive.libs.stream.filter.img.CNNewImgFilterBase;
 import com.cnlive.libs.stream.model.ActivityConfig;
 import java.io.BufferedOutputStream;
@@ -55,10 +56,6 @@ import java.util.LinkedList;
 import java.util.List;
 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE;
-import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT;
-import static com.cnlive.libs.stream.base.IStreamer.ENCODE_PROFILE_BALANCE;
-import static com.cnlive.libs.stream.base.IStreamer.ENCODE_PROFILE_HIGH_PERFORMANCE;
-import static com.cnlive.libs.stream.base.IStreamer.ENCODE_PROFILE_LOW_POWER;
 import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P;
 import static com.cnlive.libs.stream.model.Filters.*;
@@ -76,7 +73,6 @@ public class StreamActivity extends Activity {
     private View mSwitchCameraView;
     private View mFlashView;
     private ImageView mExposureView;
-    private ImageView mAddView;
     private TextView mShootingText;
     private CheckBox mWaterMarkCheckBox;
     private CheckBox mBeautyCheckBox;
@@ -190,9 +186,6 @@ public class StreamActivity extends Activity {
         //亮度
         mExposureView = (ImageView) findViewById(R.id.exposure);
         mExposureView.setOnClickListener(mObserverButton);
-        //悬浮窗
-        mAddView = (ImageView) findViewById(R.id.add);
-        mAddView.setOnClickListener(mObserverButton);
         mCheckBoxObserver = new CheckBoxObserver();
         //美颜
@@ -320,7 +313,7 @@ public class StreamActivity extends Activity {
         initBeautyUI();
-        mStreamer.setFilterOnErrorListener(new ImgFilterBase.OnErrorListener() {
+        mStreamer.setFilterOnErrorListener(new ICNImgFilterBase.OnErrorListener() {
             @Override
             public void onError(int i) {
                 Toast.makeText(StreamActivity.this, "当前机型不支持该滤镜", Toast.LENGTH_SHORT).show();
@@ -385,9 +378,9 @@ public class StreamActivity extends Activity {
                     int diff = position - 16;
                     mStreamer.setFilter(CN_FILTER_BEAUTY_1977.getFilter() + diff);
                 }
-                List<ImgFilterBase> filters = mStreamer.getFilter();
+                List<CNNewImgFilterBase> filters = mStreamer.getFilter();
                 if (filters != null && !filters.isEmpty()) {
-                    final ImgFilterBase filter = filters.get(0);
+                    final CNNewImgFilterBase filter = filters.get(0);
                     mBeautyGrindLayout.setVisibility(filter.isGrindRatioSupported() ?
                             View.VISIBLE : View.GONE);
                     mBeautyWhitenLayout.setVisibility(filter.isWhitenRatioSupported() ?
@@ -408,7 +401,7 @@ public class StreamActivity extends Activity {
                                     } else if (seekBar == mWhitenSeekBar) {
                                         filter.setWhitenRatio(val);
                                     } else if (seekBar == mRuddySeekBar) {
-                                        if (filter instanceof ImgBeautyProFilter) {
+                                        if (filter instanceof CNImgBeautyProFilter) {
                                             val = progress / 50.f - 1.0f;
                                         }
                                         filter.setRuddyRatio(val);
@@ -429,7 +422,7 @@ public class StreamActivity extends Activity {
                     mGrindSeekBar.setProgress((int) (filter.getGrindRatio() * 100));
                     mWhitenSeekBar.setProgress((int) (filter.getWhitenRatio() * 100));
                     int ruddyVal = (int) (filter.getRuddyRatio() * 100);
-                    if (filter instanceof ImgBeautyProFilter) {
+                    if (filter instanceof CNImgBeautyProFilter) {
                         ruddyVal = (int) (filter.getRuddyRatio() * 50 + 50);
                     }
                     mRuddySeekBar.setProgress(ruddyVal);
@@ -523,6 +516,7 @@ public class StreamActivity extends Activity {
     @Override
     public void onResume() {
         super.onResume();
+
         mStreamer.setDisplayPreview(mCameraPreviewView);
         mStreamer.resume();
         if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) {
@@ -532,10 +526,13 @@ public class StreamActivity extends Activity {
         if (mWaterMarkCheckBox.isChecked()) {
             showWaterMark();
         }
+
     }
+    @Override
     public void onPause() {
         super.onPause();
+
         mStreamer.pause();
 //        mStreamer.stopCameraPreview();
 //        if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) {
@@ -641,12 +638,13 @@ public class StreamActivity extends Activity {
                 } catch (FileNotFoundException e) {
                     e.printStackTrace();
                 } finally {
-                    if (bos != null)
+                    if (bos != null) {
                         try {
                             bos.close();
                         } catch (IOException e) {
                             e.printStackTrace();
                         }
+                    }
                 }
             }
         });
@@ -661,13 +659,6 @@ public class StreamActivity extends Activity {
         }
     }
-    private void onAddClick() {
-        Intent intent = new Intent(getApplicationContext(), FloatActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        CNGlobalStreamer.setInstance(mStreamer);
-        startActivity(intent);
-    }
-
     private class ButtonObserver implements View.OnClickListener {
         @Override
         public void onClick(View view) {
@@ -696,9 +687,6 @@ public class StreamActivity extends Activity {
                 case R.id.exposure:
                     onExposureClick();
                     break;
-                case R.id.add:
-                    onAddClick();
-                    break;
                 default:
                     break;
             }
@@ -833,16 +821,19 @@ public class StreamActivity extends Activity {
         //如果需要静音所有音频，调用下面方法
 //        mStreamer.setMuteAudio(isChecked);
         //如果只想要静音麦克风，则需要调用下面方法
-        if (isChecked)
+        if (isChecked) {
             mStreamer.setVoiceVolume(0.0f);
-        else mStreamer.setVoiceVolume(0.4f);
+        } else {
+            mStreamer.setVoiceVolume(0.4f);
+        }
     }
     private void onWaterMarkChecked(boolean isChecked) {
-        if (isChecked)
+        if (isChecked) {
             showWaterMark();
-        else
+        } else {
             hideWaterMark();
+        }
     }
     private void onFrontMirrorChecked(boolean isChecked) {
@@ -16,15 +16,15 @@
         android:textColor="#FFFFFF"
         android:textSize="19sp" />
-    <ImageView
-        android:id="@+id/add"
-        android:layout_width="22dp"
-        android:layout_height="22dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="8dp"
-        android:layout_toLeftOf="@+id/exposure"
-        android:background="@drawable/float_view" />
+    <!--<ImageView-->
+        <!--android:id="@+id/add"-->
+        <!--android:layout_width="22dp"-->
+        <!--android:layout_height="22dp"-->
+        <!--android:layout_gravity="center_vertical"-->
+        <!--android:layout_marginRight="10dp"-->
+        <!--android:layout_marginTop="8dp"-->
+        <!--android:layout_toLeftOf="@+id/exposure"-->
+        <!--android:background="@drawable/float_view" />-->
     <ImageView
         android:id="@+id/exposure"