for #738, remove the dvr plan append for it's no use

ossrs · Feb 6, 2017 · 0a054cd · 0a054cd
1 parent 8c01f52
commit 0a054cd
Show file tree

Hide file tree

Showing 5 changed files with 220 additions and 357 deletions.
diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf
@@ -1120,8 +1120,7 @@ vhost dvr.srs.com {
         # the dvr plan. canbe:
         #       session reap flv/mp4 when session end(unpublish).
         #       segment reap flv/mp4 when flv duration exceed the specified dvr_duration.
-        #       append always append to flv file, never reap it.
-        # @remark MP4 only support session or segment plan, not suport append plan.
+        # @remark The plan append is removed in SRS3+, for it's no use.
         # default: session
         dvr_plan        session;
         # the dvr output path, *.flv or *.mp4.
@@ -1159,8 +1158,8 @@ vhost dvr.srs.com {
         #       dvr_path ./objs/nginx/html/[app]/[stream].[timestamp].mp4;
         #       =>
         #       dvr_path ./objs/nginx/html/live/livestream.1420254068776.mp4;
-        # @see https://github.com/ossrs/srs/wiki/v2_CN_DVR#custom-path
-        # @see https://github.com/ossrs/srs/wiki/v2_EN_DVR#custom-path
+        # @see https://github.com/ossrs/srs/wiki/v3_CN_DVR#custom-path
+        # @see https://github.com/ossrs/srs/wiki/v3_EN_DVR#custom-path
         #       segment,session apply it.
         # default: ./objs/nginx/html/[app]/[stream].[timestamp].flv
         dvr_path        ./objs/nginx/html/[app]/[stream].[timestamp].flv;

diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
@@ -283,11 +283,6 @@ bool srs_config_dvr_is_plan_session(string plan)
     return plan == "session";
 }
 
-bool srs_config_dvr_is_plan_append(string plan)
-{
-    return plan == "append";
-}
-
 bool srs_stream_caster_is_udp(string caster)
 {
     return caster == "mpegts_over_udp";

diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp
@@ -99,7 +99,6 @@ extern bool srs_config_ingest_is_file(std::string type);
 extern bool srs_config_ingest_is_stream(std::string type);
 extern bool srs_config_dvr_is_plan_segment(std::string plan);
 extern bool srs_config_dvr_is_plan_session(std::string plan);
-extern bool srs_config_dvr_is_plan_append(std::string plan);
 extern bool srs_stream_caster_is_udp(std::string caster);
 extern bool srs_stream_caster_is_rtsp(std::string caster);
 extern bool srs_stream_caster_is_flv(std::string caster);