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 <brandtr@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39451}

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",

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 {

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"
 

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" ]
+}

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"
 

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 <stddef.h>
 #include <stdint.h>
@@ -77,4 +77,4 @@ class VCMPacket {
 };
 
 }  // namespace webrtc
-#endif  // MODULES_VIDEO_CODING_PACKET_H_
+#endif  // MODULES_VIDEO_CODING_DEPRECATED_PACKET_H_

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"

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 {

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"
 

modules/video_coding/jitter_buffer.cc

@@ -14,11 +14,11 @@
 #include <utility>
 
 #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"

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"

modules/video_coding/receiver.h

@@ -15,11 +15,11 @@
 #include <vector>
 
 #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 {

modules/video_coding/receiver_unittest.cc

@@ -16,9 +16,9 @@
 #include <queue>
 #include <vector>
 
+#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"

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 {

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.

modules/video_coding/session_info_unittest.cc

@@ -12,7 +12,7 @@
 
 #include <string.h>
 
-#include "modules/video_coding/packet.h"
+#include "modules/video_coding/deprecated/packet.h"
 #include "test/gtest.h"
 
 namespace webrtc {

modules/video_coding/test/stream_generator.cc

@@ -14,7 +14,7 @@
 
 #include <list>
 
-#include "modules/video_coding/packet.h"
+#include "modules/video_coding/deprecated/packet.h"
 #include "test/gtest.h"
 
 namespace webrtc {

modules/video_coding/test/stream_generator.h

@@ -14,7 +14,7 @@
 
 #include <list>
 
-#include "modules/video_coding/packet.h"
+#include "modules/video_coding/deprecated/packet.h"
 
 namespace webrtc {
 

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"