external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

move the srs_kernel_buffer to srs_protocol_buffer.

Browse source
This commit is contained in:
winlin 2014-12-03 18:56:09 +08:00
parent 2fdf994350
commit ea0e837cd6
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trunk/configure vendored
View file

@ -363,7 +363,7 @@ CORE_OBJS="${MODULE_OBJS[@]}"
MODULE_ID="KERNEL" MODULE_ID="KERNEL"
MODULE_DEPENDS=("CORE") MODULE_DEPENDS=("CORE")
ModuleLibIncs=(${SRS_OBJS_DIR}) ModuleLibIncs=(${SRS_OBJS_DIR})
MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" "srs_kernel_buffer" MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream"
"srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file" "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file"
"srs_kernel_consts") "srs_kernel_consts")
KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh
@ -374,7 +374,7 @@ MODULE_ID="RTMP"
MODULE_DEPENDS=("CORE" "KERNEL") MODULE_DEPENDS=("CORE" "KERNEL")
ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot})
MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_stack" "srs_protocol_rtmp" MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_stack" "srs_protocol_rtmp"
"srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array") "srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array" "srs_protocol_buffer")
RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh
RTMP_OBJS="${MODULE_OBJS[@]}" RTMP_OBJS="${MODULE_OBJS[@]}"
# #

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

@ -68,7 +68,7 @@ using namespace std;
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_app_avc_aac.hpp> #include <srs_app_avc_aac.hpp>
#include <srs_kernel_file.hpp> #include <srs_kernel_file.hpp>
#include <srs_kernel_buffer.hpp> #include <srs_protocol_buffer.hpp>
// max PES packets size to flush the video. // max PES packets size to flush the video.
#define SRS_AUTO_HLS_AUDIO_CACHE_SIZE 1024 * 1024 #define SRS_AUTO_HLS_AUDIO_CACHE_SIZE 1024 * 1024

2
trunk/src/kernel/srs_kernel_buffer.cpp → trunk/src/rtmp/srs_protocol_buffer.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_kernel_buffer.hpp> #include <srs_protocol_buffer.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>

2
trunk/src/kernel/srs_kernel_buffer.hpp → trunk/src/rtmp/srs_protocol_buffer.hpp
View file

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_KERNEL_BUFFER_HPP #define SRS_KERNEL_BUFFER_HPP
/* /*
#include <srs_kernel_buffer.hpp> #include <srs_protocol_buffer.hpp>
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>

2
trunk/src/rtmp/srs_protocol_io.hpp
View file

@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <sys/uio.h> #include <sys/uio.h>
#endif #endif
#include <srs_kernel_buffer.hpp> #include <srs_protocol_buffer.hpp>
/** /**
* the system io reader/writer architecture: * the system io reader/writer architecture:

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

@ -16,8 +16,6 @@ file
..\core\srs_core_autofree.hpp, ..\core\srs_core_autofree.hpp,
..\core\srs_core_autofree.cpp, ..\core\srs_core_autofree.cpp,
kernel readonly separator, kernel readonly separator,
..\kernel\srs_kernel_buffer.hpp,
..\kernel\srs_kernel_buffer.cpp,
..\kernel\srs_kernel_codec.hpp, ..\kernel\srs_kernel_codec.hpp,
..\kernel\srs_kernel_codec.cpp, ..\kernel\srs_kernel_codec.cpp,
..\kernel\srs_kernel_consts.hpp, ..\kernel\srs_kernel_consts.hpp,
@ -37,6 +35,8 @@ file
rtmp-protocol readonly separator, rtmp-protocol readonly separator,
..\rtmp\srs_protocol_amf0.hpp, ..\rtmp\srs_protocol_amf0.hpp,
..\rtmp\srs_protocol_amf0.cpp, ..\rtmp\srs_protocol_amf0.cpp,
..\rtmp\srs_protocol_buffer.hpp,
..\rtmp\srs_protocol_buffer.cpp,
..\rtmp\srs_protocol_handshake.hpp, ..\rtmp\srs_protocol_handshake.hpp,
..\rtmp\srs_protocol_handshake.cpp, ..\rtmp\srs_protocol_handshake.cpp,
..\rtmp\srs_protocol_io.hpp, ..\rtmp\srs_protocol_io.hpp,

2
trunk/src/utest/srs_utest_kernel.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string> #include <string>
#include <srs_kernel_file.hpp> #include <srs_kernel_file.hpp>
#include <srs_kernel_buffer.hpp> #include <srs_protocol_buffer.hpp>
class MockBufferReader: public ISrsBufferReader class MockBufferReader: public ISrsBufferReader
{ {

2
trunk/src/utest/srs_utest_protocol.hpp
View file

@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_protocol_rtmp.hpp> #include <srs_protocol_rtmp.hpp>
#include <srs_protocol_handshake.hpp> #include <srs_protocol_handshake.hpp>
#include <srs_kernel_buffer.hpp> #include <srs_protocol_buffer.hpp>
#ifdef SRS_AUTO_SSL #ifdef SRS_AUTO_SSL
using namespace _srs_internal; using namespace _srs_internal;