Skip to content

V-jinmgong Add some logprints to align with the alphartc log analysis #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hippogr merged 1 commit into from
Feb 21, 2025
Merged

V-jinmgong Add some logprints to align with the alphartc log analysis #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions call/rtp_transport_controller_send.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,8 @@ void RtpTransportControllerSend::PostUpdates(NetworkControlUpdate update) {
pacer()->CreateProbeCluster(probe.target_data_rate, probe.id);
}
if (update.target_rate) {
RTC_LOG(LS_INFO) << "PostUpdates SetTargetRate: " << update.target_rate->target_rate.bps()
<< ", PostUpdates SetTargetRate Time: " << Timestamp::Millis(clock_->TimeInMilliseconds()).ms();
control_handler_->SetTargetRate(*update.target_rate);
UpdateControlState();
}
Expand Down
2 changes: 2 additions & 0 deletions common_video/video_render_frames.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ int32_t VideoRenderFrames::AddFrame(VideoFrame&& new_frame) {

last_render_time_ms_ = new_frame.render_time_ms();
incoming_frames_.emplace_back(std::move(new_frame));
RTC_LOG(LS_INFO) << "Frame added to render queue, timestamp="
<< last_render_time_ms_ << " ms";

if (incoming_frames_.size() > kMaxIncomingFramesBeforeLogged) {
RTC_LOG(LS_WARNING) << "Stored incoming frames: "
Expand Down
3 changes: 2 additions & 1 deletion modules/remote_bitrate_estimator/remote_estimator_proxy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ void RemoteEstimatorProxy::IncomingPacket(int64_t arrival_time_ms,

// Save per-packet info locally on receiving
auto res = stats_collect_.StatsCollect(
header.extension.hasTransportSequenceNumber,
pacing_rate, padding_rate, header.payloadType,
header.sequenceNumber, send_time_ms, header.ssrc,
header.paddingLength, header.headerLength,
Expand All @@ -144,7 +145,7 @@ void RemoteEstimatorProxy::IncomingPacket(int64_t arrival_time_ms,
RTC_LOG(LS_ERROR) << "Save data failed";
}

// RTC_LOG(LS_INFO) << out_data;
RTC_LOG(LS_INFO) << out_data;

// if (network_state_estimator_ && header.extension.hasAbsoluteSendTime) {
// PacketResult packet_result;
Expand Down
15 changes: 15 additions & 0 deletions modules/rtp_rtcp/source/rtp_sender_egress.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,21 @@ void RtpSenderEgress::SendPacket(RtpPacketToSend* packet,
// data after rtp header may be corrupted if these packets are protected by
// the FEC.
int64_t diff_ms = now_ms - packet->capture_time_ms();
int pktype;
if (packet->packet_type() == RtpPacketMediaType::kAudio) {
pktype = 0;
} else if (packet->packet_type() == RtpPacketMediaType::kVideo) {
pktype = 1;
} else {
pktype = -1;
}
RTC_LOG(LS_INFO) << "RtpSenderEgress::SendPacket: packet ssrc: " << packet->Ssrc()
<< ", sequence number: " << packet->SequenceNumber()
<< ", timestamp: " << packet->Timestamp()
<< ", payload type: " << packet->PayloadType()
<< ", payload size: " << packet->payload_size()
<< ", packet_sendtime: " << now_ms << " ms"
<< ", packet_type: " << pktype;
if (packet->HasExtension<TransmissionOffset>()) {
packet->SetExtension<TransmissionOffset>(kTimestampTicksPerMs * diff_ms);
}
Expand Down
13 changes: 11 additions & 2 deletions modules/third_party/statcollect/StatCollect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ namespace StatCollect {
SC_NEW_MEMORY_FAIL if the new memory fail
*/
SCResult StatsCollectModule::StatsCollect(
bool hastransportSequenceNumber,
double pacerPacingRate,
double pacerPaddingRate,
//Packet Info
Expand Down Expand Up @@ -132,6 +133,7 @@ namespace StatCollect {
void* resultPtr;
if (collectType_ == SC_TYPE_STRUCT) {
struct CollectInfo* collectInfoPtr = StatsCollectByStruct(
hastransportSequenceNumber,
pacerPacingRate,
pacerPaddingRate,
payloadType,
Expand Down Expand Up @@ -175,6 +177,7 @@ namespace StatCollect {
}
else if (collectType_ == SC_TYPE_JSON) {
std::string collectInfoJson = StatsCollectByJSON(
hastransportSequenceNumber,
pacerPacingRate,
pacerPaddingRate,
payloadType,
Expand Down Expand Up @@ -246,6 +249,7 @@ namespace StatCollect {
SC_NEW_MEMORY_FAIL if the new memory fail
*/
SCResult StatsCollectModule::StatsCollect(
bool hastransportSequenceNumber,
double pacerPacingRate,
double pacerPaddingRate,
//Packet Info
Expand All @@ -263,6 +267,7 @@ namespace StatCollect {
void* resultPtr;
if (collectType_ == SC_TYPE_STRUCT) {
struct CollectInfo* collectInfoPtr = StatsCollectByStruct(
hastransportSequenceNumber,
pacerPacingRate,
pacerPaddingRate,
payloadType,
Expand Down Expand Up @@ -306,6 +311,7 @@ namespace StatCollect {
}
else if (collectType_ == SC_TYPE_JSON) {
std::string collectInfoJson = StatsCollectByJSON(
hastransportSequenceNumber,
pacerPacingRate,
pacerPaddingRate,
payloadType,
Expand Down Expand Up @@ -399,6 +405,7 @@ namespace StatCollect {
*/

struct CollectInfo* StatsCollectModule::StatsCollectByStruct(
bool hastransportSequenceNumber,
double pacerPacingRate,
double pacerPaddingRate,
//Packet Info
Expand Down Expand Up @@ -441,7 +448,7 @@ namespace StatCollect {
if (CollectInfoPtr == NULL) {
return NULL;
}

CollectInfoPtr->hastransportSequenceNumber = hastransportSequenceNumber;
CollectInfoPtr->pacerPacingRate = pacerPacingRate;
CollectInfoPtr->pacerPaddingRate = pacerPaddingRate;
CollectInfoPtr->packetInfo.header.payloadType = payloadType;
Expand Down Expand Up @@ -526,6 +533,7 @@ namespace StatCollect {
** return: json string format if successfully
*/
std::string StatsCollectModule::StatsCollectByJSON(
bool hastransportSequenceNumber,
double pacerPacingRate,
double pacerPaddingRate,
//Packet Info
Expand Down Expand Up @@ -565,6 +573,7 @@ namespace StatCollect {

using json = nlohmann::json;
json CollectInfoJson;
CollectInfoJson["hastransportSequenceNumber"] = hastransportSequenceNumber;
CollectInfoJson["pacerPacingRate"] = pacerPacingRate;
CollectInfoJson["pacerPaddingRate"] = pacerPaddingRate;
CollectInfoJson["packetInfo"]["header"]["payloadType"] = payloadType;
Expand Down Expand Up @@ -615,7 +624,7 @@ namespace StatCollect {

using json = nlohmann::json;
json CollectInfoJson;

CollectInfoJson["hastransportSequenceNumber"] = CollectInfoPtr->hastransportSequenceNumber;
CollectInfoJson["pacerPacingRate"] = CollectInfoPtr->pacerPacingRate;
CollectInfoJson["pacerPaddingRate"] = CollectInfoPtr->pacerPaddingRate;
CollectInfoJson["packetInfo"]["header"]["payloadType"] = CollectInfoPtr->packetInfo.header.payloadType;
Expand Down
5 changes: 5 additions & 0 deletions modules/third_party/statcollect/StatCollect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ namespace StatCollect {
struct CollectInfo {
PacketInfo packetInfo;
MediaInfo mediaInfo;
bool hastransportSequenceNumber;
double pacerPacingRate;
double pacerPaddingRate;
};
Expand Down Expand Up @@ -266,6 +267,7 @@ namespace StatCollect {
SC_NEW_MEMORY_FAIL if the new memory fail
*/
SCResult StatsCollect(
bool hastransportSequenceNumber,
double pacerPacingRate,
double pacerPaddingRate,
//Packet Info
Expand Down Expand Up @@ -329,6 +331,7 @@ namespace StatCollect {
SC_NEW_MEMORY_FAIL if the new memory fail
*/
SCResult StatsCollect(
bool hastransportSequenceNumber,
double pacerPacingRate,
double pacerPaddingRate,
//Packet Info
Expand Down Expand Up @@ -391,6 +394,7 @@ namespace StatCollect {
NULL if failed.
*/
struct CollectInfo* StatsCollectByStruct(
bool hastransportSequenceNumber,
double pacerPacingRate,
double pacerPaddingRate,
//Packet Info
Expand Down Expand Up @@ -474,6 +478,7 @@ namespace StatCollect {
** return: json string format if successfully
*/
std::string StatsCollectByJSON(
bool hastransportSequenceNumber,
double pacerPacingRate,
double pacerPaddingRate,
//Packet Info
Expand Down
7 changes: 4 additions & 3 deletions video/video_stream_encoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,9 +1068,10 @@ void VideoStreamEncoder::MaybeEncodeVideoFrame(const VideoFrame& video_frame,
last_frame_info_ = VideoFrameInfo(video_frame.width(), video_frame.height(),
video_frame.is_texture());
RTC_LOG(LS_INFO) << "Video frame parameters changed: dimensions="
<< last_frame_info_->width << "x"
<< last_frame_info_->height
<< ", texture=" << last_frame_info_->is_texture << ".";
<< last_frame_info_->width << "x"
<< last_frame_info_->height
<< ", texture=" << last_frame_info_->is_texture
<< " at time= " << clock_->TimeInMilliseconds() << "ms.";
// Force full frame update, since resolution has changed.
accumulated_update_rect_ =
VideoFrame::UpdateRect{0, 0, video_frame.width(), video_frame.height()};
Expand Down