Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 12 additions & 9 deletions Decimus/Lib/libquicr/QClientObjC.mm
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,19 @@ -(void)unsubscribeTrackWithHandler: (QSubscribeTrackHandlerObjC*) trackHandler
-(void) publishAnnounce: (NSData*) trackNamespace
{
assert(qClientPtr);
auto ptr = static_cast<const std::uint8_t*>(trackNamespace.bytes);
quicr::TrackNamespace name_space(ptr, ptr + trackNamespace.length);
qClientPtr->PublishAnnounce(name_space);
const auto ptr = static_cast<const std::uint8_t*>(trackNamespace.bytes);
const std::vector<std::uint8_t> name_space(ptr, ptr + trackNamespace.length);
const quicr::TrackNamespace track_namespace(name_space);
qClientPtr->PublishAnnounce(track_namespace);
}

-(void) publishUnannounce: (NSData*) trackNamespace
{
assert(qClientPtr);
auto ptr = static_cast<const std::uint8_t*>(trackNamespace.bytes);
quicr::TrackNamespace name_space(ptr, ptr + trackNamespace.length);
qClientPtr->PublishUnannounce(name_space);
const auto ptr = static_cast<const std::uint8_t*>(trackNamespace.bytes);
const std::vector<std::uint8_t> name_space(ptr, ptr + trackNamespace.length);
const quicr::TrackNamespace track_namespace(name_space);
qClientPtr->PublishUnannounce(track_namespace);
}

-(void)setCallbacks: (id<QClientCallbacks>) callbacks
Expand All @@ -121,9 +123,10 @@ -(void)setCallbacks: (id<QClientCallbacks>) callbacks
-(QPublishAnnounceStatus) getAnnounceStatus: (NSData*) trackNamespace
{
assert(qClientPtr);
auto ptr = static_cast<const std::uint8_t*>(trackNamespace.bytes);
quicr::TrackNamespace name_space(ptr, ptr + trackNamespace.length);
auto status = qClientPtr->GetAnnounceStatus(name_space);
const auto ptr = static_cast<const std::uint8_t*>(trackNamespace.bytes);
const std::vector<std::uint8_t> name_space(ptr, ptr + trackNamespace.length);
const quicr::TrackNamespace track_namespace(name_space);
const auto status = qClientPtr->GetAnnounceStatus(track_namespace);
return static_cast<QPublishAnnounceStatus>(status);
}

Expand Down
4 changes: 3 additions & 1 deletion Decimus/Lib/libquicr/QCommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#import <Foundation/Foundation.h>
#ifdef __cplusplus
#include <quicr/track_name.h>
#include <quicr/detail/messages.h>
#endif

typedef struct QMinMaxAvg {
Expand Down Expand Up @@ -36,8 +37,9 @@ typedef struct QObjectHeaders {

#ifdef __cplusplus
static quicr::FullTrackName ftnConvert(QFullTrackName qFtn) {
const auto nameSpace = std::vector<std::uint8_t>(qFtn.nameSpace, qFtn.nameSpace + qFtn.nameSpaceLength);
return {
.name_space = std::vector<std::uint8_t>(qFtn.nameSpace, qFtn.nameSpace + qFtn.nameSpaceLength),
.name_space = quicr::TrackNamespace(nameSpace),
.name = std::vector<std::uint8_t>(qFtn.name, qFtn.name + qFtn.nameLength)
};
}
Expand Down
2 changes: 1 addition & 1 deletion Decimus/Lib/libquicr/QSubscribeTrackHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class QSubscribeTrackHandler : public quicr::SubscribeTrackHandler
{
public:
QSubscribeTrackHandler(const quicr::FullTrackName& full_track_name);
QSubscribeTrackHandler(const quicr::FullTrackName& full_track_name, uint8_t priority, uint8_t group_order);

// Callbacks.
void StatusChanged(Status status) override;
Expand Down
4 changes: 2 additions & 2 deletions Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
-(id) initWithFullTrackName: (QFullTrackName) full_track_name
{
quicr::FullTrackName fullTrackName = ftnConvert(full_track_name);
handlerPtr = std::make_shared<QSubscribeTrackHandler>(fullTrackName);
handlerPtr = std::make_shared<QSubscribeTrackHandler>(fullTrackName, 2, 1);
return self;
}

Expand All @@ -30,7 +30,7 @@

// C++

QSubscribeTrackHandler::QSubscribeTrackHandler(const quicr::FullTrackName& full_track_name): quicr::SubscribeTrackHandler(full_track_name) { }
QSubscribeTrackHandler::QSubscribeTrackHandler(const quicr::FullTrackName& full_track_name, uint8_t priority, uint8_t group_order): quicr::SubscribeTrackHandler(full_track_name, static_cast<quicr::messages::ObjectPriority> (priority), static_cast<quicr::messages::GroupOrder>(group_order)) { }

Check failure on line 33 in Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm

View check run for this annotation

Xcode Cloud / Decimus | PR | Build - iOS

Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm#L33

No matching constructor for initialization of 'quicr::SubscribeTrackHandler'

Check failure on line 33 in Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm

View check run for this annotation

Xcode Cloud / Decimus | PR | Build - iOS

Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm#L33

No type named 'GroupOrder' in namespace 'quicr::messages'

Check failure on line 33 in Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm

View check run for this annotation

Xcode Cloud / Decimus | PR | Build - tvOS

Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm#L33

No type named 'GroupOrder' in namespace 'quicr::messages'

Check failure on line 33 in Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm

View check run for this annotation

Xcode Cloud / Decimus | PR | Build - tvOS

Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm#L33

No matching constructor for initialization of 'quicr::SubscribeTrackHandler'

Check failure on line 33 in Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm

View check run for this annotation

Xcode Cloud / Decimus | PR | TestPlan - macOS

Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm#L33

No matching constructor for initialization of 'quicr::SubscribeTrackHandler'

Check failure on line 33 in Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm

View check run for this annotation

Xcode Cloud / Decimus | PR | TestPlan - macOS

Decimus/Lib/libquicr/QSubscribeTrackHandlerObjC.mm#L33

No type named 'GroupOrder' in namespace 'quicr::messages'

void QSubscribeTrackHandler::StatusChanged(Status status)
{
Expand Down