From 2775a391e0b693a0b999d0f2bc8c700eb1a41fd5 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 25 Jan 2020 20:03:22 +0800 Subject: [PATCH] Fix #878, remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108 --- README.md | 2 ++ trunk/conf/full.conf | 2 +- trunk/src/app/srs_app_hls.cpp | 6 ++---- trunk/src/core/srs_core.hpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b06470dfa9..1baf02911f 100755 --- a/README.md +++ b/README.md @@ -146,6 +146,7 @@ For previous versions, please read: ## V3 changes +* v3.0, 2020-01-25, Fix [#878][bug #878], remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108 * v3.0, 2020-01-25, Fix [#703][bug #703], drop video data util sps/pps. 3.0.107 * v3.0, 2020-01-25, Fix [#1108][bug #1108], reap DVR tmp file when unpublish. 3.0.106 * v3.0, 2020-01-21, [3.0 alpha9(3.0.105)][r3.0a9] released. 121577 lines. @@ -1614,6 +1615,7 @@ Winlin [bug #1221]: https://github.com/ossrs/srs/issues/1221 [bug #1108]: https://github.com/ossrs/srs/issues/1108 [bug #703]: https://github.com/ossrs/srs/issues/703 +[bug #878]: https://github.com/ossrs/srs/issues/878 [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 1160877a43..890b1c0004 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -196,7 +196,7 @@ stream_caster { # the caster type of stream, the casters: # mpegts_over_udp, MPEG-TS over UDP caster. # rtsp, Real Time Streaming Protocol (RTSP). - # flv, FLV over HTTP POST. + # flv, FLV over HTTP by POST. caster mpegts_over_udp; # the output rtmp url. # for mpegts_over_udp caster, the typically output url: diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 72ec535caa..7470acf2a1 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -751,11 +751,9 @@ srs_error_t SrsHlsMuxer::_refresh_m3u8(string m3u8_file) // #EXTM3U\n // #EXT-X-VERSION:3\n - // #EXT-X-ALLOW-CACHE:YES\n std::stringstream ss; - ss << "#EXTM3U" << SRS_CONSTS_LF - << "#EXT-X-VERSION:3" << SRS_CONSTS_LF - << "#EXT-X-ALLOW-CACHE:YES" << SRS_CONSTS_LF; + ss << "#EXTM3U" << SRS_CONSTS_LF; + ss << "#EXT-X-VERSION:3" << SRS_CONSTS_LF; // #EXT-X-MEDIA-SEQUENCE:4294967295\n SrsHlsSegment* first = dynamic_cast(segments->first()); diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 5cd01df38a..eb575ba5a7 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 107 +#define VERSION_REVISION 108 // The macros generated by configure script. #include