Misc. cleanup: media/

Bug: none Change-Id: I5f9a4d1a93b22640940e03f41c1d9c936e3f64a0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4962518 Commit-Queue: Peter Kasting <pkasting@chromium.org> Commit-Queue: Eugene Zemtsov <eugene@chromium.org> Reviewed-by: Eugene Zemtsov <eugene@chromium.org> Auto-Submit: Peter Kasting <pkasting@chromium.org> Cr-Commit-Position: refs/heads/main@{#1213178}
chromium · Oct 22, 2023 · 4c94357 · 4c94357
1 parent 4f07550
commit 4c94357
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/media/capabilities/video_decode_stats.proto b/media/capabilities/video_decode_stats.proto
@@ -23,8 +23,8 @@ message DecodeStatsProto {
 
   // Required. Time of last data write from
   // base::Time::InMillisecondsFSinceUnixEpoch(). Data will be discarded when
-  // the date indicates its very old. This avoids a circumstance where a few bad
-  // outlier playbacks permanently define a machines capabilities.
+  // the date indicates it's very old. This avoids a circumstance where a few
+  // bad outlier playbacks permanently define a machine's capabilities.
   optional double last_write_date = 7;
 
   // Required (for those in the "unweighted" experiment). An unweighted average

diff --git a/media/capabilities/video_decode_stats_db_impl.cc b/media/capabilities/video_decode_stats_db_impl.cc
@@ -197,10 +197,10 @@ bool VideoDecodeStatsDBImpl::AreStatsUsable(
       stats_proto->unweighted_average_frames_efficient() <= 1 &&
 
       // |last_write_date| represents
-      // base::Time::InMillisecondsFSinceUnixEpoch(), a number of msec since the
-      // epoch, so it should never be negative (zero is valid, as a default for
-      // this field, indicating the last write was made before we added time
-      // stamping). The converted time should also never be in the future.
+      // base::Time::InMillisecondsFSinceUnixEpoch(), so it should never be
+      // negative (zero is valid, as a default for this field, indicating the
+      // last write was made before we added time stamping). The converted time
+      // should also never be in the future.
       stats_proto->last_write_date() >= 0 &&
       base::Time::FromMillisecondsSinceUnixEpoch(
           stats_proto->last_write_date()) <= wall_clock_->Now();

diff --git a/media/capabilities/webrtc_video_stats.proto b/media/capabilities/webrtc_video_stats.proto
@@ -11,8 +11,8 @@ package media;
 message WebrtcVideoStatsProto {
   // Required. Timestamp of this entry from
   // base::Time::InMillisecondsFSinceUnixEpochIgnoringNull(). Data will be
-  // discarded when the date indicates its very old. This avoids a circumstance
-  // where a few bad outlier playbacks permanently define a machines
+  // discarded when the date indicates it's very old. This avoids a circumstance
+  // where a few bad outlier playbacks permanently define a machine's
   // capabilities.
   optional double timestamp = 1;
   // Required. Number of frames that this entry is based on.

diff --git a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
@@ -49,8 +49,7 @@ const char kClearKeyCdmVersion[] = "0.1.0.1";
 
 // Variants of External Clear Key key system to test different scenarios.
 
-const int64_t kMsPerSecond = 1000;
-const int64_t kMaxTimerDelayMs = 5 * kMsPerSecond;
+const int64_t kMaxTimerDelayMs = base::Seconds(5).InMilliseconds();
 
 // CDM unit test result header. Must be in sync with UNIT_TEST_RESULT_HEADER in
 // media/test/data/eme_player_js/globals.js.