commit c6c02efb56b24df04ed9ab61252c14c7bddcca93
author Artem Titov <titovartem@webrtc.org> Mon May 09 08:30:09 2022
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon May 09 09:52:34 2022
tree 5f80c7b80d5f951aa9dee12a235f30962a76a41f
parent 47a9e6e94e2d02c94d40c35969776816ea292342

Revert "Don't create channel_manager when media_engine is not set"

This reverts commit c48ad732d6eb69f14dd6d44f801d62997cef2c2f.

Reason for revert: breaks downstream project

Original change's description:
> Don't create channel_manager when media_engine is not set
>
> Also remove a bunch of functions in ChannelManager that were just
> forwarding to MediaEngineInterface.
>
> Bug: webrtc:13931
> Change-Id: Ia38591fd22c665cace16d032f5c1e384e413cded
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/261304
> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
> Reviewed-by: Henrik Boström <hbos@webrtc.org>
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36801}

Bug: webrtc:13931
Change-Id: I1e260a2489547bd9483b50e043c28d2805b0fa5a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/261660
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Owners-Override: Artem Titov <titovartem@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#36811}

pc/media_session.h

diff --git a/pc/media_session.h b/pc/media_session.h
index 8f97538..9a67ad1 100644
--- a/pc/media_session.h
+++ b/pc/media_session.h
@@ -34,7 +34,6 @@
 #include "pc/media_protocol_names.h"
 #include "pc/session_description.h"
 #include "pc/simulcast_description.h"
-#include "rtc_base/memory/always_valid_pointer.h"
 #include "rtc_base/unique_id_generator.h"
 
 namespace webrtc {
@@ -329,10 +328,6 @@
 
   void ComputeVideoCodecsIntersectionAndUnion();
 
-  rtc::UniqueRandomIdGenerator* ssrc_generator() const {
-    return ssrc_generator_.get();
-  }
-
   bool is_unified_plan_ = false;
   AudioCodecs audio_send_codecs_;
   AudioCodecs audio_recv_codecs_;
@@ -346,9 +341,8 @@
   VideoCodecs video_sendrecv_codecs_;
   // Union of send and recv.
   VideoCodecs all_video_codecs_;
-  // This object may or may not be owned by this class.
-  webrtc::AlwaysValidPointer<rtc::UniqueRandomIdGenerator> const
-      ssrc_generator_;
+  // This object is not owned by the channel so it must outlive it.
+  rtc::UniqueRandomIdGenerator* const ssrc_generator_;
   bool enable_encrypted_rtp_header_extensions_ = false;
   // TODO(zhihuang): Rename secure_ to sdec_policy_; rename the related getter
   // and setter.