Skip to content

Commit 3c2646f

Browse files
author
zengxuhong
committed
bump version to 3.3.0.4
1 parent 525a41c commit 3c2646f

21 files changed

+507
-423
lines changed

‎demo/.idea/gradle.xml

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/.idea/inspectionProfiles/Project_Default.xml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/.idea/libraries/support_v4_24_0_0.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/.idea/misc.xml

Lines changed: 37 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/.idea/workspace.xml

Lines changed: 419 additions & 396 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:1.2.3'
6+
classpath 'com.android.tools.build:gradle:2.1.0'
77
}
88
}
99
apply plugin: 'com.android.application'

‎demo/demo.iml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,71 +30,78 @@
3030
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4040
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/res" type="java-resource" />
4141
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/resources" type="java-resource" />
4242
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/assets" type="java-resource" />
4343
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/aidl" isTestSource="false" />
4444
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/java" isTestSource="false" />
4545
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/jni" isTestSource="false" />
4646
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/rs" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/shaders" isTestSource="false" />
4748
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
4849
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
4950
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5051
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5152
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
5253
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5354
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5456
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
5557
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
5658
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
5759
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
5860
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
59-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
60-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
61-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
62-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
63-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6662
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
6763
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
6864
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
6965
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7066
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7167
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7268
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7378
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7481
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7582
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7783
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7884
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.0.0/jars" />
7985
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8089
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-21.jar" />
8290
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
8391
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
8592
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
8694
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8896
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8997
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9098
</content>
9199
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
92100
<orderEntry type="sourceFolder" forTests="false" />
101+
<orderEntry type="library" exported="" name="ksylive3.0" level="project" />
93102
<orderEntry type="library" exported="" name="libksyplayer" level="project" />
94103
<orderEntry type="library" exported="" name="libksystat" level="project" />
95104
<orderEntry type="library" exported="" name="support-annotations-24.0.0" level="project" />
96-
<orderEntry type="library" exported="" name="ksylive3.0" level="project" />
97105
<orderEntry type="library" exported="" name="support-v4-24.0.0" level="project" />
98-
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-21" level="project" />
99106
</component>
100107
</module>

‎demo/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Feb 04 14:09:54 CST 2016
1+
#Thu Jul 14 15:51:32 CST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

‎demo/libs/armeabi-v7a/libksyplayer.so

-96 Bytes
Binary file not shown.

‎demo/libs/armeabi-v7a/libksystreamer.so

0 Bytes
Binary file not shown.

‎demo/libs/ksylive3.0.jar

-492 Bytes
Binary file not shown.

‎demo/src/com/ksy/recordlib/demo/CameraActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ public void handleMessage(Message msg) {
186186
case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
187187
case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
188188
case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
189+
case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
190+
case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
189191
Toast.makeText(CameraActivity.this, content,
190192
Toast.LENGTH_LONG).show();
191193
chronometer.stop();

‎libs/arm64-v8a/libksyplayer.so

-4.22 KB
Binary file not shown.

‎libs/arm64-v8a/libksystreamer.so

0 Bytes
Binary file not shown.

‎libs/armeabi-v7a/libksyplayer.so

-96 Bytes
Binary file not shown.

‎libs/armeabi-v7a/libksystreamer.so

0 Bytes
Binary file not shown.

‎libs/ksylive3.0.jar

-492 Bytes
Binary file not shown.

‎libs/x86/libksyplayer.so

-4.13 KB
Binary file not shown.

‎libs/x86/libksystreamer.so

0 Bytes
Binary file not shown.

‎release_note.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,8 @@
198198
101. 修复某些机型上(Galaxy S6/S7)上fps设定无效的问题；
199199
102. 水印logo支持设置assets路径；
200200
103. 修复部分机型无Camera，Audio权限错误时未通知上层的问题；
201-
104. 修复闪光灯开关多次点击才生效的问题；
201+
104. 修复闪光灯开关多次点击才生效的问题；
202+
203+
2016-07-14 3.3.0.4
204+
104. 修改某些机型上(小米3) 硬编450p以上分辨率 预览失效问题。；
205+
105. 增加建立连接失败错误码

0 commit comments

Comments
 (0)