正在显示
2 个修改的文件
包含
4 行增加
和
2 行删除
| @@ -922,9 +922,10 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, SrsMessage* msg | @@ -922,9 +922,10 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, SrsMessage* msg | ||
| 922 | // @see https://github.com/winlinvip/simple-rtmp-server/issues/106 | 922 | // @see https://github.com/winlinvip/simple-rtmp-server/issues/106 |
| 923 | // TODO: FIXME: response in right way, or forward in edge mode. | 923 | // TODO: FIXME: response in right way, or forward in edge mode. |
| 924 | SrsCallPacket* call = dynamic_cast<SrsCallPacket*>(pkt); | 924 | SrsCallPacket* call = dynamic_cast<SrsCallPacket*>(pkt); |
| 925 | + if (call) { | ||
| 925 | // only response it when transaction id not zero, | 926 | // only response it when transaction id not zero, |
| 926 | // for the zero means donot need response. | 927 | // for the zero means donot need response. |
| 927 | - if (call && call->transaction_id > 0) { | 928 | + if (call->transaction_id > 0) { |
| 928 | SrsCallResPacket* res = new SrsCallResPacket(call->transaction_id); | 929 | SrsCallResPacket* res = new SrsCallResPacket(call->transaction_id); |
| 929 | res->command_object = SrsAmf0Any::null(); | 930 | res->command_object = SrsAmf0Any::null(); |
| 930 | res->response = SrsAmf0Any::null(); | 931 | res->response = SrsAmf0Any::null(); |
| @@ -932,6 +933,7 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, SrsMessage* msg | @@ -932,6 +933,7 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, SrsMessage* msg | ||
| 932 | srs_warn("response call failed. ret=%d", ret); | 933 | srs_warn("response call failed. ret=%d", ret); |
| 933 | return ret; | 934 | return ret; |
| 934 | } | 935 | } |
| 936 | + } | ||
| 935 | return ret; | 937 | return ret; |
| 936 | } | 938 | } |
| 937 | 939 |
| @@ -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 23 | 34 | +#define VERSION_REVISION 24 |
| 35 | // server info. | 35 | // server info. |
| 36 | #define RTMP_SIG_SRS_KEY "SRS" | 36 | #define RTMP_SIG_SRS_KEY "SRS" |
| 37 | #define RTMP_SIG_SRS_ROLE "origin/edge server" | 37 | #define RTMP_SIG_SRS_ROLE "origin/edge server" |
-
请 注册 或 登录 后发表评论