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

GB28181: Fix build fail

Browse source
This commit is contained in:
winlin 2020-09-20 18:01:03 +08:00
parent 4e2fca2b0f
commit 7e3dfa7149
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/src/app/srs_app_gb28181.hpp
View file

@ -43,6 +43,7 @@
#include <srs_app_gb28181_jitbuffer.hpp> #include <srs_app_gb28181_jitbuffer.hpp>
#include <srs_rtmp_stack.hpp> #include <srs_rtmp_stack.hpp>
#include <srs_app_source.hpp> #include <srs_app_source.hpp>
#include <srs_service_conn.hpp>
#define RTP_PORT_MODE_FIXED "fixed" #define RTP_PORT_MODE_FIXED "fixed"
#define RTP_PORT_MODE_RANDOM "random" #define RTP_PORT_MODE_RANDOM "random"
@ -76,9 +77,6 @@
#define STREAM_TYPE_AUDIO_SVAC 0x9b #define STREAM_TYPE_AUDIO_SVAC 0x9b
#define STREAM_TYPE_AUDIO_PCM 0x9c #define STREAM_TYPE_AUDIO_PCM 0x9c
class SrsConfDirective; class SrsConfDirective;
class SrsRtpPacket; class SrsRtpPacket;
class SrsRtmpClient; class SrsRtmpClient;
@ -104,6 +102,7 @@ class SrsPsJitterBuffer;
class SrsServer; class SrsServer;
class SrsSource; class SrsSource;
class SrsRequest; class SrsRequest;
class SrsResourceManager;
//ps rtp header packet parse //ps rtp header packet parse
class SrsPsRtpPacket: public SrsRtpPacket class SrsPsRtpPacket: public SrsRtpPacket

2
trunk/src/app/srs_app_gb28181_sip.cpp
View file

@ -301,7 +301,7 @@ std::string SrsGb28181SipSession::remote_ip()
return _peer_ip; return _peer_ip;
} }
const SrsContextId& SrsGb28181RtmpMuxer::get_id() const SrsContextId& SrsGb28181SipSession::get_id()
{ {
return _srs_context->get_id(); return _srs_context->get_id();
} }

2
trunk/src/app/srs_app_gb28181_sip.hpp
View file

@ -34,7 +34,7 @@
#include <srs_sip_stack.hpp> #include <srs_sip_stack.hpp>
#include <srs_app_gb28181.hpp> #include <srs_app_gb28181.hpp>
#include <srs_app_pithy_print.hpp> #include <srs_app_pithy_print.hpp>
#include <srs_service_conn.hpp>
class SrsConfDirective; class SrsConfDirective;
class SrsSipRequest; class SrsSipRequest;