Merge pull request #44 from ksvc/3.3.1.0

add to 3.3.1.0
fpzeng · Aug 25, 2016 · 7152149 · 7152149
2 parents bcb4f19 + f29ea7e
commit 7152149
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 5 deletions.
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/res/layout/camera_bottombar.xml b/demo/res/layout/camera_bottombar.xml
@@ -12,7 +12,19 @@
         android:orientation="vertical"
         android:background="#00000000"
         android:paddingLeft="5dp">
-
+        <CheckBox
+            android:id="@+id/front_mirror"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="1"
+            android:background="#11123456"
+            android:checked="false"
+            android:text="@string/frontMirror"
+            android:textColor="@color/font_color_35"
+            android:textSize="@dimen/font_size_28px">
+        </CheckBox>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

diff --git a/demo/res/values/strings.xml b/demo/res/values/strings.xml
@@ -19,5 +19,6 @@
     <string name="flash">Flash</string>
     <string name="picture_pip">开始图片画中画</string>
     <string name="stop_picture_pip">停止图片画中画</string>
+    <string name="frontMirror">开始前置摄像头镜像</string>
 
 </resources>
diff --git a/demo/src/com/ksy/recordlib/demo/CameraActivity.java b/demo/src/com/ksy/recordlib/demo/CameraActivity.java
@@ -80,6 +80,7 @@ public class CameraActivity extends Activity {
     private CheckBox mMuteAudio;
     private CheckBox mWaterMark;
     private CheckBox mPitch;
+    private CheckBox mFrontMirror;
     private TextView mShootingText;
     private boolean recording = false;
     private boolean isFlashOpened = false;
@@ -167,6 +168,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mPicturePip.setClickable(true);
         mBgm = (CheckBox) findViewById(R.id.bgm);
         mEarMirror = (CheckBox) findViewById(R.id.ear_mirror);
+        mFrontMirror = (CheckBox) findViewById(R.id.front_mirror);
         mMuteAudio = (CheckBox) findViewById(R.id.mute);
         mWaterMark = (CheckBox) findViewById(R.id.watermark);
         mPitch = (CheckBox) findViewById(R.id.pitch);
@@ -279,6 +281,7 @@ public void handleMessage(Message msg) {
 
             boolean isFrontCameraMirror = bundle.getBoolean(FRONT_CAMERA_MIRROR, false);
             builder.setFrontCameraMirror(isFrontCameraMirror);
+            mFrontMirror.setChecked(isFrontCameraMirror);  //根据外部的config值来确定checkbox的属性
             testSWFilterInterface = bundle.getBoolean(TEST_SW_FILTER, false);
             boolean focus_manual = bundle.getBoolean(MANUAL_FOCUS, false);
             builder.setManualFocus(focus_manual);
@@ -491,12 +494,12 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 // 升降调，变速
-                if ( isChecked ) {
+                if (isChecked) {
                     mStreamer.setEnableAudioEffect(true);
                     mStreamer.setPitch(-0.318f);
                     mStreamer.setSpeed(1 / 0.7f);
                     mStreamer.setTempo(0.7f);
-                }else{
+                } else {
                     mStreamer.setEnableAudioEffect(false);
                 }
             }
@@ -553,6 +556,8 @@ public void onClick(View arg0) {
 
         chronometer = (Chronometer) this.findViewById(R.id.chronometer);
         mDebugInfoTextView = (TextView) this.findViewById(R.id.debuginfo);
+
+        initFrontMirror();
     }
 
     private void beginInfoUploadTimer() {
@@ -775,7 +780,7 @@ public void onError(int what, int arg1, int arg2, String msg) {
                 default:
                     break;
             }
-            if(needRetry) {
+            if (needRetry) {
                 // 可以在这里处理断网重连的逻辑
                 if (TextUtils.isEmpty(mUrl)) {
                     mStreamer
@@ -1054,4 +1059,15 @@ private boolean checkPermission() {
         return true;
     }
 
+    private void initFrontMirror() {
+        mFrontMirror.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (mStreamer != null) {
+                    mStreamer.setEnableCameraMirror(isChecked);
+                }
+            }
+        });
+    }
+
 }
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
@@ -224,4 +224,9 @@
 
 2016-08-16 3.3.0.9
 116. 解决部分机型画中画耳返声音不同步问题
-117. 日志相关添加容错检查
+117. 日志相关添加容错检查
+
+2016-08-22 3.3.1.0
+118. 增加推流过程中动态修改前置摄像头镜像功能
+119. 修改硬编码率自适应始终为true的问题
+120. 升级libksyplayer.jar为1.4.6版本