Skip to content

Commit 2fb6564

Browse files
authored
Rename SUBGROUP_HEADER_STREAMGROUP to SUBGROUP_HEADER (moq-wg#662)
And related editorial changes Follow up to moq-wg#661
2 parents ff5a182 + ae5c5a2 commit 2fb6564

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

draft-ietf-moq-transport.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2176,7 +2176,7 @@ the type of the stream in question.
21762176
|-------|-------------------------------------------------------|
21772177
| ID | Type |
21782178
|------:|:------------------------------------------------------|
2179-
| 0x4 | STREAM_HEADER_SUBGROUP ({{stream-header-subgroup}}) |
2179+
| 0x4 | SUBGROUP_HEADER ({{subgroup-header}}) |
21802180
|-------|-------------------------------------------------------|
21812181
| 0x5 | FETCH_HEADER ({{fetch-header}}) |
21822182
|-------|-------------------------------------------------------|
@@ -2320,37 +2320,37 @@ OBJECT_DATAGRAM_STATUS Message {
23202320

23212321
## Streams
23222322

2323-
When objects are sent on streams, the stream begins with a Stream Header
2324-
Subgroup message and is followed by one or more sets of serialized object fields.
2323+
When objects are sent on streams, the stream begins with a Subgroup Header
2324+
message and is followed by one or more sets of serialized object fields.
23252325
If a stream ends gracefully in the middle of a serialized Object, the session
23262326
SHOULD be terminated with a Protocol Violation.
23272327

2328-
A publisher SHOULD NOT open more than one stream at a time with the same Stream
2329-
Header Subgroup field values.
2328+
A publisher SHOULD NOT open more than one stream at a time with the same Subgroup
2329+
Header field values.
23302330

23312331

2332-
### Stream Header Subgroup
2332+
### Subgroup Header
23332333

2334-
When a stream begins with `STREAM_HEADER_SUBGROUP`, all objects on the stream
2334+
When a stream begins with `SUBGROUP_HEADER`, all Objects on the stream
23352335
belong to the track requested in the Subscribe message identified by `Track Alias`
23362336
and the subgroup indicated by 'Group ID' and `Subgroup ID`.
23372337

23382338
~~~
2339-
STREAM_HEADER_SUBGROUP Message {
2339+
SUBGROUP_HEADER Message {
23402340
Track Alias (i),
23412341
Group ID (i),
23422342
Subgroup ID (i),
23432343
Publisher Priority (8),
23442344
}
23452345
~~~
2346-
{: #stream-header-subgroup-format title="MOQT STREAM_HEADER_SUBGROUP Message"}
2346+
{: #object-header-format title="MOQT SUBGROUP_HEADER Message"}
23472347

2348-
All Objects received on a stream opened with `STREAM_HEADER_SUBGROUP` have an
2348+
All Objects received on a stream opened with `SUBGROUP_HEADER` have an
23492349
`Object Forwarding Preference` = `Subgroup`.
23502350

23512351
To send an Object with `Object Forwarding Preference` = `Subgroup`, find the open
23522352
stream that is associated with the subscription, `Group ID` and `Subgroup ID`,
2353-
or open a new one and send the `STREAM_HEADER_SUBGROUP`. Then serialize the
2353+
or open a new one and send the `SUBGROUP_HEADER`. Then serialize the
23542354
following fields.
23552355

23562356
The Object Status field is only sent if the Object Payload Length is zero.
@@ -2363,7 +2363,7 @@ The Object Status field is only sent if the Object Payload Length is zero.
23632363
Object Payload (..),
23642364
}
23652365
~~~
2366-
{: #object-group-format title="MOQT Group Stream Object Fields"}
2366+
{: #object-subgroup-format title="MOQT Subgroup Fields"}
23672367

23682368
A publisher MUST NOT send an Object on a stream if its Object ID is less than a
23692369
previously sent Object ID within a given group in that stream.
@@ -2399,9 +2399,9 @@ the FIN if and only if all objects were received. If the application receives
23992399
all data on the stream and the FIN, it can ignore any RESET_STREAM it receives.
24002400

24012401
If a sender will not deliver any objects from a Subgroup, it MAY send
2402-
a STREAM_HEADER_SUBGROUP on a new stream, with no objects, and
2403-
then send RESET_STREAM_AT with a reliable_size equal to the length of the
2404-
stream header. This explicitly tells the receiver there is an unsent Subgroup.
2402+
a SUBGROUP_HEADER on a new stream, with no objects, and then send RESET_STREAM_AT
2403+
with a reliable_size equal to the length of the stream header. This explicitly
2404+
tells the receiver there is an unsent Subgroup.
24052405

24062406
Since SUBSCRIBEs always end on a group boundary, an ending subscription can
24072407
always cleanly close all its subgroups. A sender that terminates a stream
@@ -2479,7 +2479,7 @@ Sending a subgroup on one stream:
24792479
~~~
24802480
Stream = 2
24812481

2482-
STREAM_HEADER_SUBGROUP {
2482+
SUBGROUP_HEADER {
24832483
Track Alias = 2
24842484
Group ID = 0
24852485
Subgroup ID = 0

0 commit comments

Comments
 (0)