release v1.3.5

PLDroidCameraStreamingDemo/app/build.gradle

@@ -22,5 +22,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.0.0'
-    compile files('libs/pldroid-camera-streaming-1.3.4.jar')
+    compile files('libs/pldroid-camera-streaming-1.3.5.jar')
 }

PLDroidCameraStreamingDemo/app/src/main/java/com/pili/pldroid/streaming/camera/demo/AudioStreamingActivity.java

@@ -24,13 +24,10 @@ protected void onCreate(Bundle savedInstanceState) {
         StreamingProfile.Stream stream = new StreamingProfile.Stream(mJSONObject);
         StreamingProfile profile = new StreamingProfile();
         profile.setStream(stream)
-                .setAudioQuality(StreamingProfile.AUDIO_QUALITY_HIGH1);
-
-        CameraStreamingSetting setting = new CameraStreamingSetting();
-        setting.setStreamingProfile(profile);
+                .setAudioQuality(StreamingProfile.AUDIO_QUALITY_LOW1);
 
         mCameraStreamingManager = new CameraStreamingManager(this);
-        mCameraStreamingManager.onPrepare(setting);
+        mCameraStreamingManager.onPrepare(profile);
         mCameraStreamingManager.setStreamingStateListener(this);
 
         mShutterButton.setOnClickListener(new View.OnClickListener() {

PLDroidCameraStreamingDemo/app/src/main/java/com/pili/pldroid/streaming/camera/demo/CameraStreamingActivity.java

@@ -70,8 +70,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Stream stream = new Stream(mJSONObject);
         mProfile = new StreamingProfile();
-        mProfile.setVideoQuality(StreamingProfile.VIDEO_QUALITY_LOW1)
-                .setAudioQuality(StreamingProfile.AUDIO_QUALITY_HIGH1)
+        mProfile.setVideoQuality(StreamingProfile.VIDEO_QUALITY_MEDIUM1)
+                .setAudioQuality(StreamingProfile.AUDIO_QUALITY_MEDIUM2)
+                .setEncodingSizeLevel(StreamingProfile.VIDEO_ENCODING_SIZE_HD)
                 .setStream(stream)
 //                .setLocalFileAbsolutePath(Environment.getExternalStorageDirectory().getAbsolutePath() + "/pldroid-recording.mp4")
                 .setSendingBufferProfile(new StreamingProfile.SendingBufferProfile(0.2f, 0.8f, 3.0f, 20 * 1000));
@@ -81,7 +82,7 @@ protected void onCreate(Bundle savedInstanceState) {
         CameraStreamingSetting setting = new CameraStreamingSetting();
         setting.setCameraId(Camera.CameraInfo.CAMERA_FACING_BACK)
                 .setContinuousFocusModeEnabled(true)
-                .setCameraPrvSizeLevel(CameraStreamingSetting.PREVIEW_SIZE_LEVEL.MEDIUM)
+                .setCameraPrvSizeLevel(CameraStreamingSetting.PREVIEW_SIZE_LEVEL.SMALL)
                 .setCameraPrvSizeRatio(CameraStreamingSetting.PREVIEW_SIZE_RATIO.RATIO_16_9);
 
         mCameraStreamingManager = new CameraStreamingManager(this, afl, glSurfaceView);
@@ -232,7 +233,7 @@ public void onStateChanged(final int state, Object extra) {
         super.onStateChanged(state, extra);
         switch (state) {
             case CameraStreamingManager.STATE.CAMERA_SWITCHED:
-                mShutterButtonPressed = false;
+//                mShutterButtonPressed = false;
                 if (extra != null) {
                     Log.i(TAG, "current camera id:" + (Integer)extra);
                 }

README.md

@@ -174,6 +174,14 @@ public static final int AUDIO_QUALITY_HIGH1;
 public static final int AUDIO_QUALITY_HIGH2;
 ```
 
+- SDK 预定义的 Video Encoding Size 列表：
+```JAVA
+public static final int VIDEO_ENCODING_SIZE_QVGA;
+public static final int VIDEO_ENCODING_SIZE_VGA;
+public static final int VIDEO_ENCODING_SIZE_HD;
+public static final int VIDEO_ENCODING_SIZE_FHD;
+```
+
 - Video Quality 配置表
 
 | Level | Fps | Video Bitrate(Kbps) |
@@ -199,6 +207,15 @@ public static final int AUDIO_QUALITY_HIGH2;
 |AUDIO_QUALITY_HIGH1|96|44100|
 |AUDIO_QUALITY_HIGH2|128|44100|
 
+- Video Encoding Size 配置表
+
+| Level | Resolution(16:9) | Resolution(4:3)|
+|---|---|---|
+|VIDEO_ENCODING_SIZE_QVGA|480 x 272|320 x 240|
+|VIDEO_ENCODING_SIZE_VGA|854 x 480|640 x 480|
+|VIDEO_ENCODING_SIZE_HD|1280 x 720|960 x 720|
+|VIDEO_ENCODING_SIZE_FHD|1920 x 1080|1440 x 1080|
+
 >若设置一个未被 SDK 支持的 quality，将会得到 `IllegalArgumentException("Cannot support the quality:" + quality)` 异常。
 
 - SDK 预定义的 preivew size level 列表：
@@ -396,6 +413,16 @@ mCameraStreamingManager.setNativeLoggingEnabled(false);
 
 ### 版本历史
 
+* 1.3.5 ([Release Notes][17])
+  - 发布 pldroid-camera-streaming-1.3.5.jar
+  - 更新 libpldroid_streaming_core.so
+  - 修复部分机型音视频不同步问题
+  - 分离 preview size 与 encoding size
+  - 新增 `setEncodingSizeLevel` API，并提供 encoding size 参数列表
+  - 修复部分机型花屏问题
+  - 修复前后置摄像头切换概率性断流问题
+  - 修复概率性 crash 问题
+
 * 1.3.4 ([Release Notes][16])
   - 发布 pldroid-camera-streaming-1.3.4.jar
   - 更新 libpldroid_streaming_core.so
@@ -520,3 +547,4 @@ mCameraStreamingManager.setNativeLoggingEnabled(false);
 [14]: /ReleaseNotes/release-notes-1.3.2.md
 [15]: /ReleaseNotes/release-notes-1.3.3.md
 [16]: /ReleaseNotes/release-notes-1.3.4.md
+[17]: /ReleaseNotes/release-notes-1.3.5.md

ReleaseNotes/release-notes-1.3.5.md

@@ -0,0 +1,16 @@
+# PLDroidCameraStreaming Release Notes for 1.3.5
+
+## 简介
+PLDroidCameraStreaming 是为 Android 开发者提供的 RTMP 直播推流 SDK
+
+## 记录
+
+### 推流 SDK
+  - 发布 pldroid-camera-streaming-1.3.5.jar
+  - 更新 libpldroid_streaming_core.so
+  - 修复部分机型音视频不同步问题
+  - 分离 preview size 与 encoding size
+  - 新增 `setEncodingSizeLevel` API，并提供 encoding size 参数列表
+  - 修复部分机型花屏问题
+  - 修复前后置摄像头切换概率性断流问题
+  - 修复概率性 crash 问题