From 52f53d5419a08707c530c2446bae3c55d1d45887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Tue, 26 Jun 2018 11:52:33 +0000 Subject: Revert "Add Timestamp accessor methods to the EncodedImage class." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f34d467b03da4f20a1d036a20966fcad43d2433f. Reason for revert: Seems to break downstream project. Original change's description: > Add Timestamp accessor methods to the EncodedImage class. > > Bug: webrtc:9378 > Change-Id: I59bf14f631f92f0f4e05f60d4af25641a23a53f9 > Reviewed-on: https://webrtc-review.googlesource.com/82100 > Reviewed-by: Stefan Holmer > Reviewed-by: Philip Eliasson > Reviewed-by: Rasmus Brandt > Commit-Queue: Niels Moller > Cr-Commit-Position: refs/heads/master@{#23734} TBR=brandtr@webrtc.org,nisse@webrtc.org,stefan@webrtc.org,philipel@webrtc.org Change-Id: I3aa0c0119426886bc583c918aae862eb7f4b6b63 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9378 Reviewed-on: https://webrtc-review.googlesource.com/85600 Reviewed-by: Björn Terelius Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/master@{#23739} --- common_video/include/video_frame.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'common_video') diff --git a/common_video/include/video_frame.h b/common_video/include/video_frame.h index 7b85cc8fe1..41c391941e 100644 --- a/common_video/include/video_frame.h +++ b/common_video/include/video_frame.h @@ -37,14 +37,6 @@ class EncodedImage { EncodedImage(const EncodedImage&); EncodedImage(uint8_t* buffer, size_t length, size_t size); - // TODO(nisse): Change style to timestamp(), set_timestamp(), for consistency - // with the VideoFrame class. - // Set frame timestamp (90kHz). - void SetTimestamp(uint32_t timestamp) { _timeStamp = timestamp; } - - // Get frame timestamp (90kHz). - uint32_t Timestamp() const { return _timeStamp; } - void SetEncodeTime(int64_t encode_start_ms, int64_t encode_finish_ms); uint32_t _encodedWidth = 0; -- cgit v1.2.3