for #742, refine the u_intxx_t to uintxx_t

trunk/research/librtmp/srs_aac_raw_publish.c

@@ -136,8 +136,8 @@ int main(int argc, char** argv)
     }
     srs_human_trace("publish stream success");
 
-    u_int32_t timestamp = 0;
-    u_int32_t time_delta = 45;
+    uint32_t timestamp = 0;
+    uint32_t time_delta = 45;
     // @remark, to decode the file.
     char* p = audio_raw;
     for (;p < audio_raw + file_size;) {

trunk/research/librtmp/srs_audio_raw_publish.c

@@ -134,8 +134,8 @@ int main(int argc, char** argv)
     }
     srs_human_trace("publish stream success");
 
-    u_int32_t timestamp = 0;
-    u_int32_t time_delta = 17;
+    uint32_t timestamp = 0;
+    uint32_t time_delta = 17;
     // @remark, to decode the file.
     char* p = audio_raw;
     for (;p < audio_raw + file_size;) {

trunk/research/librtmp/srs_bandwidth_check.c

@@ -38,7 +38,7 @@ int main(int argc, char** argv)
     int size;
     char type;
     char* data;
-    u_int32_t timestamp;
+    uint32_t timestamp;
 
     // srs debug info.
     char srs_server_ip[128];

trunk/research/librtmp/srs_detect_rtmp.c

@@ -51,8 +51,8 @@ int main(int argc, char** argv)
     int size;
     char type;
     char* data;
-    u_int32_t timestamp;
-    u_int32_t basetime = 0;
+    uint32_t timestamp;
+    uint32_t basetime = 0;
 
     // user options
     const char* rtmp_url = NULL;

trunk/research/librtmp/srs_flv_injecter.c

@@ -189,7 +189,7 @@ int build_keyframes(srs_flv_t ic, srs_amf0_t *pname, srs_amf0_t* pdata, srs_amf0
 
     // packet data
     char type;
-    u_int32_t timestamp = 0;
+    uint32_t timestamp = 0;
     char* data = NULL;
     int32_t size;
     int64_t offset = 0;
@@ -294,7 +294,7 @@ int do_inject_flv(srs_flv_t ic, srs_flv_t oc, srs_amf0_t amf0_name, srs_amf0_t a
     char header[13];
     // packet data
     char type;
-    u_int32_t timestamp = 0;
+    uint32_t timestamp = 0;
     char* data = NULL;
     int32_t size;
 

trunk/research/librtmp/srs_flv_parser.c

@@ -134,7 +134,7 @@ int parse_flv(srs_flv_t flv)
     char header[13];
     // packet data
     char type;
-    u_int32_t timestamp = 0;
+    uint32_t timestamp = 0;
     char* data = NULL;
     int32_t size;
     int64_t offset = 0;

trunk/research/librtmp/srs_h264_raw_publish.c

@@ -183,7 +183,7 @@ int main(int argc, char** argv)
         // 5bits, 7.3.1 NAL unit syntax,
         // ISO_IEC_14496-10-AVC-2003.pdf, page 44.
         //  7: SPS, 8: PPS, 5: I Frame, 1: P Frame, 9: AUD, 6: SEI
-        u_int8_t nut = (char)data[nb_start_code] & 0x1f;
+        uint8_t nut = (char)data[nb_start_code] & 0x1f;
         srs_human_trace("sent packet: type=%s, time=%d, size=%d, fps=%.2f, b[%d]=%#x(%s)",
             srs_human_flv_tag_type2string(SRS_RTMP_TYPE_VIDEO), dts, size, fps, nb_start_code, (char)data[nb_start_code],
             (nut == 7? "SPS":(nut == 8? "PPS":(nut == 5? "I":(nut == 1? "P":(nut == 9? "AUD":(nut == 6? "SEI":"Unknown")))))));

trunk/research/librtmp/srs_ingest_flv.c

@@ -40,8 +40,8 @@ int connect_oc(srs_rtmp_t ortmp);
 #define RE_PULSE_MS 300
 #define RE_PULSE_JITTER_MS 3000
 int64_t re_create();
-void re_update(int64_t re, int32_t starttime, u_int32_t time);
-void re_cleanup(int64_t re, int32_t starttime, u_int32_t time);
+void re_update(int64_t re, int32_t starttime, uint32_t time);
+void re_cleanup(int64_t re, int32_t starttime, uint32_t time);
 
 int64_t tools_main_entrance_startup_time;
 int main(int argc, char** argv)
@@ -128,7 +128,7 @@ int main(int argc, char** argv)
     return ret;
 }
 
-int do_proxy(srs_flv_t flv, srs_rtmp_t ortmp, int64_t re, int32_t* pstarttime, u_int32_t* ptimestamp)
+int do_proxy(srs_flv_t flv, srs_rtmp_t ortmp, int64_t re, int32_t* pstarttime, uint32_t* ptimestamp)
 {
     int ret = 0;
 
@@ -160,7 +160,7 @@ int do_proxy(srs_flv_t flv, srs_rtmp_t ortmp, int64_t re, int32_t* pstarttime, u
             return ret;
         }
 
-        u_int32_t timestamp = *ptimestamp;
+        uint32_t timestamp = *ptimestamp;
 
         if ((ret = srs_human_print_rtmp_packet(type, timestamp, data, size)) != 0) {
             srs_human_trace("print packet failed. ret=%d", ret);
@@ -185,7 +185,7 @@ int do_proxy(srs_flv_t flv, srs_rtmp_t ortmp, int64_t re, int32_t* pstarttime, u
 int proxy(srs_flv_t flv, srs_rtmp_t ortmp)
 {
     int ret = 0;
-    u_int32_t timestamp = 0;
+    uint32_t timestamp = 0;
     int32_t starttime = -1;
 
     char header[13];
@@ -252,7 +252,7 @@ int64_t re_create()
 
     return re;
 }
-void re_update(int64_t re, int32_t starttime, u_int32_t time)
+void re_update(int64_t re, int32_t starttime, uint32_t time)
 {
     // send by pulse algorithm.
     int64_t now = srs_utils_time_ms();
@@ -261,7 +261,7 @@ void re_update(int64_t re, int32_t starttime, u_int32_t time)
         usleep((useconds_t)(diff * 1000));
     }
 }
-void re_cleanup(int64_t re, int32_t starttime, u_int32_t time)
+void re_cleanup(int64_t re, int32_t starttime, uint32_t time)
 {
     // for the last pulse, always sleep.
     // for the virtual live encoder long time publishing.

trunk/research/librtmp/srs_ingest_rtmp.c

@@ -117,8 +117,8 @@ int proxy(srs_rtmp_t irtmp, srs_rtmp_t ortmp)
     int size;
     char type;
     char* data;
-    u_int32_t timestamp;
-    u_int64_t nb_msgs = 0;
+    uint32_t timestamp;
+    uint64_t nb_msgs = 0;
 
     if ((ret = connect_ic(irtmp)) != 0) {
         return ret;

trunk/research/librtmp/srs_play.c

@@ -69,7 +69,7 @@ int main(int argc, char** argv)
         int size;
         char type;
         char* data;
-        u_int32_t timestamp;
+        uint32_t timestamp;
 
         if (srs_rtmp_read_packet(rtmp, &type, &timestamp, &data, &size) != 0) {
             goto rtmp_destroy;

trunk/research/librtmp/srs_publish.c

@@ -73,7 +73,7 @@ int main(int argc, char** argv)
     }
     srs_human_trace("publish stream success");
 
-    u_int32_t timestamp = 0;
+    uint32_t timestamp = 0;
     for (;;) {
         char type = SRS_RTMP_TYPE_VIDEO;
         int size = 4096;

trunk/research/librtmp/srs_rtmp_dump.c

@@ -275,14 +275,14 @@ int main(int argc, char** argv)
     }
 
     int64_t nb_packets = 0;
-    u_int32_t pre_timestamp = 0;
+    uint32_t pre_timestamp = 0;
     int64_t pre_now = -1;
     int64_t start_time = -1;
     for (;;) {
         int size;
         char type;
         char* data;
-        u_int32_t timestamp;
+        uint32_t timestamp;
 
         if (srs_rtmp_read_packet(rtmp, &type, &timestamp, &data, &size) != 0) {
             srs_human_trace("read rtmp packet failed.");

trunk/src/app/srs_app_caster_flv.cpp

@@ -203,7 +203,7 @@ int SrsDynamicHttpConn::do_proxy(ISrsHttpResponseReader* rr, SrsFlvDecoder* dec)
 
         char type;
         int32_t size;
-        u_int32_t time;
+        uint32_t time;
         if ((ret = dec->read_tag_header(&type, &size, &time)) != ERROR_SUCCESS) {
             if (!srs_is_client_gracefully_close(ret)) {
                 srs_error("flv: proxy tag header failed. ret=%d", ret);

trunk/src/app/srs_app_http_conn.cpp

@@ -581,7 +581,7 @@ SrsConnection* SrsHttpMessage::connection()
     return conn;
 }
 
-u_int8_t SrsHttpMessage::method()
+uint8_t SrsHttpMessage::method()
 {
     if (jsonp && !jsonp_method.empty()) {
         if (jsonp_method == "GET") {
@@ -595,12 +595,12 @@ u_int8_t SrsHttpMessage::method()
         }
     }
 
-    return (u_int8_t)_header.method;
+    return (uint8_t)_header.method;
 }
 
-u_int16_t SrsHttpMessage::status_code()
+uint16_t SrsHttpMessage::status_code()
 {
-    return (u_int16_t)_header.status_code;
+    return (uint16_t)_header.status_code;
 }
 
 string SrsHttpMessage::method_str()

trunk/src/app/srs_app_http_conn.hpp

@@ -215,8 +215,8 @@ class SrsHttpMessage : public ISrsHttpMessage
 public:
     virtual SrsConnection* connection();
 public:
-    virtual u_int8_t method();
-    virtual u_int16_t status_code();
+    virtual uint8_t method();
+    virtual uint16_t status_code();
     /**
      * method helpers.
      */

trunk/src/app/srs_app_mpegts_udp.cpp

@@ -349,8 +349,8 @@ int SrsMpegtsOverUdp::on_ts_video(SrsTsMessage* msg, SrsBuffer* avs)
     }
 
     // ts tbn to flv tbn.
-    u_int32_t dts = (u_int32_t)(msg->dts / 90);
-    u_int32_t pts = (u_int32_t)(msg->dts / 90);
+    uint32_t dts = (uint32_t)(msg->dts / 90);
+    uint32_t pts = (uint32_t)(msg->dts / 90);
 
     // send each frame.
     while (!avs->empty()) {
@@ -419,7 +419,7 @@ int SrsMpegtsOverUdp::on_ts_video(SrsTsMessage* msg, SrsBuffer* avs)
     return ret;
 }
 
-int SrsMpegtsOverUdp::write_h264_sps_pps(u_int32_t dts, u_int32_t pts)
+int SrsMpegtsOverUdp::write_h264_sps_pps(uint32_t dts, uint32_t pts)
 {
     int ret = ERROR_SUCCESS;
 
@@ -447,7 +447,7 @@ int SrsMpegtsOverUdp::write_h264_sps_pps(u_int32_t dts, u_int32_t pts)
     }
 
     // the timestamp in rtmp message header is dts.
-    u_int32_t timestamp = dts;
+    uint32_t timestamp = dts;
     if ((ret = rtmp_write_packet(SrsCodecFlvTagVideo, timestamp, flv, nb_flv)) != ERROR_SUCCESS) {
         return ret;
     }
@@ -460,7 +460,7 @@ int SrsMpegtsOverUdp::write_h264_sps_pps(u_int32_t dts, u_int32_t pts)
     return ret;
 }
 
-int SrsMpegtsOverUdp::write_h264_ipb_frame(char* frame, int frame_size, u_int32_t dts, u_int32_t pts) 
+int SrsMpegtsOverUdp::write_h264_ipb_frame(char* frame, int frame_size, uint32_t dts, uint32_t pts) 
 {
     int ret = ERROR_SUCCESS;
 
@@ -494,7 +494,7 @@ int SrsMpegtsOverUdp::write_h264_ipb_frame(char* frame, int frame_size, u_int32_
     }
 
     // the timestamp in rtmp message header is dts.
-    u_int32_t timestamp = dts;
+    uint32_t timestamp = dts;
     return rtmp_write_packet(SrsCodecFlvTagVideo, timestamp, flv, nb_flv);
 }
 
@@ -508,7 +508,7 @@ int SrsMpegtsOverUdp::on_ts_audio(SrsTsMessage* msg, SrsBuffer* avs)
     }
 
     // ts tbn to flv tbn.
-    u_int32_t dts = (u_int32_t)(msg->dts / 90);
+    uint32_t dts = (uint32_t)(msg->dts / 90);
 
     // send each frame.
     while (!avs->empty()) {
@@ -551,7 +551,7 @@ int SrsMpegtsOverUdp::on_ts_audio(SrsTsMessage* msg, SrsBuffer* avs)
     return ret;
 }
 
-int SrsMpegtsOverUdp::write_audio_raw_frame(char* frame, int frame_size, SrsRawAacStreamCodec* codec, u_int32_t dts)
+int SrsMpegtsOverUdp::write_audio_raw_frame(char* frame, int frame_size, SrsRawAacStreamCodec* codec, uint32_t dts)
 {
     int ret = ERROR_SUCCESS;
 
@@ -564,7 +564,7 @@ int SrsMpegtsOverUdp::write_audio_raw_frame(char* frame, int frame_size, SrsRawA
     return rtmp_write_packet(SrsCodecFlvTagAudio, dts, data, size);
 }
 
-int SrsMpegtsOverUdp::rtmp_write_packet(char type, u_int32_t timestamp, char* data, int size)
+int SrsMpegtsOverUdp::rtmp_write_packet(char type, uint32_t timestamp, char* data, int size)
 {
     int ret = ERROR_SUCCESS;
 

trunk/src/app/srs_app_mpegts_udp.hpp

@@ -113,12 +113,12 @@ class SrsMpegtsOverUdp : virtual public ISrsTsHandler
     virtual int on_ts_message(SrsTsMessage* msg);
 private:
     virtual int on_ts_video(SrsTsMessage* msg, SrsBuffer* avs);
-    virtual int write_h264_sps_pps(u_int32_t dts, u_int32_t pts);
-    virtual int write_h264_ipb_frame(char* frame, int frame_size, u_int32_t dts, u_int32_t pts);
+    virtual int write_h264_sps_pps(uint32_t dts, uint32_t pts);
+    virtual int write_h264_ipb_frame(char* frame, int frame_size, uint32_t dts, uint32_t pts);
     virtual int on_ts_audio(SrsTsMessage* msg, SrsBuffer* avs);
-    virtual int write_audio_raw_frame(char* frame, int frame_size, SrsRawAacStreamCodec* codec, u_int32_t dts);
+    virtual int write_audio_raw_frame(char* frame, int frame_size, SrsRawAacStreamCodec* codec, uint32_t dts);
 private:
-    virtual int rtmp_write_packet(char type, u_int32_t timestamp, char* data, int size);
+    virtual int rtmp_write_packet(char type, uint32_t timestamp, char* data, int size);
 private:
     // Connect to RTMP server.
     virtual int connect();