Merge pull request #135 from ksvc/v4.1.3

change ver to 4.1.3
fpzeng · Feb 24, 2017 · cae4ef2 · cae4ef2
2 parents 328afc3 + dacffc0
commit cae4ef2
Show file tree

Hide file tree

Showing 43 changed files with 5,571 additions and 2,151 deletions.
diff --git a/demo/src/com/ksyun/media/streamer/demo/CameraActivity.java b/demo/src/com/ksyun/media/streamer/demo/CameraActivity.java
@@ -8,7 +8,6 @@
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
-import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.hardware.Camera;
@@ -659,6 +658,11 @@ public void onInfo(int what, int msg1, int msg2) {
                     mChronometer.start();
                     beginInfoUploadTimer();
                     break;
+                case StreamerConstants.KSY_STREAMER_OPEN_FILE_SUCCESS:
+                    Log.d(TAG, "KSY_STREAMER_OPEN_FILE_SUCCESS");
+                    mChronometer.setBase(SystemClock.elapsedRealtime());
+                    mChronometer.start();
+                    break;
                 case StreamerConstants.KSY_STREAMER_FRAME_SEND_SLOW:
                     Log.d(TAG, "KSY_STREAMER_FRAME_SEND_SLOW " + msg1 + "ms");
                     Toast.makeText(CameraActivity.this, "Network not good!",
@@ -775,7 +779,9 @@ public void run() {
                 case StreamerConstants.KSY_STREAMER_FILE_PUBLISHER_CLOSE_FAILED:
                 case StreamerConstants.KSY_STREAMER_FILE_PUBLISHER_ERROR_UNKNOWN:
                 case StreamerConstants.KSY_STREAMER_FILE_PUBLISHER_OPEN_FAILED:
+                case StreamerConstants.KSY_STREAMER_FILE_PUBLISHER_FORMAT_NOT_SUPPORTED:
                 case StreamerConstants.KSY_STREAMER_FILE_PUBLISHER_WRITE_FAILED:
+                    stopRecord();
                     break;
                 case StreamerConstants.KSY_STREAMER_VIDEO_ENCODER_ERROR_UNSUPPORTED:
                 case StreamerConstants.KSY_STREAMER_VIDEO_ENCODER_ERROR_UNKNOWN:

diff --git a/docs/assets/navtree_data.js b/docs/assets/navtree_data.js
diff --git a/docs/reference/classes.html b/docs/reference/classes.html
@@ -432,18 +432,6 @@ <h2 id="letter_F">F</h2>
         </tr>
 
 
-        <tr class=" api apilevel-" >
-            <td class="jd-linkcol"><a href="./com/ksyun/media/streamer/publisher/FilePubWrapper.html">FilePubWrapper</a></td>
-            <td class="jd-descrcol" width="100%">Created by sujia on 2016/11/23.&nbsp;</td>
-        </tr>
-
-
-        <tr class="alt-color api apilevel-" >
-            <td class="jd-linkcol"><a href="./com/ksyun/media/streamer/publisher/FilePubWrapper.OnPubEvent.html">FilePubWrapper.OnPubEvent</a></td>
-            <td class="jd-descrcol" width="100%">&nbsp;</td>
-        </tr>
-
-
 </table>
 
 
@@ -858,6 +846,18 @@ <h2 id="letter_P">P</h2>
         </tr>
 
 
+        <tr class="alt-color api apilevel-" >
+            <td class="jd-linkcol"><a href="./com/ksyun/media/streamer/publisher/PublisherWrapper.html">PublisherWrapper</a></td>
+            <td class="jd-descrcol" width="100%">Created by sujia on 2017/2/8.&nbsp;</td>
+        </tr>
+
+
+        <tr class=" api apilevel-" >
+            <td class="jd-linkcol"><a href="./com/ksyun/media/streamer/publisher/PublisherWrapper.OnPubEvent.html">PublisherWrapper.OnPubEvent</a></td>
+            <td class="jd-descrcol" width="100%">&nbsp;</td>
+        </tr>
+
+
 </table>
 
 

diff --git a/docs/reference/com/ksyun/media/streamer/encoder/AVCodecAudioEncoder.html b/docs/reference/com/ksyun/media/streamer/encoder/AVCodecAudioEncoder.html
@@ -1026,6 +1026,22 @@ <h2>Summary</h2>
 
 
 
+            ByteBuffer
+        </td>
+        <td class="jd-linkcol" width="100%">
+        <span class="sympad"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#getExtra()">getExtra</a></span>()
+
+  </td></tr>
+
+
+
+    <tr class="alt-color api apilevel-" >
+        <td class="jd-typecol">
+
+
+
+
+
             int
         </td>
         <td class="jd-linkcol" width="100%">
@@ -1037,7 +1053,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1055,7 +1071,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1073,7 +1089,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1091,7 +1107,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1109,7 +1125,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1127,7 +1143,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1145,7 +1161,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1161,7 +1177,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1177,7 +1193,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1195,7 +1211,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1213,7 +1229,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1231,7 +1247,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1249,7 +1265,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1267,7 +1283,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1285,7 +1301,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 

diff --git a/docs/reference/com/ksyun/media/streamer/encoder/AVCodecSurfaceEncoder.html b/docs/reference/com/ksyun/media/streamer/encoder/AVCodecSurfaceEncoder.html
@@ -1074,6 +1074,22 @@ <h2>Summary</h2>
 
 
 
+            ByteBuffer
+        </td>
+        <td class="jd-linkcol" width="100%">
+        <span class="sympad"><a href="../../../../../com/ksyun/media/streamer/encoder/Encoder.html#getExtra()">getExtra</a></span>()
+
+  </td></tr>
+
+
+
+    <tr class="alt-color api apilevel-" >
+        <td class="jd-typecol">
+
+
+
+
+
             int
         </td>
         <td class="jd-linkcol" width="100%">
@@ -1085,7 +1101,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1103,7 +1119,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1121,7 +1137,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1139,7 +1155,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1157,7 +1173,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1175,7 +1191,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1193,7 +1209,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1209,7 +1225,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1225,7 +1241,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1243,7 +1259,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1261,7 +1277,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1279,7 +1295,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1297,7 +1313,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1315,7 +1331,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class=" api apilevel-" >
+    <tr class="alt-color api apilevel-" >
         <td class="jd-typecol">
 
 
@@ -1333,7 +1349,7 @@ <h2>Summary</h2>
 
 
 
-    <tr class="alt-color api apilevel-" >
+    <tr class=" api apilevel-" >
         <td class="jd-typecol">