正在显示
3 个修改的文件
包含
6 行增加
和
1 行删除
| @@ -242,6 +242,7 @@ Supported operating systems and hardware: | @@ -242,6 +242,7 @@ Supported operating systems and hardware: | ||
| 242 | * 2013-10-17, Created.<br/> | 242 | * 2013-10-17, Created.<br/> |
| 243 | 243 | ||
| 244 | ## History | 244 | ## History |
| 245 | +* v1.0, 2014-06-30, fix [#111](https://github.com/winlinvip/simple-rtmp-server/issues/111), always use 31bits timestamp. 0.9.143. | ||
| 245 | * v1.0, 2014-06-28, response the call message with null. 0.9.137 | 246 | * v1.0, 2014-06-28, response the call message with null. 0.9.137 |
| 246 | * v1.0, 2014-06-28, fix [#110](https://github.com/winlinvip/simple-rtmp-server/issues/110), thread start segment fault, thread cycle stop destroy thread. 0.9.136 | 247 | * v1.0, 2014-06-28, fix [#110](https://github.com/winlinvip/simple-rtmp-server/issues/110), thread start segment fault, thread cycle stop destroy thread. 0.9.136 |
| 247 | * v1.0, 2014-06-27, fix [#109](https://github.com/winlinvip/simple-rtmp-server/issues/109), fix the system jump time, adjust system startup time. 0.9.135 | 248 | * v1.0, 2014-06-27, fix [#109](https://github.com/winlinvip/simple-rtmp-server/issues/109), fix the system jump time, adjust system startup time. 0.9.135 |
| @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 31 | // current release version | 31 | // current release version |
| 32 | #define VERSION_MAJOR "0" | 32 | #define VERSION_MAJOR "0" |
| 33 | #define VERSION_MINOR "9" | 33 | #define VERSION_MINOR "9" |
| 34 | -#define VERSION_REVISION "142" | 34 | +#define VERSION_REVISION "143" |
| 35 | #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION | 35 | #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION |
| 36 | // server info. | 36 | // server info. |
| 37 | #define RTMP_SIG_SRS_KEY "SRS" | 37 | #define RTMP_SIG_SRS_KEY "SRS" |
| @@ -1128,6 +1128,10 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt, int bh_siz | @@ -1128,6 +1128,10 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt, int bh_siz | ||
| 1128 | pp[2] = *p++; | 1128 | pp[2] = *p++; |
| 1129 | pp[1] = *p++; | 1129 | pp[1] = *p++; |
| 1130 | pp[0] = *p++; | 1130 | pp[0] = *p++; |
| 1131 | + | ||
| 1132 | + // always use 31bits timestamp, for some server may use 32bits extended timestamp. | ||
| 1133 | + // @see https://github.com/winlinvip/simple-rtmp-server/issues/111 | ||
| 1134 | + timestamp &= 0x7fffffff; | ||
| 1131 | 1135 | ||
| 1132 | /** | 1136 | /** |
| 1133 | * RTMP specification and ffmpeg/librtmp is false, | 1137 | * RTMP specification and ffmpeg/librtmp is false, |
-
请 注册 或 登录 后发表评论