胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
90cd16aa 2 parents cb148e43 56cd3730

Merge branch '2.0release' into develop

内嵌 并排对比
正在显示 11 个修改的文件 包含 75 行增加 和 22 行删除
@@ -754,6 +754,7 @@ vhost hooks.callback.srs.com { @@ -754,6 +754,7 @@ vhost hooks.callback.srs.com {
754 # "client_id": 1985, 754 # "client_id": 1985,
755 # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", 755 # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
756 # "stream": "livestream", 756 # "stream": "livestream",
  757 + # "duration": 9.36, // in seconds
757 # "cwd": "/usr/local/srs", 758 # "cwd": "/usr/local/srs",
758 # "file": "./objs/nginx/html/live/livestream.1420254068776-100.ts", 759 # "file": "./objs/nginx/html/live/livestream.1420254068776-100.ts",
759 # "seq_no": 100 760 # "seq_no": 100
@@ -97,6 +97,13 @@ @@ -97,6 +97,13 @@
97 3C689F9F1AB6AAC800C9CEEE /* sched.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C689F9B1AB6AAC800C9CEEE /* sched.c */; }; 97 3C689F9F1AB6AAC800C9CEEE /* sched.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C689F9B1AB6AAC800C9CEEE /* sched.c */; };
98 3C689FA01AB6AAC800C9CEEE /* stk.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C689F9C1AB6AAC800C9CEEE /* stk.c */; }; 98 3C689FA01AB6AAC800C9CEEE /* stk.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C689F9C1AB6AAC800C9CEEE /* stk.c */; };
99 3C689FA11AB6AAC800C9CEEE /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C689F9D1AB6AAC800C9CEEE /* sync.c */; }; 99 3C689FA11AB6AAC800C9CEEE /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C689F9D1AB6AAC800C9CEEE /* sync.c */; };
  100 + 3CC52DD81ACE4023006FEB01 /* srs_utest_amf0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CC52DCA1ACE4023006FEB01 /* srs_utest_amf0.cpp */; };
  101 + 3CC52DD91ACE4023006FEB01 /* srs_utest_config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CC52DCC1ACE4023006FEB01 /* srs_utest_config.cpp */; };
  102 + 3CC52DDA1ACE4023006FEB01 /* srs_utest_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CC52DCE1ACE4023006FEB01 /* srs_utest_core.cpp */; };
  103 + 3CC52DDB1ACE4023006FEB01 /* srs_utest_kernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CC52DD01ACE4023006FEB01 /* srs_utest_kernel.cpp */; };
  104 + 3CC52DDC1ACE4023006FEB01 /* srs_utest_protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CC52DD21ACE4023006FEB01 /* srs_utest_protocol.cpp */; };
  105 + 3CC52DDD1ACE4023006FEB01 /* srs_utest_reload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CC52DD41ACE4023006FEB01 /* srs_utest_reload.cpp */; };
  106 + 3CC52DDE1ACE4023006FEB01 /* srs_utest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CC52DD61ACE4023006FEB01 /* srs_utest.cpp */; };
