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 11:11:02 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
7e14e7fa5742693c110daafdcbc0d630ef683011
7e14e7fa
1 parent
4d9b062f
move pithy print to kernel
隐藏空白字符变更
内嵌
并排对比
正在显示
8 个修改的文件
包含
12 行增加
和
12 行删除
trunk/configure
trunk/src/app/srs_core_client.cpp
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_core_pithy_print.cpp → trunk/src/kernel/srs_kernel_pithy_print.cpp
trunk/src/app/srs_core_pithy_print.hpp → trunk/src/kernel/srs_kernel_pithy_print.hpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
7e14e7f
...
...
@@ -134,7 +134,7 @@ MODULE_ID="KERNEL"
MODULE_DEPENDS
=(
"CORE"
)
ModuleLibIncs
=(
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_kernel_error"
"srs_kernel_log"
"srs_kernel_reload"
"srs_kernel_config"
"srs_kernel_stream"
"srs_kernel_buffer"
)
"srs_kernel_stream"
"srs_kernel_buffer"
"srs_kernel_pithy_print"
)
MODULE_DIR
=
"src/kernel"
. auto/modules.sh
KERNEL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
...
...
@@ -147,7 +147,7 @@ MODULE_FILES=("srs_core_server"
"srs_core_rtmp"
"srs_core_socket"
"srs_core_protocol"
"srs_core_amf0"
"srs_core_source"
"srs_core_codec"
"srs_core_handshake"
"srs_core_pithy_print"
"srs_core_handshake"
"srs_core_refer"
"srs_core_hls"
"srs_core_forward"
"srs_core_encoder"
"srs_core_http"
"srs_core_thread"
"srs_core_bandwidth"
...
...
trunk/src/app/srs_core_client.cpp
查看文件 @
7e14e7f
...
...
@@ -35,7 +35,7 @@ using namespace std;
#include <srs_core_autofree.hpp>
#include <srs_core_source.hpp>
#include <srs_core_server.hpp>
#include <srs_
core
_pithy_print.hpp>
#include <srs_
kernel
_pithy_print.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_refer.hpp>
#include <srs_core_hls.hpp>
...
...
trunk/src/app/srs_core_encoder.cpp
查看文件 @
7e14e7f
...
...
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_log.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_
core
_pithy_print.hpp>
#include <srs_
kernel
_pithy_print.hpp>
#include <srs_core_protocol.hpp>
#ifdef SRS_FFMPEG
...
...
trunk/src/app/srs_core_forward.cpp
查看文件 @
7e14e7f
...
...
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_rtmp.hpp>
#include <srs_kernel_log.hpp>
#include <srs_core_protocol.hpp>
#include <srs_
core
_pithy_print.hpp>
#include <srs_
kernel
_pithy_print.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_source.hpp>
...
...
trunk/src/app/srs_core_hls.cpp
查看文件 @
7e14e7f
...
...
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_source.hpp>
#include <srs_core_autofree.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_
core
_pithy_print.hpp>
#include <srs_
kernel
_pithy_print.hpp>
// max PES packets size to flush the video.
#define SRS_HLS_AUDIO_CACHE_SIZE 512 * 1024
...
...
trunk/src/
app/srs_core
_pithy_print.cpp → trunk/src/
kernel/srs_kernel
_pithy_print.cpp
查看文件 @
7e14e7f
...
...
@@ -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_
core
_pithy_print.hpp>
#include <srs_
kernel
_pithy_print.hpp>
#include <stdlib.h>
#include <map>
...
...
trunk/src/
app/srs_core
_pithy_print.hpp → trunk/src/
kernel/srs_kernel
_pithy_print.hpp
查看文件 @
7e14e7f
...
...
@@ -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_CORE_PITHY_PRINT_HPP
#define SRS_CORE_PITHY_PRINT_HPP
#ifndef SRS_KERNEL_PITHY_PRINT_HPP
#define SRS_KERNEL_PITHY_PRINT_HPP
/*
#include <srs_
core
_pithy_print.hpp>
#include <srs_
kernel
_pithy_print.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/srs/srs.upp
查看文件 @
7e14e7f
...
...
@@ -18,6 +18,8 @@ file
..\kernel\srs_kernel_error.cpp,
..\kernel\srs_kernel_log.hpp,
..\kernel\srs_kernel_log.cpp,
..\kernel\srs_kernel_pithy_print.hpp,
..\kernel\srs_kernel_pithy_print.cpp,
..\kernel\srs_kernel_reload.hpp,
..\kernel\srs_kernel_reload.cpp,
..\kernel\srs_kernel_stream.hpp,
...
...
@@ -45,8 +47,6 @@ file
..\app\srs_core_http.cpp,
..\app\srs_core_log_context.hpp,
..\app\srs_core_log_context.cpp,
..\app\srs_core_pithy_print.hpp,
..\app\srs_core_pithy_print.cpp,
..\app\srs_core_protocol.hpp,
..\app\srs_core_protocol.cpp,
..\app\srs_core_refer.hpp,
...
...
请
注册
或
登录
后发表评论