胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
66a26bdc 1 parent a7589b9a

move json from app to protocol

内嵌 并排对比
正在显示 12 个修改的文件 包含 26 行增加 和 22 行删除
@@ -159,7 +159,7 @@ MODULE_DEPENDS=("CORE" "KERNEL") @@ -159,7 +159,7 @@ MODULE_DEPENDS=("CORE" "KERNEL")
159 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) 159 ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
160 MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" 160 MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack"
161 "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_buffer" 161 "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_buffer"
162 - "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps") 162 + "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json")
163 PROTOCOL_INCS="src/protocol"; MODULE_DIR=${PROTOCOL_INCS} . auto/modules.sh 163 PROTOCOL_INCS="src/protocol"; MODULE_DIR=${PROTOCOL_INCS} . auto/modules.sh
164 PROTOCOL_OBJS="${MODULE_OBJS[@]}" 164 PROTOCOL_OBJS="${MODULE_OBJS[@]}"
165 # 165 #
@@ -172,7 +172,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then @@ -172,7 +172,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
172 "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http_stream" 172 "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http_stream"
173 "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" 173 "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config"
174 "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks" 174 "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks"
175 - "srs_app_json" "srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_dvr" "srs_app_edge" 175 + "srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_dvr" "srs_app_edge"
176 "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_http_static" 176 "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_http_static"
177 "srs_app_recv_thread" "srs_app_security" "srs_app_statistic" "srs_app_hds" 177 "srs_app_recv_thread" "srs_app_security" "srs_app_statistic" "srs_app_hds"
178 "srs_app_mpegts_udp" "srs_app_rtsp" "srs_app_listener" "srs_app_async_call" 178 "srs_app_mpegts_udp" "srs_app_rtsp" "srs_app_listener" "srs_app_async_call"
@@ -58,6 +58,8 @@ file @@ -58,6 +58,8 @@ file
58 ../../src/protocol/srs_rtmp_amf0.cpp, 58 ../../src/protocol/srs_rtmp_amf0.cpp,
59 ../../src/protocol/srs_protocol_buffer.hpp, 59 ../../src/protocol/srs_protocol_buffer.hpp,
60 ../../src/protocol/srs_protocol_buffer.cpp, 60 ../../src/protocol/srs_protocol_buffer.cpp,
  61 + ../../src/protocol/srs_protocol_json.hpp,
  62 + ../../src/protocol/srs_protocol_json.cpp,
61 ../../src/protocol/srs_rtmp_handshake.hpp, 63 ../../src/protocol/srs_rtmp_handshake.hpp,
62 ../../src/protocol/srs_rtmp_handshake.cpp, 64 ../../src/protocol/srs_rtmp_handshake.cpp,
63 ../../src/protocol/srs_rtmp_io.hpp, 65 ../../src/protocol/srs_rtmp_io.hpp,
@@ -109,8 +111,6 @@ file @@ -109,8 +111,6 @@ file
109 ../../src/app/srs_app_http_static.cpp, 111 ../../src/app/srs_app_http_static.cpp,
110 ../../src/app/srs_app_ingest.hpp, 112 ../../src/app/srs_app_ingest.hpp,
111 ../../src/app/srs_app_ingest.cpp, 113 ../../src/app/srs_app_ingest.cpp,
112 - ../../src/app/srs_app_json.hpp,  
113 - ../../src/app/srs_app_json.cpp,  
114 ../../src/app/srs_app_listener.hpp, 114 ../../src/app/srs_app_listener.hpp,
115 ../../src/app/srs_app_listener.cpp, 115 ../../src/app/srs_app_listener.cpp,
116 ../../src/app/srs_app_log.hpp, 116 ../../src/app/srs_app_log.hpp,
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 3C036B561B2D0AC10078E2E0 /* srs_app_http_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C036B531B2D0AC10078E2E0 /* srs_app_http_stream.cpp */; }; 11 3C036B561B2D0AC10078E2E0 /* srs_app_http_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C036B531B2D0AC10078E2E0 /* srs_app_http_stream.cpp */; };
12 3C068D6A1B10149F00AA722C /* srs_protocol_kbps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */; }; 12 3C068D6A1B10149F00AA722C /* srs_protocol_kbps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */; };
13 3C068D6D1B10175500AA722C /* srs_protocol_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */; }; 13 3C068D6D1B10175500AA722C /* srs_protocol_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */; };
  14 + 3C0D422E1B87165900C2508B /* srs_protocol_json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C0D422C1B87165900C2508B /* srs_protocol_json.cpp */; };
