正在显示
2 个修改的文件
包含
12 行增加
和
12 行删除
| @@ -879,8 +879,8 @@ int SrsRtmpConn::do_publishing(SrsSource* source, SrsPublishRecvThread* trd) | @@ -879,8 +879,8 @@ int SrsRtmpConn::do_publishing(SrsSource* source, SrsPublishRecvThread* trd) | ||
| 879 | // when not got any messages, timeout. | 879 | // when not got any messages, timeout. |
| 880 | if (trd->nb_msgs() <= nb_msgs) { | 880 | if (trd->nb_msgs() <= nb_msgs) { |
| 881 | ret = ERROR_SOCKET_TIMEOUT; | 881 | ret = ERROR_SOCKET_TIMEOUT; |
| 882 | - srs_warn("publish timeout %"PRId64"us, nb_msgs=%"PRId64", ret=%d", | ||
| 883 | - SRS_CONSTS_RTMP_RECV_TIMEOUT_US, nb_msgs, ret); | 882 | + srs_warn("publish timeout %dms, nb_msgs=%"PRId64", ret=%d", |
| 883 | + nb_msgs? publish_normal_timeout : publish_1stpkt_timeout, nb_msgs, ret); | ||
| 884 | break; | 884 | break; |
| 885 | } | 885 | } |
| 886 | nb_msgs = trd->nb_msgs(); | 886 | nb_msgs = trd->nb_msgs(); |
| @@ -2356,22 +2356,22 @@ int srs_human_print_rtmp_packet4(char type, u_int32_t timestamp, char* data, int | @@ -2356,22 +2356,22 @@ int srs_human_print_rtmp_packet4(char type, u_int32_t timestamp, char* data, int | ||
| 2356 | 2356 | ||
| 2357 | u_int32_t pts; | 2357 | u_int32_t pts; |
| 2358 | if (srs_utils_parse_timestamp(timestamp, type, data, size, &pts) != 0) { | 2358 | if (srs_utils_parse_timestamp(timestamp, type, data, size, &pts) != 0) { |
| 2359 | - srs_human_trace("Rtmp packet id=%"PRId64"/%.1f/%.1f, type=%s, dts=%d, diff=%d, ndiff=%d, size=%d, DecodeError", | ||
| 2360 | - nb_packets, pi, gfps, srs_human_flv_tag_type2string(type), timestamp, diff, ndiff, size | 2359 | + srs_human_trace("Rtmp packet id=%"PRId64"/%.1f/%.1f, type=%s, dts=%d, ndiff=%d, diff=%d, size=%d, DecodeError", |
| 2360 | + nb_packets, pi, gfps, srs_human_flv_tag_type2string(type), timestamp, ndiff, diff, size | ||
| 2361 | ); | 2361 | ); |
| 2362 | return ret; | 2362 | return ret; |
| 2363 | } | 2363 | } |
| 2364 | 2364 | ||
| 2365 | if (type == SRS_RTMP_TYPE_VIDEO) { | 2365 | if (type == SRS_RTMP_TYPE_VIDEO) { |
| 2366 | - srs_human_trace("Video packet id=%"PRId64"/%.1f/%.1f, type=%s, dts=%d, pts=%d, diff=%d, ndiff=%d, size=%d, %s(%s,%s)", | ||
| 2367 | - nb_packets, pi, gfps, srs_human_flv_tag_type2string(type), timestamp, pts, diff, ndiff, size, | 2366 | + srs_human_trace("Video packet id=%"PRId64"/%.1f/%.1f, type=%s, dts=%d, pts=%d, ndiff=%d, diff=%d, size=%d, %s(%s,%s)", |
| 2367 | + nb_packets, pi, gfps, srs_human_flv_tag_type2string(type), timestamp, pts, ndiff, diff, size, | ||
| 2368 | srs_human_flv_video_codec_id2string(srs_utils_flv_video_codec_id(data, size)), | 2368 | srs_human_flv_video_codec_id2string(srs_utils_flv_video_codec_id(data, size)), |
| 2369 | srs_human_flv_video_avc_packet_type2string(srs_utils_flv_video_avc_packet_type(data, size)), | 2369 | srs_human_flv_video_avc_packet_type2string(srs_utils_flv_video_avc_packet_type(data, size)), |
| 2370 | srs_human_flv_video_frame_type2string(srs_utils_flv_video_frame_type(data, size)) | 2370 | srs_human_flv_video_frame_type2string(srs_utils_flv_video_frame_type(data, size)) |
| 2371 | ); | 2371 | ); |
| 2372 | } else if (type == SRS_RTMP_TYPE_AUDIO) { | 2372 | } else if (type == SRS_RTMP_TYPE_AUDIO) { |
| 2373 | - srs_human_trace("Audio packet id=%"PRId64"/%.1f/%.1f, type=%s, dts=%d, pts=%d, diff=%d, ndiff=%d, size=%d, %s(%s,%s,%s,%s)", | ||
| 2374 | - nb_packets, pi, gfps, srs_human_flv_tag_type2string(type), timestamp, pts, diff, ndiff, size, | 2373 | + srs_human_trace("Audio packet id=%"PRId64"/%.1f/%.1f, type=%s, dts=%d, pts=%d, ndiff=%d, diff=%d, size=%d, %s(%s,%s,%s,%s)", |
| 2374 | + nb_packets, pi, gfps, srs_human_flv_tag_type2string(type), timestamp, pts, ndiff, diff, size, | ||
| 2375 | srs_human_flv_audio_sound_format2string(srs_utils_flv_audio_sound_format(data, size)), | 2375 | srs_human_flv_audio_sound_format2string(srs_utils_flv_audio_sound_format(data, size)), |
| 2376 | srs_human_flv_audio_sound_rate2string(srs_utils_flv_audio_sound_rate(data, size)), | 2376 | srs_human_flv_audio_sound_rate2string(srs_utils_flv_audio_sound_rate(data, size)), |
| 2377 | srs_human_flv_audio_sound_size2string(srs_utils_flv_audio_sound_size(data, size)), | 2377 | srs_human_flv_audio_sound_size2string(srs_utils_flv_audio_sound_size(data, size)), |
| @@ -2379,8 +2379,8 @@ int srs_human_print_rtmp_packet4(char type, u_int32_t timestamp, char* data, int | @@ -2379,8 +2379,8 @@ int srs_human_print_rtmp_packet4(char type, u_int32_t timestamp, char* data, int | ||
| 2379 | srs_human_flv_audio_aac_packet_type2string(srs_utils_flv_audio_aac_packet_type(data, size)) | 2379 | srs_human_flv_audio_aac_packet_type2string(srs_utils_flv_audio_aac_packet_type(data, size)) |
| 2380 | ); | 2380 | ); |
| 2381 | } else if (type == SRS_RTMP_TYPE_SCRIPT) { | 2381 | } else if (type == SRS_RTMP_TYPE_SCRIPT) { |
| 2382 | - srs_human_verbose("Data packet id=%"PRId64"/%.1f/%.1f, type=%s, time=%d, diff=%d, ndiff=%d, size=%d", | ||
| 2383 | - nb_packets, pi, gfps, srs_human_flv_tag_type2string(type), timestamp, diff, ndiff, size); | 2382 | + srs_human_verbose("Data packet id=%"PRId64"/%.1f/%.1f, type=%s, time=%d, ndiff=%d, diff=%d, size=%d", |
| 2383 | + nb_packets, pi, gfps, srs_human_flv_tag_type2string(type), timestamp, ndiff, diff, size); | ||
| 2384 | int nparsed = 0; | 2384 | int nparsed = 0; |
| 2385 | while (nparsed < size) { | 2385 | while (nparsed < size) { |
| 2386 | int nb_parsed_this = 0; | 2386 | int nb_parsed_this = 0; |
| @@ -2396,8 +2396,8 @@ int srs_human_print_rtmp_packet4(char type, u_int32_t timestamp, char* data, int | @@ -2396,8 +2396,8 @@ int srs_human_print_rtmp_packet4(char type, u_int32_t timestamp, char* data, int | ||
| 2396 | srs_freep(amf0_str); | 2396 | srs_freep(amf0_str); |
| 2397 | } | 2397 | } |
| 2398 | } else { | 2398 | } else { |
| 2399 | - srs_human_trace("Rtmp packet id=%"PRId64"/%.1f/%.1f, type=%#x, dts=%d, pts=%d, diff=%d, ndiff=%d, size=%d", | ||
| 2400 | - nb_packets, pi, gfps, type, timestamp, pts, diff, ndiff, size); | 2399 | + srs_human_trace("Rtmp packet id=%"PRId64"/%.1f/%.1f, type=%#x, dts=%d, pts=%d, ndiff=%d, diff=%d, size=%d", |
| 2400 | + nb_packets, pi, gfps, type, timestamp, pts, ndiff, diff, size); | ||
| 2401 | } | 2401 | } |
| 2402 | 2402 | ||
| 2403 | return ret; | 2403 | return ret; |
-
请 注册 或 登录 后发表评论