From a1f887f46f757601c3bd1bb520bfe97d3783189f Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 17 Jan 2015 13:29:11 +0800
Subject: [PATCH] refine code, move onMetaData to consts.

---
 trunk/research/librtmp/srs_rtmp_dump.c |  2 +-
 trunk/src/kernel/srs_kernel_consts.hpp |  6 ++++++
 trunk/src/libs/srs_librtmp.cpp         | 10 +++++++---
 trunk/src/rtmp/srs_protocol_stack.cpp  |  8 +++-----
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/trunk/research/librtmp/srs_rtmp_dump.c b/trunk/research/librtmp/srs_rtmp_dump.c
index 0e7e82b69..d9d012903 100644
--- a/trunk/research/librtmp/srs_rtmp_dump.c
+++ b/trunk/research/librtmp/srs_rtmp_dump.c
@@ -290,7 +290,7 @@ int main(int argc, char** argv)
                     goto rtmp_destroy;
                 }
             } else {
-                srs_human_trace("drop message type=%d, size=%dB", type, size);
+                srs_human_trace("drop message type=%#x, size=%dB", type, size);
             }
         }
         
diff --git a/trunk/src/kernel/srs_kernel_consts.hpp b/trunk/src/kernel/srs_kernel_consts.hpp
index 935c86e17..eaf6f8c6a 100644
--- a/trunk/src/kernel/srs_kernel_consts.hpp
+++ b/trunk/src/kernel/srs_kernel_consts.hpp
@@ -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
 ///////////////////////////////////////////////////////////
diff --git a/trunk/src/libs/srs_librtmp.cpp b/trunk/src/libs/srs_librtmp.cpp
index eefd006a3..16e66f573 100644
--- a/trunk/src/libs/srs_librtmp.cpp
+++ b/trunk/src/libs/srs_librtmp.cpp
@@ -1082,11 +1082,15 @@ srs_bool srs_rtmp_is_onMetaData(char type, char* data, int size)
         return false;
     }
     
-    if (name != "onMetaData") {
-        return false;
+    if (name == SRS_CONSTS_RTMP_ON_METADATA) {
+        return true;
     }
     
-    return true;
+    if (name == SRS_CONSTS_RTMP_SET_DATAFRAME) {
+        return true;
+    }
+    
+    return false;
 }
 
 /**
diff --git a/trunk/src/rtmp/srs_protocol_stack.cpp b/trunk/src/rtmp/srs_protocol_stack.cpp
index a2da124a5..920c2df7e 100644
--- a/trunk/src/rtmp/srs_protocol_stack.cpp
+++ b/trunk/src/rtmp/srs_protocol_stack.cpp
@@ -189,8 +189,6 @@ messages.
 #define RTMP_AMF0_COMMAND_UNPUBLISH             "FCUnpublish"
 #define RTMP_AMF0_COMMAND_PUBLISH               "publish"
 #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.
@@ -1100,7 +1098,7 @@ int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream,
             srs_info("decode the AMF0/AMF3 command(unpublish message).");
             *ppacket = packet = new SrsFMLEStartPacket();
             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).");
             *ppacket = packet = new SrsOnMetaDataPacket();
             return packet->decode(stream);
@@ -3756,7 +3754,7 @@ int SrsSampleAccessPacket::encode_packet(SrsStream* stream)
 
 SrsOnMetaDataPacket::SrsOnMetaDataPacket()
 {
-    name = RTMP_AMF0_DATA_ON_METADATA;
+    name = SRS_CONSTS_RTMP_ON_METADATA;
     metadata = SrsAmf0Any::object();
 }
 
@@ -3775,7 +3773,7 @@ int SrsOnMetaDataPacket::decode(SrsStream* stream)
     }
 
     // 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) {
             srs_error("decode metadata name failed. ret=%d", ret);
             return ret;