diff --git a/README.md b/README.md index 60627e9197..c3d9ec5d43 100755 --- a/README.md +++ b/README.md @@ -525,6 +525,8 @@ Supported operating systems and hardware: ### SRS 2.0 history +* v2.0, 2015-02-10, for [#311](https://github.com/winlinvip/simple-rtmp-server/issues/311), set pcr_base to dts. 2.0.114. +* v2.0, 2015-02-10, fix [the bug](https://github.com/winlinvip/simple-rtmp-server/commit/87519aaae835199e5adb60c0ae2c1cd24939448c) of ibmf format which decoded in annexb. * v2.0, 2015-02-10, for [#310](https://github.com/winlinvip/simple-rtmp-server/issues/310), downcast aac SSR to LC. 2.0.113 * v2.0, 2015-02-03, fix [#136](https://github.com/winlinvip/simple-rtmp-server/issues/136), support hls without io(in ram). 2.0.112 * v2.0, 2015-01-31, for [#250](https://github.com/winlinvip/simple-rtmp-server/issues/250), support push MPEGTS over UDP to SRS. 2.0.111 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index c1f965ea72..c1ea1f939a 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 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 114 +#define VERSION_REVISION 115 // server info. #define RTMP_SIG_SRS_KEY "SRS" diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp index af1a752241..35c116dc2e 100644 --- a/trunk/src/kernel/srs_kernel_ts.cpp +++ b/trunk/src/kernel/srs_kernel_ts.cpp @@ -78,10 +78,6 @@ int aac_sample_rates[] = 7350, 0, 0, 0 }; -// @see: NGX_RTMP_HLS_DELAY, -// 63000: 700ms, ts_tbn=90000 -#define SRS_AUTO_HLS_DELAY 63000 - // @see: ngx_rtmp_mpegts_header u_int8_t mpegts_header[] = { /* TS */ @@ -228,6 +224,7 @@ class SrsMpegtsWriter p[-1] |= 0x20; // Both Adaption and Payload *p++ = 7; // size *p++ = 0x50; // random access + PCR + // @see https://github.com/winlinvip/simple-rtmp-server/issues/311 p = write_pcr(p, frame->dts); } @@ -284,11 +281,11 @@ class SrsMpegtsWriter *p++ = header_size; // pts; // 33bits - p = write_dts_pts(p, flags >> 6, frame->pts + SRS_AUTO_HLS_DELAY); + p = write_dts_pts(p, flags >> 6, frame->pts); // dts; // 33bits if (frame->dts != frame->pts) { - p = write_dts_pts(p, 1, frame->dts + SRS_AUTO_HLS_DELAY); + p = write_dts_pts(p, 1, frame->dts); } }