mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move deprecated Receiver 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: I580e8412d379931bfdf9517e0a8be25c19e0cd32
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/304100
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40004}
This commit is contained in:
Rasmus Brandt 2023-05-03 11:08:11 +02:00 committed by WebRTC LUCI CQ
parent fd5edc6d81
commit 9dfb531f38
7 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/video_coding/BUILD.gn
View file

@ -308,8 +308,6 @@ rtc_library("video_coding_legacy") {
visibility = [ ":video_coding_unittests" ]
sources = [
"include/video_coding.h",
"receiver.cc",
"receiver.h",
"video_coding_impl.cc",
"video_coding_impl.h",
"video_receiver.cc",
@ -352,6 +350,7 @@ rtc_library("video_coding_legacy") {
"deprecated:deprecated_jitter_buffer",
"deprecated:deprecated_jitter_buffer_common",
"deprecated:deprecated_packet",
"deprecated:deprecated_receiver",
"deprecated:deprecated_session_info",
"timing:inter_frame_delay_variation_calculator",
"timing:jitter_estimator",
@ -1208,7 +1207,6 @@ if (rtc_include_tests) {
"loss_notification_controller_unittest.cc",
"nack_requester_unittest.cc",
"packet_buffer_unittest.cc",
"receiver_unittest.cc",
"rtp_frame_reference_finder_unittest.cc",
"rtp_vp8_ref_finder_unittest.cc",
"rtp_vp9_ref_finder_unittest.cc",

30
modules/video_coding/deprecated/BUILD.gn
View file

@ -103,6 +103,30 @@ rtc_library("deprecated_packet") {
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("deprecated_receiver") {
sources = [
"receiver.cc",
"receiver.h",
]
deps = [
":deprecated_event_wrapper",
":deprecated_jitter_buffer",
":deprecated_jitter_buffer_common",
":deprecated_packet",
"../../../api:field_trials_view",
"../../../api/video:encoded_image",
"../../../modules/video_coding",
"../../../modules/video_coding:encoded_frame",
"../../../modules/video_coding:video_codec_interface",
"../../../modules/video_coding/timing:timing_module",
"../../../rtc_base:event_tracer",
"../../../rtc_base:logging",
"../../../rtc_base:safe_conversions",
"../../../system_wrappers",
]
absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
}
rtc_library("deprecated_session_info") {
deps = [
":deprecated_jitter_buffer_common",
@ -135,6 +159,7 @@ rtc_library("deprecated_unittests") {
sources = [
"decoding_state_unittest.cc",
"jitter_buffer_unittest.cc",
"receiver_unittest.cc",
"session_info_unittest.cc",
]
visibility += [ "../../../modules/*" ]
@ -142,12 +167,17 @@ rtc_library("deprecated_unittests") {
":deprecated_decoding_state",
":deprecated_frame_buffer",
":deprecated_jitter_buffer",
":deprecated_jitter_buffer_common",
":deprecated_packet",
":deprecated_receiver",
":deprecated_session_info",
":deprecated_stream_generator",
"../../../common_video",
"../../../modules/rtp_rtcp:rtp_video_header",
"../../../modules/video_coding:codec_globals_headers",
"../../../modules/video_coding:encoded_frame",
"../../../modules/video_coding/timing:timing_module",
"../../../rtc_base:checks",
"../../../system_wrappers",
"../../../test:scoped_key_value_config",
"../../../test:test_support",

2
modules/video_coding/receiver.cc → modules/video_coding/deprecated/receiver.cc
View file

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "modules/video_coding/receiver.h"
#include "modules/video_coding/deprecated/receiver.h"
#include <cstdint>
#include <cstdlib>

7
modules/video_coding/receiver.h → modules/video_coding/deprecated/receiver.h
View file

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef MODULES_VIDEO_CODING_RECEIVER_H_
#define MODULES_VIDEO_CODING_RECEIVER_H_
#ifndef MODULES_VIDEO_CODING_DEPRECATED_RECEIVER_H_
#define MODULES_VIDEO_CODING_DEPRECATED_RECEIVER_H_
#include <memory>
#include <vector>
@ -18,7 +18,6 @@
#include "modules/video_coding/deprecated/event_wrapper.h"
#include "modules/video_coding/deprecated/jitter_buffer.h"
#include "modules/video_coding/deprecated/packet.h"
#include "modules/video_coding/include/video_coding.h"
#include "modules/video_coding/include/video_coding_defines.h"
#include "modules/video_coding/timing/timing.h"
@ -66,4 +65,4 @@ class VCMReceiver {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_RECEIVER_H_
#endif // MODULES_VIDEO_CODING_DEPRECATED_RECEIVER_H_

2
modules/video_coding/receiver_unittest.cc → modules/video_coding/deprecated/receiver_unittest.cc
View file

@ -7,7 +7,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "modules/video_coding/receiver.h"
#include "modules/video_coding/deprecated/receiver.h"
#include <string.h>

2
modules/video_coding/video_coding_impl.h
View file

@ -21,9 +21,9 @@
#include "api/sequence_checker.h"
#include "modules/video_coding/deprecated/frame_buffer.h"
#include "modules/video_coding/deprecated/jitter_buffer.h"
#include "modules/video_coding/deprecated/receiver.h"
#include "modules/video_coding/generic_decoder.h"
#include "modules/video_coding/include/video_coding.h"
#include "modules/video_coding/receiver.h"
#include "modules/video_coding/timing/timing.h"
#include "rtc_base/one_time_event.h"
#include "rtc_base/synchronization/mutex.h"

2
modules/video_coding/video_receiver.cc
View file

@ -20,13 +20,13 @@
#include "modules/video_coding/decoder_database.h"
#include "modules/video_coding/deprecated/jitter_buffer.h"
#include "modules/video_coding/deprecated/packet.h"
#include "modules/video_coding/deprecated/receiver.h"
#include "modules/video_coding/encoded_frame.h"
#include "modules/video_coding/generic_decoder.h"
#include "modules/video_coding/include/video_coding.h"
#include "modules/video_coding/include/video_coding_defines.h"
#include "modules/video_coding/internal_defines.h"
#include "modules/video_coding/media_opt_util.h"
#include "modules/video_coding/receiver.h"
#include "modules/video_coding/timing/timing.h"
#include "modules/video_coding/video_coding_impl.h"
#include "rtc_base/checks.h"