100 3CD88B3F1ACA9C58000359E0 /* srs_app_async_call.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CD88B3D1ACA9C58000359E0 /* srs_app_async_call.cpp */; }; 107 3CD88B3F1ACA9C58000359E0 /* srs_app_async_call.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CD88B3D1ACA9C58000359E0 /* srs_app_async_call.cpp */; };
101 /* End PBXBuildFile section */ 108 /* End PBXBuildFile section */
102 109
@@ -338,6 +345,20 @@ @@ -338,6 +345,20 @@
338 3C689F9B1AB6AAC800C9CEEE /* sched.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sched.c; path = "../../objs/st-1.9/sched.c"; sourceTree = "<group>"; }; 345 3C689F9B1AB6AAC800C9CEEE /* sched.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sched.c; path = "../../objs/st-1.9/sched.c"; sourceTree = "<group>"; };
339 3C689F9C1AB6AAC800C9CEEE /* stk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stk.c; path = "../../objs/st-1.9/stk.c"; sourceTree = "<group>"; }; 346 3C689F9C1AB6AAC800C9CEEE /* stk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stk.c; path = "../../objs/st-1.9/stk.c"; sourceTree = "<group>"; };
340 3C689F9D1AB6AAC800C9CEEE /* sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync.c; path = "../../objs/st-1.9/sync.c"; sourceTree = "<group>"; }; 347 3C689F9D1AB6AAC800C9CEEE /* sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync.c; path = "../../objs/st-1.9/sync.c"; sourceTree = "<group>"; };
  348 + 3CC52DCA1ACE4023006FEB01 /* srs_utest_amf0.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_utest_amf0.cpp; path = ../../src/utest/srs_utest_amf0.cpp; sourceTree = "<group>"; };
  349 + 3CC52DCB1ACE4023006FEB01 /* srs_utest_amf0.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_utest_amf0.hpp; path = ../../src/utest/srs_utest_amf0.hpp; sourceTree = "<group>"; };
  350 + 3CC52DCC1ACE4023006FEB01 /* srs_utest_config.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_utest_config.cpp; path = ../../src/utest/srs_utest_config.cpp; sourceTree = "<group>"; };
  351 + 3CC52DCD1ACE4023006FEB01 /* srs_utest_config.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_utest_config.hpp; path = ../../src/utest/srs_utest_config.hpp; sourceTree = "<group>"; };
  352 + 3CC52DCE1ACE4023006FEB01 /* srs_utest_core.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_utest_core.cpp; path = ../../src/utest/srs_utest_core.cpp; sourceTree = "<group>"; };
  353 + 3CC52DCF1ACE4023006FEB01 /* srs_utest_core.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_utest_core.hpp; path = ../../src/utest/srs_utest_core.hpp; sourceTree = "<group>"; };
  354 + 3CC52DD01ACE4023006FEB01 /* srs_utest_kernel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_utest_kernel.cpp; path = ../../src/utest/srs_utest_kernel.cpp; sourceTree = "<group>"; };
  355 + 3CC52DD11ACE4023006FEB01 /* srs_utest_kernel.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_utest_kernel.hpp; path = ../../src/utest/srs_utest_kernel.hpp; sourceTree = "<group>"; };
  356 + 3CC52DD21ACE4023006FEB01 /* srs_utest_protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_utest_protocol.cpp; path = ../../src/utest/srs_utest_protocol.cpp; sourceTree = "<group>"; };
  357 + 3CC52DD31ACE4023006FEB01 /* srs_utest_protocol.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_utest_protocol.hpp; path = ../../src/utest/srs_utest_protocol.hpp; sourceTree = "<group>"; };
  358 + 3CC52DD41ACE4023006FEB01 /* srs_utest_reload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_utest_reload.cpp; path = ../../src/utest/srs_utest_reload.cpp; sourceTree = "<group>"; };
  359 + 3CC52DD51ACE4023006FEB01 /* srs_utest_reload.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_utest_reload.hpp; path = ../../src/utest/srs_utest_reload.hpp; sourceTree = "<group>"; };
  360 + 3CC52DD61ACE4023006FEB01 /* srs_utest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_utest.cpp; path = ../../src/utest/srs_utest.cpp; sourceTree = "<group>"; };
  361 + 3CC52DD71ACE4023006FEB01 /* srs_utest.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_utest.hpp; path = ../../src/utest/srs_utest.hpp; sourceTree = "<group>"; };
341 3CD88B3D1ACA9C58000359E0 /* srs_app_async_call.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_async_call.cpp; path = ../../../src/app/srs_app_async_call.cpp; sourceTree = "<group>"; }; 362 3CD88B3D1ACA9C58000359E0 /* srs_app_async_call.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_async_call.cpp; path = ../../../src/app/srs_app_async_call.cpp; sourceTree = "<group>"; };
342 3CD88B3E1ACA9C58000359E0 /* srs_app_async_call.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_async_call.hpp; path = ../../../src/app/srs_app_async_call.hpp; sourceTree = "<group>"; }; 363 3CD88B3E1ACA9C58000359E0 /* srs_app_async_call.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_async_call.hpp; path = ../../../src/app/srs_app_async_call.hpp; sourceTree = "<group>"; };
343 /* End PBXFileReference section */ 364 /* End PBXFileReference section */
@@ -365,6 +386,7 @@ @@ -365,6 +386,7 @@
365 3C1231E61AAE64A400CE8F6C /* Products */, 386 3C1231E61AAE64A400CE8F6C /* Products */,
366 3C1232EE1AAEA71C00CE8F6C /* links */, 387 3C1232EE1AAEA71C00CE8F6C /* links */,
367 3C1231E71AAE64A400CE8F6C /* srs_xcode */, 388 3C1231E71AAE64A400CE8F6C /* srs_xcode */,
  389 + 3CC52DC91ACE4006006FEB01 /* utest */,
