for ossrs#293, move the simple buffer to kernel.

midoks · Jan 22, 2015 · dfe385d · dfe385d
1 parent 77d78ea
commit dfe385d
Show file tree

Hide file tree

Showing 10 changed files with 622 additions and 484 deletions.
diff --git a/trunk/configure b/trunk/configure
@@ -366,7 +366,7 @@ ModuleLibIncs=(${SRS_OBJS_DIR})
 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_consts" "srs_kernel_aac" "srs_kernel_mp3" "srs_kernel_ts"
-        "srs_kernel_avc")
+        "srs_kernel_avc" "srs_kernel_buffer")
 KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh
 KERNEL_OBJS="${MODULE_OBJS[@]}"
 #

diff --git a/trunk/ide/srs_upp/srs_upp.upp b/trunk/ide/srs_upp/srs_upp.upp
@@ -22,6 +22,8 @@ file
 	../../src/kernel/srs_kernel_aac.cpp,
 	../../src/kernel/srs_kernel_avc.hpp,
 	../../src/kernel/srs_kernel_avc.cpp,
+	../../src/kernel/srs_kernel_buffer.hpp,
+	../../src/kernel/srs_kernel_buffer.cpp,
 	../../src/kernel/srs_kernel_codec.hpp,
 	../../src/kernel/srs_kernel_codec.cpp,
 	../../src/kernel/srs_kernel_consts.hpp,