Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-10-01 13:04:28 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
a3c229472e4a5d7aae8d868457cd3f68918a2cc1
a3c22947
1 parent
65e4bf2e
fix #495, decrease the srs-librtmp size. 2.0.193
隐藏空白字符变更
内嵌
并排对比
正在显示
15 个修改的文件
包含
60 行增加
和
3 行删除
README.md
trunk/auto/auto_headers.sh
trunk/src/core/srs_core.hpp
trunk/src/kernel/srs_kernel_aac.cpp
trunk/src/kernel/srs_kernel_aac.hpp
trunk/src/kernel/srs_kernel_codec.cpp
trunk/src/kernel/srs_kernel_codec.hpp
trunk/src/kernel/srs_kernel_mp3.cpp
trunk/src/kernel/srs_kernel_mp3.hpp
trunk/src/kernel/srs_kernel_ts.cpp
trunk/src/kernel/srs_kernel_ts.hpp
trunk/src/protocol/srs_http_stack.cpp
trunk/src/protocol/srs_http_stack.hpp
trunk/src/protocol/srs_rtsp_stack.cpp
trunk/src/protocol/srs_rtsp_stack.hpp
README.md
查看文件 @
a3c2294
...
...
@@ -335,6 +335,7 @@ Remark:
## History
*
v2.0, 2015-10-01, for
[
#495
][
bug #495
]
decrease the srs-librtmp size. 2.0.193
*
v2.0, 2015-09-23, for
[
#485
][
bug #485
]
error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192
*
v2.0, 2015-09-23, for
[
#485
][
bug #485
]
srs for respberrypi and cubieboard. 2.0.191
*
v2.0, 2015-09-21, fix
[
#484
][
bug #484
]
hotfix the openssl build script 2.0.190
...
...
@@ -1027,6 +1028,7 @@ Winlin
[
bug #474
]:
https://github.com/simple-rtmp-server/srs/issues/474
[
bug #484
]:
https://github.com/simple-rtmp-server/srs/issues/484
[
bug #485
]:
https://github.com/simple-rtmp-server/srs/issues/485
[
bug #495
]:
https://github.com/simple-rtmp-server/srs/issues/495
[
bug #475
]:
https://github.com/simple-rtmp-server/srs/issues/475
[
bug #458
]:
https://github.com/simple-rtmp-server/srs/issues/458
[
bug #454
]:
https://github.com/simple-rtmp-server/srs/issues/454
...
...
trunk/auto/auto_headers.sh
查看文件 @
a3c2294
...
...
@@ -37,6 +37,11 @@ fi
if
[
$SRS_CUBIE
=
YES
]
;
then
echo
"#define SRS_CUBIE"
>>
$SRS_AUTO_HEADERS_H
fi
if
[
$SRS_EXPORT_LIBRTMP_PROJECT
!
=
NO
]
;
then
echo
"#define SRS_EXPORT_LIBRTMP"
>>
$SRS_AUTO_HEADERS_H
else
echo
"#undef SRS_EXPORT_LIBRTMP"
>>
$SRS_AUTO_HEADERS_H
fi
echo
""
>>
$SRS_AUTO_HEADERS_H
...
...
trunk/src/core/srs_core.hpp
查看文件 @
a3c2294
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 19
2
#define VERSION_REVISION 19
3
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/kernel/srs_kernel_aac.cpp
查看文件 @
a3c2294
...
...
@@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_aac.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
#ifndef _WIN32
#include <unistd.h>
...
...
@@ -218,3 +220,5 @@ int SrsAacEncoder::write_audio(int64_t timestamp, char* data, int size)
return
ret
;
}
#endif
...
...
trunk/src/kernel/srs_kernel_aac.hpp
查看文件 @
a3c2294
...
...
@@ -29,6 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_core.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <string>
#include <srs_kernel_codec.hpp>
...
...
@@ -71,3 +73,5 @@ public:
#endif
#endif
...
...
trunk/src/kernel/srs_kernel_codec.cpp
查看文件 @
a3c2294
...
...
@@ -380,6 +380,8 @@ int SrsCodecSample::add_sample_unit(char* bytes, int size)
return
ret
;
}
#if !defined(SRS_EXPORT_LIBRTMP)
SrsAvcAacCodec
::
SrsAvcAacCodec
()
{
avc_parse_sps
=
true
;
...
...
@@ -1225,3 +1227,5 @@ int SrsAvcAacCodec::avc_demux_ibmf_format(SrsStream* stream, SrsCodecSample* sam
return
ret
;
}
#endif
...
...
trunk/src/kernel/srs_kernel_codec.hpp
查看文件 @
a3c2294
...
...
@@ -525,6 +525,8 @@ enum SrsAvcLevel
};
std
::
string
srs_codec_avc_level2str
(
SrsAvcLevel
level
);
#if !defined(SRS_EXPORT_LIBRTMP)
/**
* the h264/avc and aac codec, for media stream.
*
...
...
@@ -663,3 +665,6 @@ private:
};
#endif
#endif
...
...
trunk/src/kernel/srs_kernel_mp3.cpp
查看文件 @
a3c2294
...
...
@@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_mp3.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
#ifndef _WIN32
#include <unistd.h>
...
...
@@ -125,3 +127,5 @@ int SrsMp3Encoder::write_audio(int64_t timestamp, char* data, int size)
return
writer
->
write
(
data
+
stream
->
pos
(),
size
-
stream
->
pos
(),
NULL
);
}
#endif
...
...
trunk/src/kernel/srs_kernel_mp3.hpp
查看文件 @
a3c2294
...
...
@@ -29,6 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_core.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <string>
class
SrsStream
;
...
...
@@ -68,3 +70,5 @@ public:
#endif
#endif
...
...
trunk/src/kernel/srs_kernel_ts.cpp
查看文件 @
a3c2294
...
...
@@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_ts.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
// for srs-librtmp, @see https://github.com/simple-rtmp-server/srs/issues/213
#ifndef _WIN32
#include <unistd.h>
...
...
@@ -3212,4 +3214,5 @@ int SrsTsEncoder::flush_video()
return
ret
;
}
#endif
...
...
trunk/src/kernel/srs_kernel_ts.hpp
查看文件 @
a3c2294
...
...
@@ -29,6 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_core.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <string>
#include <map>
#include <vector>
...
...
@@ -1656,3 +1658,5 @@ private:
#endif
#endif
...
...
trunk/src/protocol/srs_http_stack.cpp
查看文件 @
a3c2294
...
...
@@ -23,6 +23,8 @@
#include <srs_http_stack.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <stdlib.h>
#include <sstream>
#include <algorithm>
...
...
@@ -779,3 +781,6 @@ char* ISrsHttpMessage::http_ts_send_buffer()
{
return
_http_ts_send_buffer
;
}
#endif
...
...
trunk/src/protocol/srs_http_stack.hpp
查看文件 @
a3c2294
...
...
@@ -25,10 +25,12 @@
#define SRS_PROTOCOL_HTTP_HPP
/*
#include <srs_http_stack.hpp>
*/
#include <srs_http_stack.hpp>
*/
#include <srs_core.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <map>
#include <string>
#include <vector>
...
...
@@ -536,3 +538,6 @@ public:
};
#endif
#endif
...
...
trunk/src/protocol/srs_rtsp_stack.cpp
查看文件 @
a3c2294
...
...
@@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_rtsp_stack.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <stdlib.h>
#include <map>
using
namespace
std
;
...
...
@@ -1182,3 +1184,5 @@ int SrsRtspStack::recv_token(std::string& token, SrsRtspTokenState& state, char
#endif
#endif
...
...
trunk/src/protocol/srs_rtsp_stack.hpp
查看文件 @
a3c2294
...
...
@@ -30,6 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <string>
#include <sstream>
...
...
@@ -714,3 +716,5 @@ private:
#endif
#endif
...
...
请
注册
或
登录
后发表评论