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

Move deprecated VCMFrameBuffer 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: Id1c7fbb969a63eee96fd88c376371aa7eafd0919
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/296440
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39512}
This commit is contained in:
Rasmus Brandt 2023-03-07 11:20:46 +01:00 committed by WebRTC LUCI CQ
parent f5127616aa
commit 5a54800957
9 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/video_coding/BUILD.gn
View File

@ -311,8 +311,6 @@ rtc_library("video_coding_legacy") {
"decoding_state.h",
"event_wrapper.cc",
"event_wrapper.h",
"frame_buffer.cc",
"frame_buffer.h",
"include/video_coding.h",
"jitter_buffer.cc",
"jitter_buffer.h",
@ -354,6 +352,7 @@ rtc_library("video_coding_legacy") {
"../../system_wrappers",
"../rtp_rtcp:rtp_rtcp_format",
"../rtp_rtcp:rtp_video_header",
"deprecated:deprecated_frame_buffer",
"deprecated:deprecated_jitter_buffer_common",
"deprecated:deprecated_packet",
"deprecated:deprecated_session_info",
@ -1273,6 +1272,7 @@ if (rtc_include_tests) {
"../rtp_rtcp:rtp_rtcp_format",
"../rtp_rtcp:rtp_video_header",
"codecs/av1:video_coding_codecs_av1_tests",
"deprecated:deprecated_frame_buffer",
"deprecated:deprecated_jitter_buffer_common",
"deprecated:deprecated_packet",
"deprecated:deprecated_session_info",

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/frame_buffer.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 "rtc_base/logging.h"
namespace webrtc {

2
modules/video_coding/decoding_state_unittest.cc
View File

@ -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/frame_buffer.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 "test/gtest.h"

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

@ -18,6 +18,25 @@ rtc_library("deprecated_jitter_buffer_common") {
sources = [ "jitter_buffer_common.h" ]
}
rtc_library("deprecated_frame_buffer") {
sources = [
"frame_buffer.cc",
"frame_buffer.h",
]
deps = [
":deprecated_jitter_buffer_common",
":deprecated_packet",
":deprecated_session_info",
"../../../api/video:encoded_image",
"../../../api/video:video_rtp_headers",
"../../../modules/video_coding:codec_globals_headers",
"../../../modules/video_coding:encoded_frame",
"../../../rtc_base:checks",
"../../../rtc_base:event_tracer",
"../../../rtc_base:logging",
]
}
rtc_library("deprecated_packet") {
sources = [
"packet.cc",

3
modules/video_coding/frame_buffer.cc → modules/video_coding/deprecated/frame_buffer.cc
View File

@ -8,14 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "modules/video_coding/frame_buffer.h"
#include "modules/video_coding/deprecated/frame_buffer.h"
#include <string.h>
#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 "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/trace_event.h"

8
modules/video_coding/frame_buffer.h → modules/video_coding/deprecated/frame_buffer.h
View File

@ -8,21 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef MODULES_VIDEO_CODING_FRAME_BUFFER_H_
#define MODULES_VIDEO_CODING_FRAME_BUFFER_H_
#ifndef MODULES_VIDEO_CODING_DEPRECATED_FRAME_BUFFER_H_
#define MODULES_VIDEO_CODING_DEPRECATED_FRAME_BUFFER_H_
#include <stddef.h>
#include <stdint.h>
#include <vector>
#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"
namespace webrtc {
@ -86,4 +84,4 @@ class VCMFrameBuffer : public VCMEncodedFrame {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_FRAME_BUFFER_H_
#endif // MODULES_VIDEO_CODING_DEPRECATED_FRAME_BUFFER_H_

2
modules/video_coding/jitter_buffer.cc
View File

@ -14,9 +14,9 @@
#include <utility>
#include "api/units/timestamp.h"
#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/frame_buffer.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"

2
modules/video_coding/jitter_buffer_unittest.cc
View File

@ -17,8 +17,8 @@
#include "absl/memory/memory.h"
#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/frame_buffer.h"
#include "modules/video_coding/media_opt_util.h"
#include "modules/video_coding/test/stream_generator.h"
#include "system_wrappers/include/clock.h"

2
modules/video_coding/video_coding_impl.h
View File

@ -19,7 +19,7 @@
#include "absl/types/optional.h"
#include "api/field_trials_view.h"
#include "api/sequence_checker.h"
#include "modules/video_coding/frame_buffer.h"
#include "modules/video_coding/deprecated/frame_buffer.h"
#include "modules/video_coding/generic_decoder.h"
#include "modules/video_coding/include/video_coding.h"
#include "modules/video_coding/jitter_buffer.h"