merge from srs2.

@@ -557,6 +557,12 @@ int SrsHlsMuxer::segment_open(int64_t segment_start_dts)
     current->uri += hls_entry_prefix;
     current->uri += hls_entry_prefix;
     if (!hls_entry_prefix.empty() && !srs_string_ends_with(hls_entry_prefix, "/")) {
     if (!hls_entry_prefix.empty() && !srs_string_ends_with(hls_entry_prefix, "/")) {
         current->uri += "/";
         current->uri += "/";
+        
+        // add the http dir to uri.
+        string http_dir = srs_path_dirname(m3u8_url);
+        if (!http_dir.empty()) {
+            current->uri += http_dir + "/";
+        }
     }
     }
     current->uri += ts_url;
     current->uri += ts_url;
     
     

@@ -39,6 +39,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_http_conn.hpp>
 #include <srs_app_http_conn.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_amf0.hpp>
+#include <srs_app_utility.hpp>
 
 
 #define SRS_HTTP_RESPONSE_OK    SRS_XSTR(ERROR_SUCCESS)
 #define SRS_HTTP_RESPONSE_OK    SRS_XSTR(ERROR_SUCCESS)
 
 
@@ -315,6 +316,12 @@ int SrsHttpHooks::on_hls(int cid, string url, SrsRequest* req, string file, stri
     int client_id = cid;
     int client_id = cid;
     std::string cwd = _srs_config->cwd();
     std::string cwd = _srs_config->cwd();
     
     
+    // the ts_url is under the same dir of m3u8_url.
+    string prefix = srs_path_dirname(m3u8_url);
+    if (!prefix.empty() && !srs_string_is_http(ts_url)) {
+        ts_url = prefix + "/" + ts_url;
+    }
+    
     SrsJsonObject* obj = SrsJsonAny::object();
     SrsJsonObject* obj = SrsJsonAny::object();
     SrsAutoFree(SrsJsonObject, obj);
     SrsAutoFree(SrsJsonObject, obj);
     
     
@@ -358,7 +365,7 @@ int SrsHttpHooks::on_hls_notify(int cid, std::string url, SrsRequest* req, std::
     int client_id = cid;
     int client_id = cid;
     std::string cwd = _srs_config->cwd();
     std::string cwd = _srs_config->cwd();
     
     
-    if (srs_string_starts_with(ts_url, "http://") || srs_string_starts_with(ts_url, "https://")) {
+    if (srs_string_is_http(ts_url)) {
         url = ts_url;
         url = ts_url;
     }
     }
     
     

@@ -29,6 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <arpa/inet.h>
 #include <arpa/inet.h>
 #include <signal.h>
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/wait.h>
+#include <math.h>
 
 
 #ifdef SRS_OSX
 #ifdef SRS_OSX
 #include <sys/sysctl.h>
 #include <sys/sysctl.h>
@@ -47,6 +48,7 @@ using namespace std;
 #include <srs_protocol_json.hpp>
 #include <srs_protocol_json.hpp>
 #include <srs_kernel_buffer.hpp>
 #include <srs_kernel_buffer.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_amf0.hpp>
+#include <srs_kernel_utility.hpp>
 
 
 // the longest time to wait for a process to quit.
 // the longest time to wait for a process to quit.
 #define SRS_PROCESS_QUIT_TIMEOUT_MS 1000
 #define SRS_PROCESS_QUIT_TIMEOUT_MS 1000
@@ -1340,6 +1342,11 @@ string srs_get_peer_ip(int fd)
     return ip;
     return ip;
 }
 }
 
 
+bool srs_string_is_http(string url)
+{
+    return srs_string_starts_with(url, "http://", "https://");
+}
+
 bool srs_is_digit_number(const string& str)
 bool srs_is_digit_number(const string& str)
 {
 {
     if (str.empty()) {
     if (str.empty()) {

@@ -662,6 +662,9 @@ extern int srs_get_local_port(int fd);
 // where peer ip is the client public ip which connected to server.
 // where peer ip is the client public ip which connected to server.
 extern std::string srs_get_peer_ip(int fd);
 extern std::string srs_get_peer_ip(int fd);
 
 
+// whether the url is starts with http:// or https://
+extern bool srs_string_is_http(std::string url);
+
 // whether string is digit number
 // whether string is digit number
 //      is_digit("1234567890")  === true
 //      is_digit("1234567890")  === true
 //      is_digit("0123456789")  === false
 //      is_digit("0123456789")  === false

@@ -460,7 +460,7 @@ int SrsIngestSrsInput::parseM3u8(SrsHttpUri* url, double& td, double& duration)
             std::string m3u8_url = body.substr(0, pos);
             std::string m3u8_url = body.substr(0, pos);
             body = body.substr(pos + 1);
             body = body.substr(pos + 1);
             
             
-            if (!srs_string_starts_with(m3u8_url, "http://")) {
+            if (!srs_string_is_http(m3u8_url)) {
                 m3u8_url = srs_path_dirname(url->get_url()) + "/" + m3u8_url;
                 m3u8_url = srs_path_dirname(url->get_url()) + "/" + m3u8_url;
             }
             }
             srs_trace("parse sub m3u8, url=%s", m3u8_url.c_str());
             srs_trace("parse sub m3u8, url=%s", m3u8_url.c_str());
@@ -594,7 +594,7 @@ int SrsIngestSrsInput::SrsTsPiece::fetch(string m3u8)
     SrsHttpClient client;
     SrsHttpClient client;
     
     
     std::string ts_url = url;
     std::string ts_url = url;
-    if (!srs_string_starts_with(ts_url, "http://")) {
+    if (!srs_string_is_http(ts_url)) {
         ts_url = srs_path_dirname(m3u8) + "/" + url;
         ts_url = srs_path_dirname(m3u8) + "/" + url;
     }
     }