Remove unused MoqtSession reference from MoqtOutgoingQueue.
PiperOrigin-RevId: 658148878
diff --git a/quiche/quic/moqt/moqt_integration_test.cc b/quiche/quic/moqt/moqt_integration_test.cc
index f057e60..0eb9331 100644
--- a/quiche/quic/moqt/moqt_integration_test.cc
+++ b/quiche/quic/moqt/moqt_integration_test.cc
@@ -179,8 +179,7 @@
});
auto queue = std::make_shared<MoqtOutgoingQueue>(
- client_->session(), FullTrackName{"test", "data"},
- MoqtForwardingPreference::kGroup);
+ FullTrackName{"test", "data"}, MoqtForwardingPreference::kGroup);
MoqtKnownTrackPublisher known_track_publisher;
known_track_publisher.Add(queue);
client_->session()->set_publisher(&known_track_publisher);
@@ -230,8 +229,7 @@
std::string name =
absl::StrCat("pref_", static_cast<int>(forwarding_preference));
auto queue = std::make_shared<MoqtOutgoingQueue>(
- client_->session(), FullTrackName{"test", name},
- MoqtForwardingPreference::kObject);
+ FullTrackName{"test", name}, MoqtForwardingPreference::kObject);
publisher.Add(queue);
queue->AddObject(MemSliceFromString("object 1"), /*key=*/true);
queue->AddObject(MemSliceFromString("object 2"), /*key=*/false);
@@ -292,8 +290,7 @@
std::string name =
absl::StrCat("pref_", static_cast<int>(forwarding_preference));
auto queue = std::make_shared<MoqtOutgoingQueue>(
- client_->session(), FullTrackName{"test", name},
- MoqtForwardingPreference::kObject);
+ FullTrackName{"test", name}, MoqtForwardingPreference::kObject);
publisher.Add(queue);
for (int i = 0; i < 100; ++i) {
queue->AddObject(MemSliceFromString("object"), /*key=*/true);
diff --git a/quiche/quic/moqt/moqt_outgoing_queue.h b/quiche/quic/moqt/moqt_outgoing_queue.h
index e3a7d3a..23bb4cd 100644
--- a/quiche/quic/moqt/moqt_outgoing_queue.h
+++ b/quiche/quic/moqt/moqt_outgoing_queue.h
@@ -18,7 +18,6 @@
#include "quiche/quic/moqt/moqt_messages.h"
#include "quiche/quic/moqt/moqt_priority.h"
#include "quiche/quic/moqt/moqt_publisher.h"
-#include "quiche/quic/moqt/moqt_session.h"
#include "quiche/common/platform/api/quiche_mem_slice.h"
namespace moqt {
@@ -32,10 +31,9 @@
// frames that they produce.
class MoqtOutgoingQueue : public MoqtTrackPublisher {
public:
- explicit MoqtOutgoingQueue(MoqtSession* session, FullTrackName track,
+ explicit MoqtOutgoingQueue(FullTrackName track,
MoqtForwardingPreference forwarding_preference)
- : session_(session),
- track_(std::move(track)),
+ : track_(std::move(track)),
forwarding_preference_(forwarding_preference) {}
MoqtOutgoingQueue(const MoqtOutgoingQueue&) = delete;
@@ -86,7 +84,6 @@
return current_group_id_ - queue_.size() + 1;
}
- MoqtSession* session_; // Not owned.
FullTrackName track_;
MoqtForwardingPreference forwarding_preference_;
MoqtPriority publisher_priority_ = 128;
diff --git a/quiche/quic/moqt/moqt_outgoing_queue_test.cc b/quiche/quic/moqt/moqt_outgoing_queue_test.cc
index 925e369..d7a9785 100644
--- a/quiche/quic/moqt/moqt_outgoing_queue_test.cc
+++ b/quiche/quic/moqt/moqt_outgoing_queue_test.cc
@@ -27,7 +27,7 @@
public MoqtObjectListener {
public:
TestMoqtOutgoingQueue()
- : MoqtOutgoingQueue(nullptr, FullTrackName{"test", "track"},
+ : MoqtOutgoingQueue(FullTrackName{"test", "track"},
MoqtForwardingPreference::kGroup) {
AddObjectListener(this);
}
diff --git a/quiche/quic/moqt/tools/chat_client_bin.cc b/quiche/quic/moqt/tools/chat_client_bin.cc
index f2225b6..a4e4432 100644
--- a/quiche/quic/moqt/tools/chat_client_bin.cc
+++ b/quiche/quic/moqt/tools/chat_client_bin.cc
@@ -205,8 +205,7 @@
return false;
}
queue_ = std::make_shared<moqt::MoqtOutgoingQueue>(
- client_->session(), my_track_name_,
- moqt::MoqtForwardingPreference::kObject);
+ my_track_name_, moqt::MoqtForwardingPreference::kObject);
publisher_.Add(queue_);
session_->set_publisher(&publisher_);
moqt::MoqtOutgoingAnnounceCallback announce_callback =
diff --git a/quiche/quic/moqt/tools/moqt_simulator_bin.cc b/quiche/quic/moqt/tools/moqt_simulator_bin.cc
index c3fb9c1..baf9b90 100644
--- a/quiche/quic/moqt/tools/moqt_simulator_bin.cc
+++ b/quiche/quic/moqt/tools/moqt_simulator_bin.cc
@@ -99,7 +99,7 @@
QuicBandwidth bitrate)
: Actor(simulator, actor_name),
queue_(std::make_shared<MoqtOutgoingQueue>(
- session, track_name, MoqtForwardingPreference::kGroup)),
+ track_name, MoqtForwardingPreference::kGroup)),
keyframe_interval_(keyframe_interval),
time_between_frames_(QuicTimeDelta::FromMicroseconds(1.0e6 / fps)) {
int p_frame_count = keyframe_interval - 1;