368 3C663F001AB014B500286D8B /* research */, 390 3C663F001AB014B500286D8B /* research */,
369 ); 391 );
370 sourceTree = "<group>"; 392 sourceTree = "<group>";
@@ -735,6 +757,27 @@ @@ -735,6 +757,27 @@
735 name = "st-1.9"; 757 name = "st-1.9";
736 sourceTree = "<group>"; 758 sourceTree = "<group>";
737 }; 759 };
  760 + 3CC52DC91ACE4006006FEB01 /* utest */ = {
  761 + isa = PBXGroup;
  762 + children = (
  763 + 3CC52DCA1ACE4023006FEB01 /* srs_utest_amf0.cpp */,
  764 + 3CC52DCB1ACE4023006FEB01 /* srs_utest_amf0.hpp */,
  765 + 3CC52DCC1ACE4023006FEB01 /* srs_utest_config.cpp */,
  766 + 3CC52DCD1ACE4023006FEB01 /* srs_utest_config.hpp */,
  767 + 3CC52DCE1ACE4023006FEB01 /* srs_utest_core.cpp */,
  768 + 3CC52DCF1ACE4023006FEB01 /* srs_utest_core.hpp */,
  769 + 3CC52DD01ACE4023006FEB01 /* srs_utest_kernel.cpp */,
  770 + 3CC52DD11ACE4023006FEB01 /* srs_utest_kernel.hpp */,
  771 + 3CC52DD21ACE4023006FEB01 /* srs_utest_protocol.cpp */,
  772 + 3CC52DD31ACE4023006FEB01 /* srs_utest_protocol.hpp */,
  773 + 3CC52DD41ACE4023006FEB01 /* srs_utest_reload.cpp */,
  774 + 3CC52DD51ACE4023006FEB01 /* srs_utest_reload.hpp */,
  775 + 3CC52DD61ACE4023006FEB01 /* srs_utest.cpp */,
  776 + 3CC52DD71ACE4023006FEB01 /* srs_utest.hpp */,
  777 + );
  778 + name = utest;
  779 + sourceTree = "<group>";
  780 + };
738 /* End PBXGroup section */ 781 /* End PBXGroup section */
739 782
740 /* Begin PBXNativeTarget section */ 783 /* Begin PBXNativeTarget section */
@@ -798,6 +841,7 @@ @@ -798,6 +841,7 @@
798 3C1232961AAE81D900CE8F6C /* srs_app_conn.cpp in Sources */, 841 3C1232961AAE81D900CE8F6C /* srs_app_conn.cpp in Sources */,
799 3C12322A1AAE814D00CE8F6C /* srs_kernel_ts.cpp in Sources */, 842 3C12322A1AAE814D00CE8F6C /* srs_kernel_ts.cpp in Sources */,
800 3C12329E1AAE81D900CE8F6C /* srs_app_hls.cpp in Sources */, 843 3C12329E1AAE81D900CE8F6C /* srs_app_hls.cpp in Sources */,
  844 + 3CC52DD91ACE4023006FEB01 /* srs_utest_config.cpp in Sources */,
