From a4709a6439366ae94b9d329af3373c5b66e43df1 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 19 Mar 2015 21:08:42 +0800 Subject: [PATCH 1/2] for #151, add comments for the audio overflow ratio. --- trunk/src/app/srs_app_hls.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index fd6b3c129..7d7ba63b2 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -346,6 +346,7 @@ bool SrsHlsMuxer::is_segment_overflow() bool SrsHlsMuxer::is_segment_absolutely_overflow() { + // @see https://github.com/winlinvip/simple-rtmp-server/issues/151#issuecomment-83553950 srs_assert(current); return current->duration >= hls_aof_ratio * hls_fragment; } From 014993ad1ee6f469a1cdc0473d6f9b7e5c27051a Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 20 Mar 2015 15:10:17 +0800 Subject: [PATCH 2/2] remove the sudo of log. --- trunk/scripts/_log.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/scripts/_log.sh b/trunk/scripts/_log.sh index 8990c0b80..0dabad414 100755 --- a/trunk/scripts/_log.sh +++ b/trunk/scripts/_log.sh @@ -38,7 +38,7 @@ failed_msg(){ function check_log(){ log_dir="`dirname $log`" - (mkdir -p ${log_dir} && sudo chmod 777 ${log_dir} && touch $log) + (mkdir -p ${log_dir} && chmod 777 ${log_dir} && touch $log) ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "create log failed, ret=$ret"; return $ret; fi ok_msg "create log( ${log} ) success"