Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-03-01 16:02:59 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
382fd127e40a8ae8f68d417251fec718eb645685
382fd127
1 parent
b407021d
rename config and pithy-print to app module.
隐藏空白字符变更
内嵌
并排对比
正在显示
15 个修改的文件
包含
27 行增加
和
27 行删除
trunk/configure
trunk/src/app/srs_core_bandwidth.cpp
trunk/src/app/srs_core_client.cpp
trunk/src/app/srs_kernel_config.cpp → trunk/src/app/srs_core_config.cpp
trunk/src/app/srs_kernel_config.hpp → trunk/src/app/srs_core_config.hpp
trunk/src/app/srs_core_encoder.cpp
trunk/src/app/srs_core_forward.cpp
trunk/src/app/srs_core_hls.cpp
trunk/src/app/srs_kernel_pithy_print.cpp → trunk/src/app/srs_core_pithy_print.cpp
trunk/src/app/srs_kernel_pithy_print.hpp → trunk/src/app/srs_core_pithy_print.hpp
trunk/src/app/srs_core_refer.cpp
trunk/src/app/srs_core_server.cpp
trunk/src/app/srs_core_source.cpp
trunk/src/main/srs_main_server.cpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
382fd12
...
...
@@ -154,7 +154,7 @@ ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS})
MODULE_FILES
=(
"srs_core_server"
"srs_core_conn"
"srs_core_client"
"srs_core_socket"
"srs_core_source"
"srs_core_codec"
"srs_core_refer"
"srs_core_hls"
"srs_core_forward"
"srs_core_encoder"
"srs_core_http"
"srs_core_thread"
"srs_core_bandwidth"
"srs_core_st"
"srs_core_log_context"
"srs_
kernel_config"
"srs_kernel
_pithy_print"
)
"srs_
core_config"
"srs_core
_pithy_print"
)
MODULE_DIR
=
"src/app"
. auto/modules.sh
APP_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
...
...
trunk/src/app/srs_core_bandwidth.cpp
查看文件 @
382fd12
...
...
@@ -32,7 +32,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_protocol_rtmp_stack.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_
core
_config.hpp>
#include <srs_core_autofree.hpp>
SrsBandwidth
::
SrsBandwidth
()
...
...
trunk/src/app/srs_core_client.cpp
查看文件 @
382fd12
...
...
@@ -35,8 +35,8 @@ using namespace std;
#include <srs_core_autofree.hpp>
#include <srs_core_source.hpp>
#include <srs_core_server.hpp>
#include <srs_kernel_pithy_print.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_pithy_print.hpp>
#include <srs_core_config.hpp>
#include <srs_core_refer.hpp>
#include <srs_core_hls.hpp>
#include <srs_core_http.hpp>
...
...
trunk/src/app/srs_
kernel
_config.cpp → trunk/src/app/srs_
core
_config.cpp
查看文件 @
382fd12
...
...
@@ -21,7 +21,7 @@ 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 <srs_
kernel
_config.hpp>
#include <srs_
core
_config.hpp>
#include <stdio.h>
#include <stdlib.h>
...
...
trunk/src/app/srs_
kernel
_config.hpp → trunk/src/app/srs_
core
_config.hpp
查看文件 @
382fd12
...
...
@@ -21,11 +21,11 @@ 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_KERNEL_CONIFG_HPP
#define SRS_KERNEL_CONIFG_HPP
#ifndef SRS_CORE_CONIFG_HPP
#define SRS_CORE_CONIFG_HPP
/*
#include <srs_
kernel
_config.hpp>
#include <srs_
core
_config.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/app/srs_core_encoder.cpp
查看文件 @
382fd12
...
...
@@ -34,9 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_
core
_config.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_
kernel
_pithy_print.hpp>
#include <srs_
core
_pithy_print.hpp>
#include <srs_protocol_rtmp_stack.hpp>
#ifdef SRS_FFMPEG
...
...
trunk/src/app/srs_core_forward.cpp
查看文件 @
382fd12
...
...
@@ -33,8 +33,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_socket.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_kernel_config.hpp>
#include <srs_kernel_pithy_print.hpp>
#include <srs_core_config.hpp>
#include <srs_core_pithy_print.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_protocol_rtmp_stack.hpp>
#include <srs_protocol_utility.hpp>
...
...
trunk/src/app/srs_core_hls.cpp
查看文件 @
382fd12
...
...
@@ -37,11 +37,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_codec.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_protocol_rtmp_stack.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_
core
_config.hpp>
#include <srs_core_source.hpp>
#include <srs_core_autofree.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_
kernel
_pithy_print.hpp>
#include <srs_
core
_pithy_print.hpp>
// max PES packets size to flush the video.
#define SRS_HLS_AUDIO_CACHE_SIZE 512 * 1024
...
...
trunk/src/app/srs_
kernel
_pithy_print.cpp → trunk/src/app/srs_
core
_pithy_print.cpp
查看文件 @
382fd12
...
...
@@ -21,13 +21,13 @@ 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 <srs_
kernel
_pithy_print.hpp>
#include <srs_
core
_pithy_print.hpp>
#include <stdlib.h>
#include <map>
#include <srs_kernel_log.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_
core
_config.hpp>
#include <srs_kernel_reload.hpp>
#include <srs_kernel_error.hpp>
...
...
trunk/src/app/srs_
kernel
_pithy_print.hpp → trunk/src/app/srs_
core
_pithy_print.hpp
查看文件 @
382fd12
...
...
@@ -21,11 +21,11 @@ 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_KERNEL_PITHY_PRINT_HPP
#define SRS_KERNEL_PITHY_PRINT_HPP
#ifndef SRS_CORE_PITHY_PRINT_HPP
#define SRS_CORE_PITHY_PRINT_HPP
/*
#include <srs_
kernel
_pithy_print.hpp>
#include <srs_
core
_pithy_print.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/app/srs_core_refer.cpp
查看文件 @
382fd12
...
...
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_
core
_config.hpp>
int
SrsRefer
::
check
(
std
::
string
page_url
,
SrsConfDirective
*
refer
)
{
...
...
trunk/src/app/srs_core_server.cpp
查看文件 @
382fd12
...
...
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_core_client.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_
core
_config.hpp>
#define SERVER_LISTEN_BACKLOG 512
#define SRS_TIME_RESOLUTION_MS 500
...
...
trunk/src/app/srs_core_source.cpp
查看文件 @
382fd12
...
...
@@ -33,7 +33,7 @@ using namespace std;
#include <srs_core_codec.hpp>
#include <srs_core_hls.hpp>
#include <srs_core_forward.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_
core
_config.hpp>
#include <srs_core_encoder.hpp>
#include <srs_protocol_rtmp.hpp>
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
382fd12
...
...
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_core_server.hpp>
#include <srs_
kernel
_config.hpp>
#include <srs_
core
_config.hpp>
#include <stdlib.h>
#include <signal.h>
...
...
trunk/src/srs/srs.upp
查看文件 @
382fd12
...
...
@@ -42,8 +42,8 @@ file
..\app\srs_core_codec.cpp,
..\app\srs_core_conn.hpp,
..\app\srs_core_conn.cpp,
..\app\srs_kernel_config.hpp,
..\app\srs_kernel_config.cpp,
..\app\srs_core_config.hpp,
..\app\srs_core_config.cpp,
..\app\srs_core_encoder.hpp,
..\app\srs_core_encoder.cpp,
..\app\srs_core_forward.hpp,
...
...
@@ -56,8 +56,8 @@ file
..\app\srs_core_log_context.cpp,
..\app\srs_core_refer.hpp,
..\app\srs_core_refer.cpp,
..\app\srs_kernel_pithy_print.hpp,
..\app\srs_kernel_pithy_print.cpp,
..\app\srs_core_pithy_print.hpp,
..\app\srs_core_pithy_print.cpp,
..\app\srs_core_thread.hpp,
..\app\srs_core_thread.cpp,
..\app\srs_core_server.hpp,
...
...
请
注册
或
登录
后发表评论