Skip to content

Commit

Permalink
feat: expose packaging status upon failure
Browse files Browse the repository at this point in the history
  • Loading branch information
lee.fordyce committed May 1, 2024
1 parent 09b3ff6 commit 3594ee4
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 48 deletions.
48 changes: 27 additions & 21 deletions include/packager/live_packager_export.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,30 +94,36 @@ size_t livepackager_buf_size(LivePackagerBuffer_t buf);

typedef struct LivePackager_instance_s* LivePackager_t;

typedef struct LivePackagerStatus_s* LivePackagerStatus_t;
void live_packager_status_free(LivePackagerStatus_t self);

const char* status_get_error(LivePackagerStatus_t self);

LivePackager_t livepackager_new(LivePackagerConfig_t cfg);
void livepackager_free(LivePackager_t lp);

bool livepackager_package_init(LivePackager_t lp,
const uint8_t* init,
size_t init_len,
LivePackagerBuffer_t dest);

bool livepackager_package(LivePackager_t lp,
const uint8_t* init,
size_t init_len,
const uint8_t* media,
size_t media_len,
LivePackagerBuffer_t dest);

bool livepackager_package_timedtext_init(LivePackager_t lp,
const uint8_t* seg,
size_t seg_len,
LivePackagerBuffer_t dest);

bool livepackager_package_timedtext(LivePackager_t lp,
const uint8_t* seg,
size_t seg_len,
LivePackagerBuffer_t dest);
LivePackagerStatus_t livepackager_package_init(LivePackager_t lp,
const uint8_t* init,
size_t init_len,
LivePackagerBuffer_t dest);

LivePackagerStatus_t livepackager_package(LivePackager_t lp,
const uint8_t* init,
size_t init_len,
const uint8_t* media,
size_t media_len,
LivePackagerBuffer_t dest);

LivePackagerStatus_t livepackager_package_timedtext_init(
LivePackager_t lp,
const uint8_t* seg,
size_t seg_len,
LivePackagerBuffer_t dest);

LivePackagerStatus_t livepackager_package_timedtext(LivePackager_t lp,
const uint8_t* seg,
size_t seg_len,
LivePackagerBuffer_t dest);

#ifdef __cplusplus
}
Expand Down
83 changes: 56 additions & 27 deletions packager/live_packager_export.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ struct LivePackager_instance_s {
std::unique_ptr<shaka::LivePackager> inner;
};

struct LivePackagerStatus_s {
const char* status_message;
bool ok;
};

LivePackager_t livepackager_new(LivePackagerConfig_t cfg) {
shaka::LiveConfig converted{
.format = shaka::LiveConfig::OutputFormat(cfg.format),
Expand Down Expand Up @@ -49,6 +54,14 @@ void livepackager_free(LivePackager_t lp) {
delete lp;
}

void live_packager_status_free(LivePackagerStatus_t self) {
delete self;
}

const char* status_get_error(LivePackagerStatus_t self) {
return self->status_message;
}

struct LivePackager_buffer_s {
std::unique_ptr<shaka::SegmentBuffer> inner;
};
Expand All @@ -70,49 +83,65 @@ size_t livepackager_buf_size(LivePackagerBuffer_t buf) {
return buf->inner->Size();
}

bool livepackager_package_init(LivePackager_t lp,
const uint8_t* init,
size_t init_len,
LivePackagerBuffer_t dest) {
LivePackagerStatus_t livepackager_package_init(LivePackager_t lp,
const uint8_t* init,
size_t init_len,
LivePackagerBuffer_t dest) {
shaka::SegmentData input(init, init_len);
return lp->inner->PackageInit(input, *dest->inner).ok();
shaka::Status status = lp->inner->PackageInit(input, *dest->inner);
std::string status_message = status.ToString();
return new (std::nothrow)
LivePackagerStatus_s{status_message.c_str(), status.ok()};
}

bool livepackager_package(LivePackager_t lp,
const uint8_t* init,
size_t init_len,
const uint8_t* media,
size_t media_len,
LivePackagerBuffer_t dest) {
LivePackagerStatus_t livepackager_package(LivePackager_t lp,
const uint8_t* init,
size_t init_len,
const uint8_t* media,
size_t media_len,
LivePackagerBuffer_t dest) {
shaka::SegmentData input_init(init, init_len);
shaka::SegmentData input_media(media, media_len);
return lp->inner->Package(input_init, input_media, *dest->inner).ok();
shaka::Status status =
lp->inner->Package(input_init, input_media, *dest->inner);
std::string status_message = status.ToString();
return new (std::nothrow)
LivePackagerStatus_s{status_message.c_str(), status.ok()};
}

bool livepackager_package_timedtext_init(LivePackager_t lp,
const uint8_t* seg,
size_t seg_len,
LivePackagerBuffer_t dest) {
LivePackagerStatus_t livepackager_package_timedtext_init(
LivePackager_t lp,
const uint8_t* seg,
size_t seg_len,
LivePackagerBuffer_t dest) {
shaka::SegmentData input_seg(seg, seg_len);
shaka::FullSegmentBuffer out;
if (!lp->inner->PackageTimedText(input_seg, out).ok()) {
return false;
shaka::Status status = lp->inner->PackageTimedText(input_seg, out);
std::string status_message = status.ToString();
if (!status.ok()) {
return new (std::nothrow)
LivePackagerStatus_s{status_message.c_str(), status.ok()};
}

dest->inner->AppendData(out.InitSegmentData(), out.InitSegmentSize());
return true;
return new (std::nothrow)
LivePackagerStatus_s{status_message.c_str(), status.ok()};
}

bool livepackager_package_timedtext(LivePackager_t lp,
const uint8_t* seg,
size_t seg_len,
LivePackagerBuffer_t dest) {
LivePackagerStatus_t livepackager_package_timedtext(LivePackager_t lp,
const uint8_t* seg,
size_t seg_len,
LivePackagerBuffer_t dest) {
shaka::SegmentData input_seg(seg, seg_len);
shaka::FullSegmentBuffer out;
if (!lp->inner->PackageTimedText(input_seg, out).ok()) {
return false;
shaka::Status status = lp->inner->PackageTimedText(input_seg, out);
std::string status_message = status.ToString();
if (!status.ok()) {
return new (std::nothrow)
LivePackagerStatus_s{status_message.c_str(), status.ok()};
}

dest->inner->AppendData(out.SegmentData(), out.SegmentSize());
return true;
}
return new (std::nothrow)
LivePackagerStatus_s{status_message.c_str(), status.ok()};
}

0 comments on commit 3594ee4

Please sign in to comment.