bump version to 3.3.0.6

fpzeng · Jul 29, 2016 · 4ab99f1 · 4ab99f1
1 parent 23f0f2e
commit 4ab99f1
Show file tree

Hide file tree

Showing 24 changed files with 552 additions and 754 deletions.
diff --git a/demo/.idea/gradle.xml b/demo/.idea/gradle.xml
diff --git a/demo/.idea/misc.xml b/demo/.idea/misc.xml
diff --git a/demo/.idea/workspace.xml b/demo/.idea/workspace.xml
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -15,8 +15,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "22.0.0"
+    compileSdkVersion 23
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 14

diff --git a/demo/demo.iml b/demo/demo.iml
@@ -44,37 +44,32 @@
       <sourceFolder url="file://$MODULE_DIR$/build-types/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/build-types/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/build-types/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build-types/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -83,25 +78,29 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="ksylive3.0" level="project" />
     <orderEntry type="library" exported="" name="libksyplayer" level="project" />
     <orderEntry type="library" exported="" name="libksystat" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-24.0.0" level="project" />
+    <orderEntry type="library" exported="" name="ksylive3.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-24.0.0" level="project" />
   </component>
 </module>
diff --git a/demo/libs/armeabi-v7a/libaudio_effect.so b/demo/libs/armeabi-v7a/libaudio_effect.so
diff --git a/demo/libs/armeabi-v7a/libksyplayer.so b/demo/libs/armeabi-v7a/libksyplayer.so
diff --git a/demo/libs/armeabi-v7a/libksystreamer.so b/demo/libs/armeabi-v7a/libksystreamer.so
diff --git a/demo/libs/ksylive3.0.jar b/demo/libs/ksylive3.0.jar
diff --git a/demo/res/layout/camera_activity.xml b/demo/res/layout/camera_activity.xml
@@ -19,7 +19,7 @@
         android:layout_gravity="top"
         layout="@layout/camera_titlebar" />
 
-    <TextView
+    <EditText
         android:id="@+id/url"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/demo/res/layout/camera_bottombar.xml b/demo/res/layout/camera_bottombar.xml
@@ -19,6 +19,20 @@
             android:layout_marginBottom="10dp"
             android:orientation="horizontal">
 
+            <CheckBox
+                android:id="@+id/pitch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="1"
+                android:background="#11123456"
+                android:checked="false"
+                android:text="@string/pitch"
+                android:textColor="@color/font_color_35"
+                android:textSize="@dimen/font_size_28px">
+            </CheckBox>
+
             <CheckBox
                 android:id="@+id/watermark"
                 android:layout_width="wrap_content"

diff --git a/demo/res/values/strings.xml b/demo/res/values/strings.xml
@@ -10,6 +10,7 @@
     <string name="click_to_shoot">开始直播</string>
     <string name="beauty_switcher">美颜滤镜</string>
     <string name="watermark">水印</string>
+    <string name="pitch">升降调</string>
     <string name="mute">静音</string>
     <string name="bgm">背景音乐</string>
     <string name="ear_mirror">耳返</string>

diff --git a/demo/src/com/ksy/recordlib/demo/CameraActivity.java b/demo/src/com/ksy/recordlib/demo/CameraActivity.java
@@ -79,6 +79,7 @@ public class CameraActivity extends Activity {
     private CheckBox mEarMirror;
     private CheckBox mMuteAudio;
     private CheckBox mWaterMark;
+    private CheckBox mPitch;
     private TextView mShootingText;
     private boolean recording = false;
     private boolean isFlashOpened = false;
@@ -168,6 +169,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mEarMirror = (CheckBox) findViewById(R.id.ear_mirror);
         mMuteAudio = (CheckBox) findViewById(R.id.mute);
         mWaterMark = (CheckBox) findViewById(R.id.watermark);
+        mPitch = (CheckBox) findViewById(R.id.pitch);
 
         audio_mix = mBgm.isChecked();
         earMirror = mEarMirror.isChecked();
@@ -486,6 +488,22 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             }
         });
 
+        mPitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                // 升降调，变速
+                if ( isChecked ) {
+                    mStreamer.setEnableAudioEffect(true);
+                    mStreamer.setPitch(-0.318f);
+                    mStreamer.setSpeed(1 / 0.7f);
+                    mStreamer.setTempo(0.7f);
+                }else{
+                    mStreamer.setEnableAudioEffect(false);
+                }
+            }
+        });
+
+
         mShootingText = (TextView) findViewById(R.id.click_to_shoot);
         mShootingText.setClickable(true);
         mShootingText.setOnClickListener(new View.OnClickListener() {
@@ -508,6 +526,7 @@ public void onClick(View arg0) {
                         mShootingText.postInvalidate();
                         recording = true;
 
+                        // 混响
                         mStreamer.setEnableReverb(true);
                         mStreamer.setReverbLevel(4);
                     } else {

diff --git a/libs/arm64-v8a/libaudio_effect.so b/libs/arm64-v8a/libaudio_effect.so
diff --git a/libs/arm64-v8a/libksyplayer.so b/libs/arm64-v8a/libksyplayer.so
diff --git a/libs/arm64-v8a/libksystreamer.so b/libs/arm64-v8a/libksystreamer.so
diff --git a/libs/armeabi-v7a/libaudio_effect.so b/libs/armeabi-v7a/libaudio_effect.so
diff --git a/libs/armeabi-v7a/libksyplayer.so b/libs/armeabi-v7a/libksyplayer.so
diff --git a/libs/armeabi-v7a/libksystreamer.so b/libs/armeabi-v7a/libksystreamer.so
diff --git a/libs/ksylive3.0.jar b/libs/ksylive3.0.jar
diff --git a/libs/x86/libaudio_effect.so b/libs/x86/libaudio_effect.so
diff --git a/libs/x86/libksyplayer.so b/libs/x86/libksyplayer.so
diff --git a/libs/x86/libksystreamer.so b/libs/x86/libksystreamer.so
diff --git a/release_note.txt b/release_note.txt
@@ -201,9 +201,14 @@
 104. 修复闪光灯开关多次点击才生效的问题；
 
 2016-07-14 3.3.0.4
-104. 修改某些机型上(小米3) 硬编450p以上分辨率 预览失效问题；
+104. 修改某些机型上(小米3) 硬编450p以上分辨率 预览失效问题。；
 105. 增加建立连接失败错误码
 
 2016-07-18 3.3.0.5
 106. 重构日志上报相关模块
-107. 状态变更区分info和error
+107. 状态变更区分info和error
+
+2016-07-27 3.3.0.6
+108. 解决米3手机720p软编推流崩溃
+109. 升降调功能提测
+110. 解决Google Play商店OpenSSL审核不过的问题