From 34d339f12bb98024f19400d7cc78e9912496143e Mon Sep 17 00:00:00 2001 From: Rasmus Brandt Date: Thu, 2 Mar 2023 11:34:53 +0100 Subject: [PATCH] Move deprecated VCMPacket to modules/video_coding/deprecated/ This move further clarifies that the file and its class are deprecated. It also cleans up the modules/video_coding root folder a bit. No functional changes are intended. Bug: webrtc:14876 Change-Id: Ib11fe46f35ab0efba35c6a9a2482b4f7c016226c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/295821 Commit-Queue: Rasmus Brandt Reviewed-by: Philip Eliasson Cr-Commit-Position: refs/heads/main@{#39451} --- modules/video_coding/BUILD.gn | 4 +-- modules/video_coding/decoding_state.cc | 2 +- .../video_coding/decoding_state_unittest.cc | 2 +- modules/video_coding/deprecated/BUILD.gn | 29 +++++++++++++++++++ .../video_coding/{ => deprecated}/packet.cc | 2 +- .../video_coding/{ => deprecated}/packet.h | 6 ++-- modules/video_coding/frame_buffer.cc | 2 +- modules/video_coding/frame_buffer.h | 2 +- .../h264_sps_pps_tracker_unittest.cc | 1 - modules/video_coding/jitter_buffer.cc | 2 +- .../video_coding/jitter_buffer_unittest.cc | 2 +- modules/video_coding/receiver.h | 2 +- modules/video_coding/receiver_unittest.cc | 2 +- modules/video_coding/session_info.cc | 2 +- modules/video_coding/session_info.h | 2 +- modules/video_coding/session_info_unittest.cc | 2 +- modules/video_coding/test/stream_generator.cc | 2 +- modules/video_coding/test/stream_generator.h | 2 +- modules/video_coding/video_receiver.cc | 2 +- 19 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 modules/video_coding/deprecated/BUILD.gn rename modules/video_coding/{ => deprecated}/packet.cc (97%) rename modules/video_coding/{ => deprecated}/packet.h (93%) diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index 4f8b72a3ab..a9a3231e63 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -317,8 +317,6 @@ rtc_library("video_coding_legacy") { "jitter_buffer.cc", "jitter_buffer.h", "jitter_buffer_common.h", - "packet.cc", - "packet.h", "receiver.cc", "receiver.h", "session_info.cc", @@ -359,6 +357,7 @@ rtc_library("video_coding_legacy") { "../../system_wrappers", "../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_video_header", + "deprecated:deprecated_packet", "timing:inter_frame_delay", "timing:jitter_estimator", "timing:timing_module", @@ -1276,6 +1275,7 @@ if (rtc_include_tests) { "../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_video_header", "codecs/av1:video_coding_codecs_av1_tests", + "deprecated:deprecated_packet", "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 5e405cbd05..89faf73386 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/packet.h" #include "modules/video_coding/frame_buffer.h" #include "modules/video_coding/jitter_buffer_common.h" -#include "modules/video_coding/packet.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 bef7f81c62..e66a9a6a66 100644 --- a/modules/video_coding/decoding_state_unittest.cc +++ b/modules/video_coding/decoding_state_unittest.cc @@ -14,9 +14,9 @@ #include "modules/video_coding/codecs/interface/common_constants.h" #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/frame_buffer.h" #include "modules/video_coding/include/video_coding.h" -#include "modules/video_coding/packet.h" #include "modules/video_coding/session_info.h" #include "test/gtest.h" diff --git a/modules/video_coding/deprecated/BUILD.gn b/modules/video_coding/deprecated/BUILD.gn new file mode 100644 index 0000000000..dc872f943d --- /dev/null +++ b/modules/video_coding/deprecated/BUILD.gn @@ -0,0 +1,29 @@ +# Copyright (c) 2023 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +import("../../../webrtc.gni") + +rtc_library("deprecated_packet") { + visibility = [ + "../:video_coding_legacy", + "../:video_coding_unittests", + ] + sources = [ + "packet.cc", + "packet.h", + ] + deps = [ + "../../../api:rtp_headers", + "../../../api:rtp_packet_info", + "../../../api/units:timestamp", + "../../../api/video:video_frame_type", + "../../../modules/rtp_rtcp:rtp_rtcp_format", + "../../../modules/rtp_rtcp:rtp_video_header", + ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] +} diff --git a/modules/video_coding/packet.cc b/modules/video_coding/deprecated/packet.cc similarity index 97% rename from modules/video_coding/packet.cc rename to modules/video_coding/deprecated/packet.cc index f1bac4a305..7099ccfd9d 100644 --- a/modules/video_coding/packet.cc +++ b/modules/video_coding/deprecated/packet.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_coding/packet.h" +#include "modules/video_coding/deprecated/packet.h" #include "api/rtp_headers.h" diff --git a/modules/video_coding/packet.h b/modules/video_coding/deprecated/packet.h similarity index 93% rename from modules/video_coding/packet.h rename to modules/video_coding/deprecated/packet.h index 9aa2d5ce08..de69ff4302 100644 --- a/modules/video_coding/packet.h +++ b/modules/video_coding/deprecated/packet.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_VIDEO_CODING_PACKET_H_ -#define MODULES_VIDEO_CODING_PACKET_H_ +#ifndef MODULES_VIDEO_CODING_DEPRECATED_PACKET_H_ +#define MODULES_VIDEO_CODING_DEPRECATED_PACKET_H_ #include #include @@ -77,4 +77,4 @@ class VCMPacket { }; } // namespace webrtc -#endif // MODULES_VIDEO_CODING_PACKET_H_ +#endif // MODULES_VIDEO_CODING_DEPRECATED_PACKET_H_ diff --git a/modules/video_coding/frame_buffer.cc b/modules/video_coding/frame_buffer.cc index 787da1e5a9..2f3c5670cf 100644 --- a/modules/video_coding/frame_buffer.cc +++ b/modules/video_coding/frame_buffer.cc @@ -14,8 +14,8 @@ #include "api/video/encoded_image.h" #include "api/video/video_timing.h" +#include "modules/video_coding/deprecated/packet.h" #include "modules/video_coding/include/video_codec_interface.h" -#include "modules/video_coding/packet.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/trace_event.h" diff --git a/modules/video_coding/frame_buffer.h b/modules/video_coding/frame_buffer.h index 76df28e588..dcf9db91d2 100644 --- a/modules/video_coding/frame_buffer.h +++ b/modules/video_coding/frame_buffer.h @@ -18,10 +18,10 @@ #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/encoded_frame.h" #include "modules/video_coding/include/video_coding.h" #include "modules/video_coding/jitter_buffer_common.h" -#include "modules/video_coding/packet.h" #include "modules/video_coding/session_info.h" namespace webrtc { diff --git a/modules/video_coding/h264_sps_pps_tracker_unittest.cc b/modules/video_coding/h264_sps_pps_tracker_unittest.cc index 04abb75e4e..3f07c6ef60 100644 --- a/modules/video_coding/h264_sps_pps_tracker_unittest.cc +++ b/modules/video_coding/h264_sps_pps_tracker_unittest.cc @@ -18,7 +18,6 @@ #include "common_video/h264/h264_common.h" #include "modules/rtp_rtcp/source/rtp_video_header.h" #include "modules/video_coding/codecs/h264/include/h264_globals.h" -#include "modules/video_coding/packet.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/video_coding/jitter_buffer.cc b/modules/video_coding/jitter_buffer.cc index 39553c9f3f..003aecf40c 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/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/packet.h" #include "modules/video_coding/timing/inter_frame_delay.h" #include "modules/video_coding/timing/jitter_estimator.h" #include "rtc_base/checks.h" diff --git a/modules/video_coding/jitter_buffer_unittest.cc b/modules/video_coding/jitter_buffer_unittest.cc index cc791fe110..524f8ea945 100644 --- a/modules/video_coding/jitter_buffer_unittest.cc +++ b/modules/video_coding/jitter_buffer_unittest.cc @@ -17,9 +17,9 @@ #include "absl/memory/memory.h" #include "common_video/h264/h264_common.h" +#include "modules/video_coding/deprecated/packet.h" #include "modules/video_coding/frame_buffer.h" #include "modules/video_coding/media_opt_util.h" -#include "modules/video_coding/packet.h" #include "modules/video_coding/test/stream_generator.h" #include "system_wrappers/include/clock.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/video_coding/receiver.h b/modules/video_coding/receiver.h index 069f8c55c7..98d6637c55 100644 --- a/modules/video_coding/receiver.h +++ b/modules/video_coding/receiver.h @@ -15,11 +15,11 @@ #include #include "api/field_trials_view.h" +#include "modules/video_coding/deprecated/packet.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.h" -#include "modules/video_coding/packet.h" #include "modules/video_coding/timing/timing.h" namespace webrtc { diff --git a/modules/video_coding/receiver_unittest.cc b/modules/video_coding/receiver_unittest.cc index 2beb97e972..a2a1b42e95 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/packet.h" #include "modules/video_coding/encoded_frame.h" #include "modules/video_coding/jitter_buffer_common.h" -#include "modules/video_coding/packet.h" #include "modules/video_coding/test/stream_generator.h" #include "modules/video_coding/timing/timing.h" #include "rtc_base/checks.h" diff --git a/modules/video_coding/session_info.cc b/modules/video_coding/session_info.cc index 854230ae0a..37e546d6ec 100644 --- a/modules/video_coding/session_info.cc +++ b/modules/video_coding/session_info.cc @@ -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/packet.h" #include "modules/video_coding/jitter_buffer_common.h" -#include "modules/video_coding/packet.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/video_coding/session_info.h b/modules/video_coding/session_info.h index 6079dbbb72..d22fc8b72f 100644 --- a/modules/video_coding/session_info.h +++ b/modules/video_coding/session_info.h @@ -19,8 +19,8 @@ #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" -#include "modules/video_coding/packet.h" namespace webrtc { // Used to pass data from jitter buffer to session info. diff --git a/modules/video_coding/session_info_unittest.cc b/modules/video_coding/session_info_unittest.cc index 867997701d..6bd5b86925 100644 --- a/modules/video_coding/session_info_unittest.cc +++ b/modules/video_coding/session_info_unittest.cc @@ -12,7 +12,7 @@ #include -#include "modules/video_coding/packet.h" +#include "modules/video_coding/deprecated/packet.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/test/stream_generator.cc b/modules/video_coding/test/stream_generator.cc index 98a0cf1cdc..c136f2efcf 100644 --- a/modules/video_coding/test/stream_generator.cc +++ b/modules/video_coding/test/stream_generator.cc @@ -14,7 +14,7 @@ #include -#include "modules/video_coding/packet.h" +#include "modules/video_coding/deprecated/packet.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/video_coding/test/stream_generator.h b/modules/video_coding/test/stream_generator.h index ddb23ebb76..1b6bb12df8 100644 --- a/modules/video_coding/test/stream_generator.h +++ b/modules/video_coding/test/stream_generator.h @@ -14,7 +14,7 @@ #include -#include "modules/video_coding/packet.h" +#include "modules/video_coding/deprecated/packet.h" namespace webrtc { diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc index 38b70f87cd..bf2ef0b4aa 100644 --- a/modules/video_coding/video_receiver.cc +++ b/modules/video_coding/video_receiver.cc @@ -18,6 +18,7 @@ #include "api/video_codecs/video_codec.h" #include "api/video_codecs/video_decoder.h" #include "modules/video_coding/decoder_database.h" +#include "modules/video_coding/deprecated/packet.h" #include "modules/video_coding/encoded_frame.h" #include "modules/video_coding/generic_decoder.h" #include "modules/video_coding/include/video_coding.h" @@ -25,7 +26,6 @@ #include "modules/video_coding/internal_defines.h" #include "modules/video_coding/jitter_buffer.h" #include "modules/video_coding/media_opt_util.h" -#include "modules/video_coding/packet.h" #include "modules/video_coding/receiver.h" #include "modules/video_coding/timing/timing.h" #include "modules/video_coding/video_coding_impl.h"