winlin

move pithy print to kernel

@@ -134,7 +134,7 @@ MODULE_ID="KERNEL" @@ -134,7 +134,7 @@ MODULE_ID="KERNEL"
134 MODULE_DEPENDS=("CORE") 134 MODULE_DEPENDS=("CORE")
135 ModuleLibIncs=(${SRS_OBJS}) 135 ModuleLibIncs=(${SRS_OBJS})
136 MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kernel_config" 136 MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kernel_config"
137 - "srs_kernel_stream" "srs_kernel_buffer") 137 + "srs_kernel_stream" "srs_kernel_buffer" "srs_kernel_pithy_print")
138 MODULE_DIR="src/kernel" . auto/modules.sh 138 MODULE_DIR="src/kernel" . auto/modules.sh
139 KERNEL_OBJS="${MODULE_OBJS[@]}" 139 KERNEL_OBJS="${MODULE_OBJS[@]}"
140 # 140 #
@@ -147,7 +147,7 @@ MODULE_FILES=("srs_core_server" @@ -147,7 +147,7 @@ MODULE_FILES=("srs_core_server"
147 "srs_core_rtmp" "srs_core_socket" 147 "srs_core_rtmp" "srs_core_socket"
148 "srs_core_protocol" "srs_core_amf0" 148 "srs_core_protocol" "srs_core_amf0"
149 "srs_core_source" "srs_core_codec" 149 "srs_core_source" "srs_core_codec"
150 - "srs_core_handshake" "srs_core_pithy_print" 150 + "srs_core_handshake"
151 "srs_core_refer" 151 "srs_core_refer"
152 "srs_core_hls" "srs_core_forward" "srs_core_encoder" 152 "srs_core_hls" "srs_core_forward" "srs_core_encoder"
153 "srs_core_http" "srs_core_thread" "srs_core_bandwidth" 153 "srs_core_http" "srs_core_thread" "srs_core_bandwidth"
@@ -35,7 +35,7 @@ using namespace std; @@ -35,7 +35,7 @@ using namespace std;
35 #include <srs_core_autofree.hpp> 35 #include <srs_core_autofree.hpp>
36 #include <srs_core_source.hpp> 36 #include <srs_core_source.hpp>
37 #include <srs_core_server.hpp> 37 #include <srs_core_server.hpp>
38 -#include <srs_core_pithy_print.hpp> 38 +#include <srs_kernel_pithy_print.hpp>
39 #include <srs_kernel_config.hpp> 39 #include <srs_kernel_config.hpp>
40 #include <srs_core_refer.hpp> 40 #include <srs_core_refer.hpp>
41 #include <srs_core_hls.hpp> 41 #include <srs_core_hls.hpp>
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
36 #include <srs_kernel_log.hpp> 36 #include <srs_kernel_log.hpp>
37 #include <srs_kernel_config.hpp> 37 #include <srs_kernel_config.hpp>
38 #include <srs_core_rtmp.hpp> 38 #include <srs_core_rtmp.hpp>
39 -#include <srs_core_pithy_print.hpp> 39 +#include <srs_kernel_pithy_print.hpp>
40 #include <srs_core_protocol.hpp> 40 #include <srs_core_protocol.hpp>
41 41
42 #ifdef SRS_FFMPEG 42 #ifdef SRS_FFMPEG
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
32 #include <srs_core_rtmp.hpp> 32 #include <srs_core_rtmp.hpp>
33 #include <srs_kernel_log.hpp> 33 #include <srs_kernel_log.hpp>
34 #include <srs_core_protocol.hpp> 34 #include <srs_core_protocol.hpp>
35 -#include <srs_core_pithy_print.hpp> 35 +#include <srs_kernel_pithy_print.hpp>
36 #include <srs_core_rtmp.hpp> 36 #include <srs_core_rtmp.hpp>
37 #include <srs_kernel_config.hpp> 37 #include <srs_kernel_config.hpp>
38 #include <srs_core_source.hpp> 38 #include <srs_core_source.hpp>
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
41 #include <srs_core_source.hpp> 41 #include <srs_core_source.hpp>
42 #include <srs_core_autofree.hpp> 42 #include <srs_core_autofree.hpp>
43 #include <srs_core_rtmp.hpp> 43 #include <srs_core_rtmp.hpp>
44 -#include <srs_core_pithy_print.hpp> 44 +#include <srs_kernel_pithy_print.hpp>
45 45
46 // max PES packets size to flush the video. 46 // max PES packets size to flush the video.
47 #define SRS_HLS_AUDIO_CACHE_SIZE 512 * 1024 47 #define SRS_HLS_AUDIO_CACHE_SIZE 512 * 1024
@@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,7 +21,7 @@ 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 -#include <srs_core_pithy_print.hpp> 24 +#include <srs_kernel_pithy_print.hpp>
25 25
26 #include <stdlib.h> 26 #include <stdlib.h>
27 #include <map> 27 #include <map>
@@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,11 +21,11 @@ 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_CORE_PITHY_PRINT_HPP  
25 -#define SRS_CORE_PITHY_PRINT_HPP 24 +#ifndef SRS_KERNEL_PITHY_PRINT_HPP
  25 +#define SRS_KERNEL_PITHY_PRINT_HPP
26 26
27 /* 27 /*
28 -#include <srs_core_pithy_print.hpp> 28 +#include <srs_kernel_pithy_print.hpp>
29 */ 29 */
30 30
31 #include <srs_core.hpp> 31 #include <srs_core.hpp>
@@ -18,6 +18,8 @@ file @@ -18,6 +18,8 @@ file
18 ..\kernel\srs_kernel_error.cpp, 18 ..\kernel\srs_kernel_error.cpp,
19 ..\kernel\srs_kernel_log.hpp, 19 ..\kernel\srs_kernel_log.hpp,
20 ..\kernel\srs_kernel_log.cpp, 20 ..\kernel\srs_kernel_log.cpp,
  21 + ..\kernel\srs_kernel_pithy_print.hpp,
  22 + ..\kernel\srs_kernel_pithy_print.cpp,
21 ..\kernel\srs_kernel_reload.hpp, 23 ..\kernel\srs_kernel_reload.hpp,
22 ..\kernel\srs_kernel_reload.cpp, 24 ..\kernel\srs_kernel_reload.cpp,
23 ..\kernel\srs_kernel_stream.hpp, 25 ..\kernel\srs_kernel_stream.hpp,
@@ -45,8 +47,6 @@ file @@ -45,8 +47,6 @@ file
45 ..\app\srs_core_http.cpp, 47 ..\app\srs_core_http.cpp,
46 ..\app\srs_core_log_context.hpp, 48 ..\app\srs_core_log_context.hpp,
47 ..\app\srs_core_log_context.cpp, 49 ..\app\srs_core_log_context.cpp,
48 - ..\app\srs_core_pithy_print.hpp,  
49 - ..\app\srs_core_pithy_print.cpp,  
50 ..\app\srs_core_protocol.hpp, 50 ..\app\srs_core_protocol.hpp,
51 ..\app\srs_core_protocol.cpp, 51 ..\app\srs_core_protocol.cpp,
52 ..\app\srs_core_refer.hpp, 52 ..\app\srs_core_refer.hpp,