refine code, add human readable section

@@ -701,23 +701,6 @@ int srs_publish_stream(srs_rtmp_t rtmp)
     return ret;
     return ret;
 }
 }
 
 
-const char* srs_type2string(char type)
-{
-    static const char* audio = "Audio";
-    static const char* video = "Video";
-    static const char* data = "Data";
-    static const char* unknown = "Unknown";
-    
-    switch (type) {
-        case SRS_RTMP_TYPE_AUDIO: return audio;
-        case SRS_RTMP_TYPE_VIDEO: return video;
-        case SRS_RTMP_TYPE_SCRIPT: return data;
-        default: return unknown;
-    }
-    
-    return unknown;
-}
-
 int srs_bandwidth_check(srs_rtmp_t rtmp, 
 int srs_bandwidth_check(srs_rtmp_t rtmp, 
     int64_t* start_time, int64_t* end_time, 
     int64_t* start_time, int64_t* end_time, 
     int* play_kbps, int* publish_kbps,
     int* play_kbps, int* publish_kbps,
@@ -948,29 +931,6 @@ char srs_get_codec_id(char* data, int size)
     return codec_id;
     return codec_id;
 }
 }
 
 
-const char* srs_code_id2string(char codec_id)
-{
-    static const char* h263 = "H.263";
-    static const char* screen = "Screen";
-    static const char* vp6 = "VP6";
-    static const char* vp6_alpha = "VP6Alpha";
-    static const char* screen2 = "Screen2";
-    static const char* h264 = "H.264";
-    static const char* unknown = "Unknown";
-    
-    switch (codec_id) {
-        case 2: return h263;
-        case 3: return screen;
-        case 4: return vp6;
-        case 5: return vp6_alpha;
-        case 6: return screen2;
-        case 7: return h264;
-        default: return unknown;
-    }
-    
-    return unknown;
-}
-
 char srs_get_avc_packet_type(char* data, int size)
 char srs_get_avc_packet_type(char* data, int size)
 {
 {
     if (size < 2) {
     if (size < 2) {
@@ -990,23 +950,6 @@ char srs_get_avc_packet_type(char* data, int size)
     return avc_packet_type;
     return avc_packet_type;
 }
 }
 
 
-const char* srs_avc_packet2string(char avc_packet_type)
-{
-    static const char* sps_pps = "SpsPps";
-    static const char* nalu = "Nalu";
-    static const char* sps_pps_end = "SpsPpsEnd";
-    static const char* unknown = "Unknown";
-    
-    switch (avc_packet_type) {
-        case 0: return sps_pps;
-        case 1: return nalu;
-        case 2: return sps_pps_end;
-        default: return unknown;
-    }
-    
-    return unknown;
-}
-
 char srs_get_frame_type(char* data, int size)
 char srs_get_frame_type(char* data, int size)
 {
 {
     if (size < 1) {
     if (size < 1) {
@@ -1026,101 +969,6 @@ char srs_get_frame_type(char* data, int size)
     return frame_type;
     return frame_type;
 }
 }
 
 
-const char* srs_frame_type2string(char frame_type)
-{
-    static const char* keyframe = "I";
-    static const char* interframe = "P/B";
-    static const char* disposable_interframe = "DI";
-    static const char* generated_keyframe = "GI";
-    static const char* video_infoframe = "VI";
-    static const char* unknown = "Unknown";
-    
-    switch (frame_type) {
-        case 1: return keyframe;
-        case 2: return interframe;
-        case 3: return disposable_interframe;
-        case 4: return generated_keyframe;
-        case 5: return video_infoframe;
-        default: return unknown;
-    }
-    
-    return unknown;
-}
-
-int srs_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int size)
-{
-    int ret = ERROR_SUCCESS;
-    
-    u_int32_t pts;
-    if (srs_parse_timestamp(timestamp, type, data, size, &pts) != 0) {
-        return ret;
-    }
-    
-    if (type == SRS_RTMP_TYPE_VIDEO) {
-        srs_lib_trace("Video packet type=%s, dts=%d, pts=%d, size=%d, %s(%s,%s)", 
-            srs_type2string(type), timestamp, pts, size,
-            srs_code_id2string(srs_get_codec_id(data, size)),
-            srs_avc_packet2string(srs_get_avc_packet_type(data, size)),
-            srs_frame_type2string(srs_get_frame_type(data, size))
-        );
-    } else if (type == SRS_RTMP_TYPE_AUDIO) {
-        srs_lib_trace("Audio packet type=%s, dts=%d, pts=%d, size=%d", 
-            srs_type2string(type), timestamp, pts, size);
-    } else if (type == SRS_RTMP_TYPE_SCRIPT) {
-        srs_lib_verbose("Data packet type=%s, time=%d, size=%d", 
-            srs_type2string(type), timestamp, size);
-        int nparsed = 0;
-        while (nparsed < size) {
-            int nb_parsed_this = 0;
-            srs_amf0_t amf0 = srs_amf0_parse(data + nparsed, size - nparsed, &nb_parsed_this);
-            if (amf0 == NULL) {
-                break;
-            }
-            
-            nparsed += nb_parsed_this;
-            
-            char* amf0_str = NULL;
-            srs_raw_trace("%s", srs_amf0_human_print(amf0, &amf0_str, NULL));
-            srs_amf0_free_bytes(amf0_str);
-        }
-    } else {
-        srs_lib_trace("Unknown packet type=%s, dts=%d, pts=%d, size=%d", 
-            srs_type2string(type), timestamp, pts, size);
-    }
-    
-    return ret;
-}
-
-const char* srs_format_time()
-{
-    struct timeval tv;
-    static char buf[23];
-    
-    memset(buf, 0, sizeof(buf));
-    
-    // clock time
-    if (gettimeofday(&tv, NULL) == -1) {
-        return buf;
-    }
-    
-    // to calendar time
-    struct tm* tm;
-    if ((tm = localtime((const time_t*)&tv.tv_sec)) == NULL) {
-        return buf;
-    }
-    
-    snprintf(buf, sizeof(buf), 
-        "%d-%02d-%02d %02d:%02d:%02d.%03d", 
-        1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday, 
-        tm->tm_hour, tm->tm_min, tm->tm_sec, 
-        (int)(tv.tv_usec / 1000));
-        
-    // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
-    buf[sizeof(buf) - 1] = 0;
-    
-    return buf;
-}
-
 struct FlvContext
 struct FlvContext
 {
 {
     SrsFileReader reader;
     SrsFileReader reader;
@@ -1595,6 +1443,158 @@ char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize)
     return any->human_print(pdata, psize);
     return any->human_print(pdata, psize);
 }
 }
 
 
+const char* srs_type2string(char type)
+{
+    static const char* audio = "Audio";
+    static const char* video = "Video";
+    static const char* data = "Data";
+    static const char* unknown = "Unknown";
+    
+    switch (type) {
+        case SRS_RTMP_TYPE_AUDIO: return audio;
+        case SRS_RTMP_TYPE_VIDEO: return video;
+        case SRS_RTMP_TYPE_SCRIPT: return data;
+        default: return unknown;
+    }
+    
+    return unknown;
+}
+
+const char* srs_code_id2string(char codec_id)
+{
+    static const char* h263 = "H.263";
+    static const char* screen = "Screen";
+    static const char* vp6 = "VP6";
+    static const char* vp6_alpha = "VP6Alpha";
+    static const char* screen2 = "Screen2";
+    static const char* h264 = "H.264";
+    static const char* unknown = "Unknown";
+    
+    switch (codec_id) {
+        case 2: return h263;
+        case 3: return screen;
+        case 4: return vp6;
+        case 5: return vp6_alpha;
+        case 6: return screen2;
+        case 7: return h264;
+        default: return unknown;
+    }
+    
+    return unknown;
+}
+
+const char* srs_avc_packet2string(char avc_packet_type)
+{
+    static const char* sps_pps = "SpsPps";
+    static const char* nalu = "Nalu";
+    static const char* sps_pps_end = "SpsPpsEnd";
+    static const char* unknown = "Unknown";
+    
+    switch (avc_packet_type) {
+        case 0: return sps_pps;
+        case 1: return nalu;
+        case 2: return sps_pps_end;
+        default: return unknown;
+    }
+    
+    return unknown;
+}
+
+const char* srs_frame_type2string(char frame_type)
+{
+    static const char* keyframe = "I";
+    static const char* interframe = "P/B";
+    static const char* disposable_interframe = "DI";
+    static const char* generated_keyframe = "GI";
+    static const char* video_infoframe = "VI";
+    static const char* unknown = "Unknown";
+    
+    switch (frame_type) {
+        case 1: return keyframe;
+        case 2: return interframe;
+        case 3: return disposable_interframe;
+        case 4: return generated_keyframe;
+        case 5: return video_infoframe;
+        default: return unknown;
+    }
+    
+    return unknown;
+}
+
+int srs_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int size)
+{
+    int ret = ERROR_SUCCESS;
+    
+    u_int32_t pts;
+    if (srs_parse_timestamp(timestamp, type, data, size, &pts) != 0) {
+        return ret;
+    }
+    
+    if (type == SRS_RTMP_TYPE_VIDEO) {
+        srs_lib_trace("Video packet type=%s, dts=%d, pts=%d, size=%d, %s(%s,%s)", 
+            srs_type2string(type), timestamp, pts, size,
+            srs_code_id2string(srs_get_codec_id(data, size)),
+            srs_avc_packet2string(srs_get_avc_packet_type(data, size)),
+            srs_frame_type2string(srs_get_frame_type(data, size))
+        );
+    } else if (type == SRS_RTMP_TYPE_AUDIO) {
+        srs_lib_trace("Audio packet type=%s, dts=%d, pts=%d, size=%d", 
+            srs_type2string(type), timestamp, pts, size);
+    } else if (type == SRS_RTMP_TYPE_SCRIPT) {
+        srs_lib_verbose("Data packet type=%s, time=%d, size=%d", 
+            srs_type2string(type), timestamp, size);
+        int nparsed = 0;
+        while (nparsed < size) {
+            int nb_parsed_this = 0;
+            srs_amf0_t amf0 = srs_amf0_parse(data + nparsed, size - nparsed, &nb_parsed_this);
+            if (amf0 == NULL) {
+                break;
+            }
+            
+            nparsed += nb_parsed_this;
+            
+            char* amf0_str = NULL;
+            srs_raw_trace("%s", srs_amf0_human_print(amf0, &amf0_str, NULL));
+            srs_amf0_free_bytes(amf0_str);
+        }
+    } else {
+        srs_lib_trace("Unknown packet type=%s, dts=%d, pts=%d, size=%d", 
+            srs_type2string(type), timestamp, pts, size);
+    }
+    
+    return ret;
+}
+
+const char* srs_format_time()
+{
+    struct timeval tv;
+    static char buf[23];
+    
+    memset(buf, 0, sizeof(buf));
+    
+    // clock time
+    if (gettimeofday(&tv, NULL) == -1) {
+        return buf;
+    }
+    
+    // to calendar time
+    struct tm* tm;
+    if ((tm = localtime((const time_t*)&tv.tv_sec)) == NULL) {
+        return buf;
+    }
+    
+    snprintf(buf, sizeof(buf), 
+        "%d-%02d-%02d %02d:%02d:%02d.%03d", 
+        1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday, 
+        tm->tm_hour, tm->tm_min, tm->tm_sec, 
+        (int)(tv.tv_usec / 1000));
+        
+    // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
+    buf[sizeof(buf) - 1] = 0;
+    
+    return buf;
+}
+
 /**
 /**
 * write audio raw frame to SRS.
 * write audio raw frame to SRS.
 */
 */

@@ -226,16 +226,6 @@ extern int srs_bandwidth_check(srs_rtmp_t rtmp,
 // 18 = script data
 // 18 = script data
 #define SRS_RTMP_TYPE_SCRIPT 18
 #define SRS_RTMP_TYPE_SCRIPT 18
 /**
 /**
-* convert the flv tag type to string.
-*     SRS_RTMP_TYPE_AUDIO to "Audio"
-*     SRS_RTMP_TYPE_VIDEO to "Video"
-*     SRS_RTMP_TYPE_SCRIPT to "Data"
-*     otherwise, "Unknown"
-* @remark user never free the return char*, 
-*   it's static shared const string.
-*/
-extern const char* srs_type2string(char type);
-/**
 * read a audio/video/script-data packet from rtmp stream.
 * read a audio/video/script-data packet from rtmp stream.
 * @param type, output the packet type, macros:
 * @param type, output the packet type, macros:
 *            SRS_RTMP_TYPE_AUDIO, FlvTagAudio
 *            SRS_RTMP_TYPE_AUDIO, FlvTagAudio
@@ -323,20 +313,6 @@ extern int srs_parse_timestamp(
 extern char srs_get_codec_id(char* data, int size);
 extern char srs_get_codec_id(char* data, int size);
 
 
 /**
 /**
-* get the codec id string.
-*           H.263 = Sorenson H.263
-*           Screen = Screen video
-*           VP6 = On2 VP6
-*           VP6Alpha = On2 VP6 with alpha channel
-*           Screen2 = Screen video version 2
-*           H.264 = AVC
-*           otherwise, "Unknown"
-* @remark user never free the return char*, 
-*   it's static shared const string.
-*/
-extern const char* srs_code_id2string(char codec_id);
-
-/**
 * get the AVCPacketType of video tag.
 * get the AVCPacketType of video tag.
 * The following values are defined:
 * The following values are defined:
 *           0 = AVC sequence header
 *           0 = AVC sequence header
@@ -348,17 +324,6 @@ extern const char* srs_code_id2string(char codec_id);
 extern char srs_get_avc_packet_type(char* data, int size);
 extern char srs_get_avc_packet_type(char* data, int size);
 
 
 /**
 /**
-* get the avc packet type string.
-*           SpsPps = AVC sequence header
-*           Nalu = AVC NALU
-*           SpsPpsEnd = AVC end of sequence
-*           otherwise, "Unknown"
-* @remark user never free the return char*, 
-*   it's static shared const string.
-*/
-extern const char* srs_avc_packet2string(char avc_packet_type);
-
-/**
 * get the FrameType of video tag.
 * get the FrameType of video tag.
 * Type of video frame. The following values are defined:
 * Type of video frame. The following values are defined:
 *           1 = key frame (for AVC, a seekable frame)
 *           1 = key frame (for AVC, a seekable frame)
@@ -370,32 +335,6 @@ extern const char* srs_avc_packet2string(char avc_packet_type);
 */
 */
 extern char srs_get_frame_type(char* data, int size);
 extern char srs_get_frame_type(char* data, int size);
 
 
-/**
-* get the frame type string.
-*           I = key frame (for AVC, a seekable frame)
-*           P/B = inter frame (for AVC, a non-seekable frame)
-*           DI = disposable inter frame (H.263 only)
-*           GI = generated key frame (reserved for server use only)
-*           VI = video info/command frame
-*           otherwise, "Unknown"
-* @remark user never free the return char*, 
-*   it's static shared const string.
-*/
-extern const char* srs_frame_type2string(char frame_type);
-
-/**
-* print the rtmp packet, use srs_lib_trace/srs_lib_verbose for packet,
-* and use srs_raw_trace for script data body.
-* @return an error code for parse the timetstamp to dts and pts.
-*/
-extern int srs_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int size);
-
-// log to console, for use srs-librtmp application.
-extern const char* srs_format_time();
-#define srs_lib_trace(msg, ...) printf("[%s] ", srs_format_time());printf(msg, ##__VA_ARGS__);printf("\n")
-#define srs_lib_verbose(msg, ...) printf("[%s] ", srs_format_time());printf(msg, ##__VA_ARGS__);printf("\n")
-#define srs_raw_trace(msg, ...) printf(msg, ##__VA_ARGS__)
-
 /*************************************************************
 /*************************************************************
 **************************************************************
 **************************************************************
 * flv codec
 * flv codec
@@ -553,6 +492,12 @@ extern void srs_amf0_ecma_array_property_set(srs_amf0_t amf0, const char* name,
 extern int srs_amf0_strict_array_property_count(srs_amf0_t amf0);
 extern int srs_amf0_strict_array_property_count(srs_amf0_t amf0);
 extern srs_amf0_t srs_amf0_strict_array_property_at(srs_amf0_t amf0, int index);
 extern srs_amf0_t srs_amf0_strict_array_property_at(srs_amf0_t amf0, int index);
 extern void srs_amf0_strict_array_append(srs_amf0_t amf0, srs_amf0_t value);
 extern void srs_amf0_strict_array_append(srs_amf0_t amf0, srs_amf0_t value);
+
+/*************************************************************
+**************************************************************
+* human readable print.
+**************************************************************
+*************************************************************/
 /**
 /**
 * human readable print 
 * human readable print 
 * @param pdata, output the heap data, NULL to ignore.
 * @param pdata, output the heap data, NULL to ignore.
@@ -560,6 +505,67 @@ extern void srs_amf0_strict_array_append(srs_amf0_t amf0, srs_amf0_t value);
 * @return return the *pdata for print. NULL to ignore.
 * @return return the *pdata for print. NULL to ignore.
 */
 */
 extern char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize);
 extern char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize);
