Move deprecated VCMDecodingState 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: Ie6820a820f22635fe7a970db70b9c28d37499848
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/296443
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39518}
This commit is contained in:
Rasmus Brandt 2023-03-09 13:12:29 +01:00 committed by WebRTC LUCI CQ
parent 21d7cf5879
commit bc3a41e0d7
6 changed files with 30 additions and 11 deletions

View file

@ -307,8 +307,6 @@ rtc_library("video_codec_interface") {
rtc_library("video_coding_legacy") {
visibility = [ ":video_coding_unittests" ]
sources = [
"decoding_state.cc",
"decoding_state.h",
"event_wrapper.cc",
"event_wrapper.h",
"include/video_coding.h",
@ -352,6 +350,7 @@ rtc_library("video_coding_legacy") {
"../../system_wrappers",
"../rtp_rtcp:rtp_rtcp_format",
"../rtp_rtcp:rtp_video_header",
"deprecated:deprecated_decoding_state",
"deprecated:deprecated_frame_buffer",
"deprecated:deprecated_jitter_buffer_common",
"deprecated:deprecated_packet",
@ -1139,7 +1138,6 @@ if (rtc_include_tests) {
"codecs/vp8/screenshare_layers_unittest.cc",
"codecs/vp9/svc_config_unittest.cc",
"decoder_database_unittest.cc",
"decoding_state_unittest.cc",
"fec_controller_unittest.cc",
"frame_dependencies_calculator_unittest.cc",
"frame_helpers_unittest.cc",

View file

@ -14,6 +14,21 @@ visibility = [
"../:video_coding_unittests",
]
rtc_library("deprecated_decoding_state") {
sources = [
"decoding_state.cc",
"decoding_state.h",
]
deps = [
":deprecated_frame_buffer",
":deprecated_jitter_buffer_common",
":deprecated_packet",
"../../../common_video",
"../../../modules:module_api_public",
"../../../rtc_base:logging",
]
}
rtc_library("deprecated_jitter_buffer_common") {
sources = [ "jitter_buffer_common.h" ]
}
@ -71,11 +86,18 @@ rtc_library("deprecated_session_info") {
rtc_library("deprecated_unittests") {
testonly = true
sources = [ "session_info_unittest.cc" ]
sources = [
"decoding_state_unittest.cc",
"session_info_unittest.cc",
]
visibility += [ "../../../modules/*" ]
deps = [
":deprecated_decoding_state",
":deprecated_frame_buffer",
":deprecated_packet",
":deprecated_session_info",
"../../../modules/rtp_rtcp:rtp_video_header",
"../../../modules/video_coding:codec_globals_headers",
"../../../test:test_support",
]
}

View file

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "modules/video_coding/decoding_state.h"
#include "modules/video_coding/deprecated/decoding_state.h"
#include "common_video/h264/h264_common.h"
#include "modules/include/module_common_types_public.h"

View file

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef MODULES_VIDEO_CODING_DECODING_STATE_H_
#define MODULES_VIDEO_CODING_DECODING_STATE_H_
#ifndef MODULES_VIDEO_CODING_DEPRECATED_DECODING_STATE_H_
#define MODULES_VIDEO_CODING_DEPRECATED_DECODING_STATE_H_
#include <cstdint>
#include <map>
@ -86,4 +86,4 @@ class VCMDecodingState {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_DECODING_STATE_H_
#endif // MODULES_VIDEO_CODING_DEPRECATED_DECODING_STATE_H_

View file

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "modules/video_coding/decoding_state.h"
#include "modules/video_coding/deprecated/decoding_state.h"
#include "modules/rtp_rtcp/source/rtp_video_header.h"
#include "modules/video_coding/codecs/interface/common_constants.h"
@ -17,7 +17,6 @@
#include "modules/video_coding/deprecated/frame_buffer.h"
#include "modules/video_coding/deprecated/packet.h"
#include "modules/video_coding/deprecated/session_info.h"
#include "modules/video_coding/include/video_coding.h"
#include "test/gtest.h"
namespace webrtc {

View file

@ -20,7 +20,7 @@
#include "api/field_trials_view.h"
#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/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"