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

Move deprecated JitterBuffer 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: Ic3ac439b3dd3492e6c9c85869efa80a6708658ee
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/301521
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39876}
This commit is contained in:
Rasmus Brandt 2023-04-17 14:02:49 +02:00 committed by WebRTC LUCI CQ
parent 4730201454
commit 59d09aeeee
11 changed files with 63 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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",
"jitter_buffer.cc",
"jitter_buffer.h",
"receiver.cc",
"receiver.h",
"video_coding_impl.cc",
@ -351,6 +349,7 @@ rtc_library("video_coding_legacy") {
"deprecated:deprecated_decoding_state",
"deprecated:deprecated_event_wrapper",
"deprecated:deprecated_frame_buffer",
"deprecated:deprecated_jitter_buffer",
"deprecated:deprecated_jitter_buffer_common",
"deprecated:deprecated_packet",
"deprecated:deprecated_session_info",
@ -1206,7 +1205,6 @@ if (rtc_include_tests) {
"h264_sprop_parameter_sets_unittest.cc",
"h264_sps_pps_tracker_unittest.cc",
"histogram_unittest.cc",
"jitter_buffer_unittest.cc",
"loss_notification_controller_unittest.cc",
"nack_requester_unittest.cc",
"packet_buffer_unittest.cc",
@ -1214,8 +1212,6 @@ if (rtc_include_tests) {
"rtp_frame_reference_finder_unittest.cc",
"rtp_vp8_ref_finder_unittest.cc",
"rtp_vp9_ref_finder_unittest.cc",
"test/stream_generator.cc",
"test/stream_generator.h",
"utility/bandwidth_quality_scaler_unittest.cc",
"utility/decoded_frames_history_unittest.cc",
"utility/frame_dropper_unittest.cc",
@ -1334,6 +1330,7 @@ if (rtc_include_tests) {
"deprecated:deprecated_jitter_buffer_common",
"deprecated:deprecated_packet",
"deprecated:deprecated_session_info",
"deprecated:deprecated_stream_generator",
"svc:scalability_structure_tests",
"svc:svc_rate_allocator_tests",
"timing:jitter_estimator",

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

@ -41,6 +41,33 @@ rtc_library("deprecated_jitter_buffer_common") {
sources = [ "jitter_buffer_common.h" ]
}
rtc_library("deprecated_jitter_buffer") {
sources = [
"jitter_buffer.cc",
"jitter_buffer.h",
]
deps = [
":deprecated_decoding_state",
":deprecated_event_wrapper",
":deprecated_frame_buffer",
":deprecated_jitter_buffer_common",
":deprecated_packet",
"../../../api:field_trials_view",
"../../../api/units:timestamp",
"../../../modules:module_api",
"../../../modules:module_api_public",
"../../../modules/video_coding:video_codec_interface",
"../../../modules/video_coding/timing:inter_frame_delay_variation_calculator",
"../../../modules/video_coding/timing:jitter_estimator",
"../../../rtc_base:checks",
"../../../rtc_base:logging",
"../../../rtc_base:macromagic",
"../../../rtc_base/synchronization:mutex",
"../../../system_wrappers",
]
absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
}
rtc_library("deprecated_frame_buffer") {
sources = [
"frame_buffer.cc",
@ -92,20 +119,38 @@ rtc_library("deprecated_session_info") {
absl_deps = [ "//third_party/abseil-cpp/absl/types:variant" ]
}
rtc_library("deprecated_stream_generator") {
deps = [
":deprecated_packet",
"../../../rtc_base:checks",
]
sources = [
"stream_generator.cc",
"stream_generator.h",
]
}
rtc_library("deprecated_unittests") {
testonly = true
sources = [
"decoding_state_unittest.cc",
"jitter_buffer_unittest.cc",
"session_info_unittest.cc",
]
visibility += [ "../../../modules/*" ]
deps = [
":deprecated_decoding_state",
":deprecated_frame_buffer",
":deprecated_jitter_buffer",
":deprecated_packet",
":deprecated_session_info",
":deprecated_stream_generator",
"../../../common_video",
"../../../modules/rtp_rtcp:rtp_video_header",
"../../../modules/video_coding:codec_globals_headers",
"../../../system_wrappers",
"../../../test:scoped_key_value_config",
"../../../test:test_support",
]
absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
}

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

@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "modules/video_coding/jitter_buffer.h"
#include "modules/video_coding/deprecated/jitter_buffer.h"
#include <algorithm>
#include <limits>
@ -17,8 +17,6 @@
#include "modules/video_coding/deprecated/frame_buffer.h"
#include "modules/video_coding/deprecated/jitter_buffer_common.h"
#include "modules/video_coding/deprecated/packet.h"
#include "modules/video_coding/include/video_coding.h"
#include "modules/video_coding/internal_defines.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"

7
modules/video_coding/jitter_buffer.h → modules/video_coding/deprecated/jitter_buffer.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_H_
#define MODULES_VIDEO_CODING_JITTER_BUFFER_H_
#ifndef MODULES_VIDEO_CODING_DEPRECATED_JITTER_BUFFER_H_
#define MODULES_VIDEO_CODING_DEPRECATED_JITTER_BUFFER_H_
#include <list>
#include <map>
@ -23,7 +23,6 @@
#include "modules/video_coding/deprecated/decoding_state.h"
#include "modules/video_coding/deprecated/event_wrapper.h"
#include "modules/video_coding/deprecated/jitter_buffer_common.h"
#include "modules/video_coding/include/video_coding.h"
#include "modules/video_coding/include/video_coding_defines.h"
#include "modules/video_coding/timing/inter_frame_delay_variation_calculator.h"
#include "modules/video_coding/timing/jitter_estimator.h"
@ -280,4 +279,4 @@ class VCMJitterBuffer {
};
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_JITTER_BUFFER_H_
#endif // MODULES_VIDEO_CODING_DEPRECATED_JITTER_BUFFER_H_

6
modules/video_coding/jitter_buffer_unittest.cc → modules/video_coding/deprecated/jitter_buffer_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/jitter_buffer.h"
#include "modules/video_coding/deprecated/jitter_buffer.h"
#include <list>
#include <memory>
@ -19,10 +19,8 @@
#include "common_video/h264/h264_common.h"
#include "modules/video_coding/deprecated/frame_buffer.h"
#include "modules/video_coding/deprecated/packet.h"
#include "modules/video_coding/media_opt_util.h"
#include "modules/video_coding/test/stream_generator.h"
#include "modules/video_coding/deprecated/stream_generator.h"
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/metrics.h"
#include "test/gmock.h"
#include "test/gtest.h"
#include "test/scoped_key_value_config.h"

6
modules/video_coding/test/stream_generator.cc → modules/video_coding/deprecated/stream_generator.cc
View File

@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "modules/video_coding/test/stream_generator.h"
#include "modules/video_coding/deprecated/stream_generator.h"
#include <string.h>
#include <list>
#include "modules/video_coding/deprecated/packet.h"
#include "test/gtest.h"
#include "rtc_base/checks.h"
namespace webrtc {
@ -55,7 +55,7 @@ VCMPacket StreamGenerator::GeneratePacket(uint16_t sequence_number,
bool first_packet,
bool marker_bit,
VideoFrameType type) {
EXPECT_LT(size, kMaxPacketSize);
RTC_CHECK_LT(size, kMaxPacketSize);
VCMPacket packet;
packet.seqNum = sequence_number;
packet.timestamp = timestamp;

6
modules/video_coding/test/stream_generator.h → modules/video_coding/deprecated/stream_generator.h
View File

@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_
#define MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_
#ifndef MODULES_VIDEO_CODING_DEPRECATED_STREAM_GENERATOR_H_
#define MODULES_VIDEO_CODING_DEPRECATED_STREAM_GENERATOR_H_
#include <stdint.h>
@ -71,4 +71,4 @@ class StreamGenerator {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_
#endif // MODULES_VIDEO_CODING_DEPRECATED_STREAM_GENERATOR_H_

2
modules/video_coding/receiver.h
View File

@ -16,10 +16,10 @@
#include "api/field_trials_view.h"
#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/jitter_buffer.h"
#include "modules/video_coding/timing/timing.h"
namespace webrtc {

2
modules/video_coding/receiver_unittest.cc
View File

@ -18,8 +18,8 @@
#include "modules/video_coding/deprecated/jitter_buffer_common.h"
#include "modules/video_coding/deprecated/packet.h"
#include "modules/video_coding/deprecated/stream_generator.h"
#include "modules/video_coding/encoded_frame.h"
#include "modules/video_coding/test/stream_generator.h"
#include "modules/video_coding/timing/timing.h"
#include "rtc_base/checks.h"
#include "system_wrappers/include/clock.h"

2
modules/video_coding/video_coding_impl.h
View File

@ -20,9 +20,9 @@
#include "api/field_trials_view.h"
#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/generic_decoder.h"
#include "modules/video_coding/include/video_coding.h"
#include "modules/video_coding/jitter_buffer.h"
#include "modules/video_coding/receiver.h"
#include "modules/video_coding/timing/timing.h"
#include "rtc_base/one_time_event.h"

2
modules/video_coding/video_receiver.cc
View File

@ -18,13 +18,13 @@
#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/jitter_buffer.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"
#include "modules/video_coding/include/video_coding_defines.h"
#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/receiver.h"
#include "modules/video_coding/timing/timing.h"