14 3C0E1B8D1B0F5ADF003ADEF7 /* srs_http_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */; }; 15 3C0E1B8D1B0F5ADF003ADEF7 /* srs_http_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */; };
15 3C1231F61AAE652D00CE8F6C /* srs_core_autofree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F01AAE652C00CE8F6C /* srs_core_autofree.cpp */; }; 16 3C1231F61AAE652D00CE8F6C /* srs_core_autofree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F01AAE652C00CE8F6C /* srs_core_autofree.cpp */; };
16 3C1231F71AAE652D00CE8F6C /* srs_core_performance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F21AAE652C00CE8F6C /* srs_core_performance.cpp */; }; 17 3C1231F71AAE652D00CE8F6C /* srs_core_performance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F21AAE652C00CE8F6C /* srs_core_performance.cpp */; };
@@ -52,7 +53,6 @@ @@ -52,7 +53,6 @@
52 3C1232A11AAE81D900CE8F6C /* srs_app_http_conn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232661AAE81D900CE8F6C /* srs_app_http_conn.cpp */; }; 53 3C1232A11AAE81D900CE8F6C /* srs_app_http_conn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232661AAE81D900CE8F6C /* srs_app_http_conn.cpp */; };
53 3C1232A21AAE81D900CE8F6C /* srs_app_http_hooks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232681AAE81D900CE8F6C /* srs_app_http_hooks.cpp */; }; 54 3C1232A21AAE81D900CE8F6C /* srs_app_http_hooks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232681AAE81D900CE8F6C /* srs_app_http_hooks.cpp */; };
54 3C1232A41AAE81D900CE8F6C /* srs_app_ingest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */; }; 55 3C1232A41AAE81D900CE8F6C /* srs_app_ingest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */; };
55 - 3C1232A51AAE81D900CE8F6C /* srs_app_json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12326E1AAE81D900CE8F6C /* srs_app_json.cpp */; };  
56 3C1232A71AAE81D900CE8F6C /* srs_app_listener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232721AAE81D900CE8F6C /* srs_app_listener.cpp */; }; 56 3C1232A71AAE81D900CE8F6C /* srs_app_listener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232721AAE81D900CE8F6C /* srs_app_listener.cpp */; };
57 3C1232A81AAE81D900CE8F6C /* srs_app_log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232741AAE81D900CE8F6C /* srs_app_log.cpp */; }; 57 3C1232A81AAE81D900CE8F6C /* srs_app_log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232741AAE81D900CE8F6C /* srs_app_log.cpp */; };
58 3C1232A91AAE81D900CE8F6C /* srs_app_mpegts_udp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232761AAE81D900CE8F6C /* srs_app_mpegts_udp.cpp */; }; 58 3C1232A91AAE81D900CE8F6C /* srs_app_mpegts_udp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232761AAE81D900CE8F6C /* srs_app_mpegts_udp.cpp */; };
@@ -131,6 +131,8 @@ @@ -131,6 +131,8 @@
131 3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_kbps.hpp; path = ../../../src/protocol/srs_protocol_kbps.hpp; sourceTree = "<group>"; }; 131 3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_kbps.hpp; path = ../../../src/protocol/srs_protocol_kbps.hpp; sourceTree = "<group>"; };
132 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_buffer.cpp; path = ../../../src/protocol/srs_protocol_buffer.cpp; sourceTree = "<group>"; }; 132 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_buffer.cpp; path = ../../../src/protocol/srs_protocol_buffer.cpp; sourceTree = "<group>"; };
133 3C068D6C1B10175500AA722C /* srs_protocol_buffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_buffer.hpp; path = ../../../src/protocol/srs_protocol_buffer.hpp; sourceTree = "<group>"; }; 133 3C068D6C1B10175500AA722C /* srs_protocol_buffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_buffer.hpp; path = ../../../src/protocol/srs_protocol_buffer.hpp; sourceTree = "<group>"; };
  134 + 3C0D422C1B87165900C2508B /* srs_protocol_json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_json.cpp; path = ../../../src/protocol/srs_protocol_json.cpp; sourceTree = "<group>"; };
  135 + 3C0D422D1B87165900C2508B /* srs_protocol_json.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_json.hpp; path = ../../../src/protocol/srs_protocol_json.hpp; sourceTree = "<group>"; };
134 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_http_stack.cpp; path = ../../../src/protocol/srs_http_stack.cpp; sourceTree = "<group>"; }; 136 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_http_stack.cpp; path = ../../../src/protocol/srs_http_stack.cpp; sourceTree = "<group>"; };
135 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_http_stack.hpp; path = ../../../src/protocol/srs_http_stack.hpp; sourceTree = "<group>"; }; 137 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_http_stack.hpp; path = ../../../src/protocol/srs_http_stack.hpp; sourceTree = "<group>"; };
136 3C1231E51AAE64A400CE8F6C /* srs_xcode */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = srs_xcode; sourceTree = BUILT_PRODUCTS_DIR; }; 138 3C1231E51AAE64A400CE8F6C /* srs_xcode */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = srs_xcode; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -214,8 +216,6 @@ @@ -214,8 +216,6 @@
214 3C1232691AAE81D900CE8F6C /* srs_app_http_hooks.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_http_hooks.hpp; path = ../../../src/app/srs_app_http_hooks.hpp; sourceTree = "<group>"; }; 216 3C1232691AAE81D900CE8F6C /* srs_app_http_hooks.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_http_hooks.hpp; path = ../../../src/app/srs_app_http_hooks.hpp; sourceTree = "<group>"; };
215 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_ingest.cpp; path = ../../../src/app/srs_app_ingest.cpp; sourceTree = "<group>"; }; 217 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_ingest.cpp; path = ../../../src/app/srs_app_ingest.cpp; sourceTree = "<group>"; };
216 3C12326D1AAE81D900CE8F6C /* srs_app_ingest.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_ingest.hpp; path = ../../../src/app/srs_app_ingest.hpp; sourceTree = "<group>"; }; 218 3C12326D1AAE81D900CE8F6C /* srs_app_ingest.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_ingest.hpp; path = ../../../src/app/srs_app_ingest.hpp; sourceTree = "<group>"; };
217 - 3C12326E1AAE81D900CE8F6C /* srs_app_json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_json.cpp; path = ../../../src/app/srs_app_json.cpp; sourceTree = "<group>"; };  
218 - 3C12326F1AAE81D900CE8F6C /* srs_app_json.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_json.hpp; path = ../../../src/app/srs_app_json.hpp; sourceTree = "<group>"; };  
219 3C1232721AAE81D900CE8F6C /* srs_app_listener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_listener.cpp; path = ../../../src/app/srs_app_listener.cpp; sourceTree = "<group>"; }; 219 3C1232721AAE81D900CE8F6C /* srs_app_listener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_listener.cpp; path = ../../../src/app/srs_app_listener.cpp; sourceTree = "<group>"; };
220 3C1232731AAE81D900CE8F6C /* srs_app_listener.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_listener.hpp; path = ../../../src/app/srs_app_listener.hpp; sourceTree = "<group>"; }; 220 3C1232731AAE81D900CE8F6C /* srs_app_listener.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_listener.hpp; path = ../../../src/app/srs_app_listener.hpp; sourceTree = "<group>"; };
221 3C1232741AAE81D900CE8F6C /* srs_app_log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_log.cpp; path = ../../../src/app/srs_app_log.cpp; sourceTree = "<group>"; }; 221 3C1232741AAE81D900CE8F6C /* srs_app_log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_log.cpp; path = ../../../src/app/srs_app_log.cpp; sourceTree = "<group>"; };
@@ -496,6 +496,8 @@ @@ -496,6 +496,8 @@
496 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */, 496 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */,
497 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */, 497 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */,
498 3C068D6C1B10175500AA722C /* srs_protocol_buffer.hpp */, 498 3C068D6C1B10175500AA722C /* srs_protocol_buffer.hpp */,
  499 + 3C0D422C1B87165900C2508B /* srs_protocol_json.cpp */,
  500 + 3C0D422D1B87165900C2508B /* srs_protocol_json.hpp */,
