Revert "fix bug of report error when receive a amf3 data object"
This reverts commit 94ef3288. Conflicts: trunk/src/protocol/srs_rtmp_stack.cpp
正在显示
1 个修改的文件
包含
2 行增加
和
2 行删除
| @@ -719,7 +719,7 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsBuffer* stream, | @@ -719,7 +719,7 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsBuffer* stream, | ||
| 719 | srs_verbose("start to decode AMF0/AMF3 command message."); | 719 | srs_verbose("start to decode AMF0/AMF3 command message."); |
| 720 | 720 | ||
| 721 | // skip 1bytes to decode the amf3 command. | 721 | // skip 1bytes to decode the amf3 command. |
| 722 | - if (header.is_amf3_command() && stream->require(1)) { | 722 | + if (header.is_amf3_command() && stream->require(1)) { |
| 723 | srs_verbose("skip 1bytes to decode AMF3 command"); | 723 | srs_verbose("skip 1bytes to decode AMF3 command"); |
| 724 | stream->skip(1); | 724 | stream->skip(1); |
| 725 | } | 725 | } |
| @@ -728,7 +728,7 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsBuffer* stream, | @@ -728,7 +728,7 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsBuffer* stream, | ||
| 728 | // need to read the command name. | 728 | // need to read the command name. |
| 729 | std::string command; | 729 | std::string command; |
| 730 | if ((ret = srs_amf0_read_string(stream, command)) != ERROR_SUCCESS) { | 730 | if ((ret = srs_amf0_read_string(stream, command)) != ERROR_SUCCESS) { |
| 731 | - srs_error("decode AMF0/AMF3 command name failed. message type:%d ret=%d", header.message_type,ret); | 731 | + srs_error("decode AMF0/AMF3 command name failed. ret=%d", ret); |
| 732 | return ret; | 732 | return ret; |
| 733 | } | 733 | } |
| 734 | srs_verbose("AMF0/AMF3 command message, command_name=%s", command.c_str()); | 734 | srs_verbose("AMF0/AMF3 command message, command_name=%s", command.c_str()); |
-
请 注册 或 登录 后发表评论