正在显示
14 个修改的文件
包含
22 行增加
和
22 行删除
| @@ -149,7 +149,7 @@ ModuleLibIncs=(${SRS_OBJS_DIR}) | @@ -149,7 +149,7 @@ ModuleLibIncs=(${SRS_OBJS_DIR}) | ||
| 149 | MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" | 149 | MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" |
| 150 | "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file" | 150 | "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file" |
| 151 | "srs_kernel_consts" "srs_kernel_aac" "srs_kernel_mp3" "srs_kernel_ts" | 151 | "srs_kernel_consts" "srs_kernel_aac" "srs_kernel_mp3" "srs_kernel_ts" |
| 152 | - "srs_kernel_buffer") | 152 | + "srs_kernel_temp") |
| 153 | KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh | 153 | KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh |
| 154 | KERNEL_OBJS="${MODULE_OBJS[@]}" | 154 | KERNEL_OBJS="${MODULE_OBJS[@]}" |
| 155 | # | 155 | # |
| @@ -23,8 +23,8 @@ file | @@ -23,8 +23,8 @@ file | ||
| 23 | kernel readonly separator, | 23 | kernel readonly separator, |
| 24 | ../../src/kernel/srs_kernel_aac.hpp, | 24 | ../../src/kernel/srs_kernel_aac.hpp, |
| 25 | ../../src/kernel/srs_kernel_aac.cpp, | 25 | ../../src/kernel/srs_kernel_aac.cpp, |
| 26 | - ../../src/kernel/srs_kernel_buffer.hpp, | ||
| 27 | - ../../src/kernel/srs_kernel_buffer.cpp, | 26 | + ../../src/kernel/srs_kernel_temp.hpp, |
| 27 | + ../../src/kernel/srs_kernel_temp.cpp, | ||
| 28 | ../../src/kernel/srs_kernel_codec.hpp, | 28 | ../../src/kernel/srs_kernel_codec.hpp, |
| 29 | ../../src/kernel/srs_kernel_codec.cpp, | 29 | ../../src/kernel/srs_kernel_codec.cpp, |
| 30 | ../../src/kernel/srs_kernel_consts.hpp, | 30 | ../../src/kernel/srs_kernel_consts.hpp, |
| @@ -105,7 +105,7 @@ | @@ -105,7 +105,7 @@ | ||
| 105 | <ClInclude Include="..\..\src\core\srs_core_performance.hpp" /> | 105 | <ClInclude Include="..\..\src\core\srs_core_performance.hpp" /> |
| 106 | <ClInclude Include="..\..\src\kernel\srs_kernel_aac.hpp" /> | 106 | <ClInclude Include="..\..\src\kernel\srs_kernel_aac.hpp" /> |
| 107 | <ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp" /> | 107 | <ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp" /> |
| 108 | - <ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp" /> | 108 | + <ClInclude Include="..\..\src\kernel\srs_kernel_temp.hpp" /> |
| 109 | <ClInclude Include="..\..\src\kernel\srs_kernel_codec.hpp" /> | 109 | <ClInclude Include="..\..\src\kernel\srs_kernel_codec.hpp" /> |
| 110 | <ClInclude Include="..\..\src\kernel\srs_kernel_consts.hpp" /> | 110 | <ClInclude Include="..\..\src\kernel\srs_kernel_consts.hpp" /> |
| 111 | <ClInclude Include="..\..\src\kernel\srs_kernel_error.hpp" /> | 111 | <ClInclude Include="..\..\src\kernel\srs_kernel_error.hpp" /> |
| @@ -187,7 +187,7 @@ | @@ -187,7 +187,7 @@ | ||
| 187 | <ClCompile Include="..\..\src\core\srs_core_performance.cpp" /> | 187 | <ClCompile Include="..\..\src\core\srs_core_performance.cpp" /> |
| 188 | <ClCompile Include="..\..\src\kernel\srs_kernel_aac.cpp" /> | 188 | <ClCompile Include="..\..\src\kernel\srs_kernel_aac.cpp" /> |
| 189 | <ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp" /> | 189 | <ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp" /> |
| 190 | - <ClCompile Include="..\..\src\kernel\srs_kernel_buffer.cpp" /> | 190 | + <ClCompile Include="..\..\src\kernel\srs_kernel_temp.cpp" /> |
| 191 | <ClCompile Include="..\..\src\kernel\srs_kernel_codec.cpp" /> | 191 | <ClCompile Include="..\..\src\kernel\srs_kernel_codec.cpp" /> |
| 192 | <ClCompile Include="..\..\src\kernel\srs_kernel_consts.cpp" /> | 192 | <ClCompile Include="..\..\src\kernel\srs_kernel_consts.cpp" /> |
| 193 | <ClCompile Include="..\..\src\kernel\srs_kernel_error.cpp" /> | 193 | <ClCompile Include="..\..\src\kernel\srs_kernel_error.cpp" /> |
| @@ -199,7 +199,7 @@ | @@ -199,7 +199,7 @@ | ||
| 199 | <ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp"> | 199 | <ClCompile Include="..\..\src\kernel\srs_kernel_avc.cpp"> |
| 200 | <Filter>srs</Filter> | 200 | <Filter>srs</Filter> |
| 201 | </ClCompile> | 201 | </ClCompile> |
| 202 | - <ClCompile Include="..\..\src\kernel\srs_kernel_buffer.cpp"> | 202 | + <ClCompile Include="..\..\src\kernel\srs_kernel_temp.cpp"> |
| 203 | <Filter>srs</Filter> | 203 | <Filter>srs</Filter> |
| 204 | </ClCompile> | 204 | </ClCompile> |
| 205 | <ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp"> | 205 | <ClCompile Include="..\..\src\protocol\srs_rtmp_amf0.cpp"> |
| @@ -393,7 +393,7 @@ | @@ -393,7 +393,7 @@ | ||
| 393 | <ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp"> | 393 | <ClInclude Include="..\..\src\kernel\srs_kernel_avc.hpp"> |
| 394 | <Filter>srs</Filter> | 394 | <Filter>srs</Filter> |
| 395 | </ClInclude> | 395 | </ClInclude> |
| 396 | - <ClInclude Include="..\..\src\kernel\srs_kernel_buffer.hpp"> | 396 | + <ClInclude Include="..\..\src\kernel\srs_kernel_temp.hpp"> |
| 397 | <Filter>srs</Filter> | 397 | <Filter>srs</Filter> |
| 398 | </ClInclude> | 398 | </ClInclude> |
| 399 | <ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp"> | 399 | <ClInclude Include="..\..\src\protocol\srs_rtmp_amf0.hpp"> |
| @@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
| 18 | 3C1231F81AAE652D00CE8F6C /* srs_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F41AAE652D00CE8F6C /* srs_core.cpp */; }; | 18 | 3C1231F81AAE652D00CE8F6C /* srs_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F41AAE652D00CE8F6C /* srs_core.cpp */; }; |
| 19 | 3C1232061AAE812C00CE8F6C /* srs_main_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232051AAE812C00CE8F6C /* srs_main_server.cpp */; }; | 19 | 3C1232061AAE812C00CE8F6C /* srs_main_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232051AAE812C00CE8F6C /* srs_main_server.cpp */; }; |
| 20 | 3C1232201AAE814D00CE8F6C /* srs_kernel_aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */; }; | 20 | 3C1232201AAE814D00CE8F6C /* srs_kernel_aac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */; }; |
| 21 | - 3C1232211AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */; }; | 21 | + 3C1232211AAE814D00CE8F6C /* srs_kernel_temp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320A1AAE814D00CE8F6C /* srs_kernel_temp.cpp */; }; |
| 22 | 3C1232221AAE814D00CE8F6C /* srs_kernel_codec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */; }; | 22 | 3C1232221AAE814D00CE8F6C /* srs_kernel_codec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */; }; |
| 23 | 3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */; }; | 23 | 3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */; }; |
| 24 | 3C1232241AAE814D00CE8F6C /* srs_kernel_error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232101AAE814D00CE8F6C /* srs_kernel_error.cpp */; }; | 24 | 3C1232241AAE814D00CE8F6C /* srs_kernel_error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232101AAE814D00CE8F6C /* srs_kernel_error.cpp */; }; |
| @@ -149,8 +149,8 @@ | @@ -149,8 +149,8 @@ | ||
| 149 | 3C1232051AAE812C00CE8F6C /* srs_main_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_main_server.cpp; path = ../../../src/main/srs_main_server.cpp; sourceTree = "<group>"; }; | 149 | 3C1232051AAE812C00CE8F6C /* srs_main_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_main_server.cpp; path = ../../../src/main/srs_main_server.cpp; sourceTree = "<group>"; }; |
| 150 | 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_aac.cpp; path = ../../../src/kernel/srs_kernel_aac.cpp; sourceTree = "<group>"; }; | 150 | 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_aac.cpp; path = ../../../src/kernel/srs_kernel_aac.cpp; sourceTree = "<group>"; }; |
| 151 | 3C1232091AAE814D00CE8F6C /* srs_kernel_aac.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_aac.hpp; path = ../../../src/kernel/srs_kernel_aac.hpp; sourceTree = "<group>"; }; | 151 | 3C1232091AAE814D00CE8F6C /* srs_kernel_aac.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_aac.hpp; path = ../../../src/kernel/srs_kernel_aac.hpp; sourceTree = "<group>"; }; |
| 152 | - 3C12320A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_buffer.cpp; path = ../../../src/kernel/srs_kernel_buffer.cpp; sourceTree = "<group>"; }; | ||
| 153 | - 3C12320B1AAE814D00CE8F6C /* srs_kernel_buffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_buffer.hpp; path = ../../../src/kernel/srs_kernel_buffer.hpp; sourceTree = "<group>"; }; | 152 | + 3C12320A1AAE814D00CE8F6C /* srs_kernel_temp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_temp.cpp; path = ../../../src/kernel/srs_kernel_temp.cpp; sourceTree = "<group>"; }; |
| 153 | + 3C12320B1AAE814D00CE8F6C /* srs_kernel_temp.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_temp.hpp; path = ../../../src/kernel/srs_kernel_temp.hpp; sourceTree = "<group>"; }; | ||
| 154 | 3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_codec.cpp; path = ../../../src/kernel/srs_kernel_codec.cpp; sourceTree = "<group>"; }; | 154 | 3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_codec.cpp; path = ../../../src/kernel/srs_kernel_codec.cpp; sourceTree = "<group>"; }; |
| 155 | 3C12320D1AAE814D00CE8F6C /* srs_kernel_codec.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_codec.hpp; path = ../../../src/kernel/srs_kernel_codec.hpp; sourceTree = "<group>"; }; | 155 | 3C12320D1AAE814D00CE8F6C /* srs_kernel_codec.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_kernel_codec.hpp; path = ../../../src/kernel/srs_kernel_codec.hpp; sourceTree = "<group>"; }; |
| 156 | 3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_consts.cpp; path = ../../../src/kernel/srs_kernel_consts.cpp; sourceTree = "<group>"; }; | 156 | 3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_kernel_consts.cpp; path = ../../../src/kernel/srs_kernel_consts.cpp; sourceTree = "<group>"; }; |
| @@ -479,8 +479,8 @@ | @@ -479,8 +479,8 @@ | ||
| 479 | children = ( | 479 | children = ( |
| 480 | 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */, | 480 | 3C1232081AAE814D00CE8F6C /* srs_kernel_aac.cpp */, |
| 481 | 3C1232091AAE814D00CE8F6C /* srs_kernel_aac.hpp */, | 481 | 3C1232091AAE814D00CE8F6C /* srs_kernel_aac.hpp */, |
| 482 | - 3C12320A1AAE814D00CE8F6C /* srs_kernel_buffer.cpp */, | ||
| 483 | - 3C12320B1AAE814D00CE8F6C /* srs_kernel_buffer.hpp */, | 482 | + 3C12320A1AAE814D00CE8F6C /* srs_kernel_temp.cpp */, |
| 483 | + 3C12320B1AAE814D00CE8F6C /* srs_kernel_temp.hpp */, | ||
| 484 | 3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */, | 484 | 3C12320C1AAE814D00CE8F6C /* srs_kernel_codec.cpp */, |
| 485 | 3C12320D1AAE814D00CE8F6C /* srs_kernel_codec.hpp */, | 485 | 3C12320D1AAE814D00CE8F6C /* srs_kernel_codec.hpp */, |
| 486 | 3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */, | 486 | 3C12320E1AAE814D00CE8F6C /* srs_kernel_consts.cpp */, |
| @@ -967,7 +967,7 @@ | @@ -967,7 +967,7 @@ | ||
| 967 | 3C663F161AB0155100286D8B /* srs_ingest_flv.c in Sources */, | 967 | 3C663F161AB0155100286D8B /* srs_ingest_flv.c in Sources */, |
| 968 | 3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */, | 968 | 3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */, |
| 969 | 3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */, | 969 | 3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */, |
| 970 | - 3C1232211AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */, | 970 | + 3C1232211AAE814D00CE8F6C /* srs_kernel_temp.cpp in Sources */, |
| 971 | 3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */, | 971 | 3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */, |
| 972 | 3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */, | 972 | 3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */, |
| 973 | 3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */, | 973 | 3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */, |
| @@ -21,6 +21,6 @@ for file in $files; do | @@ -21,6 +21,6 @@ for file in $files; do | ||
| 21 | grep -in "$from" $file >/dev/null 2>&1; | 21 | grep -in "$from" $file >/dev/null 2>&1; |
| 22 | if [[ 0 -eq $? ]]; then | 22 | if [[ 0 -eq $? ]]; then |
| 23 | echo "replace $file"; | 23 | echo "replace $file"; |
| 24 | - #sed -i '' "s|$from|$to|g" $file; | 24 | + sed -i '' "s|$from|$to|g" $file; |
| 25 | fi; | 25 | fi; |
| 26 | done | 26 | done |
| @@ -38,7 +38,7 @@ using namespace std; | @@ -38,7 +38,7 @@ using namespace std; | ||
| 38 | #include <srs_kernel_ts.hpp> | 38 | #include <srs_kernel_ts.hpp> |
| 39 | #include <srs_kernel_stream.hpp> | 39 | #include <srs_kernel_stream.hpp> |
| 40 | #include <srs_kernel_ts.hpp> | 40 | #include <srs_kernel_ts.hpp> |
| 41 | -#include <srs_kernel_buffer.hpp> | 41 | +#include <srs_kernel_temp.hpp> |
| 42 | #include <srs_kernel_file.hpp> | 42 | #include <srs_kernel_file.hpp> |
| 43 | #include <srs_core_autofree.hpp> | 43 | #include <srs_core_autofree.hpp> |
| 44 | #include <srs_kernel_utility.hpp> | 44 | #include <srs_kernel_utility.hpp> |
| @@ -34,7 +34,7 @@ using namespace std; | @@ -34,7 +34,7 @@ using namespace std; | ||
| 34 | #include <srs_app_utility.hpp> | 34 | #include <srs_app_utility.hpp> |
| 35 | #include <srs_core_autofree.hpp> | 35 | #include <srs_core_autofree.hpp> |
| 36 | #include <srs_kernel_stream.hpp> | 36 | #include <srs_kernel_stream.hpp> |
| 37 | -#include <srs_kernel_buffer.hpp> | 37 | +#include <srs_kernel_temp.hpp> |
| 38 | #include <srs_rtmp_stack.hpp> | 38 | #include <srs_rtmp_stack.hpp> |
| 39 | #include <srs_rtmp_amf0.hpp> | 39 | #include <srs_rtmp_amf0.hpp> |
| 40 | #include <srs_rtmp_utility.hpp> | 40 | #include <srs_rtmp_utility.hpp> |
| @@ -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_kernel_buffer.hpp> | 24 | +#include <srs_kernel_temp.hpp> |
| 25 | 25 | ||
| 26 | #include <srs_kernel_error.hpp> | 26 | #include <srs_kernel_error.hpp> |
| 27 | #include <srs_kernel_log.hpp> | 27 | #include <srs_kernel_log.hpp> |
| @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 25 | #define SRS_KERNEL_BUFFER_HPP | 25 | #define SRS_KERNEL_BUFFER_HPP |
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | -#include <srs_kernel_buffer.hpp> | 28 | +#include <srs_kernel_temp.hpp> |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <srs_core.hpp> | 31 | #include <srs_core.hpp> |
| @@ -36,7 +36,7 @@ using namespace std; | @@ -36,7 +36,7 @@ using namespace std; | ||
| 36 | #include <srs_kernel_error.hpp> | 36 | #include <srs_kernel_error.hpp> |
| 37 | #include <srs_kernel_file.hpp> | 37 | #include <srs_kernel_file.hpp> |
| 38 | #include <srs_kernel_codec.hpp> | 38 | #include <srs_kernel_codec.hpp> |
| 39 | -#include <srs_kernel_buffer.hpp> | 39 | +#include <srs_kernel_temp.hpp> |
| 40 | #include <srs_kernel_utility.hpp> | 40 | #include <srs_kernel_utility.hpp> |
| 41 | #include <srs_kernel_stream.hpp> | 41 | #include <srs_kernel_stream.hpp> |
| 42 | #include <srs_core_autofree.hpp> | 42 | #include <srs_core_autofree.hpp> |
| @@ -35,7 +35,7 @@ using namespace std; | @@ -35,7 +35,7 @@ using namespace std; | ||
| 35 | #include <srs_app_log.hpp> | 35 | #include <srs_app_log.hpp> |
| 36 | #include <srs_kernel_utility.hpp> | 36 | #include <srs_kernel_utility.hpp> |
| 37 | #include <srs_rtmp_stack.hpp> | 37 | #include <srs_rtmp_stack.hpp> |
| 38 | -#include <srs_kernel_buffer.hpp> | 38 | +#include <srs_kernel_temp.hpp> |
| 39 | #include <srs_kernel_stream.hpp> | 39 | #include <srs_kernel_stream.hpp> |
| 40 | #include <srs_kernel_ts.hpp> | 40 | #include <srs_kernel_ts.hpp> |
| 41 | #include <srs_app_http_client.hpp> | 41 | #include <srs_app_http_client.hpp> |
| @@ -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 | 32 | ||
| 33 | #include <srs_rtmp_io.hpp> | 33 | #include <srs_rtmp_io.hpp> |
| 34 | #include <srs_core_performance.hpp> | 34 | #include <srs_core_performance.hpp> |
| 35 | -#include <srs_kernel_buffer.hpp> | 35 | +#include <srs_kernel_temp.hpp> |
| 36 | 36 | ||
| 37 | #ifdef SRS_PERF_MERGED_READ | 37 | #ifdef SRS_PERF_MERGED_READ |
| 38 | /** | 38 | /** |
| @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 28 | using namespace std; | 28 | using namespace std; |
| 29 | 29 | ||
| 30 | #include <srs_rtmp_io.hpp> | 30 | #include <srs_rtmp_io.hpp> |
| 31 | -#include <srs_kernel_buffer.hpp> | 31 | +#include <srs_kernel_temp.hpp> |
| 32 | #include <srs_kernel_error.hpp> | 32 | #include <srs_kernel_error.hpp> |
| 33 | #include <srs_kernel_log.hpp> | 33 | #include <srs_kernel_log.hpp> |
| 34 | #include <srs_kernel_consts.hpp> | 34 | #include <srs_kernel_consts.hpp> |
-
请 注册 或 登录 后发表评论