801 3C663F171AB0155100286D8B /* srs_ingest_rtmp.c in Sources */, 845 3C663F171AB0155100286D8B /* srs_ingest_rtmp.c in Sources */,
802 3C663F131AB0155100286D8B /* srs_flv_injecter.c in Sources */, 846 3C663F131AB0155100286D8B /* srs_flv_injecter.c in Sources */,
803 3C1232971AAE81D900CE8F6C /* srs_app_dvr.cpp in Sources */, 847 3C1232971AAE81D900CE8F6C /* srs_app_dvr.cpp in Sources */,
@@ -816,15 +860,18 @@ @@ -816,15 +860,18 @@
816 3C1EE6AE1AB1055800576EE9 /* srs_app_hds.cpp in Sources */, 860 3C1EE6AE1AB1055800576EE9 /* srs_app_hds.cpp in Sources */,
817 3C663F101AB0155100286D8B /* srs_audio_raw_publish.c in Sources */, 861 3C663F101AB0155100286D8B /* srs_audio_raw_publish.c in Sources */,
818 3C663F111AB0155100286D8B /* srs_bandwidth_check.c in Sources */, 862 3C663F111AB0155100286D8B /* srs_bandwidth_check.c in Sources */,
  863 + 3CC52DDE1ACE4023006FEB01 /* srs_utest.cpp in Sources */,
819 3C1232A11AAE81D900CE8F6C /* srs_app_http_conn.cpp in Sources */, 864 3C1232A11AAE81D900CE8F6C /* srs_app_http_conn.cpp in Sources */,
820 3C1232AC1AAE81D900CE8F6C /* srs_app_refer.cpp in Sources */, 865 3C1232AC1AAE81D900CE8F6C /* srs_app_refer.cpp in Sources */,
821 3C1232991AAE81D900CE8F6C /* srs_app_empty.cpp in Sources */, 866 3C1232991AAE81D900CE8F6C /* srs_app_empty.cpp in Sources */,
  867 + 3CC52DDA1ACE4023006FEB01 /* srs_utest_core.cpp in Sources */,
822 3C36DB5C1ABD1CB90066CCAF /* srs_lib_simple_socket.cpp in Sources */, 868 3C36DB5C1ABD1CB90066CCAF /* srs_lib_simple_socket.cpp in Sources */,
823 3C1232201AAE814D00CE8F6C /* srs_kernel_aac.cpp in Sources */, 869 3C1232201AAE814D00CE8F6C /* srs_kernel_aac.cpp in Sources */,
824 3C1232941AAE81D900CE8F6C /* srs_app_bandwidth.cpp in Sources */, 870 3C1232941AAE81D900CE8F6C /* srs_app_bandwidth.cpp in Sources */,
825 3C1232221AAE814D00CE8F6C /* srs_kernel_codec.cpp in Sources */, 871 3C1232221AAE814D00CE8F6C /* srs_kernel_codec.cpp in Sources */,
826 3C1232B71AAE81D900CE8F6C /* srs_app_utility.cpp in Sources */, 872 3C1232B71AAE81D900CE8F6C /* srs_app_utility.cpp in Sources */,
827 3C1232AB1AAE81D900CE8F6C /* srs_app_recv_thread.cpp in Sources */, 873 3C1232AB1AAE81D900CE8F6C /* srs_app_recv_thread.cpp in Sources */,
  874 + 3CC52DDC1ACE4023006FEB01 /* srs_utest_protocol.cpp in Sources */,
828 3C663F151AB0155100286D8B /* srs_h264_raw_publish.c in Sources */, 875 3C663F151AB0155100286D8B /* srs_h264_raw_publish.c in Sources */,
829 3C1231F61AAE652D00CE8F6C /* srs_core_autofree.cpp in Sources */, 876 3C1231F61AAE652D00CE8F6C /* srs_core_autofree.cpp in Sources */,
830 3C1EE6D71AB1367D00576EE9 /* README.md in Sources */, 877 3C1EE6D71AB1367D00576EE9 /* README.md in Sources */,
@@ -849,7 +896,9 @@ @@ -849,7 +896,9 @@
849 3C1232281AAE814D00CE8F6C /* srs_kernel_mp3.cpp in Sources */, 896 3C1232281AAE814D00CE8F6C /* srs_kernel_mp3.cpp in Sources */,
850 3C1232B21AAE81D900CE8F6C /* srs_app_source.cpp in Sources */, 897 3C1232B21AAE81D900CE8F6C /* srs_app_source.cpp in Sources */,
851 3C1231F71AAE652D00CE8F6C /* srs_core_performance.cpp in Sources */, 898 3C1231F71AAE652D00CE8F6C /* srs_core_performance.cpp in Sources */,
  899 + 3CC52DD81ACE4023006FEB01 /* srs_utest_amf0.cpp in Sources */,
