From 1de2bb0801ce782737bb5a0f2a01107cfb5b4fa4 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 21 Sep 2015 17:12:28 +0800 Subject: [PATCH] add kafka protocol files. --- trunk/configure | 3 +- trunk/ide/srs_upp/srs_upp.upp | 358 +++++++++--------- .../srs_xcode.xcodeproj/project.pbxproj | 20 +- trunk/src/protocol/srs_http_stack.hpp | 4 +- trunk/src/protocol/srs_kafka_stack.cpp | 25 ++ trunk/src/protocol/srs_kafka_stack.hpp | 33 ++ 6 files changed, 261 insertions(+), 182 deletions(-) create mode 100644 trunk/src/protocol/srs_kafka_stack.cpp create mode 100644 trunk/src/protocol/srs_kafka_stack.hpp diff --git a/trunk/configure b/trunk/configure index 0eeac78e8..32a36a313 100755 --- a/trunk/configure +++ b/trunk/configure @@ -159,7 +159,8 @@ MODULE_DEPENDS=("CORE" "KERNEL") ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_buffer" - "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json") + "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json" + "srs_kafka_stack") PROTOCOL_INCS="src/protocol"; MODULE_DIR=${PROTOCOL_INCS} . auto/modules.sh PROTOCOL_OBJS="${MODULE_OBJS[@]}" # diff --git a/trunk/ide/srs_upp/srs_upp.upp b/trunk/ide/srs_upp/srs_upp.upp index 314abce10..a75ad1692 100755 --- a/trunk/ide/srs_upp/srs_upp.upp +++ b/trunk/ide/srs_upp/srs_upp.upp @@ -1,182 +1,184 @@ file - main readonly separator, - ../../src/main/srs_main_server.cpp, - ../../src/main/srs_main_ingest_hls.cpp, - auto readonly separator, - ../../objs/srs_auto_headers.hpp, - libs readonly separator, - ../../src/libs/srs_librtmp.hpp, - ../../src/libs/srs_librtmp.cpp, - ../../src/libs/srs_lib_bandwidth.hpp, - ../../src/libs/srs_lib_bandwidth.cpp, - ../../src/libs/srs_lib_simple_socket.hpp, - ../../src/libs/srs_lib_simple_socket.cpp, - core readonly separator, - ../../src/core/srs_core.hpp, - ../../src/core/srs_core.cpp, - ../../src/core/srs_core_autofree.hpp, - ../../src/core/srs_core_autofree.cpp, - ../../src/core/srs_core_mem_watch.hpp, - ../../src/core/srs_core_mem_watch.cpp, - ../../src/core/srs_core_performance.hpp, - ../../src/core/srs_core_performance.cpp, - kernel readonly separator, - ../../src/kernel/srs_kernel_aac.hpp, - ../../src/kernel/srs_kernel_aac.cpp, - ../../src/kernel/srs_kernel_buffer.hpp, - ../../src/kernel/srs_kernel_buffer.cpp, - ../../src/kernel/srs_kernel_codec.hpp, - ../../src/kernel/srs_kernel_codec.cpp, - ../../src/kernel/srs_kernel_consts.hpp, - ../../src/kernel/srs_kernel_consts.cpp, - ../../src/kernel/srs_kernel_error.hpp, - ../../src/kernel/srs_kernel_error.cpp, - ../../src/kernel/srs_kernel_file.hpp, - ../../src/kernel/srs_kernel_file.cpp, - ../../src/kernel/srs_kernel_flv.hpp, - ../../src/kernel/srs_kernel_flv.cpp, - ../../src/kernel/srs_kernel_log.hpp, - ../../src/kernel/srs_kernel_log.cpp, - ../../src/kernel/srs_kernel_mp3.hpp, - ../../src/kernel/srs_kernel_mp3.cpp, - ../../src/kernel/srs_rtsp_stack.hpp, - ../../src/kernel/srs_rtsp_stack.cpp, - ../../src/kernel/srs_kernel_stream.hpp, - ../../src/kernel/srs_kernel_stream.cpp, - ../../src/kernel/srs_kernel_ts.cpp, - ../../src/kernel/srs_kernel_ts.hpp, - ../../src/kernel/srs_kernel_utility.hpp, - ../../src/kernel/srs_kernel_utility.cpp, - protocol readonly separator, - ../../src/protocol/srs_http_stack.hpp, - ../../src/protocol/srs_http_stack.cpp, - ../../src/protocol/srs_protocol_kbps.hpp, - ../../src/protocol/srs_protocol_kbps.cpp, - ../../src/protocol/srs_raw_avc.hpp, - ../../src/protocol/srs_raw_avc.cpp, - ../../src/protocol/srs_rtmp_amf0.hpp, - ../../src/protocol/srs_rtmp_amf0.cpp, - ../../src/protocol/srs_protocol_buffer.hpp, - ../../src/protocol/srs_protocol_buffer.cpp, - ../../src/protocol/srs_protocol_json.hpp, - ../../src/protocol/srs_protocol_json.cpp, - ../../src/protocol/srs_rtmp_handshake.hpp, - ../../src/protocol/srs_rtmp_handshake.cpp, - ../../src/protocol/srs_rtmp_io.hpp, - ../../src/protocol/srs_rtmp_io.cpp, - ../../src/protocol/srs_rtmp_msg_array.hpp, - ../../src/protocol/srs_rtmp_msg_array.cpp, - ../../src/protocol/srs_rtmp_stack.hpp, - ../../src/protocol/srs_rtmp_stack.cpp, - ../../src/protocol/srs_rtmp_utility.hpp, - ../../src/protocol/srs_rtmp_utility.cpp, - app readonly separator, - ../../src/app/srs_app_async_call.hpp, - ../../src/app/srs_app_async_call.cpp, - ../../src/app/srs_app_bandwidth.hpp, - ../../src/app/srs_app_bandwidth.cpp, - ../../src/app/srs_app_caster_flv.hpp, - ../../src/app/srs_app_caster_flv.cpp, - ../../src/app/srs_app_conn.hpp, - ../../src/app/srs_app_conn.cpp, - ../../src/app/srs_app_config.hpp, - ../../src/app/srs_app_config.cpp, - ../../src/app/srs_app_dvr.hpp, - ../../src/app/srs_app_dvr.cpp, - ../../src/app/srs_app_edge.hpp, - ../../src/app/srs_app_edge.cpp, - ../../src/app/srs_app_empty.hpp, - ../../src/app/srs_app_empty.cpp, - ../../src/app/srs_app_encoder.hpp, - ../../src/app/srs_app_encoder.cpp, - ../../src/app/srs_app_ffmpeg.hpp, - ../../src/app/srs_app_ffmpeg.cpp, - ../../src/app/srs_app_forward.hpp, - ../../src/app/srs_app_forward.cpp, - ../../src/app/srs_app_heartbeat.hpp, - ../../src/app/srs_app_heartbeat.cpp, - ../../src/app/srs_app_hls.hpp, - ../../src/app/srs_app_hls.cpp, - ../../src/app/srs_app_http_api.hpp, - ../../src/app/srs_app_http_api.cpp, - ../../src/app/srs_app_http_client.hpp, - ../../src/app/srs_app_http_client.cpp, - ../../src/app/srs_app_http_conn.hpp, - ../../src/app/srs_app_http_conn.cpp, - ../../src/app/srs_app_http_hooks.hpp, - ../../src/app/srs_app_http_hooks.cpp, - ../../src/app/srs_app_http_stream.hpp, - ../../src/app/srs_app_http_stream.cpp, - ../../src/app/srs_app_http_static.hpp, - ../../src/app/srs_app_http_static.cpp, - ../../src/app/srs_app_ingest.hpp, - ../../src/app/srs_app_ingest.cpp, - ../../src/app/srs_app_listener.hpp, - ../../src/app/srs_app_listener.cpp, - ../../src/app/srs_app_log.hpp, - ../../src/app/srs_app_log.cpp, - ../../src/app/srs_app_mpegts_udp.hpp, - ../../src/app/srs_app_mpegts_udp.cpp, - ../../src/app/srs_app_ng_exec.hpp, - ../../src/app/srs_app_ng_exec.cpp, - ../../src/app/srs_app_process.hpp, - ../../src/app/srs_app_process.cpp, - ../../src/app/srs_app_recv_thread.hpp, - ../../src/app/srs_app_recv_thread.cpp, - ../../src/app/srs_app_refer.hpp, - ../../src/app/srs_app_refer.cpp, - ../../src/app/srs_app_reload.hpp, - ../../src/app/srs_app_reload.cpp, - ../../src/app/srs_app_rtmp_conn.hpp, - ../../src/app/srs_app_rtmp_conn.cpp, - ../../src/app/srs_app_rtsp.hpp, - ../../src/app/srs_app_rtsp.cpp, - ../../src/app/srs_app_pithy_print.hpp, - ../../src/app/srs_app_pithy_print.cpp, - ../../src/app/srs_app_security.hpp, - ../../src/app/srs_app_security.cpp, - ../../src/app/srs_app_server.hpp, - ../../src/app/srs_app_server.cpp, - ../../src/app/srs_app_st.hpp, - ../../src/app/srs_app_st.cpp, - ../../src/app/srs_app_statistic.hpp, - ../../src/app/srs_app_statistic.cpp, - ../../src/app/srs_app_source.hpp, - ../../src/app/srs_app_source.cpp, - ../../src/app/srs_app_thread.hpp, - ../../src/app/srs_app_thread.cpp, - ../../src/app/srs_app_utility.hpp, - ../../src/app/srs_app_utility.cpp, - utest readonly separator, - ../../src/utest/srs_utest.hpp, - ../../src/utest/srs_utest.cpp, - ../../src/utest/srs_utest_amf0.hpp, - ../../src/utest/srs_utest_amf0.cpp, - ../../src/utest/srs_utest_config.hpp, - ../../src/utest/srs_utest_config.cpp, - ../../src/utest/srs_utest_core.hpp, - ../../src/utest/srs_utest_core.cpp, - ../../src/utest/srs_utest_kernel.hpp, - ../../src/utest/srs_utest_kernel.cpp, - ../../src/utest/srs_utest_protocol.hpp, - ../../src/utest/srs_utest_protocol.cpp, - ../../src/utest/srs_utest_reload.hpp, - ../../src/utest/srs_utest_reload.cpp, - research readonly separator, - ../../research/librtmp/srs_aac_raw_publish.c, - ../../research/librtmp/srs_audio_raw_publish.c, - ../../research/librtmp/srs_bandwidth_check.c, - ../../research/librtmp/srs_detect_rtmp.c, - ../../research/librtmp/srs_flv_injecter.c, - ../../research/librtmp/srs_flv_parser.c, - ../../research/librtmp/srs_h264_raw_publish.c, - ../../research/librtmp/srs_ingest_flv.c, - ../../research/librtmp/srs_ingest_rtmp.c, - ../../research/librtmp/srs_play.c, - ../../research/librtmp/srs_publish.c, - ../../research/librtmp/srs_rtmp_dump.c, - ../../research/hls/ts_info.cc; + main readonly separator, + ../../src/main/srs_main_server.cpp, + ../../src/main/srs_main_ingest_hls.cpp, + auto readonly separator, + ../../objs/srs_auto_headers.hpp, + libs readonly separator, + ../../src/libs/srs_librtmp.hpp, + ../../src/libs/srs_librtmp.cpp, + ../../src/libs/srs_lib_bandwidth.hpp, + ../../src/libs/srs_lib_bandwidth.cpp, + ../../src/libs/srs_lib_simple_socket.hpp, + ../../src/libs/srs_lib_simple_socket.cpp, + core readonly separator, + ../../src/core/srs_core.hpp, + ../../src/core/srs_core.cpp, + ../../src/core/srs_core_autofree.hpp, + ../../src/core/srs_core_autofree.cpp, + ../../src/core/srs_core_mem_watch.hpp, + ../../src/core/srs_core_mem_watch.cpp, + ../../src/core/srs_core_performance.hpp, + ../../src/core/srs_core_performance.cpp, + kernel readonly separator, + ../../src/kernel/srs_kernel_aac.hpp, + ../../src/kernel/srs_kernel_aac.cpp, + ../../src/kernel/srs_kernel_buffer.hpp, + ../../src/kernel/srs_kernel_buffer.cpp, + ../../src/kernel/srs_kernel_codec.hpp, + ../../src/kernel/srs_kernel_codec.cpp, + ../../src/kernel/srs_kernel_consts.hpp, + ../../src/kernel/srs_kernel_consts.cpp, + ../../src/kernel/srs_kernel_error.hpp, + ../../src/kernel/srs_kernel_error.cpp, + ../../src/kernel/srs_kernel_file.hpp, + ../../src/kernel/srs_kernel_file.cpp, + ../../src/kernel/srs_kernel_flv.hpp, + ../../src/kernel/srs_kernel_flv.cpp, + ../../src/kernel/srs_kernel_log.hpp, + ../../src/kernel/srs_kernel_log.cpp, + ../../src/kernel/srs_kernel_mp3.hpp, + ../../src/kernel/srs_kernel_mp3.cpp, + ../../src/kernel/srs_rtsp_stack.hpp, + ../../src/kernel/srs_rtsp_stack.cpp, + ../../src/kernel/srs_kernel_stream.hpp, + ../../src/kernel/srs_kernel_stream.cpp, + ../../src/kernel/srs_kernel_ts.cpp, + ../../src/kernel/srs_kernel_ts.hpp, + ../../src/kernel/srs_kernel_utility.hpp, + ../../src/kernel/srs_kernel_utility.cpp, + protocol readonly separator, + ../../src/protocol/srs_http_stack.hpp, + ../../src/protocol/srs_http_stack.cpp, + ../../src/protocol/srs_kafka_stack.hpp, + ../../src/protocol/srs_kafka_stack.cpp, + ../../src/protocol/srs_protocol_kbps.hpp, + ../../src/protocol/srs_protocol_kbps.cpp, + ../../src/protocol/srs_raw_avc.hpp, + ../../src/protocol/srs_raw_avc.cpp, + ../../src/protocol/srs_rtmp_amf0.hpp, + ../../src/protocol/srs_rtmp_amf0.cpp, + ../../src/protocol/srs_protocol_buffer.hpp, + ../../src/protocol/srs_protocol_buffer.cpp, + ../../src/protocol/srs_protocol_json.hpp, + ../../src/protocol/srs_protocol_json.cpp, + ../../src/protocol/srs_rtmp_handshake.hpp, + ../../src/protocol/srs_rtmp_handshake.cpp, + ../../src/protocol/srs_rtmp_io.hpp, + ../../src/protocol/srs_rtmp_io.cpp, + ../../src/protocol/srs_rtmp_msg_array.hpp, + ../../src/protocol/srs_rtmp_msg_array.cpp, + ../../src/protocol/srs_rtmp_stack.hpp, + ../../src/protocol/srs_rtmp_stack.cpp, + ../../src/protocol/srs_rtmp_utility.hpp, + ../../src/protocol/srs_rtmp_utility.cpp, + app readonly separator, + ../../src/app/srs_app_async_call.hpp, + ../../src/app/srs_app_async_call.cpp, + ../../src/app/srs_app_bandwidth.hpp, + ../../src/app/srs_app_bandwidth.cpp, + ../../src/app/srs_app_caster_flv.hpp, + ../../src/app/srs_app_caster_flv.cpp, + ../../src/app/srs_app_conn.hpp, + ../../src/app/srs_app_conn.cpp, + ../../src/app/srs_app_config.hpp, + ../../src/app/srs_app_config.cpp, + ../../src/app/srs_app_dvr.hpp, + ../../src/app/srs_app_dvr.cpp, + ../../src/app/srs_app_edge.hpp, + ../../src/app/srs_app_edge.cpp, + ../../src/app/srs_app_empty.hpp, + ../../src/app/srs_app_empty.cpp, + ../../src/app/srs_app_encoder.hpp, + ../../src/app/srs_app_encoder.cpp, + ../../src/app/srs_app_ffmpeg.hpp, + ../../src/app/srs_app_ffmpeg.cpp, + ../../src/app/srs_app_forward.hpp, + ../../src/app/srs_app_forward.cpp, + ../../src/app/srs_app_heartbeat.hpp, + ../../src/app/srs_app_heartbeat.cpp, + ../../src/app/srs_app_hls.hpp, + ../../src/app/srs_app_hls.cpp, + ../../src/app/srs_app_http_api.hpp, + ../../src/app/srs_app_http_api.cpp, + ../../src/app/srs_app_http_client.hpp, + ../../src/app/srs_app_http_client.cpp, + ../../src/app/srs_app_http_conn.hpp, + ../../src/app/srs_app_http_conn.cpp, + ../../src/app/srs_app_http_hooks.hpp, + ../../src/app/srs_app_http_hooks.cpp, + ../../src/app/srs_app_http_stream.hpp, + ../../src/app/srs_app_http_stream.cpp, + ../../src/app/srs_app_http_static.hpp, + ../../src/app/srs_app_http_static.cpp, + ../../src/app/srs_app_ingest.hpp, + ../../src/app/srs_app_ingest.cpp, + ../../src/app/srs_app_listener.hpp, + ../../src/app/srs_app_listener.cpp, + ../../src/app/srs_app_log.hpp, + ../../src/app/srs_app_log.cpp, + ../../src/app/srs_app_mpegts_udp.hpp, + ../../src/app/srs_app_mpegts_udp.cpp, + ../../src/app/srs_app_ng_exec.hpp, + ../../src/app/srs_app_ng_exec.cpp, + ../../src/app/srs_app_process.hpp, + ../../src/app/srs_app_process.cpp, + ../../src/app/srs_app_recv_thread.hpp, + ../../src/app/srs_app_recv_thread.cpp, + ../../src/app/srs_app_refer.hpp, + ../../src/app/srs_app_refer.cpp, + ../../src/app/srs_app_reload.hpp, + ../../src/app/srs_app_reload.cpp, + ../../src/app/srs_app_rtmp_conn.hpp, + ../../src/app/srs_app_rtmp_conn.cpp, + ../../src/app/srs_app_rtsp.hpp, + ../../src/app/srs_app_rtsp.cpp, + ../../src/app/srs_app_pithy_print.hpp, + ../../src/app/srs_app_pithy_print.cpp, + ../../src/app/srs_app_security.hpp, + ../../src/app/srs_app_security.cpp, + ../../src/app/srs_app_server.hpp, + ../../src/app/srs_app_server.cpp, + ../../src/app/srs_app_st.hpp, + ../../src/app/srs_app_st.cpp, + ../../src/app/srs_app_statistic.hpp, + ../../src/app/srs_app_statistic.cpp, + ../../src/app/srs_app_source.hpp, + ../../src/app/srs_app_source.cpp, + ../../src/app/srs_app_thread.hpp, + ../../src/app/srs_app_thread.cpp, + ../../src/app/srs_app_utility.hpp, + ../../src/app/srs_app_utility.cpp, + utest readonly separator, + ../../src/utest/srs_utest.hpp, + ../../src/utest/srs_utest.cpp, + ../../src/utest/srs_utest_amf0.hpp, + ../../src/utest/srs_utest_amf0.cpp, + ../../src/utest/srs_utest_config.hpp, + ../../src/utest/srs_utest_config.cpp, + ../../src/utest/srs_utest_core.hpp, + ../../src/utest/srs_utest_core.cpp, + ../../src/utest/srs_utest_kernel.hpp, + ../../src/utest/srs_utest_kernel.cpp, + ../../src/utest/srs_utest_protocol.hpp, + ../../src/utest/srs_utest_protocol.cpp, + ../../src/utest/srs_utest_reload.hpp, + ../../src/utest/srs_utest_reload.cpp, + research readonly separator, + ../../research/librtmp/srs_aac_raw_publish.c, + ../../research/librtmp/srs_audio_raw_publish.c, + ../../research/librtmp/srs_bandwidth_check.c, + ../../research/librtmp/srs_detect_rtmp.c, + ../../research/librtmp/srs_flv_injecter.c, + ../../research/librtmp/srs_flv_parser.c, + ../../research/librtmp/srs_h264_raw_publish.c, + ../../research/librtmp/srs_ingest_flv.c, + ../../research/librtmp/srs_ingest_rtmp.c, + ../../research/librtmp/srs_play.c, + ../../research/librtmp/srs_publish.c, + ../../research/librtmp/srs_rtmp_dump.c, + ../../research/hls/ts_info.cc; mainconfig - "" = "MAIN"; + "" = "MAIN"; diff --git a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj index db636932f..bfaaeaa48 100644 --- a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj +++ b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj @@ -101,6 +101,7 @@ 3C689F9F1AB6AAC800C9CEEE /* sched.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C689F9B1AB6AAC800C9CEEE /* sched.c */; }; 3C689FA01AB6AAC800C9CEEE /* stk.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C689F9C1AB6AAC800C9CEEE /* stk.c */; }; 3C689FA11AB6AAC800C9CEEE /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C689F9D1AB6AAC800C9CEEE /* sync.c */; }; + 3C82802C1BAFF8CC004A1794 /* srs_kafka_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C82802A1BAFF8CC004A1794 /* srs_kafka_stack.cpp */; }; 3CC52DD81ACE4023006FEB01 /* srs_utest_amf0.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CC52DCA1ACE4023006FEB01 /* srs_utest_amf0.cpp */; }; 3CC52DD91ACE4023006FEB01 /* srs_utest_config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CC52DCC1ACE4023006FEB01 /* srs_utest_config.cpp */; }; 3CC52DDA1ACE4023006FEB01 /* srs_utest_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3CC52DCE1ACE4023006FEB01 /* srs_utest_core.cpp */; }; @@ -359,6 +360,14 @@ 3C689F9B1AB6AAC800C9CEEE /* sched.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sched.c; path = "../../objs/st-1.9/sched.c"; sourceTree = ""; }; 3C689F9C1AB6AAC800C9CEEE /* stk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stk.c; path = "../../objs/st-1.9/stk.c"; sourceTree = ""; }; 3C689F9D1AB6AAC800C9CEEE /* sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync.c; path = "../../objs/st-1.9/sync.c"; sourceTree = ""; }; + 3C8280241BAFF896004A1794 /* compatible.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = compatible.conf; path = ../../../conf/compatible.conf; sourceTree = ""; }; + 3C8280251BAFF896004A1794 /* full.one.vhost.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = full.one.vhost.conf; path = ../../../conf/full.one.vhost.conf; sourceTree = ""; }; + 3C8280261BAFF896004A1794 /* http.flv.live.edge1.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = http.flv.live.edge1.conf; path = ../../../conf/http.flv.live.edge1.conf; sourceTree = ""; }; + 3C8280271BAFF896004A1794 /* http.flv.live.edge2.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = http.flv.live.edge2.conf; path = ../../../conf/http.flv.live.edge2.conf; sourceTree = ""; }; + 3C8280281BAFF896004A1794 /* push.flv.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = push.flv.conf; path = ../../../conf/push.flv.conf; sourceTree = ""; }; + 3C8280291BAFF896004A1794 /* transform.edge.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = transform.edge.conf; path = ../../../conf/transform.edge.conf; sourceTree = ""; }; + 3C82802A1BAFF8CC004A1794 /* srs_kafka_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kafka_stack.cpp; path = ../../../src/protocol/srs_kafka_stack.cpp; sourceTree = ""; }; + 3C82802B1BAFF8CC004A1794 /* srs_kafka_stack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kafka_stack.hpp; path = ../../../src/protocol/srs_kafka_stack.hpp; sourceTree = ""; }; 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 = ""; }; 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 = ""; }; 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 = ""; }; @@ -501,6 +510,8 @@ children = ( 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */, 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */, + 3C82802A1BAFF8CC004A1794 /* srs_kafka_stack.cpp */, + 3C82802B1BAFF8CC004A1794 /* srs_kafka_stack.hpp */, 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */, 3C068D6C1B10175500AA722C /* srs_protocol_buffer.hpp */, 3C0D422C1B87165900C2508B /* srs_protocol_json.cpp */, @@ -682,8 +693,8 @@ 3C1EE6AF1AB107EE00576EE9 /* conf */ = { isa = PBXGroup; children = ( - 3C4AB9341B8C9FF9006627D3 /* exec.conf */, 3C1EE6B01AB1080900576EE9 /* bandwidth.conf */, + 3C8280241BAFF896004A1794 /* compatible.conf */, 3C1EE6B11AB1080900576EE9 /* console.conf */, 3C1EE6B21AB1080900576EE9 /* demo.19350.conf */, 3C1EE6B31AB1080900576EE9 /* demo.conf */, @@ -692,14 +703,18 @@ 3C1EE6B61AB1080900576EE9 /* dvr.session.conf */, 3C1EE6B71AB1080900576EE9 /* edge.conf */, 3C1EE6B81AB1080900576EE9 /* edge.token.traverse.conf */, + 3C4AB9341B8C9FF9006627D3 /* exec.conf */, 3C1EE6B91AB1080900576EE9 /* ffmpeg.transcode.conf */, 3C1EE6BA1AB1080900576EE9 /* forward.master.conf */, 3C1EE6BB1AB1080900576EE9 /* forward.slave.conf */, 3C1EE6BC1AB1080900576EE9 /* full.conf */, + 3C8280251BAFF896004A1794 /* full.one.vhost.conf */, 3C1EE6BD1AB1080900576EE9 /* hds.conf */, 3C1EE6BE1AB1080900576EE9 /* hls.conf */, 3C1EE6BF1AB1080900576EE9 /* http.aac.live.conf */, 3C1EE6C01AB1080900576EE9 /* http.flv.live.conf */, + 3C8280261BAFF896004A1794 /* http.flv.live.edge1.conf */, + 3C8280271BAFF896004A1794 /* http.flv.live.edge2.conf */, 3C1EE6C11AB1080900576EE9 /* http.heartbeat.conf */, 3C1EE6C21AB1080900576EE9 /* http.hls.conf */, 3C1EE6C31AB1080900576EE9 /* http.hooks.callback.conf */, @@ -709,6 +724,7 @@ 3C1EE6C71AB1080900576EE9 /* ingest.conf */, 3C1EE6C81AB1080900576EE9 /* mac.dev.conf */, 3C1EE6C91AB1080900576EE9 /* origin.conf */, + 3C8280281BAFF896004A1794 /* push.flv.conf */, 3C1EE6CA1AB1080900576EE9 /* push.mpegts.over.udp.conf */, 3C1EE6CB1AB1080900576EE9 /* push.rtsp.conf */, 3C1EE6CC1AB1080900576EE9 /* ram.hls.conf */, @@ -717,6 +733,7 @@ 3C1EE6CF1AB1080900576EE9 /* security.deny.publish.conf */, 3C1EE6D01AB1080900576EE9 /* srs.conf */, 3C1EE6D11AB1080900576EE9 /* transcode2hls.audio.only.conf */, + 3C8280291BAFF896004A1794 /* transform.edge.conf */, ); name = conf; sourceTree = ""; @@ -901,6 +918,7 @@ 3C1231F61AAE652D00CE8F6C /* srs_core_autofree.cpp in Sources */, 3C5265B41B241BF0009CA186 /* srs_core_mem_watch.cpp in Sources */, 3C1EE6D71AB1367D00576EE9 /* README.md in Sources */, + 3C82802C1BAFF8CC004A1794 /* srs_kafka_stack.cpp in Sources */, 3C1232411AAE81A400CE8F6C /* srs_raw_avc.cpp in Sources */, 3C1232491AAE81A400CE8F6C /* srs_rtmp_utility.cpp in Sources */, 3C663F191AB0155100286D8B /* srs_publish.c in Sources */, diff --git a/trunk/src/protocol/srs_http_stack.hpp b/trunk/src/protocol/srs_http_stack.hpp index 5d119d16b..be8200c80 100644 --- a/trunk/src/protocol/srs_http_stack.hpp +++ b/trunk/src/protocol/srs_http_stack.hpp @@ -25,8 +25,8 @@ #define SRS_PROTOCOL_HTTP_HPP /* - #include - */ +#include +*/ #include #include diff --git a/trunk/src/protocol/srs_kafka_stack.cpp b/trunk/src/protocol/srs_kafka_stack.cpp new file mode 100644 index 000000000..fa2dcbe82 --- /dev/null +++ b/trunk/src/protocol/srs_kafka_stack.cpp @@ -0,0 +1,25 @@ +/* + The MIT License (MIT) + + Copyright (c) 2013-2015 SRS(simple-rtmp-server) + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include + diff --git a/trunk/src/protocol/srs_kafka_stack.hpp b/trunk/src/protocol/srs_kafka_stack.hpp new file mode 100644 index 000000000..03d17f312 --- /dev/null +++ b/trunk/src/protocol/srs_kafka_stack.hpp @@ -0,0 +1,33 @@ +/* + The MIT License (MIT) + + Copyright (c) 2013-2015 SRS(simple-rtmp-server) + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef SRS_PROTOCOL_KAFKA_HPP +#define SRS_PROTOCOL_KAFKA_HPP + +/* +#include +*/ +#include + +#endif +