external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

merge from srs2

Browse source
This commit is contained in:
winlin 2015-10-01 13:05:25 +08:00
commit 8862ec1988
14 changed files with 56 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -1100,6 +1100,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

5
trunk/auto/auto_headers.sh
View file

@ -58,6 +58,11 @@ fi
if [ $SRS_CUBIE = YES ]; then
srs_define_macro "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

4
trunk/src/kernel/srs_kernel_aac.cpp
View file

@ -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

4
trunk/src/kernel/srs_kernel_aac.hpp
View file

@ -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

4
trunk/src/kernel/srs_kernel_codec.cpp
View file

@ -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(SrsBuffer* stream, SrsCodecSample* sam
return ret;
}
#endif

5
trunk/src/kernel/srs_kernel_codec.hpp
View file

@ -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

4
trunk/src/kernel/srs_kernel_mp3.cpp
View file

@ -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

4
trunk/src/kernel/srs_kernel_mp3.hpp
View file

@ -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 SrsBuffer;
@ -68,3 +70,5 @@ public:
#endif
#endif

3
trunk/src/kernel/srs_kernel_ts.cpp
View file

@ -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>
@ -3224,4 +3226,5 @@ int SrsTsEncoder::flush_video()
return ret;
}
#endif

4
trunk/src/kernel/srs_kernel_ts.hpp
View file

@ -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>
@ -1664,3 +1666,5 @@ private:
#endif
#endif

5
trunk/src/protocol/srs_http_stack.cpp
View file

@ -23,6 +23,8 @@
#include <srs_http_stack.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <stdlib.h>
#include <sstream>
#include <algorithm>
@ -777,3 +779,6 @@ char* ISrsHttpMessage::http_ts_send_buffer()
{
return _http_ts_send_buffer;
}
#endif

5
trunk/src/protocol/srs_http_stack.hpp
View file

@ -29,6 +29,8 @@
*/
#include <srs_core.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <map>
#include <string>
#include <vector>
@ -536,3 +538,6 @@ public:
};
#endif
#endif

4
trunk/src/protocol/srs_rtsp_stack.cpp
View file

@ -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

4
trunk/src/protocol/srs_rtsp_stack.hpp
View file

@ -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