update to v3.3.0.3

fpzeng · Jul 7, 2016 · 525a41c · 525a41c
1 parent 2909426
commit 525a41c
Show file tree

Hide file tree

Showing 55 changed files with 146 additions and 205 deletions.
diff --git a/demo/.idea/libraries/support_v4_24_0_0.xml b/demo/.idea/libraries/support_v4_24_0_0.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/AndroidManifest.xml b/demo/AndroidManifest.xml
diff --git a/demo/build.gradle b/demo/build.gradle
diff --git a/demo/demo.iml b/demo/demo.iml
@@ -56,20 +56,20 @@
       <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/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/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/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" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />

diff --git a/demo/gradle.properties b/demo/gradle.properties
diff --git a/demo/gradle/wrapper/gradle-wrapper.jar b/demo/gradle/wrapper/gradle-wrapper.jar
diff --git a/demo/gradle/wrapper/gradle-wrapper.properties b/demo/gradle/wrapper/gradle-wrapper.properties
diff --git a/demo/gradlew.bat b/demo/gradlew.bat
diff --git a/demo/libs/armeabi-v7a/libDenoise_export.so b/demo/libs/armeabi-v7a/libDenoise_export.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/armeabi-v7a/libksyyuv.so b/demo/libs/armeabi-v7a/libksyyuv.so
diff --git a/demo/libs/armeabi-v7a/libreverb.so b/demo/libs/armeabi-v7a/libreverb.so
diff --git a/demo/libs/ksylive3.0.jar b/demo/libs/ksylive3.0.jar
diff --git a/demo/libs/libksyplayer.jar b/demo/libs/libksyplayer.jar
diff --git a/demo/lint.xml b/demo/lint.xml
diff --git a/demo/proguard-project.txt b/demo/proguard-project.txt
diff --git a/demo/project.properties b/demo/project.properties
diff --git a/demo/res/drawable-xhdpi/stream_exit_disable.png b/demo/res/drawable-xhdpi/stream_exit_disable.png
diff --git a/demo/res/drawable-xhdpi/stream_exit_normal.png b/demo/res/drawable-xhdpi/stream_exit_normal.png
diff --git a/demo/res/drawable-xhdpi/stream_exitsure_normal.png b/demo/res/drawable-xhdpi/stream_exitsure_normal.png
diff --git a/demo/res/drawable-xhdpi/stream_flash_disable.png b/demo/res/drawable-xhdpi/stream_flash_disable.png
diff --git a/demo/res/drawable-xhdpi/stream_flash_highlighted.png b/demo/res/drawable-xhdpi/stream_flash_highlighted.png
diff --git a/demo/res/drawable-xhdpi/stream_flash_normal.png b/demo/res/drawable-xhdpi/stream_flash_normal.png
diff --git a/demo/res/drawable-xhdpi/stream_switch_camera_disable.png b/demo/res/drawable-xhdpi/stream_switch_camera_disable.png
diff --git a/demo/res/drawable-xhdpi/stream_switch_camera_highlighted.png b/demo/res/drawable-xhdpi/stream_switch_camera_highlighted.png
diff --git a/demo/res/drawable-xhdpi/stream_switch_camera_normal.png b/demo/res/drawable-xhdpi/stream_switch_camera_normal.png
diff --git a/demo/res/drawable/streamer_delete_icon.xml b/demo/res/drawable/streamer_delete_icon.xml
diff --git a/demo/res/drawable/streamer_flash_icon.xml b/demo/res/drawable/streamer_flash_icon.xml
diff --git a/demo/res/drawable/streamer_rotate_icon.xml b/demo/res/drawable/streamer_rotate_icon.xml
diff --git a/demo/res/layout/activity_main.xml b/demo/res/layout/activity_main.xml
diff --git a/demo/res/layout/camera_activity2.xml b/demo/res/layout/camera_activity2.xml
diff --git a/demo/res/layout/demo_activity2.xml b/demo/res/layout/demo_activity2.xml
diff --git a/demo/src/com/ksy/recordlib/demo/CameraActivity.java b/demo/src/com/ksy/recordlib/demo/CameraActivity.java
@@ -694,6 +694,7 @@ public void onStatus(int what, int arg1, int arg2, String msg) {
                     //编码码率上升状态通知
                     break;
                 case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
+                    Log.e("CameraActivity", "init audio failed");
                     //音频录制初始化失败回调
                     break;
                 case RecorderConstants.KSYVIDEO_INIT_DONE:
@@ -708,6 +709,15 @@ public void onStatus(int what, int arg1, int arg2, String msg) {
                     mHandler.obtainMessage(what, "renderer exception")
                             .sendToTarget();
                     break;
+                case RecorderConstants.KSYVIDEO_AUDIO_PERMISSION_DENIED:
+                    Log.e("CameraActivity", "-------no audio permission");
+                    break;
+                case RecorderConstants.KSYVIDEO_CAMERA_DISABLED:
+                    Log.e("CameraActivity", "-------no camera permission");
+                    break;
+                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
+                    Log.e("CameraActivity", "-------init camera failed");
+                    break;
                 default:
                     if (msg != null) {
                         // 可以在这里处理断网重连的逻辑
@@ -823,6 +833,9 @@ private void onSwitchCamClick() {
     }
 
     private void onFlashClick() {
+        if (mStreamer.isFrontCamera())
+            isFlashOpened = true;
+
         if (isFlashOpened) {
             mStreamer.toggleTorch(false);
             isFlashOpened = false;

diff --git a/demo/src/com/ksy/recordlib/demo/Constants.java b/demo/src/com/ksy/recordlib/demo/Constants.java
diff --git a/libs/arm64-v8a/libDenoise_export.so b/libs/arm64-v8a/libDenoise_export.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/arm64-v8a/libksyyuv.so b/libs/arm64-v8a/libksyyuv.so
diff --git a/libs/arm64-v8a/libreverb.so b/libs/arm64-v8a/libreverb.so
diff --git a/libs/armeabi-v7a/libDenoise_export.so b/libs/armeabi-v7a/libDenoise_export.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/armeabi-v7a/libksyyuv.so b/libs/armeabi-v7a/libksyyuv.so
diff --git a/libs/armeabi-v7a/libreverb.so b/libs/armeabi-v7a/libreverb.so
diff --git a/libs/ksylive3.0.jar b/libs/ksylive3.0.jar
diff --git a/libs/libksyplayer.jar b/libs/libksyplayer.jar
diff --git a/libs/x86/libDenoise_export.so b/libs/x86/libDenoise_export.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/libs/x86/libksyyuv.so b/libs/x86/libksyyuv.so
diff --git a/libs/x86/libreverb.so b/libs/x86/libreverb.so
diff --git a/release_note.txt b/release_note.txt
@@ -192,4 +192,10 @@
 
 2016-06-24 3.3.0.2
 99. 减小so库的体积
-100. 修复关闭摄像头权限或录音权限后应用崩溃的问题，并在无权限时上报相应的错误类型
+100. 修复关闭摄像头权限或录音权限后应用崩溃的问题，并在无权限时上报相应的错误类型
+
+2016-07-07 3.3.0.3
+101. 修复某些机型上(Galaxy S6/S7)上fps设定无效的问题；
+102. 水印logo支持设置assets路径；
+103. 修复部分机型无Camera，Audio权限错误时未通知上层的问题；
+104. 修复闪光灯开关多次点击才生效的问题；