From fb70602f931d7626232c01ef471cf57421db2923 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 30 Jun 2014 21:23:13 +0800 Subject: [PATCH] fix #111, always use 31bits timestamp. 0.9.143. --- README.md | 1 + trunk/src/core/srs_core.hpp | 2 +- trunk/src/rtmp/srs_protocol_rtmp_stack.cpp | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f0d7d70fd..0945d58a3 100755 --- a/README.md +++ b/README.md @@ -242,6 +242,7 @@ Supported operating systems and hardware: * 2013-10-17, Created.
## History +* v1.0, 2014-06-30, fix [#111](https://github.com/winlinvip/simple-rtmp-server/issues/111), always use 31bits timestamp. 0.9.143. * v1.0, 2014-06-28, response the call message with null. 0.9.137 * 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 * 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 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 25f095da4..8249b98b9 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR "0" #define VERSION_MINOR "9" -#define VERSION_REVISION "142" +#define VERSION_REVISION "143" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "SRS" diff --git a/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp b/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp index 0a1ed1efc..b41cae081 100644 --- a/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp +++ b/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp @@ -1128,6 +1128,10 @@ int SrsProtocol::read_message_header(SrsChunkStream* chunk, char fmt, int bh_siz pp[2] = *p++; pp[1] = *p++; pp[0] = *p++; + + // always use 31bits timestamp, for some server may use 32bits extended timestamp. + // @see https://github.com/winlinvip/simple-rtmp-server/issues/111 + timestamp &= 0x7fffffff; /** * RTMP specification and ffmpeg/librtmp is false,