499 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */, 501 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */,
500 3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */, 502 3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */,
501 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */, 503 3C12322D1AAE81A400CE8F6C /* srs_raw_avc.cpp */,
@@ -563,8 +565,6 @@ @@ -563,8 +565,6 @@
563 3C036B541B2D0AC10078E2E0 /* srs_app_http_stream.hpp */, 565 3C036B541B2D0AC10078E2E0 /* srs_app_http_stream.hpp */,
564 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */, 566 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */,
565 3C12326D1AAE81D900CE8F6C /* srs_app_ingest.hpp */, 567 3C12326D1AAE81D900CE8F6C /* srs_app_ingest.hpp */,
566 - 3C12326E1AAE81D900CE8F6C /* srs_app_json.cpp */,  
567 - 3C12326F1AAE81D900CE8F6C /* srs_app_json.hpp */,  
568 3C1232721AAE81D900CE8F6C /* srs_app_listener.cpp */, 568 3C1232721AAE81D900CE8F6C /* srs_app_listener.cpp */,
569 3C1232731AAE81D900CE8F6C /* srs_app_listener.hpp */, 569 3C1232731AAE81D900CE8F6C /* srs_app_listener.hpp */,
570 3C1232741AAE81D900CE8F6C /* srs_app_log.cpp */, 570 3C1232741AAE81D900CE8F6C /* srs_app_log.cpp */,
@@ -862,12 +862,12 @@ @@ -862,12 +862,12 @@
862 3C689F961AB6AAAC00C9CEEE /* event.c in Sources */, 862 3C689F961AB6AAAC00C9CEEE /* event.c in Sources */,
863 3C1232A81AAE81D900CE8F6C /* srs_app_log.cpp in Sources */, 863 3C1232A81AAE81D900CE8F6C /* srs_app_log.cpp in Sources */,
864 3C1232A41AAE81D900CE8F6C /* srs_app_ingest.cpp in Sources */, 864 3C1232A41AAE81D900CE8F6C /* srs_app_ingest.cpp in Sources */,
  865 + 3C0D422E1B87165900C2508B /* srs_protocol_json.cpp in Sources */,
