Deprecate VideoFrameMetadata::GetFrameDependencies in favor of the new GetDependencies with a different signature. Bug: webrtc:515776877 Change-Id: Ic46ea55a779fea4c26aa178a7c2113b084fa8d7c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/475141 Reviewed-by: Guido Urdaneta <guidou@webrtc.org> Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47864}
diff --git a/api/video/video_frame_metadata.h b/api/video/video_frame_metadata.h index d959e82..5e17920 100644 --- a/api/video/video_frame_metadata.h +++ b/api/video/video_frame_metadata.h
@@ -67,11 +67,11 @@ int GetTemporalIndex() const; void SetTemporalIndex(int temporal_index); - // TODO: https://issues.webrtc.org/515776877 - Deprecate and remove this - // method. + // TODO: https://issues.webrtc.org/515776877 - Remove this method. + [[deprecated("Use GetDependencies instead")]] std::span<const int64_t> GetFrameDependencies() const; - // TODO: https://issues.webrtc.org/515776877 - Deprecate and remove this - // method. + // TODO: https://issues.webrtc.org/515776877 - Remove this method. + [[deprecated("Use SetDependencies instead")]] void SetFrameDependencies(std::span<const int64_t> frame_dependencies); std::optional<std::span<const int64_t>> GetDependencies() const; void SetDependencies(std::optional<std::span<const int64_t>> dependencies);
diff --git a/api/video/video_frame_metadata_unittest.cc b/api/video/video_frame_metadata_unittest.cc index b04e68a..ab385fc 100644 --- a/api/video/video_frame_metadata_unittest.cc +++ b/api/video/video_frame_metadata_unittest.cc
@@ -128,7 +128,10 @@ VideoFrameMetadata metadata; EXPECT_EQ(metadata.GetFrameId(), std::nullopt); EXPECT_EQ(metadata.GetDependencies(), std::nullopt); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" EXPECT_THAT(metadata.GetFrameDependencies(), IsEmpty()); +#pragma clang diagnostic pop metadata.SetFrameId(42); EXPECT_THAT(metadata.GetFrameId(), Optional(42)); @@ -136,9 +139,12 @@ const int64_t deps[] = {1, 2, 3}; metadata.SetDependencies(deps); EXPECT_THAT(metadata.GetDependencies(), Optional(ElementsAre(1, 2, 3))); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" EXPECT_THAT(metadata.GetFrameDependencies(), ElementsAre(1, 2, 3)); const int64_t other_deps[] = {4, 5}; metadata.SetFrameDependencies(other_deps); +#pragma clang diagnostic pop EXPECT_THAT(metadata.GetDependencies(), Optional(ElementsAre(4, 5))); metadata.SetDependencies(std::nullopt);