mirror of
https://github.com/ossrs/srs.git
synced 2025-02-13 11:51:57 +00:00
Merge branch '2.0release' into develop
This commit is contained in:
commit
3dadad2dbc
8 changed files with 818 additions and 818 deletions
0
trunk/src/app/srs_app_edge.cpp
Executable file → Normal file
0
trunk/src/app/srs_app_edge.cpp
Executable file → Normal file
0
trunk/src/app/srs_app_edge.hpp
Executable file → Normal file
0
trunk/src/app/srs_app_edge.hpp
Executable file → Normal file
File diff suppressed because it is too large
Load diff
|
@ -1,68 +1,68 @@
|
||||||
/*
|
/*
|
||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2013-2015 SRS(simple-rtmp-server)
|
Copyright (c) 2013-2015 SRS(simple-rtmp-server)
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
this software and associated documentation files (the "Software"), to deal in
|
this software and associated documentation files (the "Software"), to deal in
|
||||||
the Software without restriction, including without limitation the rights to
|
the Software without restriction, including without limitation the rights to
|
||||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||||
the Software, and to permit persons to whom the Software is furnished to do so,
|
the Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
subject to the following conditions:
|
subject to the following conditions:
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
The above copyright notice and this permission notice shall be included in all
|
||||||
copies or substantial portions of the Software.
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef SRS_APP_HDS_HPP
|
#ifndef SRS_APP_HDS_HPP
|
||||||
#define SRS_APP_HDS_HPP
|
#define SRS_APP_HDS_HPP
|
||||||
|
|
||||||
#include <srs_core.hpp>
|
#include <srs_core.hpp>
|
||||||
|
|
||||||
#ifdef SRS_AUTO_HDS
|
#ifdef SRS_AUTO_HDS
|
||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
|
|
||||||
class SrsRequest;
|
class SrsRequest;
|
||||||
class SrsSharedPtrMessage;
|
class SrsSharedPtrMessage;
|
||||||
class SrsHdsFragment;
|
class SrsHdsFragment;
|
||||||
class SrsSource;
|
class SrsSource;
|
||||||
|
|
||||||
class SrsHds
|
class SrsHds
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
SrsHds(SrsSource* s);
|
SrsHds(SrsSource* s);
|
||||||
~SrsHds();
|
~SrsHds();
|
||||||
|
|
||||||
int on_publish(SrsRequest* req);
|
int on_publish(SrsRequest* req);
|
||||||
int on_unpublish();
|
int on_unpublish();
|
||||||
|
|
||||||
int on_video(SrsSharedPtrMessage* msg);
|
int on_video(SrsSharedPtrMessage* msg);
|
||||||
int on_audio(SrsSharedPtrMessage* msg);
|
int on_audio(SrsSharedPtrMessage* msg);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int flush_mainfest();
|
int flush_mainfest();
|
||||||
int flush_bootstrap();
|
int flush_bootstrap();
|
||||||
void adjust_windows();
|
void adjust_windows();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::list<SrsHdsFragment *> fragments;
|
std::list<SrsHdsFragment *> fragments;
|
||||||
SrsHdsFragment *currentSegment;
|
SrsHdsFragment *currentSegment;
|
||||||
int fragment_index;
|
int fragment_index;
|
||||||
SrsSharedPtrMessage *video_sh;
|
SrsSharedPtrMessage *video_sh;
|
||||||
SrsSharedPtrMessage *audio_sh;
|
SrsSharedPtrMessage *audio_sh;
|
||||||
|
|
||||||
SrsRequest *hds_req;
|
SrsRequest *hds_req;
|
||||||
bool hds_enabled;
|
bool hds_enabled;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
0
trunk/src/app/srs_app_rtmp_conn.cpp
Executable file → Normal file
0
trunk/src/app/srs_app_rtmp_conn.cpp
Executable file → Normal file
0
trunk/src/app/srs_app_rtmp_conn.hpp
Executable file → Normal file
0
trunk/src/app/srs_app_rtmp_conn.hpp
Executable file → Normal file
0
trunk/src/app/srs_app_source.cpp
Executable file → Normal file
0
trunk/src/app/srs_app_source.cpp
Executable file → Normal file
0
trunk/src/app/srs_app_source.hpp
Executable file → Normal file
0
trunk/src/app/srs_app_source.hpp
Executable file → Normal file
Loading…
Reference in a new issue