+/**
+* convert the flv tag type to string.
+*     SRS_RTMP_TYPE_AUDIO to "Audio"
+*     SRS_RTMP_TYPE_VIDEO to "Video"
+*     SRS_RTMP_TYPE_SCRIPT to "Data"
+*     otherwise, "Unknown"
+* @remark user never free the return char*, 
+*   it's static shared const string.
+*/
+extern const char* srs_type2string(char type);
+
+/**
+* get the codec id string.
+*           H.263 = Sorenson H.263
+*           Screen = Screen video
+*           VP6 = On2 VP6
+*           VP6Alpha = On2 VP6 with alpha channel
+*           Screen2 = Screen video version 2
+*           H.264 = AVC
+*           otherwise, "Unknown"
+* @remark user never free the return char*, 
+*   it's static shared const string.
+*/
+extern const char* srs_code_id2string(char codec_id);
+
+/**
+* get the avc packet type string.
+*           SpsPps = AVC sequence header
+*           Nalu = AVC NALU
+*           SpsPpsEnd = AVC end of sequence
+*           otherwise, "Unknown"
+* @remark user never free the return char*, 
+*   it's static shared const string.
+*/
+extern const char* srs_avc_packet2string(char avc_packet_type);
+
+/**
+* get the frame type string.
+*           I = key frame (for AVC, a seekable frame)
+*           P/B = inter frame (for AVC, a non-seekable frame)
+*           DI = disposable inter frame (H.263 only)
+*           GI = generated key frame (reserved for server use only)
+*           VI = video info/command frame
+*           otherwise, "Unknown"
+* @remark user never free the return char*, 
+*   it's static shared const string.
+*/
+extern const char* srs_frame_type2string(char frame_type);
+
+/**
+* print the rtmp packet, use srs_lib_trace/srs_lib_verbose for packet,
+* and use srs_raw_trace for script data body.
+* @return an error code for parse the timetstamp to dts and pts.
+*/
+extern int srs_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int size);
+
+// log to console, for use srs-librtmp application.
+extern const char* srs_format_time();
+#define srs_lib_trace(msg, ...) printf("[%s] ", srs_format_time());printf(msg, ##__VA_ARGS__);printf("\n")
+#define srs_lib_verbose(msg, ...) printf("[%s] ", srs_format_time());printf(msg, ##__VA_ARGS__);printf("\n")
+#define srs_raw_trace(msg, ...) printf(msg, ##__VA_ARGS__)
 
 
 /*************************************************************
 /*************************************************************
 **************************************************************
 **************************************************************