address mr comments

Author: stephen-derosa

user_timestamped_video/README.md

@@ -20,9 +20,12 @@ LIVEKIT_URL=ws://localhost:7880 LIVEKIT_TOKEN=<consumer-token> ./UserTimestamped
 Flags:
 
 - Producer default: sends user timestamps
+- Producer `--with-user-timestamp`: explicitly sends user timestamps
 - Producer `--without-user-timestamp`: does not send user timestamps
 - Consumer default: reads user timestamps through `setOnVideoFrameEventCallback`
-- Consumer `--ignore-user-timestamp`: ignores metadata through the legacy
+- Consumer `--with-user-timestamp`: explicitly reads user timestamps through
+  `setOnVideoFrameEventCallback`
+- Consumer `--without-user-timestamp`: ignores metadata through the legacy
   `setOnVideoFrameCallback`
 
 Matrix:
@@ -34,11 +37,11 @@ Matrix:
 
 # 2. Producer sends, consumer ignores
 ./UserTimestampedVideoProducer
-./UserTimestampedVideoConsumer --ignore-user-timestamp
+./UserTimestampedVideoConsumer --without-user-timestamp
 
 # 3. Producer does not send, consumer ignores
 ./UserTimestampedVideoProducer --without-user-timestamp
-./UserTimestampedVideoConsumer --ignore-user-timestamp
+./UserTimestampedVideoConsumer --without-user-timestamp
 
 # 4. Producer does not send, consumer reads
 ./UserTimestampedVideoProducer --without-user-timestamp

user_timestamped_video/consumer/main.cpp

@@ -21,7 +21,8 @@
 /// with `UserTimestampedVideoProducer` running in another process.
 ///
 /// Usage:
-///   UserTimestampedVideoConsumer <ws-url> <token> [--ignore-user-timestamp]
+///   UserTimestampedVideoConsumer <ws-url> <token>
+///       [--with-user-timestamp|--without-user-timestamp]
 ///
 /// Or via environment variables:
 ///   LIVEKIT_URL, LIVEKIT_TOKEN
@@ -66,11 +67,11 @@ formatUserTimestamp(const std::optional<VideoFrameMetadata> &metadata) {
 
 void printUsage(const char *program) {
   std::cerr << "Usage:\n"
-            << "  " << program
-            << " <ws-url> <token> [--ignore-user-timestamp]\n"
+            << "  " << program << " <ws-url> <token> "
+            << "[--with-user-timestamp|--without-user-timestamp]\n"
             << "or:\n"
             << "  LIVEKIT_URL=... LIVEKIT_TOKEN=... " << program
-            << " [--ignore-user-timestamp]\n";
+            << " [--with-user-timestamp|--without-user-timestamp]\n";
 }
 
 bool parseArgs(int argc, char *argv[], std::string &url, std::string &token,
@@ -83,11 +84,11 @@ bool parseArgs(int argc, char *argv[], std::string &url, std::string &token,
     if (arg == "-h" || arg == "--help") {
       return false;
     }
-    if (arg == "--ignore-user-timestamp") {
+    if (arg == "--without-user-timestamp") {
       read_user_timestamp = false;
       continue;
     }
-    if (arg == "--read-user-timestamp") {
+    if (arg == "--with-user-timestamp") {
       read_user_timestamp = true;
       continue;
     }

user_timestamped_video/producer/main.cpp

@@ -22,7 +22,8 @@
 /// timestamps flowing end to end.
 ///
 /// Usage:
-///   UserTimestampedVideoProducer <ws-url> <token> [--without-user-timestamp]
+///   UserTimestampedVideoProducer <ws-url> <token>
+///       [--with-user-timestamp|--without-user-timestamp]
 ///
 /// Or via environment variables:
 ///   LIVEKIT_URL, LIVEKIT_TOKEN
@@ -81,11 +82,11 @@ void fillFrame(VideoFrame &frame, std::uint32_t frame_index) {
 
 void printUsage(const char *program) {
   std::cerr << "Usage:\n"
-            << "  " << program
-            << " <ws-url> <token> [--without-user-timestamp]\n"
+            << "  " << program << " <ws-url> <token> "
+            << "[--with-user-timestamp|--without-user-timestamp]\n"
             << "or:\n"
             << "  LIVEKIT_URL=... LIVEKIT_TOKEN=... " << program
-            << " [--without-user-timestamp]\n";
+            << " [--with-user-timestamp|--without-user-timestamp]\n";
 }
 
 bool parseArgs(int argc, char *argv[], std::string &url, std::string &token,
@@ -199,8 +200,8 @@ int main(int argc, char *argv[]) {
                       << " capture_ts_us=" << capture_options.timestamp_us
                       << " user_ts_us="
                       << (send_user_timestamp
-                              ? std::to_string(
-                                    *capture_options.metadata->user_timestamp_us)
+                              ? std::to_string(*capture_options.metadata
+                                                    ->user_timestamp_us)
                               : std::string("disabled"))
                       << "\n";
           }