admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move deprecated VCMSessionInfo to modules/video_coding/deprecated/.

Browse Source 
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: Ieafdb2640b12c254edfac04e98f86f9170c5a71a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/295870
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39483}
This commit is contained in:
Rasmus Brandt 2023-03-06 11:10:26 +01:00 committed by WebRTC LUCI CQ
parent 8eb7aef196
commit 78e1388ea7
14 changed files with 59 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/BUILD.gn
View File

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

8
modules/video_coding/BUILD.gn
View File

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

2
modules/video_coding/decoding_state.cc
View File

@ -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 {

2
modules/video_coding/decoding_state_unittest.cc
View File

@ -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 {

41
modules/video_coding/deprecated/BUILD.gn
View File

@ -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",
]
}

6
modules/video_coding/jitter_buffer_common.h → modules/video_coding/deprecated/jitter_buffer_common.h
View File

@ -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_

4
modules/video_coding/session_info.cc → modules/video_coding/deprecated/session_info.cc
View File

@ -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 <string.h>
@ -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 {

7
modules/video_coding/session_info.h → modules/video_coding/deprecated/session_info.h
View File

@ -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 <stddef.h>
#include <stdint.h>
@ -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_

2
modules/video_coding/session_info_unittest.cc → modules/video_coding/deprecated/session_info_unittest.cc
View File

@ -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 <string.h>

4
modules/video_coding/frame_buffer.h
View File

@ -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 {

2
modules/video_coding/jitter_buffer.cc
View File

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

2
modules/video_coding/jitter_buffer.h
View File

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

3
modules/video_coding/receiver.cc
View File

@ -10,7 +10,6 @@
#include "modules/video_coding/receiver.h"
#include <cstdint>
#include <cstdlib>
#include <utility>
@ -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"

2
modules/video_coding/receiver_unittest.cc
View File

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