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

SquashSRS4: Remove srs-librtmp

Browse source
This commit is contained in:
winlin 2021-05-20 20:07:13 +08:00
parent f043a7eb48
commit 6dc8d9dd6f
26 changed files with 139 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,8 +23,6 @@
#include <srs_kernel_aac.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
// for srs-librtmp, @see https://github.com/ossrs/srs/issues/213
#ifndef _WIN32
#include <unistd.h>
@ -202,5 +200,3 @@ srs_error_t SrsAacTransmuxer::write_audio(int64_t timestamp, char* data, int siz
return err;
}
#endif

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

@ -26,8 +26,6 @@
#include <srs_core.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <string>
#include <srs_kernel_codec.hpp>
@ -61,5 +59,3 @@ public:
#endif
#endif

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

@ -23,8 +23,6 @@
#include <srs_kernel_mp3.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
// for srs-librtmp, @see https://github.com/ossrs/srs/issues/213
#ifndef _WIN32
#include <unistd.h>
@ -126,5 +124,3 @@ srs_error_t SrsMp3Transmuxer::write_audio(int64_t timestamp, char* data, int siz
return err;
}
#endif

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

@ -26,8 +26,6 @@
#include <srs_core.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <string>
class SrsBuffer;
@ -65,5 +63,3 @@ public:
#endif
#endif

10
trunk/src/kernel/srs_kernel_rtc_rtp.cpp
View file

@ -823,9 +823,8 @@ char* SrsRtpPacket::wrap(char* data, int size)
char* SrsRtpPacket::wrap(SrsSharedPtrMessage* msg)
{
// Generally, the wrap(msg) is used for RTMP to RTC, which is not generated by RTC,
// so we do not recycle the msg. It's ok to directly free the msg, event the msg is
// allocated by object cache manager.
// Generally, the wrap(msg) is used for RTMP to RTC, where the msg
// is not generated by RTC.
srs_freep(shared_buffer_);
// Copy from the new message.
@ -840,11 +839,6 @@ SrsRtpPacket* SrsRtpPacket::copy()
{
SrsRtpPacket* cp = new SrsRtpPacket();
// We got packet from cache, the payload and message MUST be NULL,
// because we had clear it in recycle.
//srs_assert(!cp->payload_);
//srs_assert(!cp->shared_buffer_);
cp->header = header;
cp->payload_ = payload_? payload_->copy():NULL;
cp->payload_type_ = payload_type_;

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

@ -23,8 +23,6 @@
#include <srs_kernel_ts.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
// for srs-librtmp, @see https://github.com/ossrs/srs/issues/213
#ifndef _WIN32
#include <unistd.h>
@ -3174,5 +3172,3 @@ srs_error_t SrsTsTransmuxer::flush_video()
return err;
}
#endif

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

@ -26,8 +26,6 @@
#include <srs_core.hpp>
#if !defined(SRS_EXPORT_LIBRTMP)
#include <string>
#include <map>
#include <vector>
@ -1350,5 +1348,3 @@ private:
#endif
#endif