852 3C1232981AAE81D900CE8F6C /* srs_app_edge.cpp in Sources */, 900 3C1232981AAE81D900CE8F6C /* srs_app_edge.cpp in Sources */,
  901 + 3CC52DDB1ACE4023006FEB01 /* srs_utest_kernel.cpp in Sources */,
853 3C689F9E1AB6AAC800C9CEEE /* md.S in Sources */, 902 3C689F9E1AB6AAC800C9CEEE /* md.S in Sources */,
854 3C1232461AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp in Sources */, 903 3C1232461AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp in Sources */,
855 3C1232A71AAE81D900CE8F6C /* srs_app_listener.cpp in Sources */, 904 3C1232A71AAE81D900CE8F6C /* srs_app_listener.cpp in Sources */,
@@ -875,6 +924,7 @@ @@ -875,6 +924,7 @@
875 3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */, 924 3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */,
876 3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */, 925 3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */,
877 3C1232AF1AAE81D900CE8F6C /* srs_app_rtsp.cpp in Sources */, 926 3C1232AF1AAE81D900CE8F6C /* srs_app_rtsp.cpp in Sources */,
  927 + 3CC52DDD1ACE4023006FEB01 /* srs_utest_reload.cpp in Sources */,
878 3C689FA11AB6AAC800C9CEEE /* sync.c in Sources */, 928 3C689FA11AB6AAC800C9CEEE /* sync.c in Sources */,
879 3C1232A31AAE81D900CE8F6C /* srs_app_http.cpp in Sources */, 929 3C1232A31AAE81D900CE8F6C /* srs_app_http.cpp in Sources */,
880 3C12329A1AAE81D900CE8F6C /* srs_app_encoder.cpp in Sources */, 930 3C12329A1AAE81D900CE8F6C /* srs_app_encoder.cpp in Sources */,
@@ -328,8 +328,11 @@ class RESTHls(object): @@ -328,8 +328,11 @@ class RESTHls(object):
328 { 328 {
329 "action": "on_dvr", 329 "action": "on_dvr",
330 "client_id": 1985, 330 "client_id": 1985,
331 - "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", 331 + "ip": "192.168.1.10",
  332 + "vhost": "video.test.com",
  333 + "app": "live",
332 "stream": "livestream", 334 "stream": "livestream",
  335 + "duration": 9.68, // in seconds
333 "cwd": "/usr/local/srs", 336 "cwd": "/usr/local/srs",
334 "file": "./objs/nginx/html/live/livestream.1420254068776-100.ts", 337 "file": "./objs/nginx/html/live/livestream.1420254068776-100.ts",
335 "seq_no": 100 338 "seq_no": 100
@@ -368,8 +371,8 @@ class RESTHls(object): @@ -368,8 +371,8 @@ class RESTHls(object):
368 def __on_hls(self, req): 371 def __on_hls(self, req):
369 code = Error.success 372 code = Error.success
370 373
371 - trace("srs %s: client id=%s, ip=%s, vhost=%s, app=%s, stream=%s, cwd=%s, file=%s, seq_no=%s"%(  
372 - req["action"], req["client_id"], req["ip"], req["vhost"], req["app"], req["stream"], 374 + trace("srs %s: client id=%s, ip=%s, vhost=%s, app=%s, stream=%s, duration=%s, cwd=%s, file=%s, seq_no=%s"%(
  375 + req["action"], req["client_id"], req["ip"], req["vhost"], req["app"], req["stream"], req["duration"],
373 req["cwd"], req["file"], req["seq_no"] 376 req["cwd"], req["file"], req["seq_no"]
374 )) 377 ))
375 378
@@ -3414,7 +3414,7 @@ bool SrsConfig::get_hls_cleanup(string vhost) @@ -3414,7 +3414,7 @@ bool SrsConfig::get_hls_cleanup(string vhost)
3414 3414
3415 SrsConfDirective* conf = hls->get("hls_cleanup"); 3415 SrsConfDirective* conf = hls->get("hls_cleanup");
3416 3416
3417 - if (!conf && conf->arg0() != "off") { 3417 + if (conf && conf->arg0() != "off") {
3418 return SRS_CONF_DEFAULT_HLS_CLEANUP; 3418 return SRS_CONF_DEFAULT_HLS_CLEANUP;
3419 } 3419 }
3420 3420
@@ -170,11 +170,12 @@ void SrsHlsSegment::update_duration(int64_t current_frame_dts) @@ -170,11 +170,12 @@ void SrsHlsSegment::update_duration(int64_t current_frame_dts)
170 return; 170 return;
171 } 171 }
172 172
173 -SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(SrsRequest* r, string p, int s) 173 +SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(SrsRequest* r, string p, int s, double d)
174 { 174 {
175 req = r; 175 req = r;
176 path = p; 176 path = p;
177 seq_no = s; 177 seq_no = s;
  178 + duration = d;
178 } 179 }
179 180
180 SrsDvrAsyncCallOnHls::~SrsDvrAsyncCallOnHls() 181 SrsDvrAsyncCallOnHls::~SrsDvrAsyncCallOnHls()
@@ -199,7 +200,7 @@ int SrsDvrAsyncCallOnHls::call() @@ -199,7 +200,7 @@ int SrsDvrAsyncCallOnHls::call()
199 int sn = seq_no; 200 int sn = seq_no;
200 for (int i = 0; i < (int)on_hls->args.size(); i++) { 201 for (int i = 0; i < (int)on_hls->args.size(); i++) {
201 std::string url = on_hls->args.at(i); 202 std::string url = on_hls->args.at(i);
202 - if ((ret = SrsHttpHooks::on_hls(url, req, file, sn)) != ERROR_SUCCESS) { 203 + if ((ret = SrsHttpHooks::on_hls(url, req, file, sn, duration)) != ERROR_SUCCESS) {
203 srs_error("hook client on_hls failed. url=%s, ret=%d", url.c_str(), ret); 204 srs_error("hook client on_hls failed. url=%s, ret=%d", url.c_str(), ret);
204 return ret; 205 return ret;
205 } 206 }
@@ -581,7 +582,7 @@ int SrsHlsMuxer::segment_close(string log_desc) @@ -581,7 +582,7 @@ int SrsHlsMuxer::segment_close(string log_desc)
581 } 582 }
582 583
583 // use async to call the http hooks, for it will cause thread switch. 584 // use async to call the http hooks, for it will cause thread switch.
584 - if ((ret = async->call(new SrsDvrAsyncCallOnHls(req, current->full_path, current->sequence_no))) != ERROR_SUCCESS) { 585 + if ((ret = async->call(new SrsDvrAsyncCallOnHls(req, current->full_path, current->sequence_no, current->duration))) != ERROR_SUCCESS) {
585 return ret; 586 return ret;
586 } 587 }
587 588
@@ -164,8 +164,9 @@ private: @@ -164,8 +164,9 @@ private:
164 std::string path; 164 std::string path;
165 int seq_no; 165 int seq_no;
166 SrsRequest* req; 166 SrsRequest* req;
  167 + double duration;
