From 5975060ed239fe3f99e5df450458a1786b8e99c0 Mon Sep 17 00:00:00 2001
From: Peter Thatcher <pthatcher@google.com>
Date: Thu, 5 Sep 2019 18:40:25 -0700
Subject: [PATCH] Fix a bunch of minor things for streaming during PR review

---
 index.bs               | 14 +++++++-------
 messages_appendix.cddl | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/index.bs b/index.bs
index 7319803..b38a4d5 100644
--- a/index.bs
+++ b/index.bs
@@ -1489,7 +1489,7 @@ streaming-session-start-request message with the following properties:
     receiver) pair.  Can be used later to modify or terminate a
     streaming session.
 
-: stats-interval
+: desired-stats-interval
 :: Indicates the frequency the receiver should send stats messages to
     the sender.
 
@@ -1599,7 +1599,7 @@ After receiving a streaming-session-start-request message, a receiver
 should send back a streaming-session-start-response message with the
 following properties:
 
-: stats-interval
+: desired-stats-interval
 :: Indicates the frequency the sender should send stats messages to
     the receiver.
 
@@ -1669,13 +1669,13 @@ separate QUIC streams.
     helps to avoid sending duplicate information in every frame.
 
 : start-time
-:: Identifies the beginning of the time range of the audio frame.  The time
+:: Identifies the beginning of the time range of the audio frame. The time
     scale is inferred from the properties of the encoding (from the
     audio-encoding-offer).  The end time can be inferred from the
     start time and duration.
 
 : duration
-:: If present, the duration of the audio frame.  The time
+:: If present, the duration of the audio frame. The time
     scale is inferred from the properties of the encoding.  Likewise, if not
     present, the duration is inferred from the properties of the encoding.
 
@@ -1724,14 +1724,14 @@ ending at the last dependent frame.
     If not present, the default value is [-1].
 
 : start-time
-:: Identifies the beginning of the time range of the video frame.  The time
+:: Identifies the beginning of the time range of the video frame. The time
     scale is inferred from the properties of the encoding (from the
     video-encoding-offer).  The end time can be inferred from the
     start time and duration.
 
 : duration
-:: If present, the duration of the video frame.  The time
-    scale is inferred from the properties of the encoding.  If not
+:: If present, the duration of the video frame. The time
+    scale is inferred from the properties of the encoding. If not
     present, that means duration is unknown.
 
 : sync-time
diff --git a/messages_appendix.cddl b/messages_appendix.cddl
index b4b6c4e..ef895e5 100644
--- a/messages_appendix.cddl
+++ b/messages_appendix.cddl
@@ -505,7 +505,7 @@ video-resolution = {
 receive-video-capability = {
   0: format ; codec
   ? 1: video-resolution ; max-resolution
-  ? 2: uint ; max-frames-per-second
+  ? 2: ratio ; max-frames-per-second
   ? 3: uint ; max-pixels-per-second
   ? 4: uint ; min-bit-rate
   ? 5: ratio ; aspect-ratio
@@ -523,7 +523,7 @@ streaming-session-start-request = {
   request
   1: uint; streaming-session-id
   2: [* media-stream-offer] ;  stream-offers
-  3: microseconds ; stats-interval
+  3: microseconds ; desired-stats-interval
 }
 
 ; type key 135
@@ -531,7 +531,7 @@ streaming-session-start-response = {
   response
   1: &result ; result
   2: [* media-stream-request] ; stream-requests
-  3: microseconds ; stats-interval
+  3: microseconds ; desired-stats-interval
 }
 
 ; type key 136
@@ -608,7 +608,7 @@ audio-encoding-request = {
 video-encoding-request = {
   1 : uint ; encoding-id
   ? 2 : video-resolution ; target-resolution
-  ? 3 : float32 ; max-frames-per-second
+  ? 3 : ratio ; max-frames-per-second
 }
 
 data-encoding-request = {
@@ -635,7 +635,7 @@ video-frame = {
   3: uint ; start-time
   ? 4: uint ; duration
   5: bytes ; payload
-  ? 6: uint ; rotation
+  ? 6: uint ; video-rotation
   ? 7: media-time ; sync-time
 }
 
@@ -663,6 +663,13 @@ ratio = [
   consequent: uint
 ]
 
+video-rotation = &(
+  ; Degrees clockwise
+  video-rotation-0
+  video-rotation-90
+  video-rotation-180
+  video-rotation-270
+)
 
 ; type key 142
 streaming-session-sender-stats-event = {