正在显示
2 个修改的文件
包含
9 行增加
和
2 行删除
| @@ -230,9 +230,16 @@ int SrsListener::cycle() | @@ -230,9 +230,16 @@ int SrsListener::cycle() | ||
| 230 | #ifdef SRS_AUTO_STREAM_CASTER | 230 | #ifdef SRS_AUTO_STREAM_CASTER |
| 231 | SrsUdpListener::SrsUdpListener(SrsServer* server, SrsListenerType type, SrsConfDirective* c) : SrsListener(server, type) | 231 | SrsUdpListener::SrsUdpListener(SrsServer* server, SrsListenerType type, SrsConfDirective* c) : SrsListener(server, type) |
| 232 | { | 232 | { |
| 233 | + _type = type; | ||
| 233 | nb_buf = SRS_UDP_MAX_PACKET_SIZE; | 234 | nb_buf = SRS_UDP_MAX_PACKET_SIZE; |
| 234 | buf = new char[nb_buf]; | 235 | buf = new char[nb_buf]; |
| 235 | - caster = new SrsMpegtsOverUdp(c); | 236 | + |
| 237 | + // the caller already ensure the type is ok, | ||
| 238 | + // we just assert here for unknown stream caster. | ||
| 239 | + srs_assert(_type == SrsListenerMpegTsOverUdp); | ||
| 240 | + if (_type == SrsListenerMpegTsOverUdp) { | ||
| 241 | + caster = new SrsMpegtsOverUdp(c); | ||
| 242 | + } | ||
| 236 | } | 243 | } |
| 237 | 244 | ||
| 238 | SrsUdpListener::~SrsUdpListener() | 245 | SrsUdpListener::~SrsUdpListener() |
| @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 31 | // current release version | 31 | // current release version |
| 32 | #define VERSION_MAJOR 2 | 32 | #define VERSION_MAJOR 2 |
| 33 | #define VERSION_MINOR 0 | 33 | #define VERSION_MINOR 0 |
| 34 | -#define VERSION_REVISION 103 | 34 | +#define VERSION_REVISION 104 |
| 35 | 35 | ||
| 36 | // server info. | 36 | // server info. |
| 37 | #define RTMP_SIG_SRS_KEY "SRS" | 37 | #define RTMP_SIG_SRS_KEY "SRS" |
-
请 注册 或 登录 后发表评论