diff options
| author | pkasting <pkasting@chromium.org> | 2014-10-14 16:08:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-14 23:10:15 +0000 |
| commit | acec86f50047d33fa4e3429ba61f56546a332cc7 (patch) | |
| tree | a40e44965a8210849ac84eb37f484583fe9a4543 /media/cast/logging | |
| parent | 2cdf37cc0dd9dc4b517158bfc81fb0d53bf6b9ca (diff) | |
| download | chromium_src-acec86f50047d33fa4e3429ba61f56546a332cc7.zip chromium_src-acec86f50047d33fa4e3429ba61f56546a332cc7.tar.gz chromium_src-acec86f50047d33fa4e3429ba61f56546a332cc7.tar.bz2 | |
Use int64 more pervasively in storing time s/ms/us values.
The various To/From[Milli,Micro]Seconds() functions all use int64. Convert some
other intermediary types to int64 to avoid type conversions along the way.
BUG=81439
TEST=none
Review URL: https://codereview.chromium.org/641263002
Cr-Commit-Position: refs/heads/master@{#299578}
Diffstat (limited to 'media/cast/logging')
| -rw-r--r-- | media/cast/logging/proto/raw_events.proto | 2 | ||||
| -rw-r--r-- | media/cast/logging/serialize_deserialize_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/cast/logging/proto/raw_events.proto b/media/cast/logging/proto/raw_events.proto index 1d2c537..e9e75bc 100644 --- a/media/cast/logging/proto/raw_events.proto +++ b/media/cast/logging/proto/raw_events.proto @@ -120,7 +120,7 @@ message AggregatedFrameEvent { optional int32 encoded_frame_size = 4; // Only set if there is a frame playout event. - optional int32 delay_millis = 5; + optional int64 delay_millis = 5; // Only set if there is a video frame encoded event. optional bool key_frame = 6; diff --git a/media/cast/logging/serialize_deserialize_test.cc b/media/cast/logging/serialize_deserialize_test.cc index 7e5aa7d..8c8e2fe 100644 --- a/media/cast/logging/serialize_deserialize_test.cc +++ b/media/cast/logging/serialize_deserialize_test.cc @@ -29,7 +29,7 @@ const media::cast::CastLoggingEvent kVideoPacketEvents[] = { // The frame event fields cycle through these numbers. const int kEncodedFrameSize[] = {512, 425, 399, 400, 237}; -const int kDelayMillis[] = {15, 4, 8, 42, 23, 16}; +const int64 kDelayMillis[] = {15, 4, 8, 42, 23, 16}; const int kMaxSerializedBytes = 10000; |