167 public: 168 public:
168 - SrsDvrAsyncCallOnHls(SrsRequest* r, std::string p, int s); 169 + SrsDvrAsyncCallOnHls(SrsRequest* r, std::string p, int s, double d);
169 virtual ~SrsDvrAsyncCallOnHls(); 170 virtual ~SrsDvrAsyncCallOnHls();
170 public: 171 public:
171 virtual int call(); 172 virtual int call();
@@ -287,7 +287,7 @@ int SrsHttpHooks::on_dvr(string url, SrsRequest* req, string file) @@ -287,7 +287,7 @@ int SrsHttpHooks::on_dvr(string url, SrsRequest* req, string file)
287 return ret; 287 return ret;
288 } 288 }
289 289
290 -int SrsHttpHooks::on_hls(string url, SrsRequest* req, string file, int sn) 290 +int SrsHttpHooks::on_hls(string url, SrsRequest* req, string file, int sn, double duration)
291 { 291 {
292 int ret = ERROR_SUCCESS; 292 int ret = ERROR_SUCCESS;
293 293
@@ -302,6 +302,7 @@ int SrsHttpHooks::on_hls(string url, SrsRequest* req, string file, int sn) @@ -302,6 +302,7 @@ int SrsHttpHooks::on_hls(string url, SrsRequest* req, string file, int sn)
302 << SRS_JFIELD_STR("vhost", req->vhost) << SRS_JFIELD_CONT 302 << SRS_JFIELD_STR("vhost", req->vhost) << SRS_JFIELD_CONT
303 << SRS_JFIELD_STR("app", req->app) << SRS_JFIELD_CONT 303 << SRS_JFIELD_STR("app", req->app) << SRS_JFIELD_CONT
304 << SRS_JFIELD_STR("stream", req->stream) << SRS_JFIELD_CONT 304 << SRS_JFIELD_STR("stream", req->stream) << SRS_JFIELD_CONT
  305 + << SRS_JFIELD_ORG("duration", duration) << SRS_JFIELD_CONT
305 << SRS_JFIELD_STR("cwd", cwd) << SRS_JFIELD_CONT 306 << SRS_JFIELD_STR("cwd", cwd) << SRS_JFIELD_CONT
306 << SRS_JFIELD_STR("file", file) << SRS_JFIELD_CONT 307 << SRS_JFIELD_STR("file", file) << SRS_JFIELD_CONT
307 << SRS_JFIELD_ORG("seq_no", sn) 308 << SRS_JFIELD_ORG("seq_no", sn)
@@ -102,8 +102,9 @@ public: @@ -102,8 +102,9 @@ public:
102 * ignore if empty. 102 * ignore if empty.
103 * @param file the ts file path, can be relative or absolute path. 103 * @param file the ts file path, can be relative or absolute path.
104 * @param sn the seq_no, the sequence number of ts in hls/m3u8. 104 * @param sn the seq_no, the sequence number of ts in hls/m3u8.
  105 + * @param duration the segment duration in seconds.
105 */ 106 */
106 - static int on_hls(std::string url, SrsRequest* req, std::string file, int sn); 107 + static int on_hls(std::string url, SrsRequest* req, std::string file, int sn, double duration);
107 private: 108 private:
108 static int do_post(std::string url, std::string req, int& code, std::string& res); 109 static int do_post(std::string url, std::string req, int& code, std::string& res);
109 }; 110 };
@@ -347,10 +347,6 @@ int SrsMpegtsOverUdp::on_ts_video(SrsTsMessage* msg, SrsStream* avs) @@ -347,10 +347,6 @@ int SrsMpegtsOverUdp::on_ts_video(SrsTsMessage* msg, SrsStream* avs)
347 // ts tbn to flv tbn. 347 // ts tbn to flv tbn.
348 u_int32_t dts = msg->dts / 90; 348 u_int32_t dts = msg->dts / 90;
349 u_int32_t pts = msg->dts / 90; 349 u_int32_t pts = msg->dts / 90;
350 -  
351 - // the whole ts pes video packet must be a flv frame packet.  
352 - char* ibpframe = avs->data() + avs->pos();  
353 - int ibpframe_size = avs->size() - avs->pos();  
354 350
355 // send each frame. 351 // send each frame.
356 while (!avs->empty()) { 352 while (!avs->empty()) {
@@ -388,8 +384,6 @@ int SrsMpegtsOverUdp::on_ts_video(SrsTsMessage* msg, SrsStream* avs) @@ -388,8 +384,6 @@ int SrsMpegtsOverUdp::on_ts_video(SrsTsMessage* msg, SrsStream* avs)
388 384
389 // for pps 385 // for pps
390 if (avc->is_pps(frame, frame_size)) { 386 if (avc->is_pps(frame, frame_size)) {
391 - got_sps_pps = true;  
392 -  
393 std::string pps; 387 std::string pps;
394 if ((ret = avc->pps_demux(frame, frame_size, pps)) != ERROR_SUCCESS) { 388 if ((ret = avc->pps_demux(frame, frame_size, pps)) != ERROR_SUCCESS) {
395 return ret; 389 return ret;
@@ -1018,8 +1018,9 @@ int SrsServer::listen_stream_caster() @@ -1018,8 +1018,9 @@ int SrsServer::listen_stream_caster()
1018 srs_error("invalid stream caster port %d. ret=%d", port, ret); 1018 srs_error("invalid stream caster port %d. ret=%d", port, ret);
1019 return ret; 1019 return ret;
1020 } 1020 }
1021 -  
1022 - if ((ret = listener->listen(port)) != ERROR_SUCCESS) { 1021 +
  1022 + // TODO: support listen at <[ip:]port>
  1023 + if ((ret = listener->listen("0.0.0.0", port)) != ERROR_SUCCESS) {
1023 srs_error("StreamCaster listen at port %d failed. ret=%d", port, ret); 1024 srs_error("StreamCaster listen at port %d failed. ret=%d", port, ret);
1024 return ret; 1025 return ret;
1025 } 1026 }
@@ -1356,7 +1356,7 @@ VOID TEST(ConfigMainTest, ParseMinConf) @@ -1356,7 +1356,7 @@ VOID TEST(ConfigMainTest, ParseMinConf)
1356 MockSrsConfig conf; 1356 MockSrsConfig conf;
1357 EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF)); 1357 EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF));
1358 1358
1359 - vector<string> listens = conf.get_listen(); 1359 + vector<string> listens = conf.get_listens();
1360 EXPECT_EQ(1, (int)listens.size()); 1360 EXPECT_EQ(1, (int)listens.size());
1361 EXPECT_STREQ("1935", listens.at(0).c_str()); 1361 EXPECT_STREQ("1935", listens.at(0).c_str());
1362 } 1362 }
@@ -1379,7 +1379,7 @@ VOID TEST(ConfigMainTest, ParseFullConf) @@ -1379,7 +1379,7 @@ VOID TEST(ConfigMainTest, ParseFullConf)
1379 MockSrsConfig conf; 1379 MockSrsConfig conf;
1380 EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_full_conf)); 1380 EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_full_conf));
1381 1381
1382 - vector<string> listens = conf.get_listen(); 1382 + vector<string> listens = conf.get_listens();
1383 EXPECT_EQ(1, (int)listens.size()); 1383 EXPECT_EQ(1, (int)listens.size());
1384 EXPECT_STREQ("1935", listens.at(0).c_str()); 1384 EXPECT_STREQ("1935", listens.at(0).c_str());
1385 1385
@@ -1403,10 +1403,10 @@ VOID TEST(ConfigMainTest, ParseFullConf) @@ -1403,10 +1403,10 @@ VOID TEST(ConfigMainTest, ParseFullConf)
1403 EXPECT_EQ(4, (int)conf.get_stats_disk_device()->args.size()); 1403 EXPECT_EQ(4, (int)conf.get_stats_disk_device()->args.size());
1404 1404
1405 EXPECT_TRUE(conf.get_http_api_enabled()); 1405 EXPECT_TRUE(conf.get_http_api_enabled());
1406 - EXPECT_EQ(1985, conf.get_http_api_listen()); 1406 + EXPECT_STREQ("1985", conf.get_http_api_listen().c_str());
1407 1407
1408 EXPECT_TRUE(conf.get_http_stream_enabled()); 1408 EXPECT_TRUE(conf.get_http_stream_enabled());
1409 - EXPECT_EQ(8080, conf.get_http_stream_listen()); 1409 + EXPECT_STREQ("8080", conf.get_http_stream_listen().c_str());
1410 EXPECT_STREQ("./objs/nginx/html", conf.get_http_stream_dir().c_str()); 1410 EXPECT_STREQ("./objs/nginx/html", conf.get_http_stream_dir().c_str());
1411 1411
1412 EXPECT_EQ(10000, conf.get_pithy_print_ms()); 1412 EXPECT_EQ(10000, conf.get_pithy_print_ms());