From 3e9068a6b488c63d98e5dd8a21caf7b83eb3744f Mon Sep 17 00:00:00 2001 From: Guido Urdaneta Date: Mon, 18 May 2020 12:25:04 +0000 Subject: [PATCH] Revert "Make TransformableVideoFrameInterface::GetMetadata pure virtual." This reverts commit 576ad5d510894040d7bbc041d5c86745c67f30f8. Reason for revert: Causes compile error in Chrome. Original change's description: > Make TransformableVideoFrameInterface::GetMetadata pure virtual. > > GetMetadata() has been implemented downstream and can be made pure > virtual. > > Bug: chromium:1069295 > Change-Id: I62a3be6106552d2d82d8c413c6f523d31626b0d8 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175001 > Commit-Queue: Marina Ciocea > Reviewed-by: Harald Alvestrand > Cr-Commit-Position: refs/heads/master@{#31281} TBR=hta@webrtc.org,marinaciocea@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: chromium:1069295 Change-Id: I5915270d5b8dab9fc30a07f22fddedb29beca01a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/175620 Reviewed-by: Guido Urdaneta Commit-Queue: Guido Urdaneta Cr-Commit-Position: refs/heads/master@{#31304} --- api/frame_transformer_interface.h | 9 ++++++++- api/video/video_frame_metadata.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/api/frame_transformer_interface.h b/api/frame_transformer_interface.h index 2cfe6edb88..753c7f4bb9 100644 --- a/api/frame_transformer_interface.h +++ b/api/frame_transformer_interface.h @@ -50,7 +50,14 @@ class TransformableVideoFrameInterface : public TransformableFrameInterface { // webrtc::RtpDescriptorAuthentication is exposed in api/. virtual std::vector GetAdditionalData() const = 0; - virtual const VideoFrameMetadata& GetMetadata() const = 0; + // TODO(bugs.webrtc.org/11380) make pure virtual after implementating it + // downstream. + virtual const VideoFrameMetadata& GetMetadata() const { return metadata_; } + + private: + // TODO(bugs.webrtc.org/11380) remove from interface once GetRtpVideoHeader is + // pure virtual. + VideoFrameMetadata metadata_; }; // Extends the TransformableFrameInterface to expose audio-specific information. diff --git a/api/video/video_frame_metadata.h b/api/video/video_frame_metadata.h index 2e9309841b..ce9b2a1318 100644 --- a/api/video/video_frame_metadata.h +++ b/api/video/video_frame_metadata.h @@ -27,6 +27,7 @@ struct RTPVideoHeader; class VideoFrameMetadata { public: explicit VideoFrameMetadata(const RTPVideoHeader& header); + VideoFrameMetadata() = default; VideoFrameMetadata(const VideoFrameMetadata&) = default; VideoFrameMetadata& operator=(const VideoFrameMetadata&) = default;