Add accessor methods for RTP timestamp of EncodedImage.
Intention is to make the member private, but downstream callers
must be updated to use the accessor methods first.
Bug: webrtc:9378
Change-Id: I3495bd8d545b7234fbea10abfd14f082caa420b6
Reviewed-on: https://webrtc-review.googlesource.com/82160
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24352}diff --git a/modules/video_coding/generic_encoder_unittest.cc b/modules/video_coding/generic_encoder_unittest.cc
index 6037381..c889769 100644
--- a/modules/video_coding/generic_encoder_unittest.cc
+++ b/modules/video_coding/generic_encoder_unittest.cc
@@ -94,7 +94,7 @@
CodecSpecificInfo codec_specific;
image._length = FrameSize(min_frame_size, max_frame_size, s, i);
image.capture_time_ms_ = current_timestamp;
- image._timeStamp = static_cast<uint32_t>(current_timestamp * 90);
+ image.SetTimestamp(static_cast<uint32_t>(current_timestamp * 90));
codec_specific.codecType = kVideoCodecGeneric;
codec_specific.codecSpecific.generic.simulcast_idx = s;
callback.OnEncodeStarted(static_cast<uint32_t>(current_timestamp * 90),
@@ -187,7 +187,7 @@
int64_t timestamp = 1;
image._length = 500;
image.capture_time_ms_ = timestamp;
- image._timeStamp = static_cast<uint32_t>(timestamp * 90);
+ image.SetTimestamp(static_cast<uint32_t>(timestamp * 90));
codec_specific.codecType = kVideoCodecGeneric;
codec_specific.codecSpecific.generic.simulcast_idx = 0;
FakeEncodedImageCallback sink;
@@ -204,7 +204,7 @@
// New frame, now skip OnEncodeStarted. Should not result in timing frame.
image.capture_time_ms_ = ++timestamp;
- image._timeStamp = static_cast<uint32_t>(timestamp * 90);
+ image.SetTimestamp(static_cast<uint32_t>(timestamp * 90));
callback.OnEncodedImage(image, &codec_specific, nullptr);
EXPECT_FALSE(sink.WasTimingFrame());
}
@@ -219,7 +219,7 @@
int64_t timestamp = 1;
image._length = 500;
image.capture_time_ms_ = timestamp;
- image._timeStamp = static_cast<uint32_t>(timestamp * 90);
+ image.SetTimestamp(static_cast<uint32_t>(timestamp * 90));
codec_specific.codecType = kVideoCodecGeneric;
codec_specific.codecSpecific.generic.simulcast_idx = 0;
FakeEncodedImageCallback sink;
@@ -237,7 +237,7 @@
// New frame, but this time with encode timestamps set in timing_.
// This should be a timing frame.
image.capture_time_ms_ = ++timestamp;
- image._timeStamp = static_cast<uint32_t>(timestamp * 90);
+ image.SetTimestamp(static_cast<uint32_t>(timestamp * 90));
image.timing_.encode_start_ms = timestamp + kEncodeStartDelayMs;
image.timing_.encode_finish_ms = timestamp + kEncodeFinishDelayMs;
callback.OnEncodedImage(image, &codec_specific, nullptr);
@@ -263,27 +263,27 @@
// Any non-zero bitrate needed to be set before the first frame.
callback.OnTargetBitrateChanged(500, 0);
image.capture_time_ms_ = kTimestampMs1;
- image._timeStamp = static_cast<uint32_t>(image.capture_time_ms_ * 90);
- callback.OnEncodeStarted(image._timeStamp, image.capture_time_ms_, 0);
+ image.SetTimestamp(static_cast<uint32_t>(image.capture_time_ms_ * 90));
+ callback.OnEncodeStarted(image.Timestamp(), image.capture_time_ms_, 0);
EXPECT_EQ(0u, sink.GetNumFramesDropped());
callback.OnEncodedImage(image, &codec_specific, nullptr);
image.capture_time_ms_ = kTimestampMs2;
- image._timeStamp = static_cast<uint32_t>(image.capture_time_ms_ * 90);
- callback.OnEncodeStarted(image._timeStamp, image.capture_time_ms_, 0);
+ image.SetTimestamp(static_cast<uint32_t>(image.capture_time_ms_ * 90));
+ callback.OnEncodeStarted(image.Timestamp(), image.capture_time_ms_, 0);
// No OnEncodedImageCall for timestamp2. Yet, at this moment it's not known
// that frame with timestamp2 was dropped.
EXPECT_EQ(0u, sink.GetNumFramesDropped());
image.capture_time_ms_ = kTimestampMs3;
- image._timeStamp = static_cast<uint32_t>(image.capture_time_ms_ * 90);
- callback.OnEncodeStarted(image._timeStamp, image.capture_time_ms_, 0);
+ image.SetTimestamp(static_cast<uint32_t>(image.capture_time_ms_ * 90));
+ callback.OnEncodeStarted(image.Timestamp(), image.capture_time_ms_, 0);
callback.OnEncodedImage(image, &codec_specific, nullptr);
EXPECT_EQ(1u, sink.GetNumFramesDropped());
image.capture_time_ms_ = kTimestampMs4;
- image._timeStamp = static_cast<uint32_t>(image.capture_time_ms_ * 90);
- callback.OnEncodeStarted(image._timeStamp, image.capture_time_ms_, 0);
+ image.SetTimestamp(static_cast<uint32_t>(image.capture_time_ms_ * 90));
+ callback.OnEncodeStarted(image.Timestamp(), image.capture_time_ms_, 0);
callback.OnEncodedImage(image, &codec_specific, nullptr);
EXPECT_EQ(1u, sink.GetNumFramesDropped());
}
@@ -299,8 +299,8 @@
// Any non-zero bitrate needed to be set before the first frame.
callback.OnTargetBitrateChanged(500, 0);
image.capture_time_ms_ = kTimestampMs; // Incorrect timesetamp.
- image._timeStamp = static_cast<uint32_t>(image.capture_time_ms_ * 90);
- callback.OnEncodeStarted(image._timeStamp, image.capture_time_ms_, 0);
+ image.SetTimestamp(static_cast<uint32_t>(image.capture_time_ms_ * 90));
+ callback.OnEncodeStarted(image.Timestamp(), image.capture_time_ms_, 0);
image.capture_time_ms_ = 0; // Incorrect timesetamp.
callback.OnEncodedImage(image, &codec_specific, nullptr);
EXPECT_EQ(kTimestampMs, sink.GetLastCaptureTimestamp());