diff --git a/README.md b/README.md index 01db71424..08707cc83 100755 --- a/README.md +++ b/README.md @@ -145,13 +145,14 @@ For previous versions, please read: ## V3 changes -* v3.0, 2019-12-11, SrsPacket supports converting to message, so can be sent by one API. +* v3.0, 2019-12-12, For [#547][bug #547], [#1506][bug #1506], default hls_dts_directly to on. 3.0.71 +* v3.0, 2019-12-12, SrsPacket supports converting to message, so can be sent by one API. * v3.0, 2019-12-11, For [#1042][bug #1042], cover RTMP client/server protocol. * v3.0, 2019-12-11, Fix [#1445][bug #1445], limit the createStream recursive depth. 3.0.70 * v3.0, 2019-12-11, For [#1042][bug #1042], cover RTMP handshake protocol. * v3.0, 2019-12-11, Fix [#1229][bug #1229], fix the security risk in logger. 3.0.69 * v3.0, 2019-12-11, For [#1229][bug #1229], fix the security risk in HDS. 3.0.69 -* v3.0, 2019-12-05, Fix [#1506][bug #1501], support directly turn FLV timestamp to TS DTS. 3.0.68 +* v3.0, 2019-12-05, Fix [#1506][bug #1506], support directly turn FLV timestamp to TS DTS. 3.0.68 * v3.0, 2019-11-30, [3.0 alpha3(3.0.67)][r3.0a3] released. 110864 lines. * v3.0, 2019-12-01, Fix [#1501][bug #1501], use request coworker for origin cluster. 3.0.67 * v3.0, 2019-11-30, [3.0 alpha2(3.0.66)][r3.0a2] released. 110831 lines. @@ -1519,6 +1520,7 @@ Winlin [bug #1229]: https://github.com/ossrs/srs/issues/1229 [bug #1042]: https://github.com/ossrs/srs/issues/1042 [bug #1445]: https://github.com/ossrs/srs/issues/1445 +[bug #1506]: https://github.com/ossrs/srs/issues/1506 [bug #xxxxxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 66a8c770c..c8d041144 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -1128,8 +1128,8 @@ vhost hls.srs.com { # If on, guess the specific DTS by AAC samples, please read https://github.com/ossrs/srs/issues/547#issuecomment-294350544 # If off, directly turn the FLV timestamp to DTS, which might cause corrupt audio stream. # @remark Recommend to set to off, unless your audio stream sample-rate and timestamp is not correct. - # Default: off - hls_dts_directly off; + # Default: on + hls_dts_directly on; # on_hls, never config in here, should config in http_hooks. # for the hls http callback, @see http_hooks.on_hls of vhost hooks.callback.srs.com diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 024e296e2..9f8ed7726 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -6152,7 +6152,7 @@ int SrsConfig::get_vhost_hls_nb_notify(string vhost) bool SrsConfig::get_vhost_hls_dts_directly(string vhost) { - static bool DEFAULT = false; + static bool DEFAULT = true; SrsConfDirective* conf = get_hls(vhost); if (!conf) { @@ -6164,7 +6164,7 @@ bool SrsConfig::get_vhost_hls_dts_directly(string vhost) return DEFAULT; } - return SRS_CONF_PERFER_FALSE(conf->arg0()); + return SRS_CONF_PERFER_TRUE(conf->arg0()); } bool SrsConfig::get_hls_cleanup(string vhost) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 24a702933..f7cee590d 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -27,7 +27,7 @@ // The version config. #define VERSION_MAJOR 3 #define VERSION_MINOR 0 -#define VERSION_REVISION 70 +#define VERSION_REVISION 71 // The macros generated by configure script. #include