From 60de8aab4619284affd72f225a2a5bd914c0e05b Mon Sep 17 00:00:00 2001 From: Rasmus Brandt Date: Mon, 23 May 2022 10:34:27 +0200 Subject: [PATCH] Remove unused VideoReceiveStreamInterface::Config::target_delay_ms field. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:14128 Change-Id: I83aa23124ed260b836930463aa712ddd097cef84 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/263142 Reviewed-by: Artem Titov Commit-Queue: Rasmus Brandt Reviewed-by: Björn Terelius Cr-Commit-Position: refs/heads/main@{#37031} --- call/video_receive_stream.cc | 1 - call/video_receive_stream.h | 4 ---- test/call_config_utils.cc | 2 -- test/call_config_utils_unittest.cc | 2 -- 4 files changed, 9 deletions(-) diff --git a/call/video_receive_stream.cc b/call/video_receive_stream.cc index 437464cdfb..8cd4a952d4 100644 --- a/call/video_receive_stream.cc +++ b/call/video_receive_stream.cc @@ -110,7 +110,6 @@ std::string VideoReceiveStreamInterface::Config::ToString() const { ss << ", render_delay_ms: " << render_delay_ms; if (!sync_group.empty()) ss << ", sync_group: " << sync_group; - ss << ", target_delay_ms: " << target_delay_ms; ss << '}'; return ss.str(); diff --git a/call/video_receive_stream.h b/call/video_receive_stream.h index 473b8c74e3..7af0f642ad 100644 --- a/call/video_receive_stream.h +++ b/call/video_receive_stream.h @@ -247,10 +247,6 @@ class VideoReceiveStreamInterface : public MediaReceiveStreamInterface { // to one of the audio streams. std::string sync_group; - // Target delay in milliseconds. A positive value indicates this stream is - // used for streaming instead of a real-time call. - int target_delay_ms = 0; - // An optional custom frame decryptor that allows the entire frame to be // decrypted in whatever way the caller choses. This is not required by // default. diff --git a/test/call_config_utils.cc b/test/call_config_utils.cc index 7e226b00d2..35c5f7e845 100644 --- a/test/call_config_utils.cc +++ b/test/call_config_utils.cc @@ -37,7 +37,6 @@ VideoReceiveStreamInterface::Config ParseVideoReceiveStreamJsonConfig( receive_config.decoders.push_back(decoder); } receive_config.render_delay_ms = json["render_delay_ms"].asInt64(); - receive_config.target_delay_ms = json["target_delay_ms"].asInt64(); receive_config.rtp.remote_ssrc = json["rtp"]["remote_ssrc"].asInt64(); receive_config.rtp.local_ssrc = json["rtp"]["local_ssrc"].asInt64(); receive_config.rtp.rtcp_mode = @@ -118,7 +117,6 @@ Json::Value GenerateVideoReceiveStreamJsonConfig( root_json["rtp"] = rtp_json; root_json["render_delay_ms"] = config.render_delay_ms; - root_json["target_delay_ms"] = config.target_delay_ms; return root_json; } diff --git a/test/call_config_utils_unittest.cc b/test/call_config_utils_unittest.cc index b898299160..cdaa3b5030 100644 --- a/test/call_config_utils_unittest.cc +++ b/test/call_config_utils_unittest.cc @@ -25,7 +25,6 @@ TEST(CallConfigUtils, MarshalUnmarshalProcessSameObject) { decoder.video_format.parameters["99"] = "b"; recv_config.decoders.push_back(decoder); recv_config.render_delay_ms = 10; - recv_config.target_delay_ms = 15; recv_config.rtp.remote_ssrc = 100; recv_config.rtp.local_ssrc = 101; recv_config.rtp.rtcp_mode = RtcpMode::kCompound; @@ -48,7 +47,6 @@ TEST(CallConfigUtils, MarshalUnmarshalProcessSameObject) { EXPECT_EQ(recv_config.decoders[0].video_format.parameters, unmarshaled_config.decoders[0].video_format.parameters); EXPECT_EQ(recv_config.render_delay_ms, unmarshaled_config.render_delay_ms); - EXPECT_EQ(recv_config.target_delay_ms, unmarshaled_config.target_delay_ms); EXPECT_EQ(recv_config.rtp.remote_ssrc, unmarshaled_config.rtp.remote_ssrc); EXPECT_EQ(recv_config.rtp.local_ssrc, unmarshaled_config.rtp.local_ssrc); EXPECT_EQ(recv_config.rtp.rtcp_mode, unmarshaled_config.rtp.rtcp_mode);