From 5219c6f7ad28602fb05d5e9797b89260e79c7532 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Tue, 27 Jul 2021 12:48:50 +0200 Subject: [PATCH] Delete legacy forwarding header svc_rate_allocator.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I8a73f1139560b8e5a654948497751e9515aa7b92 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227029 Reviewed-by: Erik Språng Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#34581} --- modules/video_coding/BUILD.gn | 3 +-- .../codecs/vp9/libvpx_vp9_encoder.cc | 2 +- .../codecs/vp9/svc_rate_allocator.h | 17 ----------------- video/BUILD.gn | 1 + video/video_stream_encoder.cc | 2 +- 5 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 modules/video_coding/codecs/vp9/svc_rate_allocator.h diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn index 2ffee9e432..f99bf79dc3 100644 --- a/modules/video_coding/BUILD.gn +++ b/modules/video_coding/BUILD.gn @@ -555,7 +555,6 @@ rtc_library("webrtc_vp9_helpers") { sources = [ "codecs/vp9/svc_config.cc", "codecs/vp9/svc_config.h", - "codecs/vp9/svc_rate_allocator.h", ] deps = [ @@ -569,7 +568,6 @@ rtc_library("webrtc_vp9_helpers") { "../../rtc_base:checks", "../../rtc_base:logging", "../../rtc_base/experiments:stable_target_rate_experiment", - "svc:svc_rate_allocator", ] absl_deps = [ "//third_party/abseil-cpp/absl/container:inlined_vector" ] } @@ -614,6 +612,7 @@ rtc_library("webrtc_vp9") { "../rtp_rtcp:rtp_rtcp_format", "svc:scalability_structures", "svc:scalable_video_controller", + "svc:svc_rate_allocator", "//third_party/libyuv", ] absl_deps = [ diff --git a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc index da8b019e74..f29ad927f2 100644 --- a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc +++ b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc @@ -26,10 +26,10 @@ #include "common_video/include/video_frame_buffer.h" #include "common_video/libyuv/include/webrtc_libyuv.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "modules/video_coding/codecs/vp9/svc_rate_allocator.h" #include "modules/video_coding/svc/create_scalability_structure.h" #include "modules/video_coding/svc/scalable_video_controller.h" #include "modules/video_coding/svc/scalable_video_controller_no_layering.h" +#include "modules/video_coding/svc/svc_rate_allocator.h" #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h" #include "rtc_base/checks.h" #include "rtc_base/experiments/field_trial_list.h" diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator.h b/modules/video_coding/codecs/vp9/svc_rate_allocator.h deleted file mode 100644 index fa53a155ab..0000000000 --- a/modules/video_coding/codecs/vp9/svc_rate_allocator.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * 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_CODECS_VP9_SVC_RATE_ALLOCATOR_H_ -#define MODULES_VIDEO_CODING_CODECS_VP9_SVC_RATE_ALLOCATOR_H_ - -// TODO(danilchap): Update dependent includes and remove this forwarding header. -#include "modules/video_coding/svc/svc_rate_allocator.h" - -#endif // MODULES_VIDEO_CODING_CODECS_VP9_SVC_RATE_ALLOCATOR_H_ diff --git a/video/BUILD.gn b/video/BUILD.gn index 4bdd94f345..f2f5c99e97 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -298,6 +298,7 @@ rtc_library("video_stream_encoder_impl") { "../modules/video_coding:video_codec_interface", "../modules/video_coding:video_coding_utility", "../modules/video_coding:webrtc_vp9_helpers", + "../modules/video_coding/svc:svc_rate_allocator", "../rtc_base:checks", "../rtc_base:criticalsection", "../rtc_base:logging", diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc index dc47167da7..7eac42642a 100644 --- a/video/video_stream_encoder.cc +++ b/video/video_stream_encoder.cc @@ -31,8 +31,8 @@ #include "api/video_codecs/video_encoder.h" #include "call/adaptation/resource_adaptation_processor.h" #include "call/adaptation/video_stream_adapter.h" -#include "modules/video_coding/codecs/vp9/svc_rate_allocator.h" #include "modules/video_coding/include/video_codec_initializer.h" +#include "modules/video_coding/svc/svc_rate_allocator.h" #include "rtc_base/arraysize.h" #include "rtc_base/checks.h" #include "rtc_base/constructor_magic.h"