865 3C1232B41AAE81D900CE8F6C /* srs_app_st.cpp in Sources */, 866 3C1232B41AAE81D900CE8F6C /* srs_app_st.cpp in Sources */,
866 3C1232481AAE81A400CE8F6C /* srs_rtmp_stack.cpp in Sources */, 867 3C1232481AAE81A400CE8F6C /* srs_rtmp_stack.cpp in Sources */,
867 3C1232B01AAE81D900CE8F6C /* srs_app_security.cpp in Sources */, 868 3C1232B01AAE81D900CE8F6C /* srs_app_security.cpp in Sources */,
868 3C12322B1AAE814D00CE8F6C /* srs_kernel_utility.cpp in Sources */, 869 3C12322B1AAE814D00CE8F6C /* srs_kernel_utility.cpp in Sources */,
869 3C12324A1AAE81A400CE8F6C /* srs_rtsp_stack.cpp in Sources */, 870 3C12324A1AAE81A400CE8F6C /* srs_rtsp_stack.cpp in Sources */,
870 - 3C1232A51AAE81D900CE8F6C /* srs_app_json.cpp in Sources */,  
871 3C36DB5D1ABD1CB90066CCAF /* srs_librtmp.cpp in Sources */, 871 3C36DB5D1ABD1CB90066CCAF /* srs_librtmp.cpp in Sources */,
872 3C12329F1AAE81D900CE8F6C /* srs_app_http_api.cpp in Sources */, 872 3C12329F1AAE81D900CE8F6C /* srs_app_http_api.cpp in Sources */,
873 3C1EE6AE1AB1055800576EE9 /* srs_app_hds.cpp in Sources */, 873 3C1EE6AE1AB1055800576EE9 /* srs_app_hds.cpp in Sources */,
@@ -40,7 +40,7 @@ using namespace std; @@ -40,7 +40,7 @@ using namespace std;
40 #include <srs_kernel_file.hpp> 40 #include <srs_kernel_file.hpp>
41 #include <srs_rtmp_amf0.hpp> 41 #include <srs_rtmp_amf0.hpp>
42 #include <srs_kernel_stream.hpp> 42 #include <srs_kernel_stream.hpp>
43 -#include <srs_app_json.hpp> 43 +#include <srs_protocol_json.hpp>
44 #include <srs_app_utility.hpp> 44 #include <srs_app_utility.hpp>
45 45
46 // update the flv duration and filesize every this interval in ms. 46 // update the flv duration and filesize every this interval in ms.
@@ -32,7 +32,7 @@ using namespace std; @@ -32,7 +32,7 @@ using namespace std;
32 #include <srs_kernel_log.hpp> 32 #include <srs_kernel_log.hpp>
33 #include <srs_app_config.hpp> 33 #include <srs_app_config.hpp>
34 #include <srs_app_http_client.hpp> 34 #include <srs_app_http_client.hpp>
35 -#include <srs_app_json.hpp> 35 +#include <srs_protocol_json.hpp>
36 #include <srs_app_utility.hpp> 36 #include <srs_app_utility.hpp>
37 #include <srs_core_autofree.hpp> 37 #include <srs_core_autofree.hpp>
38 #include <srs_app_http_conn.hpp> 38 #include <srs_app_http_conn.hpp>
@@ -33,7 +33,7 @@ using namespace std; @@ -33,7 +33,7 @@ using namespace std;
33 #include <srs_kernel_error.hpp> 33 #include <srs_kernel_error.hpp>
34 #include <srs_app_st.hpp> 34 #include <srs_app_st.hpp>
35 #include <srs_core_autofree.hpp> 35 #include <srs_core_autofree.hpp>
36 -#include <srs_app_json.hpp> 36 +#include <srs_protocol_json.hpp>
37 #include <srs_kernel_utility.hpp> 37 #include <srs_kernel_utility.hpp>
38 #include <srs_app_utility.hpp> 38 #include <srs_app_utility.hpp>
39 #include <srs_app_statistic.hpp> 39 #include <srs_app_statistic.hpp>
@@ -31,7 +31,7 @@ using namespace std; @@ -31,7 +31,7 @@ using namespace std;
31 #include <srs_kernel_error.hpp> 31 #include <srs_kernel_error.hpp>
32 #include <srs_rtmp_stack.hpp> 32 #include <srs_rtmp_stack.hpp>
33 #include <srs_app_st.hpp> 33 #include <srs_app_st.hpp>
34 -#include <srs_app_json.hpp> 34 +#include <srs_protocol_json.hpp>
35 #include <srs_app_dvr.hpp> 35 #include <srs_app_dvr.hpp>
36 #include <srs_app_http_client.hpp> 36 #include <srs_app_http_client.hpp>
37 #include <srs_core_autofree.hpp> 37 #include <srs_core_autofree.hpp>
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28 using namespace std; 28 using namespace std;
29 29
30 #include <srs_rtmp_stack.hpp> 30 #include <srs_rtmp_stack.hpp>
31 -#include <srs_app_json.hpp> 31 +#include <srs_protocol_json.hpp>
32 #include <srs_protocol_kbps.hpp> 32 #include <srs_protocol_kbps.hpp>
33 #include <srs_app_conn.hpp> 33 #include <srs_app_conn.hpp>
34 #include <srs_app_config.hpp> 34 #include <srs_app_config.hpp>
@@ -43,7 +43,7 @@ using namespace std; @@ -43,7 +43,7 @@ using namespace std;
43 #include <srs_kernel_utility.hpp> 43 #include <srs_kernel_utility.hpp>
44 #include <srs_kernel_error.hpp> 44 #include <srs_kernel_error.hpp>
45 #include <srs_protocol_kbps.hpp> 45 #include <srs_protocol_kbps.hpp>
46 -#include <srs_app_json.hpp> 46 +#include <srs_protocol_json.hpp>
47 #include <srs_kernel_stream.hpp> 47 #include <srs_kernel_stream.hpp>
48 48
49 // the longest time to wait for a process to quit. 49 // the longest time to wait for a process to quit.
@@ -32,6 +32,7 @@ using namespace std; @@ -32,6 +32,7 @@ using namespace std;
32 #include <srs_kernel_log.hpp> 32 #include <srs_kernel_log.hpp>
33 #include <srs_kernel_utility.hpp> 33 #include <srs_kernel_utility.hpp>
34 #include <srs_kernel_file.hpp> 34 #include <srs_kernel_file.hpp>
  35 +#include <srs_protocol_json.hpp>
