Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose transport mode #109

Merged
merged 4 commits into from
Feb 22, 2024
Merged

Expose transport mode #109

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84fadd6
Add TransportMode to QMedia APIs
RichLogan Feb 16, 2024
a493d28
Merge branch 'main' into expose-transport-mode
TimEvens Feb 21, 2024
1cdcd88
Set transport mode for tests
RichLogan Feb 21, 2024
ba30496
Readd Tim's comment
RichLogan Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ctest/qtest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class QSubscriptionTestDelegate : public qmedia::QSubscriptionDelegate
logger->Log("QSubscriptionTestDelegate constructed");
}
public:
int prepare(const std::string& sourceId, const std::string& label, const qmedia::manifest::ProfileSet& profileSet, bool& reliable) override {
int prepare(const std::string& sourceId, const std::string& label, const qmedia::manifest::ProfileSet& profileSet, quicr::TransportMode& transportMode) override {
logger->Log("QSubscriptionTestDelegate::prepare");
return 0;
}
Expand Down Expand Up @@ -96,7 +96,7 @@ class QPublicationTestDelegate : public qmedia::QPublicationDelegate
logger->Log("QPublicationTestDelegate constructed");
}
public:
int prepare(const std::string& sourceId, const std::string& qualityProfile, bool& reliable) {
int prepare(const std::string& sourceId, const std::string& qualityProfile, quicr::TransportMode& reliable) {
logger->Log("QPublicationTestDelegate::prepare");
std::cerr << "pub prepare " << std::endl;
return 0;
Expand Down
9 changes: 4 additions & 5 deletions include/qmedia/QController.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class QController
const quicr::Namespace& quicrNamespace,
const quicr::SubscribeIntent intent,
const std::string& originUrl,
const bool useReliableTransport,
const quicr::TransportMode transportMode,
const std::string& authToken,
quicr::bytes&& e2eToken,
std::shared_ptr<qmedia::QSubscriptionDelegate> delegate);
Expand All @@ -104,7 +104,7 @@ class QController
quicr::bytes&& payload,
const std::vector<std::uint8_t>& priority,
const std::vector<std::uint16_t>& expiry,
bool reliableTransport);
const quicr::TransportMode transportMode);

std::shared_ptr<QSubscriptionDelegate> getSubscriptionDelegate(const SourceId& sourceId,
const manifest::ProfileSet& profileSet);
Expand All @@ -118,7 +118,7 @@ class QController
const quicr::Namespace& quicrNamespace,
const quicr::SubscribeIntent intent,
const std::string& originUrl,
const bool useReliableTransport,
const quicr::TransportMode transportMode,
const std::string& authToken,
quicr::bytes& e2eToken);

Expand All @@ -130,7 +130,7 @@ class QController
quicr::bytes&& payload,
const std::vector<std::uint8_t>& priority,
const std::vector<std::uint16_t>& expiry,
bool reliableTransport);
const quicr::TransportMode transportMode);

void stopPublication(const quicr::Namespace& quicrNamespace);

Expand All @@ -145,7 +145,6 @@ class QController
std::mutex pubsMutex;

const cantina::LoggerPointer logger;
const quicr::TransportMode _def_reliable_mode = quicr::TransportMode::ReliablePerGroup;

std::shared_ptr<QSubscriberDelegate> qSubscriberDelegate;
std::shared_ptr<QPublisherDelegate> qPublisherDelegate;
Expand Down
4 changes: 2 additions & 2 deletions include/qmedia/QDelegates.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ class QSubscriptionDelegate
virtual int prepare(const std::string& sourceId,
const std::string& label,
const manifest::ProfileSet& profiles,
bool& reliable) = 0;
quicr::TransportMode& transportMode) = 0;
virtual int update(const std::string& sourceId, const std::string& label, const manifest::ProfileSet& profiles) = 0;
virtual int subscribedObject(const quicr::Namespace& quicrNamespace, quicr::bytes&& data, std::uint32_t groupId, std::uint16_t objectId) = 0;
};

class QPublicationDelegate
{
public:
virtual int prepare(const std::string& sourceId, const std::string& qualityProfile, bool& reliable) = 0;
virtual int prepare(const std::string& sourceId, const std::string& qualityProfile, quicr::TransportMode& reliable) = 0;
virtual int update(const std::string& sourceId, const std::string& qualityProfile) = 0;
virtual void publish(bool) = 0;
};
Expand Down
36 changes: 12 additions & 24 deletions src/QController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ QController::createQuicrSubscriptionDelegate(const std::string& sourceId,
const quicr::Namespace& quicrNamespace,
const quicr::SubscribeIntent intent,
const std::string& originUrl,
const bool useReliableTransport,
const quicr::TransportMode transportMode,
const std::string& authToken,
quicr::bytes&& e2eToken,
std::shared_ptr<qmedia::QSubscriptionDelegate> qDelegate)
Expand All @@ -177,12 +177,10 @@ QController::createQuicrSubscriptionDelegate(const std::string& sourceId,
return nullptr;
}

