Skip to content

avformat/moqenc: sized init + draft-18 #1

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

Open
BufferStarved wants to merge 1 commit into
base: feat/add-moq-output-h264
Choose a base branch
from
Open

avformat/moqenc: sized init + draft-18 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions libavformat/moqenc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,14 +320,18 @@ static int moq_init(AVFormatContext *s)
if (ret < 0)
return ret;

static const moq_version_t versions[] = { MOQ_VERSION_DRAFT_16 };
static const moq_version_t versions[] = {
MOQ_VERSION_DRAFT_18,
MOQ_VERSION_DRAFT_16,
};
moq_endpoint_cfg_t ecfg;
moq_endpoint_cfg_init(&ecfg);
ecfg.url = moq_bytes_cstr(s->url);
ecfg.insecure_skip_verify = ctx->insecure;
if (ctx->ca_file)
ecfg.ca_file = moq_bytes_cstr(ctx->ca_file);
ecfg.versions.policy = MOQ_VERSION_POLICY_EXACT;
/* EXACT is one version and fatal on mismatch. */
ecfg.versions.policy = MOQ_VERSION_POLICY_LIST;
ecfg.versions.versions = versions;
ecfg.versions.version_count = FF_ARRAY_ELEMS(versions);

Expand All @@ -336,7 +340,9 @@ static int moq_init(AVFormatContext *s)
return moq_err(s, res, "Could not connect to the relay");

moq_media_sender_cfg_t scfg;
moq_media_sender_cfg_init_live(&scfg);
/* Pointer-only init_live() stamps the v0 prefix only, so publish_tracks
* would be ignored. */
moq_media_sender_cfg_init_live_sized(&scfg, sizeof(scfg));
scfg.endpoint = NULL; /* use our endpoint to allow */
scfg.namespace_.parts = ctx->ns_parts;
scfg.namespace_.count = ctx->ns_count;
Expand Down