commit 0f6ee2821f60475fc4414e7e0432dd5a61e3d272
author Harald Alvestrand <hta@webrtc.org> Tue May 13 07:47:10 2025
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue May 13 09:56:34 2025
tree c1475804db2e6fe4f46aac58c29a5e1056ebc0f7
parent 887a6b9f7fb88291413ccc454651cb5e571740b2

Remove unused "recv" variables in VideoSendChannel

These were leftovers from the send/recv split.

Bug: None
Change-Id: Ia2efccc7a20c438e85aececbf5ed4f7d427392ae
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/390402
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44604}

media/engine/webrtc_video_engine.cc

diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc
index 6f1d2f5..ea3c6a7 100644
--- a/media/engine/webrtc_video_engine.cc
+++ b/media/engine/webrtc_video_engine.cc
@@ -88,7 +88,6 @@
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "modules/rtp_rtcp/source/rtp_util.h"
 #include "modules/video_coding/svc/scalability_mode_util.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/dscp.h"
@@ -843,7 +842,7 @@
     VideoBitrateAllocatorFactory* video_bitrate_allocator_factory) {
   return std::make_unique<WebRtcVideoSendChannel>(
       call, config, options, crypto_options, encoder_factory_.get(),
-      decoder_factory_.get(), video_bitrate_allocator_factory);
+      video_bitrate_allocator_factory);
 }
 std::unique_ptr<VideoMediaReceiveChannelInterface>
 WebRtcVideoEngine::CreateReceiveChannel(Call* call,
@@ -925,7 +924,6 @@
     const VideoOptions& options,
     const CryptoOptions& crypto_options,
     VideoEncoderFactory* encoder_factory,
-    VideoDecoderFactory* decoder_factory,
     VideoBitrateAllocatorFactory* bitrate_allocator_factory)
     : MediaChannelUtil(call->network_thread(), config.enable_dscp),
       worker_thread_(call->worker_thread()),
@@ -935,7 +933,6 @@
       default_sink_(nullptr),
       video_config_(config.video),
       encoder_factory_(encoder_factory),
-      decoder_factory_(decoder_factory),
       bitrate_allocator_factory_(bitrate_allocator_factory),
       default_send_options_(options),
       last_send_stats_log_ms_(-1),
@@ -946,13 +943,6 @@
       crypto_options_(crypto_options) {
   RTC_DCHECK_RUN_ON(&thread_checker_);
   rtcp_receiver_report_ssrc_ = kDefaultRtcpReceiverReportSsrc;
-  // Crash if MapCodecs fails.
-  recv_codecs_ = MapCodecs(GetPayloadTypesAndDefaultCodecs(
-                               decoder_factory_, /*is_decoder_factory=*/true,
-                               /*include_rtx=*/true, call_->trials()))
-                     .value();
-  recv_flexfec_payload_type_ =
-      recv_codecs_.empty() ? 0 : recv_codecs_.front().flexfec_payload_type;
 }
 
 WebRtcVideoSendChannel::~WebRtcVideoSendChannel() {

media/engine/webrtc_video_engine.h

diff --git a/media/engine/webrtc_video_engine.h b/media/engine/webrtc_video_engine.h
index 5d6bd6a..e8cfa26 100644
--- a/media/engine/webrtc_video_engine.h
+++ b/media/engine/webrtc_video_engine.h
@@ -25,7 +25,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/strings/string_view.h"
-#include "api/array_view.h"
 #include "api/crypto/crypto_options.h"
 #include "api/crypto/frame_decryptor_interface.h"
 #include "api/crypto/frame_encryptor_interface.h"
@@ -164,7 +163,6 @@
       const VideoOptions& options,
       const CryptoOptions& crypto_options,
       VideoEncoderFactory* encoder_factory,
-      VideoDecoderFactory* decoder_factory,
       VideoBitrateAllocatorFactory* bitrate_allocator_factory);
   ~WebRtcVideoSendChannel() override;
 
@@ -308,15 +306,6 @@
   bool ValidateSendSsrcAvailability(const StreamParams& sp) const
       RTC_EXCLUSIVE_LOCKS_REQUIRED(thread_checker_);
 
-  // Populates `rtx_associated_payload_types`, `raw_payload_types` and
-  // `decoders` based on codec settings provided by `recv_codecs`.
-  // `recv_codecs` must be non-empty and all other parameters must be empty.
-  static void ExtractCodecInformation(
-      ArrayView<const VideoCodecSettings> recv_codecs,
-      std::map<int, int>& rtx_associated_payload_types,
-      std::set<int>& raw_payload_types,
-      std::vector<VideoReceiveStreamInterface::Decoder>& decoders);
-
   // Wrapper for the sender part.
   class WebRtcVideoSendStream {
    public:
@@ -505,13 +494,8 @@
       RTC_GUARDED_BY(thread_checker_);
 
   VideoEncoderFactory* const encoder_factory_ RTC_GUARDED_BY(thread_checker_);
-  VideoDecoderFactory* const decoder_factory_ RTC_GUARDED_BY(thread_checker_);
   VideoBitrateAllocatorFactory* const bitrate_allocator_factory_
       RTC_GUARDED_BY(thread_checker_);
-  std::vector<VideoCodecSettings> recv_codecs_ RTC_GUARDED_BY(thread_checker_);
-  RtpHeaderExtensionMap recv_rtp_extension_map_ RTC_GUARDED_BY(thread_checker_);
-  std::vector<RtpExtension> recv_rtp_extensions_
-      RTC_GUARDED_BY(thread_checker_);
   // See reason for keeping track of the FlexFEC payload type separately in
   // comment in WebRtcVideoChannel::ChangedReceiverParameters.
   int recv_flexfec_payload_type_ RTC_GUARDED_BY(thread_checker_);