Skip to content

Commit da37a7e

Browse files
GjmustcGjmustc
authored
V-jinmgong Add some logprints to align with the alphartc log analysis (#113)
1 parent 45d90f4 commit da37a7e

File tree

7 files changed

+41
-6
lines changed

7 files changed

+41
-6
lines changed

‎call/rtp_transport_controller_send.cc

+2
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,8 @@ void RtpTransportControllerSend::PostUpdates(NetworkControlUpdate update) {
647647
pacer()->CreateProbeCluster(probe.target_data_rate, probe.id);
648648
}
649649
if (update.target_rate) {
650+
RTC_LOG(LS_INFO) << "PostUpdates SetTargetRate: " << update.target_rate->target_rate.bps()
651+
<< ", PostUpdates SetTargetRate Time: " << Timestamp::Millis(clock_->TimeInMilliseconds()).ms();
650652
control_handler_->SetTargetRate(*update.target_rate);
651653
UpdateControlState();
652654
}

‎common_video/video_render_frames.cc

+2
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ int32_t VideoRenderFrames::AddFrame(VideoFrame&& new_frame) {
7979

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

8385
if (incoming_frames_.size() > kMaxIncomingFramesBeforeLogged) {
8486
RTC_LOG(LS_WARNING) << "Stored incoming frames: "

‎modules/remote_bitrate_estimator/remote_estimator_proxy.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ void RemoteEstimatorProxy::IncomingPacket(int64_t arrival_time_ms,
130130

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

147-
// RTC_LOG(LS_INFO) << out_data;
148+
RTC_LOG(LS_INFO) << out_data;
148149

149150
// if (network_state_estimator_ && header.extension.hasAbsoluteSendTime) {
150151
// PacketResult packet_result;

‎modules/rtp_rtcp/source/rtp_sender_egress.cc

+15
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,21 @@ void RtpSenderEgress::SendPacket(RtpPacketToSend* packet,
144144
// data after rtp header may be corrupted if these packets are protected by
145145
// the FEC.
146146
int64_t diff_ms = now_ms - packet->capture_time_ms();
147+
int pktype;
148+
if (packet->packet_type() == RtpPacketMediaType::kAudio) {
149+
pktype = 0;
150+
} else if (packet->packet_type() == RtpPacketMediaType::kVideo) {
151+
pktype = 1;
152+
} else {
153+
pktype = -1;
154+
}
155+
RTC_LOG(LS_INFO) << "RtpSenderEgress::SendPacket: packet ssrc: " << packet->Ssrc()
156+
<< ", sequence number: " << packet->SequenceNumber()
157+
<< ", timestamp: " << packet->Timestamp()
158+
<< ", payload type: " << packet->PayloadType()
159+
<< ", payload size: " << packet->payload_size()
160+
<< ", packet_sendtime: " << now_ms << " ms"
161+
<< ", packet_type: " << pktype;
147162
if (packet->HasExtension<TransmissionOffset>()) {
148163
packet->SetExtension<TransmissionOffset>(kTimestampTicksPerMs * diff_ms);
149164
}

‎modules/third_party/statcollect/StatCollect.cpp

+11-2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ namespace StatCollect {
9393
SC_NEW_MEMORY_FAIL if the new memory fail
9494
*/
9595
SCResult StatsCollectModule::StatsCollect(
96+
bool hastransportSequenceNumber,
9697
double pacerPacingRate,
9798
double pacerPaddingRate,
9899
//Packet Info
@@ -132,6 +133,7 @@ namespace StatCollect {
132133
void* resultPtr;
133134
if (collectType_ == SC_TYPE_STRUCT) {
134135
struct CollectInfo* collectInfoPtr = StatsCollectByStruct(
136+
hastransportSequenceNumber,
135137
pacerPacingRate,
136138
pacerPaddingRate,
137139
payloadType,
@@ -175,6 +177,7 @@ namespace StatCollect {
175177
}
176178
else if (collectType_ == SC_TYPE_JSON) {
177179
std::string collectInfoJson = StatsCollectByJSON(
180+
hastransportSequenceNumber,
178181
pacerPacingRate,
179182
pacerPaddingRate,
180183
payloadType,
@@ -246,6 +249,7 @@ namespace StatCollect {
246249
SC_NEW_MEMORY_FAIL if the new memory fail
247250
*/
248251
SCResult StatsCollectModule::StatsCollect(
252+
bool hastransportSequenceNumber,
249253
double pacerPacingRate,
250254
double pacerPaddingRate,
251255
//Packet Info
@@ -263,6 +267,7 @@ namespace StatCollect {
263267
void* resultPtr;
264268
if (collectType_ == SC_TYPE_STRUCT) {
265269
struct CollectInfo* collectInfoPtr = StatsCollectByStruct(
270+
hastransportSequenceNumber,
266271
pacerPacingRate,
267272
pacerPaddingRate,
268273
payloadType,
@@ -306,6 +311,7 @@ namespace StatCollect {
306311
}
307312
else if (collectType_ == SC_TYPE_JSON) {
308313
std::string collectInfoJson = StatsCollectByJSON(
314+
hastransportSequenceNumber,
309315
pacerPacingRate,
310316
pacerPaddingRate,
311317
payloadType,
@@ -399,6 +405,7 @@ namespace StatCollect {
399405
*/
400406

401407
struct CollectInfo* StatsCollectModule::StatsCollectByStruct(
408+
bool hastransportSequenceNumber,
402409
double pacerPacingRate,
403410
double pacerPaddingRate,
404411
//Packet Info
@@ -441,7 +448,7 @@ namespace StatCollect {
441448
if (CollectInfoPtr == NULL) {
442449
return NULL;
443450
}
444-
451+
CollectInfoPtr->hastransportSequenceNumber = hastransportSequenceNumber;
445452
CollectInfoPtr->pacerPacingRate = pacerPacingRate;
446453
CollectInfoPtr->pacerPaddingRate = pacerPaddingRate;
447454
CollectInfoPtr->packetInfo.header.payloadType = payloadType;
@@ -526,6 +533,7 @@ namespace StatCollect {
526533
** return: json string format if successfully
527534
*/
528535
std::string StatsCollectModule::StatsCollectByJSON(
536+
bool hastransportSequenceNumber,
529537
double pacerPacingRate,
530538
double pacerPaddingRate,
531539
//Packet Info
@@ -565,6 +573,7 @@ namespace StatCollect {
565573

566574
using json = nlohmann::json;
567575
json CollectInfoJson;
576+
CollectInfoJson["hastransportSequenceNumber"] = hastransportSequenceNumber;
568577
CollectInfoJson["pacerPacingRate"] = pacerPacingRate;
569578
CollectInfoJson["pacerPaddingRate"] = pacerPaddingRate;
570579
CollectInfoJson["packetInfo"]["header"]["payloadType"] = payloadType;
@@ -615,7 +624,7 @@ namespace StatCollect {
615624

616625
using json = nlohmann::json;
617626
json CollectInfoJson;
618-
627+
CollectInfoJson["hastransportSequenceNumber"] = CollectInfoPtr->hastransportSequenceNumber;
619628
CollectInfoJson["pacerPacingRate"] = CollectInfoPtr->pacerPacingRate;
620629
CollectInfoJson["pacerPaddingRate"] = CollectInfoPtr->pacerPaddingRate;
621630
CollectInfoJson["packetInfo"]["header"]["payloadType"] = CollectInfoPtr->packetInfo.header.payloadType;

‎modules/third_party/statcollect/StatCollect.h

+5
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ namespace StatCollect {
190190
struct CollectInfo {
191191
PacketInfo packetInfo;
192192
MediaInfo mediaInfo;
193+
bool hastransportSequenceNumber;
193194
double pacerPacingRate;
194195
double pacerPaddingRate;
195196
};
@@ -266,6 +267,7 @@ namespace StatCollect {
266267
SC_NEW_MEMORY_FAIL if the new memory fail
267268
*/
268269
SCResult StatsCollect(
270+
bool hastransportSequenceNumber,
269271
double pacerPacingRate,
270272
double pacerPaddingRate,
271273
//Packet Info
@@ -329,6 +331,7 @@ namespace StatCollect {
329331
SC_NEW_MEMORY_FAIL if the new memory fail
330332
*/
331333
SCResult StatsCollect(
334+
bool hastransportSequenceNumber,
332335
double pacerPacingRate,
333336
double pacerPaddingRate,
334337
//Packet Info
@@ -391,6 +394,7 @@ namespace StatCollect {
391394
NULL if failed.
392395
*/
393396
struct CollectInfo* StatsCollectByStruct(
397+
bool hastransportSequenceNumber,
394398
double pacerPacingRate,
395399
double pacerPaddingRate,
396400
//Packet Info
@@ -474,6 +478,7 @@ namespace StatCollect {
474478
** return: json string format if successfully
475479
*/
476480
std::string StatsCollectByJSON(
481+
bool hastransportSequenceNumber,
477482
double pacerPacingRate,
478483
double pacerPaddingRate,
479484
//Packet Info

‎video/video_stream_encoder.cc

+4-3
Original file line numberDiff line numberDiff line change
@@ -1068,9 +1068,10 @@ void VideoStreamEncoder::MaybeEncodeVideoFrame(const VideoFrame& video_frame,
10681068
last_frame_info_ = VideoFrameInfo(video_frame.width(), video_frame.height(),
10691069
video_frame.is_texture());
10701070
RTC_LOG(LS_INFO) << "Video frame parameters changed: dimensions="
1071-
<< last_frame_info_->width << "x"
1072-
<< last_frame_info_->height
1073-
<< ", texture=" << last_frame_info_->is_texture << ".";
1071+
<< last_frame_info_->width << "x"
1072+
<< last_frame_info_->height
1073+
<< ", texture=" << last_frame_info_->is_texture
1074+
<< " at time= " << clock_->TimeInMilliseconds() << "ms.";
10741075
// Force full frame update, since resolution has changed.
10751076
accumulated_update_rect_ =
10761077
VideoFrame::UpdateRect{0, 0, video_frame.width(), video_frame.height()};

0 commit comments

Comments
 (0)