Merge pull request #48 from ksvc/3.3.2.0

add to 3.3.2.0
fpzeng · Sep 8, 2016 · 7153121 · 7153121
2 parents 7152149 + a4ceb74
commit 7153121
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 1 deletion.
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/libs/libksyplayer.jar b/demo/libs/libksyplayer.jar
diff --git a/demo/src/com/ksy/recordlib/demo/CameraActivity.java b/demo/src/com/ksy/recordlib/demo/CameraActivity.java
@@ -197,6 +197,7 @@ public void handleMessage(Message msg) {
                         case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
                         case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
                         case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
+                        case RecorderConstants.KSYVIDEO_AV_SYNC_ERROR:
                             Toast.makeText(CameraActivity.this, content,
                                     Toast.LENGTH_LONG).show();
                             chronometer.stop();
@@ -777,6 +778,14 @@ public void onError(int what, int arg1, int arg2, String msg) {
                     }
                     needRetry = false;
                     break;
+                case RecorderConstants.KSYVIDEO_AV_SYNC_ERROR:
+                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AV_SYNC_ERROR, pts diff:" +
+                                String.valueOf(arg1));
+                    if (mHandler != null) {
+                        mHandler.obtainMessage(what, msg).sendToTarget();
+                    }
+                    needRetry = false;
+                    break;
                 default:
                     break;
             }

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/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/libksyplayer.jar b/libs/libksyplayer.jar
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
@@ -229,4 +229,10 @@
 2016-08-22 3.3.1.0
 118. 增加推流过程中动态修改前置摄像头镜像功能
 119. 修改硬编码率自适应始终为true的问题
-120. 升级libksyplayer.jar为1.4.6版本
+120. 升级libksyplayer.jar为1.4.6版本
+
+2016-09-6 3.3.2.0
+121. 修复魅族pro5 5.1.9.0A版本固件上预览黑屏的bug
+122. 修复软编偶现crash问题
+123. 特殊情况下，音视频不同步时上报给APP
+124. 升级libksyplayer.jar为1.5.0版本