35 36
36 #define SRS_HTTP_DEFAULT_PAGE "index.html" 37 #define SRS_HTTP_DEFAULT_PAGE "index.html"
37 38
@@ -146,8 +147,11 @@ int srs_http_response_json(ISrsHttpResponseWriter* w, string data) @@ -146,8 +147,11 @@ int srs_http_response_json(ISrsHttpResponseWriter* w, string data)
146 int srs_http_response_code(ISrsHttpResponseWriter* w, int code) 147 int srs_http_response_code(ISrsHttpResponseWriter* w, int code)
147 { 148 {
148 std::stringstream ss; 149 std::stringstream ss;
149 - // TODO: FIXME: implements it.  
150 - //ss << SRS_JOBJECT_START << SRS_JFIELD_ERROR(code) << SRS_JOBJECT_END; 150 +
  151 + ss << SRS_JOBJECT_START
  152 + << SRS_JFIELD_ERROR(code)
  153 + << SRS_JOBJECT_END;
  154 +
151 return srs_http_response_json(w, ss.str()); 155 return srs_http_response_json(w, ss.str());
152 } 156 }
153 157
@@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#include <srs_app_json.hpp> 24 +#include <srs_protocol_json.hpp>
25 25
26 using namespace std; 26 using namespace std;
27 27
@@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#ifndef SRS_APP_JSON_HPP  
25 -#define SRS_APP_JSON_HPP 24 +#ifndef SRS_PROTOCOL_JSON_HPP
  25 +#define SRS_PROTOCOL_JSON_HPP
26 26
27 /* 27 /*
28 -#include <srs_app_json.hpp> 28 +#include <srs_protocol_json.hpp>
29 */ 29 */
30 #include <srs_core.hpp> 30 #include <srs_core.hpp>
31 31