external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00
Code Issues Releases Wiki Activity

refine code, move onMetaData to consts.

Browse source
This commit is contained in:
winlin 2015-01-17 13:29:11 +08:00
parent 04aa6f8296
commit a1f887f46f
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/research/librtmp/srs_rtmp_dump.c
View file

@ -290,7 +290,7 @@ int main(int argc, char** argv)
goto rtmp_destroy; goto rtmp_destroy;
} }
} else { } else {
srs_human_trace("drop message type=%d, size=%dB", type, size); srs_human_trace("drop message type=%#x, size=%dB", type, size);
} }
} }

6
trunk/src/kernel/srs_kernel_consts.hpp
View file

@ -195,6 +195,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////
// RTMP consts values
///////////////////////////////////////////////////////////
#define SRS_CONSTS_RTMP_SET_DATAFRAME "@setDataFrame"
#define SRS_CONSTS_RTMP_ON_METADATA "onMetaData"
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// HTTP consts values // HTTP consts values
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////

10
trunk/src/libs/srs_librtmp.cpp
View file

@ -1082,11 +1082,15 @@ srs_bool srs_rtmp_is_onMetaData(char type, char* data, int size)
return false; return false;
} }
if (name != "onMetaData") { if (name == SRS_CONSTS_RTMP_ON_METADATA) {
return false; return true;
} }
return true; if (name == SRS_CONSTS_RTMP_SET_DATAFRAME) {
return true;
}
return false;
} }
/** /**

8
trunk/src/rtmp/srs_protocol_stack.cpp
View file

@ -189,8 +189,6 @@ messages.
#define RTMP_AMF0_COMMAND_UNPUBLISH "FCUnpublish" #define RTMP_AMF0_COMMAND_UNPUBLISH "FCUnpublish"
#define RTMP_AMF0_COMMAND_PUBLISH "publish" #define RTMP_AMF0_COMMAND_PUBLISH "publish"
#define RTMP_AMF0_DATA_SAMPLE_ACCESS "|RtmpSampleAccess" #define RTMP_AMF0_DATA_SAMPLE_ACCESS "|RtmpSampleAccess"
#define RTMP_AMF0_DATA_SET_DATAFRAME "@setDataFrame"
#define RTMP_AMF0_DATA_ON_METADATA "onMetaData"
/** /**
* band width check method name, which will be invoked by client. * band width check method name, which will be invoked by client.
@ -1100,7 +1098,7 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream,
srs_info("decode the AMF0/AMF3 command(unpublish message)."); srs_info("decode the AMF0/AMF3 command(unpublish message).");
*ppacket = packet = new SrsFMLEStartPacket(); *ppacket = packet = new SrsFMLEStartPacket();
return packet->decode(stream); return packet->decode(stream);
} else if(command == RTMP_AMF0_DATA_SET_DATAFRAME || command == RTMP_AMF0_DATA_ON_METADATA) { } else if(command == SRS_CONSTS_RTMP_SET_DATAFRAME || command == SRS_CONSTS_RTMP_ON_METADATA) {
srs_info("decode the AMF0/AMF3 data(onMetaData message)."); srs_info("decode the AMF0/AMF3 data(onMetaData message).");
*ppacket = packet = new SrsOnMetaDataPacket(); *ppacket = packet = new SrsOnMetaDataPacket();
return packet->decode(stream); return packet->decode(stream);
@ -3756,7 +3754,7 @@ int SrsSampleAccessPacket::encode_packet(SrsStream* stream)
SrsOnMetaDataPacket::SrsOnMetaDataPacket() SrsOnMetaDataPacket::SrsOnMetaDataPacket()
{ {
name = RTMP_AMF0_DATA_ON_METADATA; name = SRS_CONSTS_RTMP_ON_METADATA;
metadata = SrsAmf0Any::object(); metadata = SrsAmf0Any::object();
} }
@ -3775,7 +3773,7 @@ int SrsOnMetaDataPacket::decode(SrsStream* stream)
} }
// ignore the @setDataFrame // ignore the @setDataFrame
if (name == RTMP_AMF0_DATA_SET_DATAFRAME) { if (name == SRS_CONSTS_RTMP_SET_DATAFRAME) {
if ((ret = srs_amf0_read_string(stream, name)) != ERROR_SUCCESS) { if ((ret = srs_amf0_read_string(stream, name)) != ERROR_SUCCESS) {
srs_error("decode metadata name failed. ret=%d", ret); srs_error("decode metadata name failed. ret=%d", ret);
return ret; return ret;