Merge pull request #273 from geeklok/release_v2.2.6

release_v2.2.6
pili-engineering · Dec 19, 2017 · b949205 · b949205
2 parents 6149c3e + 1d1e0e6
commit b949205
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/PLDroidMediaStreamingDemo/app/build.gradle b/PLDroidMediaStreamingDemo/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.qiniu.pili.droid.streaming.demo"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 65
-        versionName "2.2.5"
+        versionCode 66
+        versionName "2.2.6"
     }
     buildTypes {
         release {
@@ -25,7 +25,7 @@ dependencies {
     compile 'com.journeyapps:zxing-android-embedded:3.0.2@aar'
     compile 'com.google.zxing:core:3.2.0'
     compile 'com.android.support:appcompat-v7:23.0.0'
-    compile files('libs/pldroid-media-streaming-2.2.5.jar')
+    compile files('libs/pldroid-media-streaming-2.2.6.jar')
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
     testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'

diff --git a/...pp/libs/pldroid-media-streaming-2.2.5.jar → ...pp/libs/pldroid-media-streaming-2.2.6.jar b/...pp/libs/pldroid-media-streaming-2.2.5.jar → ...pp/libs/pldroid-media-streaming-2.2.6.jar
diff --git a/...app/src/main/java/com/qiniu/pili/droid/streaming/demo/activity/StreamingBaseActivity.java b/...app/src/main/java/com/qiniu/pili/droid/streaming/demo/activity/StreamingBaseActivity.java
@@ -325,7 +325,8 @@ private void initEncodingProfile() {
                 vProfile = new StreamingProfile.VideoProfile(
                         mEncodingConfig.mVideoQualityCustomFPS,
                         mEncodingConfig.mVideoQualityCustomBitrate * 1024,
-                        mEncodingConfig.mVideoQualityCustomMaxKeyFrameInterval
+                        mEncodingConfig.mVideoQualityCustomMaxKeyFrameInterval,
+                        StreamingProfile.H264Profile.HIGH
                 );
             }
 

diff --git a/ReleaseNotes/release-notes-2.2.6.md b/ReleaseNotes/release-notes-2.2.6.md
@@ -0,0 +1,15 @@
+# PLDroidMediaStreaming Release Notes for 2.2.6
+
+本次更新:
+
+## 版本
+
+- 发布 pldroid-media-streaming-2.2.6.jar
+
+## 功能
+
+- 新增 H.264 Profile 设置接口
+
+## 缺陷
+
+- 修复部分机型推流画面拉伸问题
diff --git a/releases/pldroid-media-streaming-2.2.5.jar → releases/pldroid-media-streaming-2.2.6.jar b/releases/pldroid-media-streaming-2.2.5.jar → releases/pldroid-media-streaming-2.2.6.jar