external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

fix #424, fix aggregate timestamp bug. 2.0.174

Browse source
This commit is contained in:
winlin 2015-06-10 13:53:13 +08:00
parent 8e8c8108fc
commit 6941f2c072
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -344,6 +344,7 @@ Remark:
### SRS 2.0 history ### SRS 2.0 history
* v2.0, 2015-06-10, fix [#424](https://github.com/simple-rtmp-server/srs/issues/424) fix aggregate timestamp bug. 2.0.174
* v2.0, 2015-06-06, fix [#421](https://github.com/simple-rtmp-server/srs/issues/421) drop video for unkown RTMP header. * v2.0, 2015-06-06, fix [#421](https://github.com/simple-rtmp-server/srs/issues/421) drop video for unkown RTMP header.
* v2.0, 2015-06-05, fix [#420](https://github.com/simple-rtmp-server/srs/issues/420) remove ts for hls ram mode. * v2.0, 2015-06-05, fix [#420](https://github.com/simple-rtmp-server/srs/issues/420) remove ts for hls ram mode.
* v2.0, 2015-05-30, fix [#209](https://github.com/simple-rtmp-server/srs/issues/209) cleanup hls when stop and timeout. 2.0.173. * v2.0, 2015-05-30, fix [#209](https://github.com/simple-rtmp-server/srs/issues/209) cleanup hls when stop and timeout. 2.0.173.

3
trunk/src/app/srs_app_source.cpp
View file

@ -1922,7 +1922,8 @@ int SrsSource::on_aggregate(SrsCommonMessage* msg)
timestamp &= 0x7FFFFFFF; timestamp &= 0x7FFFFFFF;
// adjust abs timestamp in aggregate msg. // adjust abs timestamp in aggregate msg.
if (delta < 0) { // only -1 means uninitialized delta.
if (delta == -1) {
delta = (int)msg->header.timestamp - (int)timestamp; delta = (int)msg->header.timestamp - (int)timestamp;
} }
timestamp += delta; timestamp += delta;

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 2 #define VERSION_MAJOR 2
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 173 #define VERSION_REVISION 174
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"