external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

move pithy print to kernel

Browse source
This commit is contained in:
winlin 2014-03-01 11:11:02 +08:00
parent 4d9b062f16
commit 7e14e7fa57
8 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/configure vendored
View file

@ -134,7 +134,7 @@ MODULE_ID="KERNEL"
MODULE_DEPENDS=("CORE") MODULE_DEPENDS=("CORE")
ModuleLibIncs=(${SRS_OBJS}) ModuleLibIncs=(${SRS_OBJS})
MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kernel_config" 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 MODULE_DIR="src/kernel" . auto/modules.sh
KERNEL_OBJS="${MODULE_OBJS[@]}" KERNEL_OBJS="${MODULE_OBJS[@]}"
# #
@ -147,7 +147,7 @@ MODULE_FILES=("srs_core_server"
"srs_core_rtmp" "srs_core_socket" "srs_core_rtmp" "srs_core_socket"
"srs_core_protocol" "srs_core_amf0" "srs_core_protocol" "srs_core_amf0"
"srs_core_source" "srs_core_codec" "srs_core_source" "srs_core_codec"
"srs_core_handshake" "srs_core_pithy_print" "srs_core_handshake"
"srs_core_refer" "srs_core_refer"
"srs_core_hls" "srs_core_forward" "srs_core_encoder" "srs_core_hls" "srs_core_forward" "srs_core_encoder"
"srs_core_http" "srs_core_thread" "srs_core_bandwidth" "srs_core_http" "srs_core_thread" "srs_core_bandwidth"

2
trunk/src/app/srs_core_client.cpp
View file

@ -35,7 +35,7 @@ using namespace std;
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_core_source.hpp> #include <srs_core_source.hpp>
#include <srs_core_server.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_kernel_config.hpp>
#include <srs_core_refer.hpp> #include <srs_core_refer.hpp>
#include <srs_core_hls.hpp> #include <srs_core_hls.hpp>

2
trunk/src/app/srs_core_encoder.cpp
View file

@ -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_log.hpp>
#include <srs_kernel_config.hpp> #include <srs_kernel_config.hpp>
#include <srs_core_rtmp.hpp> #include <srs_core_rtmp.hpp>
#include <srs_core_pithy_print.hpp> #include <srs_kernel_pithy_print.hpp>
#include <srs_core_protocol.hpp> #include <srs_core_protocol.hpp>
#ifdef SRS_FFMPEG #ifdef SRS_FFMPEG

2
trunk/src/app/srs_core_forward.cpp
View file

@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_rtmp.hpp> #include <srs_core_rtmp.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_core_protocol.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_core_rtmp.hpp>
#include <srs_kernel_config.hpp> #include <srs_kernel_config.hpp>
#include <srs_core_source.hpp> #include <srs_core_source.hpp>

2
trunk/src/app/srs_core_hls.cpp
View file

@ -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_source.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_core_rtmp.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. // max PES packets size to flush the video.
#define SRS_HLS_AUDIO_CACHE_SIZE 512 * 1024 #define SRS_HLS_AUDIO_CACHE_SIZE 512 * 1024

2
trunk/src/app/srs_core_pithy_print.cpp → trunk/src/kernel/srs_kernel_pithy_print.cpp
View file

@ -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. 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 <stdlib.h>
#include <map> #include <map>

6
trunk/src/app/srs_core_pithy_print.hpp → trunk/src/kernel/srs_kernel_pithy_print.hpp
View file

@ -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. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef SRS_CORE_PITHY_PRINT_HPP #ifndef SRS_KERNEL_PITHY_PRINT_HPP
#define SRS_CORE_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> #include <srs_core.hpp>

4
trunk/src/srs/srs.upp
View file

@ -18,6 +18,8 @@ file
..\kernel\srs_kernel_error.cpp, ..\kernel\srs_kernel_error.cpp,
..\kernel\srs_kernel_log.hpp, ..\kernel\srs_kernel_log.hpp,
..\kernel\srs_kernel_log.cpp, ..\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.hpp,
..\kernel\srs_kernel_reload.cpp, ..\kernel\srs_kernel_reload.cpp,
..\kernel\srs_kernel_stream.hpp, ..\kernel\srs_kernel_stream.hpp,
@ -45,8 +47,6 @@ file
..\app\srs_core_http.cpp, ..\app\srs_core_http.cpp,
..\app\srs_core_log_context.hpp, ..\app\srs_core_log_context.hpp,
..\app\srs_core_log_context.cpp, ..\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.hpp,
..\app\srs_core_protocol.cpp, ..\app\srs_core_protocol.cpp,
..\app\srs_core_refer.hpp, ..\app\srs_core_refer.hpp,