胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
胡斌
66748fde 1 parent 31a3d800

replace srs_info with srs_trace in do_decode_message

内嵌 并排对比
正在显示 1 个修改的文件 包含 15 行增加 和 14 行删除
@@ -753,17 +753,17 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream, @@ -753,17 +753,17 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream,
753 srs_verbose("AMF0/AMF3 request parsed. request_name=%s", request_name.c_str()); 753 srs_verbose("AMF0/AMF3 request parsed. request_name=%s", request_name.c_str());
754 754
755 if (request_name == RTMP_AMF0_COMMAND_CONNECT) { 755 if (request_name == RTMP_AMF0_COMMAND_CONNECT) {
756 - srs_info("decode the AMF0/AMF3 response command(%s message).", request_name.c_str()); 756 + srs_trace("decode the AMF0/AMF3 response command(%s message).", request_name.c_str());
757 *ppacket = packet = new SrsConnectAppResPacket(); 757 *ppacket = packet = new SrsConnectAppResPacket();
758 return packet->decode(stream); 758 return packet->decode(stream);
759 } else if (request_name == RTMP_AMF0_COMMAND_CREATE_STREAM) { 759 } else if (request_name == RTMP_AMF0_COMMAND_CREATE_STREAM) {
760 - srs_info("decode the AMF0/AMF3 response command(%s message).", request_name.c_str()); 760 + srs_trace("decode the AMF0/AMF3 response command(%s message).", request_name.c_str());
761 *ppacket = packet = new SrsCreateStreamResPacket(0, 0); 761 *ppacket = packet = new SrsCreateStreamResPacket(0, 0);
762 return packet->decode(stream); 762 return packet->decode(stream);
763 } else if (request_name == RTMP_AMF0_COMMAND_RELEASE_STREAM 763 } else if (request_name == RTMP_AMF0_COMMAND_RELEASE_STREAM
764 || request_name == RTMP_AMF0_COMMAND_FC_PUBLISH 764 || request_name == RTMP_AMF0_COMMAND_FC_PUBLISH
765 || request_name == RTMP_AMF0_COMMAND_UNPUBLISH) { 765 || request_name == RTMP_AMF0_COMMAND_UNPUBLISH) {
766 - srs_info("decode the AMF0/AMF3 response command(%s message).", request_name.c_str()); 766 + srs_trace("decode the AMF0/AMF3 response command(%s message).", request_name.c_str());
767 *ppacket = packet = new SrsFMLEStartResPacket(0); 767 *ppacket = packet = new SrsFMLEStartResPacket(0);
768 return packet->decode(stream); 768 return packet->decode(stream);
769 } else { 769 } else {
@@ -783,39 +783,39 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream, @@ -783,39 +783,39 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream,
783 783
784 // decode command object. 784 // decode command object.
785 if (command == RTMP_AMF0_COMMAND_CONNECT) { 785 if (command == RTMP_AMF0_COMMAND_CONNECT) {
786 - srs_info("decode the AMF0/AMF3 command(connect vhost/app message)."); 786 + srs_trace("decode the AMF0/AMF3 command(connect vhost/app message).");
787 *ppacket = packet = new SrsConnectAppPacket(); 787 *ppacket = packet = new SrsConnectAppPacket();
788 return packet->decode(stream); 788 return packet->decode(stream);
789 } else if(command == RTMP_AMF0_COMMAND_CREATE_STREAM) { 789 } else if(command == RTMP_AMF0_COMMAND_CREATE_STREAM) {
790 - srs_info("decode the AMF0/AMF3 command(createStream message)."); 790 + srs_trace("decode the AMF0/AMF3 command(createStream message).");
791 *ppacket = packet = new SrsCreateStreamPacket(); 791 *ppacket = packet = new SrsCreateStreamPacket();
792 return packet->decode(stream); 792 return packet->decode(stream);
793 } else if(command == RTMP_AMF0_COMMAND_PLAY) { 793 } else if(command == RTMP_AMF0_COMMAND_PLAY) {
794 - srs_info("decode the AMF0/AMF3 command(paly message)."); 794 + srs_trace("decode the AMF0/AMF3 command(paly message).");
795 *ppacket = packet = new SrsPlayPacket(); 795 *ppacket = packet = new SrsPlayPacket();
796 return packet->decode(stream); 796 return packet->decode(stream);
797 } else if(command == RTMP_AMF0_COMMAND_PAUSE) { 797 } else if(command == RTMP_AMF0_COMMAND_PAUSE) {
798 - srs_info("decode the AMF0/AMF3 command(pause message)."); 798 + srs_trace("decode the AMF0/AMF3 command(pause message).");
799 *ppacket = packet = new SrsPausePacket(); 799 *ppacket = packet = new SrsPausePacket();
800 return packet->decode(stream); 800 return packet->decode(stream);
801 } else if(command == RTMP_AMF0_COMMAND_RELEASE_STREAM) { 801 } else if(command == RTMP_AMF0_COMMAND_RELEASE_STREAM) {
802 - srs_info("decode the AMF0/AMF3 command(FMLE releaseStream message)."); 802 + srs_trace("decode the AMF0/AMF3 command(FMLE releaseStream message).");
803 *ppacket = packet = new SrsFMLEStartPacket(); 803 *ppacket = packet = new SrsFMLEStartPacket();
804 return packet->decode(stream); 804 return packet->decode(stream);
805 } else if(command == RTMP_AMF0_COMMAND_FC_PUBLISH) { 805 } else if(command == RTMP_AMF0_COMMAND_FC_PUBLISH) {
806 - srs_info("decode the AMF0/AMF3 command(FMLE FCPublish message)."); 806 + srs_trace("decode the AMF0/AMF3 command(FMLE FCPublish message).");
807 *ppacket = packet = new SrsFMLEStartPacket(); 807 *ppacket = packet = new SrsFMLEStartPacket();
808 return packet->decode(stream); 808 return packet->decode(stream);
809 } else if(command == RTMP_AMF0_COMMAND_PUBLISH) { 809 } else if(command == RTMP_AMF0_COMMAND_PUBLISH) {
810 - srs_info("decode the AMF0/AMF3 command(publish message)."); 810 + srs_trace("decode the AMF0/AMF3 command(publish message).");
811 *ppacket = packet = new SrsPublishPacket(); 811 *ppacket = packet = new SrsPublishPacket();
812 return packet->decode(stream); 812 return packet->decode(stream);
813 } else if(command == RTMP_AMF0_COMMAND_UNPUBLISH) { 813 } else if(command == RTMP_AMF0_COMMAND_UNPUBLISH) {
814 - srs_info("decode the AMF0/AMF3 command(unpublish message)."); 814 + srs_trace("decode the AMF0/AMF3 command(unpublish message).");
815 *ppacket = packet = new SrsFMLEStartPacket(); 815 *ppacket = packet = new SrsFMLEStartPacket();
816 return packet->decode(stream); 816 return packet->decode(stream);
817 } else if(command == SRS_CONSTS_RTMP_SET_DATAFRAME || command == SRS_CONSTS_RTMP_ON_METADATA) { 817 } else if(command == SRS_CONSTS_RTMP_SET_DATAFRAME || command == SRS_CONSTS_RTMP_ON_METADATA) {
818 - srs_info("decode the AMF0/AMF3 data(onMetaData message)."); 818 + srs_trace("decode the AMF0/AMF3 data(onMetaData message).");
819 *ppacket = packet = new SrsOnMetaDataPacket(); 819 *ppacket = packet = new SrsOnMetaDataPacket();
820 return packet->decode(stream); 820 return packet->decode(stream);
821 } else if(command == SRS_BW_CHECK_FINISHED 821 } else if(command == SRS_BW_CHECK_FINISHED
@@ -831,15 +831,16 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream, @@ -831,15 +831,16 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream,
831 || command == SRS_BW_CHECK_STOPPED_PUBLISH 831 || command == SRS_BW_CHECK_STOPPED_PUBLISH
832 || command == SRS_BW_CHECK_FINAL) 832 || command == SRS_BW_CHECK_FINAL)
833 { 833 {
834 - srs_info("decode the AMF0/AMF3 band width check message."); 834 + srs_trace("decode the AMF0/AMF3 band width check message.");
835 *ppacket = packet = new SrsBandwidthPacket(); 835 *ppacket = packet = new SrsBandwidthPacket();
836 return packet->decode(stream); 836 return packet->decode(stream);
837 } else if (command == RTMP_AMF0_COMMAND_CLOSE_STREAM) { 837 } else if (command == RTMP_AMF0_COMMAND_CLOSE_STREAM) {
838 - srs_info("decode the AMF0/AMF3 closeStream message."); 838 + srs_trace("decode the AMF0/AMF3 closeStream message.");
839 *ppacket = packet = new SrsCloseStreamPacket(); 839 *ppacket = packet = new SrsCloseStreamPacket();
840 return packet->decode(stream); 840 return packet->decode(stream);
841 }else if (command == RTMP_AMF0_COMMAND_CHECKBANDWIDTH || command == RTMP_AMF0_COMMAND_CHECKBW) { 841 }else if (command == RTMP_AMF0_COMMAND_CHECKBANDWIDTH || command == RTMP_AMF0_COMMAND_CHECKBW) {
842 //todo: process check bandwidth command,now drop it 842 //todo: process check bandwidth command,now drop it
  843 + srs_trace("decode the AMF0/AMF3 call message:%s,ignore it",command.c_str());
843 return ret; 844 return ret;
844 } 845 }
845 else if (header.is_amf0_command() || header.is_amf3_command()) { 846 else if (header.is_amf0_command() || header.is_amf3_command()) {