diff --git a/modules/BUILD.gn b/modules/BUILD.gn index ffb7491b31..229a0ed529 100644 --- a/modules/BUILD.gn +++ b/modules/BUILD.gn @@ -229,6 +229,7 @@ if (rtc_include_tests && !build_with_chromium) { "rtp_rtcp:rtp_rtcp_unittests", "utility:utility_unittests", "video_coding:video_coding_unittests", + "video_coding/deprecated:deprecated_unittests", "video_coding/timing:timing_unittests", ] diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index 824d4d803b..cae7206af3 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -316,11 +316,8 @@ rtc_library("video_coding_legacy") { "include/video_coding.h", "jitter_buffer.cc", "jitter_buffer.h", - "jitter_buffer_common.h", "receiver.cc", "receiver.h", - "session_info.cc", - "session_info.h", "video_coding_impl.cc", "video_coding_impl.h", "video_receiver.cc", @@ -357,7 +354,9 @@ rtc_library("video_coding_legacy") { "../../system_wrappers", "../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_video_header", + "deprecated:deprecated_jitter_buffer_common", "deprecated:deprecated_packet", + "deprecated:deprecated_session_info", "timing:inter_frame_delay_variation_calculator", "timing:jitter_estimator", "timing:timing_module", @@ -1158,7 +1157,6 @@ if (rtc_include_tests) { "rtp_frame_reference_finder_unittest.cc", "rtp_vp8_ref_finder_unittest.cc", "rtp_vp9_ref_finder_unittest.cc", - "session_info_unittest.cc", "test/stream_generator.cc", "test/stream_generator.h", "utility/bandwidth_quality_scaler_unittest.cc", @@ -1275,7 +1273,9 @@ if (rtc_include_tests) { "../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_video_header", "codecs/av1:video_coding_codecs_av1_tests", + "deprecated:deprecated_jitter_buffer_common", "deprecated:deprecated_packet", + "deprecated:deprecated_session_info", "svc:scalability_structure_tests", "svc:svc_rate_allocator_tests", "timing:jitter_estimator", diff --git a/modules/video_coding/decoding_state.cc b/modules/video_coding/decoding_state.cc index 89faf73386..3269122e2f 100644 --- a/modules/video_coding/decoding_state.cc +++ b/modules/video_coding/decoding_state.cc @@ -12,9 +12,9 @@ #include "common_video/h264/h264_common.h" #include "modules/include/module_common_types_public.h" +#include "modules/video_coding/deprecated/jitter_buffer_common.h" #include "modules/video_coding/deprecated/packet.h" #include "modules/video_coding/frame_buffer.h" -#include "modules/video_coding/jitter_buffer_common.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/decoding_state_unittest.cc b/modules/video_coding/decoding_state_unittest.cc index e66a9a6a66..4464e43b5c 100644 --- a/modules/video_coding/decoding_state_unittest.cc +++ b/modules/video_coding/decoding_state_unittest.cc @@ -15,9 +15,9 @@ #include "modules/video_coding/codecs/vp8/include/vp8_globals.h" #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "modules/video_coding/deprecated/packet.h" +#include "modules/video_coding/deprecated/session_info.h" #include "modules/video_coding/frame_buffer.h" #include "modules/video_coding/include/video_coding.h" -#include "modules/video_coding/session_info.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/deprecated/BUILD.gn b/modules/video_coding/deprecated/BUILD.gn index dc872f943d..8209637a57 100644 --- a/modules/video_coding/deprecated/BUILD.gn +++ b/modules/video_coding/deprecated/BUILD.gn @@ -8,11 +8,17 @@ import("../../../webrtc.gni") +visibility = [ + ":*", + "../:video_coding_legacy", + "../:video_coding_unittests", +] + +rtc_library("deprecated_jitter_buffer_common") { + sources = [ "jitter_buffer_common.h" ] +} + rtc_library("deprecated_packet") { - visibility = [ - "../:video_coding_legacy", - "../:video_coding_unittests", - ] sources = [ "packet.cc", "packet.h", @@ -27,3 +33,30 @@ rtc_library("deprecated_packet") { ] absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] } + +rtc_library("deprecated_session_info") { + deps = [ + ":deprecated_jitter_buffer_common", + ":deprecated_packet", + "../../../modules:module_api", + "../../../modules:module_api_public", + "../../../modules/video_coding:codec_globals_headers", + "../../../rtc_base:logging", + ] + sources = [ + "session_info.cc", + "session_info.h", + ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:variant" ] +} + +rtc_library("deprecated_unittests") { + testonly = true + sources = [ "session_info_unittest.cc" ] + visibility += [ "../../../modules/*" ] + deps = [ + ":deprecated_packet", + ":deprecated_session_info", + "../../../test:test_support", + ] +} diff --git a/modules/video_coding/jitter_buffer_common.h b/modules/video_coding/deprecated/jitter_buffer_common.h similarity index 90% rename from modules/video_coding/jitter_buffer_common.h rename to modules/video_coding/deprecated/jitter_buffer_common.h index 6ccfe39199..48be9589f8 100644 --- a/modules/video_coding/jitter_buffer_common.h +++ b/modules/video_coding/deprecated/jitter_buffer_common.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ -#define MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ +#ifndef MODULES_VIDEO_CODING_DEPRECATED_JITTER_BUFFER_COMMON_H_ +#define MODULES_VIDEO_CODING_DEPRECATED_JITTER_BUFFER_COMMON_H_ namespace webrtc { @@ -56,4 +56,4 @@ enum VCMFrameBufferStateEnum { enum { kH264StartCodeLengthBytes = 4 }; } // namespace webrtc -#endif // MODULES_VIDEO_CODING_JITTER_BUFFER_COMMON_H_ +#endif // MODULES_VIDEO_CODING_DEPRECATED_JITTER_BUFFER_COMMON_H_ diff --git a/modules/video_coding/session_info.cc b/modules/video_coding/deprecated/session_info.cc similarity index 99% rename from modules/video_coding/session_info.cc rename to modules/video_coding/deprecated/session_info.cc index 37e546d6ec..b15dc0a9ff 100644 --- a/modules/video_coding/session_info.cc +++ b/modules/video_coding/deprecated/session_info.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/session_info.h" +#include "modules/video_coding/deprecated/session_info.h" #include @@ -19,8 +19,8 @@ #include "modules/include/module_common_types_public.h" #include "modules/video_coding/codecs/interface/common_constants.h" #include "modules/video_coding/codecs/vp8/include/vp8_globals.h" +#include "modules/video_coding/deprecated/jitter_buffer_common.h" #include "modules/video_coding/deprecated/packet.h" -#include "modules/video_coding/jitter_buffer_common.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/session_info.h b/modules/video_coding/deprecated/session_info.h similarity index 95% rename from modules/video_coding/session_info.h rename to modules/video_coding/deprecated/session_info.h index d22fc8b72f..dfc5d06931 100644 --- a/modules/video_coding/session_info.h +++ b/modules/video_coding/deprecated/session_info.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_VIDEO_CODING_SESSION_INFO_H_ -#define MODULES_VIDEO_CODING_SESSION_INFO_H_ +#ifndef MODULES_VIDEO_CODING_DEPRECATED_SESSION_INFO_H_ +#define MODULES_VIDEO_CODING_DEPRECATED_SESSION_INFO_H_ #include #include @@ -20,7 +20,6 @@ #include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" #include "modules/video_coding/deprecated/packet.h" -#include "modules/video_coding/include/video_coding.h" namespace webrtc { // Used to pass data from jitter buffer to session info. @@ -119,4 +118,4 @@ class VCMSessionInfo { } // namespace webrtc -#endif // MODULES_VIDEO_CODING_SESSION_INFO_H_ +#endif // MODULES_VIDEO_CODING_DEPRECATED_SESSION_INFO_H_ diff --git a/modules/video_coding/session_info_unittest.cc b/modules/video_coding/deprecated/session_info_unittest.cc similarity index 99% rename from modules/video_coding/session_info_unittest.cc rename to modules/video_coding/deprecated/session_info_unittest.cc index 6bd5b86925..0a789d5f2d 100644 --- a/modules/video_coding/session_info_unittest.cc +++ b/modules/video_coding/deprecated/session_info_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/session_info.h" +#include "modules/video_coding/deprecated/session_info.h" #include diff --git a/modules/video_coding/frame_buffer.h b/modules/video_coding/frame_buffer.h index dcf9db91d2..1ba7d072e9 100644 --- a/modules/video_coding/frame_buffer.h +++ b/modules/video_coding/frame_buffer.h @@ -18,11 +18,11 @@ #include "modules/video_coding/codecs/h264/include/h264_globals.h" #include "modules/video_coding/codecs/vp9/include/vp9_globals.h" +#include "modules/video_coding/deprecated/jitter_buffer_common.h" #include "modules/video_coding/deprecated/packet.h" +#include "modules/video_coding/deprecated/session_info.h" #include "modules/video_coding/encoded_frame.h" #include "modules/video_coding/include/video_coding.h" -#include "modules/video_coding/jitter_buffer_common.h" -#include "modules/video_coding/session_info.h" namespace webrtc { diff --git a/modules/video_coding/jitter_buffer.cc b/modules/video_coding/jitter_buffer.cc index 1277c936e2..b77f25a383 100644 --- a/modules/video_coding/jitter_buffer.cc +++ b/modules/video_coding/jitter_buffer.cc @@ -14,11 +14,11 @@ #include #include "api/units/timestamp.h" +#include "modules/video_coding/deprecated/jitter_buffer_common.h" #include "modules/video_coding/deprecated/packet.h" #include "modules/video_coding/frame_buffer.h" #include "modules/video_coding/include/video_coding.h" #include "modules/video_coding/internal_defines.h" -#include "modules/video_coding/jitter_buffer_common.h" #include "modules/video_coding/timing/inter_frame_delay_variation_calculator.h" #include "modules/video_coding/timing/jitter_estimator.h" #include "rtc_base/checks.h" diff --git a/modules/video_coding/jitter_buffer.h b/modules/video_coding/jitter_buffer.h index 452eaa349d..def85c9b18 100644 --- a/modules/video_coding/jitter_buffer.h +++ b/modules/video_coding/jitter_buffer.h @@ -21,10 +21,10 @@ #include "modules/include/module_common_types.h" #include "modules/include/module_common_types_public.h" #include "modules/video_coding/decoding_state.h" +#include "modules/video_coding/deprecated/jitter_buffer_common.h" #include "modules/video_coding/event_wrapper.h" #include "modules/video_coding/include/video_coding.h" #include "modules/video_coding/include/video_coding_defines.h" -#include "modules/video_coding/jitter_buffer_common.h" #include "modules/video_coding/timing/inter_frame_delay_variation_calculator.h" #include "modules/video_coding/timing/jitter_estimator.h" #include "rtc_base/synchronization/mutex.h" diff --git a/modules/video_coding/receiver.cc b/modules/video_coding/receiver.cc index 3f954ec9bf..67e05e2e74 100644 --- a/modules/video_coding/receiver.cc +++ b/modules/video_coding/receiver.cc @@ -10,7 +10,6 @@ #include "modules/video_coding/receiver.h" - #include #include #include @@ -18,9 +17,9 @@ #include "absl/memory/memory.h" #include "api/video/encoded_image.h" +#include "modules/video_coding/deprecated/jitter_buffer_common.h" #include "modules/video_coding/encoded_frame.h" #include "modules/video_coding/internal_defines.h" -#include "modules/video_coding/jitter_buffer_common.h" #include "rtc_base/logging.h" #include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/trace_event.h" diff --git a/modules/video_coding/receiver_unittest.cc b/modules/video_coding/receiver_unittest.cc index a2a1b42e95..ef8df0757c 100644 --- a/modules/video_coding/receiver_unittest.cc +++ b/modules/video_coding/receiver_unittest.cc @@ -16,9 +16,9 @@ #include #include +#include "modules/video_coding/deprecated/jitter_buffer_common.h" #include "modules/video_coding/deprecated/packet.h" #include "modules/video_coding/encoded_frame.h" -#include "modules/video_coding/jitter_buffer_common.h" #include "modules/video_coding/test/stream_generator.h" #include "modules/video_coding/timing/timing.h" #include "rtc_base/checks.h"