From 5b3f278243efb1e45ca12961d1ed9190aa386cd3 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 17 Sep 2020 16:25:24 +0800 Subject: [PATCH] RTC: Refine log --- trunk/src/app/srs_app_log.hpp | 5 +++++ trunk/src/app/srs_app_rtc_dtls.cpp | 2 +- trunk/src/app/srs_app_rtc_source.cpp | 14 +++++++++++++- trunk/src/main/srs_main_server.cpp | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/trunk/src/app/srs_app_log.hpp b/trunk/src/app/srs_app_log.hpp index 7f4cf5418..f09185c45 100644 --- a/trunk/src/app/srs_app_log.hpp +++ b/trunk/src/app/srs_app_log.hpp @@ -32,6 +32,11 @@ #include #include +// For log TAGs. +#define TAG_MAIN "MAIN" +#define TAG_MAYBE "MAYBE" +#define TAG_DTLS_ALERT "DTLSALERT" + // Use memory/disk cache and donot flush when write log. // it's ok to use it without config, which will log to console, and default trace level. // when you want to use different level, override this classs, set the protected _level. diff --git a/trunk/src/app/srs_app_rtc_dtls.cpp b/trunk/src/app/srs_app_rtc_dtls.cpp index 6c17d133b..6de1e2599 100644 --- a/trunk/src/app/srs_app_rtc_dtls.cpp +++ b/trunk/src/app/srs_app_rtc_dtls.cpp @@ -598,7 +598,7 @@ void SrsDtlsImpl::callback_by_ssl(std::string type, std::string desc) { srs_error_t err = srs_success; if ((err = callback_->on_dtls_alert(type, desc)) != srs_success) { - srs_warn2("DTLSAlert", "DTLS: handler alert err %s", srs_error_desc(err).c_str()); + srs_warn2(TAG_DTLS_ALERT, "DTLS: handler alert err %s", srs_error_desc(err).c_str()); srs_freep(err); } } diff --git a/trunk/src/app/srs_app_rtc_source.cpp b/trunk/src/app/srs_app_rtc_source.cpp index d74171f2f..8cad76705 100644 --- a/trunk/src/app/srs_app_rtc_source.cpp +++ b/trunk/src/app/srs_app_rtc_source.cpp @@ -882,6 +882,7 @@ srs_error_t SrsRtcFromRtmpBridger::package_stap_a(SrsRtcStream* source, SrsShare pkt->header.set_payload_type(kVideoPayloadType); pkt->header.set_ssrc(video_ssrc); pkt->frame_type = SrsFrameTypeVideo; + pkt->nalu_type = (SrsAvcNaluType)kStapA; pkt->header.set_marker(false); pkt->header.set_sequence(video_sequence++); pkt->header.set_timestamp(msg->timestamp * 90); @@ -929,6 +930,7 @@ srs_error_t SrsRtcFromRtmpBridger::package_nalus(SrsSharedPtrMessage* msg, const srs_error_t err = srs_success; SrsRtpRawNALUs* raw = new SrsRtpRawNALUs(); + SrsAvcNaluType first_nalu_type = SrsAvcNaluTypeReserved; for (int i = 0; i < (int)samples.size(); i++) { SrsSample* sample = samples[i]; @@ -939,6 +941,14 @@ srs_error_t SrsRtcFromRtmpBridger::package_nalus(SrsSharedPtrMessage* msg, const continue; } + if (!sample->size) { + continue; + } + + if (first_nalu_type == SrsAvcNaluTypeReserved) { + first_nalu_type = SrsAvcNaluType((uint8_t)(sample->bytes[0] & kNalTypeMask)); + } + raw->push_back(sample->copy()); } @@ -955,6 +965,7 @@ srs_error_t SrsRtcFromRtmpBridger::package_nalus(SrsSharedPtrMessage* msg, const pkt->header.set_payload_type(kVideoPayloadType); pkt->header.set_ssrc(video_ssrc); pkt->frame_type = SrsFrameTypeVideo; + pkt->nalu_type = (SrsAvcNaluType)first_nalu_type; pkt->header.set_sequence(video_sequence++); pkt->header.set_timestamp(msg->timestamp * 90); pkt->payload = raw; @@ -987,6 +998,7 @@ srs_error_t SrsRtcFromRtmpBridger::package_nalus(SrsSharedPtrMessage* msg, const pkt->header.set_payload_type(kVideoPayloadType); pkt->header.set_ssrc(video_ssrc); pkt->frame_type = SrsFrameTypeVideo; + pkt->nalu_type = (SrsAvcNaluType)kFuA; pkt->header.set_sequence(video_sequence++); pkt->header.set_timestamp(msg->timestamp * 90); @@ -1813,7 +1825,7 @@ srs_error_t SrsRtcVideoRecvTrack::check_send_nacks() return err; } - srs_trace2("MAYBE", "RTC: NACK timeout=%u, request PLI, track=%s, ssrc=%u", timeout_nacks, + srs_trace2(TAG_MAYBE, "RTC: NACK timeout=%u, request PLI, track=%s, ssrc=%u", timeout_nacks, track_desc_->id_.c_str(), track_desc_->ssrc_); return err; diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index c1d25ae7b..60b100383 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -134,7 +134,7 @@ srs_error_t do_main(int argc, char** argv) } // config already applied to log. - srs_trace2("MAIN", "%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE); + srs_trace2(TAG_MAIN, "%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE); srs_trace("authors: %s", RTMP_SIG_SRS_AUTHORS); srs_trace("contributors: %s", SRS_CONSTRIBUTORS); srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s, osx: %d",