正在显示
7 个修改的文件
包含
85 行增加
和
85 行删除
| @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | // current release version | 31 | // current release version |
| 32 | -#define RTMP_SIG_SRS_VERSION "0.9.6" | 32 | +#define RTMP_SIG_SRS_VERSION "0.9.7" |
| 33 | // server info. | 33 | // server info. |
| 34 | #define RTMP_SIG_SRS_KEY "srs" | 34 | #define RTMP_SIG_SRS_KEY "srs" |
| 35 | #define RTMP_SIG_SRS_ROLE "origin server" | 35 | #define RTMP_SIG_SRS_ROLE "origin server" |
| @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,8 +21,8 @@ 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_PROTOCOL_AMF0_HPP | ||
| 25 | -#define SRS_PROTOCOL_AMF0_HPP | 24 | +#ifndef SRS_RTMP_PROTOCOL_AMF0_HPP |
| 25 | +#define SRS_RTMP_PROTOCOL_AMF0_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | #include <srs_protocol_amf0.hpp> | 28 | #include <srs_protocol_amf0.hpp> |
| @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,8 +21,8 @@ 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_PROTOCOL_HANDSHKAE_HPP | ||
| 25 | -#define SRS_PROTOCOL_HANDSHKAE_HPP | 24 | +#ifndef SRS_RTMP_PROTOCOL_HANDSHKAE_HPP |
| 25 | +#define SRS_RTMP_PROTOCOL_HANDSHKAE_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | #include <srs_protocol_handshake.hpp> | 28 | #include <srs_protocol_handshake.hpp> |
| @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,8 +21,8 @@ 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_PROTOCOL_IO_HPP | ||
| 25 | -#define SRS_PROTOCOL_IO_HPP | 24 | +#ifndef SRS_RTMP_PROTOCOL_IO_HPP |
| 25 | +#define SRS_RTMP_PROTOCOL_IO_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | #include <srs_protocol_io.hpp> | 28 | #include <srs_protocol_io.hpp> |
| @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,8 +21,8 @@ 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_PROTOCOL_RTMP_HPP | ||
| 25 | -#define SRS_PROTOCOL_RTMP_HPP | 24 | +#ifndef SRS_RTMP_PROTOCOL_RTMP_HPP |
| 25 | +#define SRS_RTMP_PROTOCOL_RTMP_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | #include <srs_protocol_rtmp.hpp> | 28 | #include <srs_protocol_rtmp.hpp> |
| @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,8 +21,8 @@ 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_PROTOCOL_RTMP_STACK_HPP | ||
| 25 | -#define SRS_PROTOCOL_RTMP_STACK_HPP | 24 | +#ifndef SRS_RTMP_PROTOCOL_RTMP_STACK_HPP |
| 25 | +#define SRS_RTMP_PROTOCOL_RTMP_STACK_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | #include <srs_protocol_rtmp_stack.hpp> | 28 | #include <srs_protocol_rtmp_stack.hpp> |
| 1 | -file | ||
| 2 | - main readonly separator, | ||
| 3 | - ..\main\srs_main_server.cpp, | ||
| 4 | - ..\main\srs_main_bandcheck.cpp, | ||
| 5 | - auto readonly separator, | ||
| 6 | - ..\..\objs\srs_auto_headers.hpp, | ||
| 7 | - core readonly separator, | ||
| 8 | - ..\core\srs_core.hpp, | ||
| 9 | - ..\core\srs_core.cpp, | ||
| 10 | - ..\core\srs_core_autofree.hpp, | ||
| 11 | - ..\core\srs_core_autofree.cpp, | ||
| 12 | - kernel readonly separator, | ||
| 13 | - ..\kernel\srs_kernel_buffer.hpp, | ||
| 14 | - ..\kernel\srs_kernel_buffer.cpp, | ||
| 15 | - ..\kernel\srs_kernel_config.hpp, | ||
| 16 | - ..\kernel\srs_kernel_config.cpp, | ||
| 17 | - ..\kernel\srs_kernel_error.hpp, | ||
| 18 | - ..\kernel\srs_kernel_error.cpp, | ||
| 19 | - ..\kernel\srs_kernel_log.hpp, | ||
| 20 | - ..\kernel\srs_kernel_log.cpp, | ||
| 21 | - ..\kernel\srs_kernel_pithy_print.hpp, | ||
| 22 | - ..\kernel\srs_kernel_pithy_print.cpp, | ||
| 23 | - ..\kernel\srs_kernel_reload.hpp, | ||
| 24 | - ..\kernel\srs_kernel_reload.cpp, | ||
| 25 | - ..\kernel\srs_kernel_stream.hpp, | ||
| 26 | - ..\kernel\srs_kernel_stream.cpp, | ||
| 27 | - rtmp protocol readonly separator, | ||
| 28 | - ..\rtmp\srs_protocol_amf0.hpp, | ||
| 29 | - ..\rtmp\srs_protocol_amf0.cpp, | ||
| 30 | - ..\rtmp\srs_protocol_handshake.hpp, | ||
| 31 | - ..\rtmp\srs_protocol_handshake.cpp, | ||
| 32 | - ..\rtmp\srs_protocol_io.hpp, | ||
| 33 | - ..\rtmp\srs_protocol_io.cpp, | ||
| 34 | - ..\rtmp\srs_protocol_rtmp.hpp, | ||
| 35 | - ..\rtmp\srs_protocol_rtmp.cpp, | ||
| 36 | - ..\rtmp\srs_protocol_rtmp_stack.hpp, | ||
| 37 | - ..\rtmp\srs_protocol_rtmp_stack.cpp, | ||
| 38 | - app readonly separator, | ||
| 39 | - ..\app\srs_core_bandwidth.hpp, | ||
| 40 | - ..\app\srs_core_bandwidth.cpp, | ||
| 41 | - ..\app\srs_core_client.hpp, | ||
| 42 | - ..\app\srs_core_client.cpp, | ||
| 43 | - ..\app\srs_core_codec.hpp, | ||
| 44 | - ..\app\srs_core_codec.cpp, | ||
| 45 | - ..\app\srs_core_conn.hpp, | ||
| 46 | - ..\app\srs_core_conn.cpp, | ||
| 47 | - ..\app\srs_core_encoder.hpp, | ||
| 48 | - ..\app\srs_core_encoder.cpp, | ||
| 49 | - ..\app\srs_core_forward.hpp, | ||
| 50 | - ..\app\srs_core_forward.cpp, | ||
| 51 | - ..\app\srs_core_hls.hpp, | ||
| 52 | - ..\app\srs_core_hls.cpp, | ||
| 53 | - ..\app\srs_core_http.hpp, | ||
| 54 | - ..\app\srs_core_http.cpp, | ||
| 55 | - ..\app\srs_core_log_context.hpp, | ||
| 56 | - ..\app\srs_core_log_context.cpp, | ||
| 57 | - ..\app\srs_core_refer.hpp, | ||
| 58 | - ..\app\srs_core_refer.cpp, | ||
| 59 | - ..\app\srs_core_thread.hpp, | ||
| 60 | - ..\app\srs_core_thread.cpp, | ||
| 61 | - ..\app\srs_core_server.hpp, | ||
| 62 | - ..\app\srs_core_server.cpp, | ||
| 63 | - ..\app\srs_core_st.hpp, | ||
| 64 | - ..\app\srs_core_st.cpp, | ||
| 65 | - ..\app\srs_core_socket.hpp, | ||
| 66 | - ..\app\srs_core_socket.cpp, | ||
| 67 | - ..\app\srs_core_source.hpp, | ||
| 68 | - ..\app\srs_core_source.cpp, | ||
| 69 | - research readonly separator, | ||
| 70 | - ..\..\research\hls\ts_info.cc; | ||
| 71 | - | ||
| 72 | -mainconfig | ||
| 73 | - "" = "MAIN"; | ||
| 74 | - | 1 | +file |
| 2 | + main readonly separator, | ||
| 3 | + ..\main\srs_main_server.cpp, | ||
| 4 | + ..\main\srs_main_bandcheck.cpp, | ||
| 5 | + auto readonly separator, | ||
| 6 | + ..\..\objs\srs_auto_headers.hpp, | ||
| 7 | + core readonly separator, | ||
| 8 | + ..\core\srs_core.hpp, | ||
| 9 | + ..\core\srs_core.cpp, | ||
| 10 | + ..\core\srs_core_autofree.hpp, | ||
| 11 | + ..\core\srs_core_autofree.cpp, | ||
| 12 | + kernel readonly separator, | ||
| 13 | + ..\kernel\srs_kernel_buffer.hpp, | ||
| 14 | + ..\kernel\srs_kernel_buffer.cpp, | ||
| 15 | + ..\kernel\srs_kernel_config.hpp, | ||
| 16 | + ..\kernel\srs_kernel_config.cpp, | ||
| 17 | + ..\kernel\srs_kernel_error.hpp, | ||
| 18 | + ..\kernel\srs_kernel_error.cpp, | ||
| 19 | + ..\kernel\srs_kernel_log.hpp, | ||
| 20 | + ..\kernel\srs_kernel_log.cpp, | ||
| 21 | + ..\kernel\srs_kernel_pithy_print.hpp, | ||
| 22 | + ..\kernel\srs_kernel_pithy_print.cpp, | ||
| 23 | + ..\kernel\srs_kernel_reload.hpp, | ||
| 24 | + ..\kernel\srs_kernel_reload.cpp, | ||
| 25 | + ..\kernel\srs_kernel_stream.hpp, | ||
| 26 | + ..\kernel\srs_kernel_stream.cpp, | ||
| 27 | + rtmp-protocol readonly separator, | ||
| 28 | + ..\rtmp\srs_protocol_amf0.hpp, | ||
| 29 | + ..\rtmp\srs_protocol_amf0.cpp, | ||
| 30 | + ..\rtmp\srs_protocol_handshake.hpp, | ||
| 31 | + ..\rtmp\srs_protocol_handshake.cpp, | ||
| 32 | + ..\rtmp\srs_protocol_io.hpp, | ||
| 33 | + ..\rtmp\srs_protocol_io.cpp, | ||
| 34 | + ..\rtmp\srs_protocol_rtmp.hpp, | ||
| 35 | + ..\rtmp\srs_protocol_rtmp.cpp, | ||
| 36 | + ..\rtmp\srs_protocol_rtmp_stack.hpp, | ||
| 37 | + ..\rtmp\srs_protocol_rtmp_stack.cpp, | ||
| 38 | + app readonly separator, | ||
| 39 | + ..\app\srs_core_bandwidth.hpp, | ||
| 40 | + ..\app\srs_core_bandwidth.cpp, | ||
| 41 | + ..\app\srs_core_client.hpp, | ||
| 42 | + ..\app\srs_core_client.cpp, | ||
| 43 | + ..\app\srs_core_codec.hpp, | ||
| 44 | + ..\app\srs_core_codec.cpp, | ||
| 45 | + ..\app\srs_core_conn.hpp, | ||
| 46 | + ..\app\srs_core_conn.cpp, | ||
| 47 | + ..\app\srs_core_encoder.hpp, | ||
| 48 | + ..\app\srs_core_encoder.cpp, | ||
| 49 | + ..\app\srs_core_forward.hpp, | ||
| 50 | + ..\app\srs_core_forward.cpp, | ||
| 51 | + ..\app\srs_core_hls.hpp, | ||
| 52 | + ..\app\srs_core_hls.cpp, | ||
| 53 | + ..\app\srs_core_http.hpp, | ||
| 54 | + ..\app\srs_core_http.cpp, | ||
| 55 | + ..\app\srs_core_log_context.hpp, | ||
| 56 | + ..\app\srs_core_log_context.cpp, | ||
| 57 | + ..\app\srs_core_refer.hpp, | ||
| 58 | + ..\app\srs_core_refer.cpp, | ||
| 59 | + ..\app\srs_core_thread.hpp, | ||
| 60 | + ..\app\srs_core_thread.cpp, | ||
| 61 | + ..\app\srs_core_server.hpp, | ||
| 62 | + ..\app\srs_core_server.cpp, | ||
| 63 | + ..\app\srs_core_st.hpp, | ||
| 64 | + ..\app\srs_core_st.cpp, | ||
| 65 | + ..\app\srs_core_socket.hpp, | ||
| 66 | + ..\app\srs_core_socket.cpp, | ||
| 67 | + ..\app\srs_core_source.hpp, | ||
| 68 | + ..\app\srs_core_source.cpp, | ||
| 69 | + research readonly separator, | ||
| 70 | + ..\..\research\hls\ts_info.cc; | ||
| 71 | + | ||
| 72 | +mainconfig | ||
| 73 | + "" = "MAIN"; | ||
| 74 | + |
-
请 注册 或 登录 后发表评论