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

for #250, add mpegts over udp stream caster class.

Browse source
This commit is contained in:
winlin 2015-01-24 16:27:30 +08:00
parent 7f02bfa3a4
commit 6463d22a14
8 changed files with 148 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

25
trunk/src/app/srs_app_server.cpp
View file

@ -44,6 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_source.hpp>
#include <srs_app_utility.hpp>
#include <srs_app_heartbeat.hpp>
#include <srs_app_mpegts_udp.hpp>
// signal defines.
#define SIGNAL_RELOAD SIGHUP
@ -226,14 +227,18 @@ int SrsListener::cycle()
return ret;
}
SrsUdpListener::SrsUdpListener(SrsServer* server, SrsListenerType type) : SrsListener(server, type)
#ifdef SRS_AUTO_STREAM_CASTER
SrsUdpListener::SrsUdpListener(SrsServer* server, SrsListenerType type, SrsConfDirective* c) : SrsListener(server, type)
{
nb_buf = SRS_UDP_MAX_PACKET_SIZE;
buf = new char[nb_buf];
caster = new SrsMpegtsOverUdp(c);
}
SrsUdpListener::~SrsUdpListener()
{
srs_freep(caster);
srs_freep(buf);
}
int SrsUdpListener::listen(int port)
@ -313,7 +318,7 @@ int SrsUdpListener::cycle()
continue;
}
if ((ret = _server->on_udp_packet(_type, &from, buf, nread)) != ERROR_SUCCESS) {
if ((ret = caster->on_udp_packet(&from, buf, nread)) != ERROR_SUCCESS) {
srs_warn("handle udp packet failed. ret=%d", ret);
continue;
}
@ -328,6 +333,7 @@ int SrsUdpListener::cycle()
return ret;
}
#endif
SrsSignalManager* SrsSignalManager::instance = NULL;
@ -1015,7 +1021,7 @@ int SrsServer::listen_stream_caster()
std::string caster = _srs_config->get_stream_caster_engine(stream_caster);
if (caster == SRS_CONF_DEFAULT_STREAM_CASTER_MPEGTS_OVER_UDP) {
listener = new SrsUdpListener(this, SrsListenerMpegTsOverUdp);
listener = new SrsUdpListener(this, SrsListenerMpegTsOverUdp, stream_caster);
} else {
ret = ERROR_STREAM_CASTER_ENGINE;
srs_error("unsupported stream caster %s. ret=%d", caster.c_str(), ret);
@ -1141,19 +1147,6 @@ int SrsServer::accept_client(SrsListenerType type, st_netfd_t client_stfd)
return ret;
}
int SrsServer::on_udp_packet(SrsListenerType type, sockaddr_in* from, char* buf, int nb_buf)
{
int ret = ERROR_SUCCESS;
std::string peer_ip = inet_ntoa(from->sin_addr);
int peer_port = ntohs(from->sin_port);
// TODO: FIXME: implements it.
srs_warn("udp: drop %s:%d packet %d bytes", peer_ip.c_str(), peer_port, nb_buf);
return ret;
}
int SrsServer::on_reload_listen()
{
return listen();