const quicr::TransportMode transport_mode = useReliableTransport ? _def_reliable_mode
: quicr::TransportMode::Unreliable;
quicrSubscriptionsMap[quicrNamespace] = SubscriptionDelegate::create(sourceId,
quicrNamespace,
intent,
transport_mode,
transportMode,
originUrl,
authToken,
std::move(e2eToken),
Expand Down Expand Up @@ -210,11 +208,8 @@ QController::createQuicrPublicationDelegate(std::shared_ptr<qmedia::QPublication
quicr::bytes&& payload,
const std::vector<std::uint8_t>& priority,
const std::vector<std::uint16_t>& expiry,
bool reliableTransport)
const quicr::TransportMode transportMode)
{
const quicr::TransportMode transport_mode = reliableTransport ? _def_reliable_mode
: quicr::TransportMode::Unreliable;

std::lock_guard<std::mutex> _(pubsMutex);
if (quicrPublicationsMap.contains(quicrNamespace))
{
Expand All @@ -227,7 +222,7 @@ QController::createQuicrPublicationDelegate(std::shared_ptr<qmedia::QPublication
.delegate = PublicationDelegate::create(std::move(qDelegate),
sourceId,
quicrNamespace,
transport_mode,
transportMode,
originUrl,
authToken,
std::move(payload),
Expand Down Expand Up @@ -287,7 +282,7 @@ int QController::startSubscription(std::shared_ptr<qmedia::QSubscriptionDelegate
const quicr::Namespace& quicrNamespace,
const quicr::SubscribeIntent intent,
const std::string& originUrl,
const bool useReliableTransport,
const quicr::TransportMode transportMode,
const std::string& authToken,
quicr::bytes& e2eToken)
{
Expand All @@ -299,7 +294,7 @@ int QController::startSubscription(std::shared_ptr<qmedia::QSubscriptionDelegate
quicrNamespace,
intent,
originUrl,
useReliableTransport,
transportMode,
authToken,
std::move(e2eToken),
std::move(qDelegate));
Expand All @@ -311,10 +306,7 @@ int QController::startSubscription(std::shared_ptr<qmedia::QSubscriptionDelegate
return -1;
}

const quicr::TransportMode transport_mode = useReliableTransport ? _def_reliable_mode
: quicr::TransportMode::Unreliable;

sub_delegate->subscribe(client_session, transport_mode);
sub_delegate->subscribe(client_session, transportMode);
return 0;
}

Expand Down Expand Up @@ -343,7 +335,7 @@ int QController::startPublication(std::shared_ptr<qmedia::QPublicationDelegate>
quicr::bytes&& payload,
const std::vector<std::uint8_t>& priority,
const std::vector<std::uint16_t>& expiry,
bool reliableTransport)
const quicr::TransportMode transportMode)

{
if (!client_session)
Expand All @@ -360,19 +352,15 @@ int QController::startPublication(std::shared_ptr<qmedia::QPublicationDelegate>
std::move(payload),
priority,
expiry,
reliableTransport);
transportMode);
if (!quicrPubDelegate)
{
LOGGER_ERROR(logger, "Failed to start publication for " << quicrNamespace << ": Delegate was null");
return -1;
}

// TODO: hack till we update the manifest to provide transport mode
quicr::TransportMode transport_mode = reliableTransport ? _def_reliable_mode
: quicr::TransportMode::Unreliable;

// TODO: add more intent parameters - max queue size (in time), default ttl, priority
quicrPubDelegate->publishIntent(client_session, transport_mode);
quicrPubDelegate->publishIntent(client_session, transportMode);
return 0;
}

Expand All @@ -395,7 +383,7 @@ void QController::processSubscriptions(const std::vector<manifest::MediaStream>&
continue;
}

bool reliable = false;
auto reliable = quicr::TransportMode::Unreliable;
int prepare_error = delegate->prepare(subscription.sourceId, subscription.label, subscription.profileSet, reliable);
if (prepare_error != 0)
{
Expand Down Expand Up @@ -439,7 +427,7 @@ void QController::processPublications(const std::vector<manifest::MediaStream>&
}

// Notify client to prepare for incoming media
bool reliable = false;
quicr::TransportMode reliable = quicr::TransportMode::Unreliable;
int prepare_error = delegate->prepare(publication.sourceId, profile.qualityProfile, reliable);
if (prepare_error != 0)
{
Expand Down
6 changes: 2 additions & 4 deletions test/qmedia.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,10 @@ class QSubscriptionTestDelegate : public qmedia::QSubscriptionDelegate
int prepare(const std::string& sourceId,
const std::string& label,
const qmedia::manifest::ProfileSet& /* profileSet */,
bool& reliable) override
bool& /* reliable */) override
{
collector->sourceId(sourceId);
collector->label(label);
reliable = true; // Testing microbursts data, which often results in drops. Use reliable for tests.
// collector->qualityProfile(profileSet);
return 0;
}
Expand Down Expand Up @@ -158,9 +157,8 @@ class QPublicationTestDelegate : public qmedia::QPublicationDelegate
public:
virtual ~QPublicationTestDelegate() = default;

int prepare(const std::string& /* sourceId */, const std::string& /* qualityProfile */, bool& reliable)
int prepare(const std::string& /* sourceId */, const std::string& /* qualityProfile */, bool& /* reliable */)
{
reliable = true; // Testing microbursts data, which often results in drops. Use reliable for tests.
return 0;
}

Expand Down
Loading