Move video video receiver transformable frame to modules/rtc_rtcp/source

Step 1 of combining the sender and receiver types

Also moved the RtpFrameObject to rtp_rtcp/source, as it's heavily used
by the transformable receiver frame, I couldn't work out a better way
of managing the dependencies, and everything else seemed to work fine.

Bug: chromium:1412687
Change-Id: I55e816a0d7aa2962560ff9ebaf30ad63ab0b9810
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291710
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Tony Herre <herre@google.com>
Cr-Commit-Position: refs/heads/main@{#39255}

api/video/rtp_video_frame_assembler.cc

@@ -19,6 +19,7 @@
 
 #include "absl/container/inlined_vector.h"
 #include "absl/types/optional.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h"
 #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
@@ -28,7 +29,6 @@
 #include "modules/rtp_rtcp/source/video_rtp_depacketizer_raw.h"
 #include "modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.h"
 #include "modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.h"
-#include "modules/video_coding/frame_object.h"
 #include "modules/video_coding/packet_buffer.h"
 #include "modules/video_coding/rtp_frame_reference_finder.h"
 #include "rtc_base/logging.h"

modules/rtp_rtcp/BUILD.gn

@@ -177,6 +177,8 @@ rtc_library("rtp_rtcp") {
     "source/forward_error_correction.h",
     "source/forward_error_correction_internal.cc",
     "source/forward_error_correction_internal.h",
+    "source/frame_object.cc",
+    "source/frame_object.h",
     "source/packet_loss_stats.cc",
     "source/packet_loss_stats.h",
     "source/packet_sequencer.cc",
@@ -224,6 +226,8 @@ rtc_library("rtp_rtcp") {
     "source/rtp_sender_video_frame_transformer_delegate.h",
     "source/rtp_sequence_number_map.cc",
     "source/rtp_sequence_number_map.h",
+    "source/rtp_video_stream_receiver_frame_transformer_delegate.cc",
+    "source/rtp_video_stream_receiver_frame_transformer_delegate.h",
     "source/source_tracker.cc",
     "source/source_tracker.h",
     "source/time_util.cc",
@@ -298,6 +302,7 @@ rtc_library("rtp_rtcp") {
     "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../call:rtp_interfaces",
+    "../../call:video_stream_api",
     "../../common_video",
     "../../logging:rtc_event_audio",
     "../../logging:rtc_event_rtp_rtcp",
@@ -322,6 +327,7 @@ rtc_library("rtp_rtcp") {
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:safe_conversions",
     "../../rtc_base:safe_minmax",
+    "../../rtc_base:threading",
     "../../rtc_base:timeutils",
     "../../rtc_base/containers:flat_map",
     "../../rtc_base/experiments:field_trial_parser",
@@ -603,6 +609,7 @@ if (rtc_include_tests) {
       "source/rtp_sequence_number_map_unittest.cc",
       "source/rtp_util_unittest.cc",
       "source/rtp_video_layers_allocation_extension_unittest.cc",
+      "source/rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc",
       "source/source_tracker_unittest.cc",
       "source/time_util_unittest.cc",
       "source/ulpfec_generator_unittest.cc",
@@ -655,6 +662,7 @@ if (rtc_include_tests) {
       "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../call:rtp_receiver",
+      "../../call:video_stream_api",
       "../../common_video",
       "../../common_video/generic_frame_descriptor",
       "../../common_video/test:utilities",

modules/rtp_rtcp/source/frame_object.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 
 #include <string.h>
 
@@ -93,8 +93,7 @@ RtpFrameObject::RtpFrameObject(
   is_last_spatial_layer = markerBit;
 }
 
-RtpFrameObject::~RtpFrameObject() {
+RtpFrameObject::~RtpFrameObject() {}
-}
 
 uint16_t RtpFrameObject::first_seq_num() const {
   return first_seq_num_;

modules/rtp_rtcp/source/frame_object.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MODULES_VIDEO_CODING_FRAME_OBJECT_H_
+#ifndef MODULES_RTP_RTCP_SOURCE_FRAME_OBJECT_H_
-#define MODULES_VIDEO_CODING_FRAME_OBJECT_H_
+#define MODULES_RTP_RTCP_SOURCE_FRAME_OBJECT_H_
 
 #include <vector>
 
@@ -70,4 +70,4 @@ class RtpFrameObject : public EncodedFrame {
 
 }  // namespace webrtc
 
-#endif  // MODULES_VIDEO_CODING_FRAME_OBJECT_H_
+#endif  // MODULES_RTP_RTCP_SOURCE_FRAME_OBJECT_H_

modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "video/rtp_video_stream_receiver_frame_transformer_delegate.h"
+#include "modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h"
 
 #include <utility>
 #include <vector>

modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef VIDEO_RTP_VIDEO_STREAM_RECEIVER_FRAME_TRANSFORMER_DELEGATE_H_
+#ifndef MODULES_RTP_RTCP_SOURCE_RTP_VIDEO_STREAM_RECEIVER_FRAME_TRANSFORMER_DELEGATE_H_
-#define VIDEO_RTP_VIDEO_STREAM_RECEIVER_FRAME_TRANSFORMER_DELEGATE_H_
+#define MODULES_RTP_RTCP_SOURCE_RTP_VIDEO_STREAM_RECEIVER_FRAME_TRANSFORMER_DELEGATE_H_
 
 #include <memory>
 
 #include "api/frame_transformer_interface.h"
 #include "api/sequence_checker.h"
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "rtc_base/system/no_unique_address.h"
 #include "rtc_base/thread.h"
 
@@ -71,4 +71,4 @@ class RtpVideoStreamReceiverFrameTransformerDelegate
 
 }  // namespace webrtc
 
-#endif  // VIDEO_RTP_VIDEO_STREAM_RECEIVER_FRAME_TRANSFORMER_DELEGATE_H_
+#endif  // MODULES_RTP_RTCP_SOURCE_RTP_VIDEO_STREAM_RECEIVER_FRAME_TRANSFORMER_DELEGATE_H_

modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "video/rtp_video_stream_receiver_frame_transformer_delegate.h"
+#include "modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h"
 
 #include <cstdio>
 #include <memory>
@@ -154,24 +154,23 @@ TEST(RtpVideoStreamReceiverFrameTransformerDelegateTest,
   // Check that the transformable frame passed to the frame transformer has the
   // correct metadata.
   EXPECT_CALL(*mock_frame_transformer, Transform)
-      .WillOnce(
+      .WillOnce([&](std::unique_ptr<TransformableFrameInterface>
-          [&](std::unique_ptr<TransformableFrameInterface>
+                        transformable_frame) {
-                  transformable_frame) {
+        auto frame =
-            auto frame =
+            absl::WrapUnique(static_cast<TransformableVideoFrameInterface*>(
-                absl::WrapUnique(static_cast<TransformableVideoFrameInterface*>(
+                transformable_frame.release()));
-                    transformable_frame.release()));
+        ASSERT_TRUE(frame);
-            ASSERT_TRUE(frame);
+        auto metadata = frame->GetMetadata();
-            auto metadata = frame->GetMetadata();
+        EXPECT_EQ(metadata.GetWidth(), 1280u);
-            EXPECT_EQ(metadata.GetWidth(), 1280u);
+        EXPECT_EQ(metadata.GetHeight(), 720u);
-            EXPECT_EQ(metadata.GetHeight(), 720u);
+        EXPECT_EQ(metadata.GetFrameId(), 10);
-            EXPECT_EQ(metadata.GetFrameId(), 10);
+        EXPECT_EQ(metadata.GetTemporalIndex(), 3);
-            EXPECT_EQ(metadata.GetTemporalIndex(), 3);
+        EXPECT_EQ(metadata.GetSpatialIndex(), 2);
-            EXPECT_EQ(metadata.GetSpatialIndex(), 2);
+        EXPECT_THAT(metadata.GetFrameDependencies(), ElementsAre(5));
-            EXPECT_THAT(metadata.GetFrameDependencies(), ElementsAre(5));
+        EXPECT_THAT(metadata.GetDecodeTargetIndications(),
-            EXPECT_THAT(metadata.GetDecodeTargetIndications(),
+                    ElementsAre(DecodeTargetIndication::kSwitch));
-                        ElementsAre(DecodeTargetIndication::kSwitch));
+        EXPECT_EQ(metadata.GetCsrcs(), csrcs);
-            EXPECT_EQ(metadata.GetCsrcs(), csrcs);
+      });
-          });
   // The delegate creates a transformable frame from the RtpFrameObject.
   delegate->TransformFrame(CreateRtpFrameObject(video_header, csrcs));
 }

modules/video_coding/BUILD.gn

@@ -207,8 +207,6 @@ rtc_library("video_coding") {
     "fec_controller_default.cc",
     "fec_controller_default.h",
     "fec_rate_table.h",
-    "frame_object.cc",
-    "frame_object.h",
     "generic_decoder.cc",
     "generic_decoder.h",
     "h264_sprop_parameter_sets.cc",
@@ -1311,6 +1309,7 @@ if (rtc_include_tests) {
       "../../test:video_test_support",
       "../../test/time_controller:time_controller",
       "../../third_party/libyuv:libyuv",
+      "../rtp_rtcp",
       "../rtp_rtcp:rtp_rtcp_format",
       "../rtp_rtcp:rtp_video_header",
       "codecs/av1:video_coding_codecs_av1_tests",

modules/video_coding/frame_buffer2_unittest.cc

@@ -19,7 +19,7 @@
 #include "api/task_queue/task_queue_base.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/video_coding/timing/jitter_estimator.h"
 #include "modules/video_coding/timing/timing.h"
 #include "rtc_base/numerics/sequence_number_util.h"

modules/video_coding/packet_buffer_unittest.cc

@@ -17,7 +17,7 @@
 
 #include "api/array_view.h"
 #include "common_video/h264/h264_common.h"
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "rtc_base/numerics/sequence_number_unwrapper.h"
 #include "rtc_base/random.h"
 #include "test/field_trial.h"

modules/video_coding/rtp_frame_id_only_ref_finder.h

@@ -14,7 +14,7 @@
 #include <memory>
 
 #include "absl/container/inlined_vector.h"
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/video_coding/rtp_frame_reference_finder.h"
 #include "rtc_base/numerics/sequence_number_unwrapper.h"
 

modules/video_coding/rtp_frame_reference_finder.cc

@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "absl/types/variant.h"
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/video_coding/rtp_frame_id_only_ref_finder.h"
 #include "modules/video_coding/rtp_generic_ref_finder.h"
 #include "modules/video_coding/rtp_seq_num_only_ref_finder.h"

modules/video_coding/rtp_frame_reference_finder.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 
 namespace webrtc {
 namespace internal {

modules/video_coding/rtp_frame_reference_finder_unittest.cc

@@ -8,6 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "modules/video_coding/rtp_frame_reference_finder.h"
+
 #include <cstring>
 #include <limits>
 #include <map>
@@ -15,9 +17,8 @@
 #include <utility>
 #include <vector>
 
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/video_coding/packet_buffer.h"
-#include "modules/video_coding/rtp_frame_reference_finder.h"
 #include "rtc_base/random.h"
 #include "rtc_base/ref_count.h"
 #include "system_wrappers/include/clock.h"

modules/video_coding/rtp_generic_ref_finder.h

@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/video_coding/rtp_frame_reference_finder.h"
 
 namespace webrtc {

modules/video_coding/rtp_seq_num_only_ref_finder.h

@@ -18,7 +18,7 @@
 #include <utility>
 
 #include "absl/container/inlined_vector.h"
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/video_coding/rtp_frame_reference_finder.h"
 #include "rtc_base/numerics/sequence_number_unwrapper.h"
 

modules/video_coding/rtp_vp8_ref_finder.h

@@ -17,7 +17,7 @@
 #include <set>
 
 #include "absl/container/inlined_vector.h"
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/video_coding/rtp_frame_reference_finder.h"
 #include "rtc_base/numerics/sequence_number_unwrapper.h"
 

modules/video_coding/rtp_vp8_ref_finder_unittest.cc

@@ -13,7 +13,7 @@
 #include <utility>
 #include <vector>
 
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 

modules/video_coding/rtp_vp9_ref_finder.h

@@ -17,7 +17,7 @@
 #include <set>
 
 #include "absl/container/inlined_vector.h"
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/video_coding/rtp_frame_reference_finder.h"
 #include "rtc_base/numerics/sequence_number_unwrapper.h"
 

modules/video_coding/rtp_vp9_ref_finder_unittest.cc

@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "modules/video_coding/rtp_vp9_ref_finder.h"
+
 #include <utility>
 #include <vector>
 
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
-#include "modules/video_coding/rtp_vp9_ref_finder.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 

test/fuzzers/BUILD.gn

@@ -581,7 +581,8 @@ webrtc_fuzzer_test("rtp_frame_reference_finder_fuzzer") {
   deps = [
     "../../api:rtp_packet_info",
     "../../api:scoped_refptr",
-    "../../modules/video_coding/",
+    "../../modules/rtp_rtcp",
+    "../../modules/video_coding:video_coding",
     "../../system_wrappers",
   ]
 }

test/fuzzers/rtp_frame_reference_finder_fuzzer.cc

@@ -11,7 +11,7 @@
 #include <memory>
 
 #include "api/rtp_packet_infos.h"
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/video_coding/rtp_frame_reference_finder.h"
 
 namespace webrtc {

video/BUILD.gn

@@ -53,8 +53,6 @@ rtc_library("video") {
     "rtp_streams_synchronizer2.h",
     "rtp_video_stream_receiver2.cc",
     "rtp_video_stream_receiver2.h",
-    "rtp_video_stream_receiver_frame_transformer_delegate.cc",
-    "rtp_video_stream_receiver_frame_transformer_delegate.h",
     "send_delay_stats.cc",
     "send_delay_stats.h",
     "send_statistics_proxy.cc",
@@ -791,7 +789,6 @@ if (rtc_include_tests) {
       "receive_statistics_proxy2_unittest.cc",
       "report_block_stats_unittest.cc",
       "rtp_video_stream_receiver2_unittest.cc",
-      "rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc",
       "send_delay_stats_unittest.cc",
       "send_statistics_proxy_unittest.cc",
       "stats_counter_unittest.cc",

video/buffered_frame_decryptor.cc

@@ -13,8 +13,8 @@
 #include <utility>
 #include <vector>
 
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/rtp_rtcp/source/rtp_descriptor_authentication.h"
-#include "modules/video_coding/frame_object.h"
 #include "rtc_base/logging.h"
 #include "system_wrappers/include/field_trial.h"
 

video/buffered_frame_decryptor.h

@@ -17,7 +17,7 @@
 #include "api/crypto/crypto_options.h"
 #include "api/crypto/frame_decryptor_interface.h"
 #include "api/field_trials_view.h"
-#include "modules/video_coding/frame_object.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 
 namespace webrtc {
 

video/rtp_video_stream_receiver2.cc

@@ -26,6 +26,7 @@
 #include "modules/rtp_rtcp/include/receive_statistics.h"
 #include "modules/rtp_rtcp/include/rtp_cvo.h"
 #include "modules/rtp_rtcp/source/create_video_rtp_depacketizer.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h"
 #include "modules/rtp_rtcp/source/rtp_format.h"
 #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h"
@@ -36,7 +37,6 @@
 #include "modules/rtp_rtcp/source/ulpfec_receiver.h"
 #include "modules/rtp_rtcp/source/video_rtp_depacketizer.h"
 #include "modules/rtp_rtcp/source/video_rtp_depacketizer_raw.h"
-#include "modules/video_coding/frame_object.h"
 #include "modules/video_coding/h264_sprop_parameter_sets.h"
 #include "modules/video_coding/h264_sps_pps_tracker.h"
 #include "modules/video_coding/nack_requester.h"

video/rtp_video_stream_receiver2.h

@@ -36,6 +36,7 @@
 #include "modules/rtp_rtcp/source/rtp_rtcp_impl2.h"
 #include "modules/rtp_rtcp/source/rtp_rtcp_interface.h"
 #include "modules/rtp_rtcp/source/rtp_video_header.h"
+#include "modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h"
 #include "modules/rtp_rtcp/source/video_rtp_depacketizer.h"
 #include "modules/video_coding/h264_sps_pps_tracker.h"
 #include "modules/video_coding/loss_notification_controller.h"
@@ -47,7 +48,6 @@
 #include "rtc_base/system/no_unique_address.h"
 #include "rtc_base/thread_annotations.h"
 #include "video/buffered_frame_decryptor.h"
-#include "video/rtp_video_stream_receiver_frame_transformer_delegate.h"
 #include "video/unique_timestamp_counter.h"
 
 namespace webrtc {

video/rtp_video_stream_receiver2_unittest.cc

@@ -19,6 +19,7 @@
 #include "call/test/mock_rtp_packet_sink_interface.h"
 #include "common_video/h264/h264_common.h"
 #include "media/base/media_constants.h"
+#include "modules/rtp_rtcp/source/frame_object.h"
 #include "modules/rtp_rtcp/source/rtp_descriptor_authentication.h"
 #include "modules/rtp_rtcp/source/rtp_format.h"
 #include "modules/rtp_rtcp/source/rtp_format_vp9.h"
@@ -27,7 +28,6 @@
 #include "modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
-#include "modules/video_coding/frame_object.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/rtp_frame_reference_finder.h"
 #include "rtc_base/byte_buffer.h"