zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move scalability structures from av1 into own subfolder

Browse Source 
To make it natural to reuse them for vp9

Bug: webrtc:11999
Change-Id: If2ef7ca16b8be96e0e03bb19211d9f5eb74b2d3d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/188620
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32414}
This commit is contained in:
Danil Chapovalov
2020-10-15 15:57:17 +02:00
committed by Commit Bot
parent 4c54f8638c
commit da7fe39b84
40 changed files with 203 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/video_coding/BUILD.gn
View File

@ -1004,9 +1004,9 @@ if (rtc_include_tests) {
"../../test/time_controller:time_controller",
"../rtp_rtcp:rtp_rtcp_format",
"../rtp_rtcp:rtp_video_header",
"codecs/av1:scalability_structure_tests",
"codecs/av1:video_coding_codecs_av1_tests",
"deprecated:nack_module",
"svc:scalability_structure_tests",
]
absl_deps = [
"//third_party/abseil-cpp/absl/memory",

89
modules/video_coding/codecs/av1/BUILD.gn
View File

@ -34,74 +34,13 @@ rtc_library("libaom_av1_decoder") {
}
}
rtc_source_set("scalable_video_controller") {
sources = [
"scalable_video_controller.h",
"scalable_video_controller_no_layering.cc",
"scalable_video_controller_no_layering.h",
]
deps = [
"../../../../api/transport/rtp:dependency_descriptor",
"../../../../api/video:video_bitrate_allocation",
"../../../../common_video/generic_frame_descriptor",
"../../../../rtc_base:checks",
]
absl_deps = [
"//third_party/abseil-cpp/absl/container:inlined_vector",
"//third_party/abseil-cpp/absl/types:optional",
]
}
rtc_source_set("scalability_structures") {
sources = [
"create_scalability_structure.cc",
"create_scalability_structure.h",
"scalability_structure_full_svc.cc",
"scalability_structure_full_svc.h",
"scalability_structure_l1t2.cc",
"scalability_structure_l1t2.h",
"scalability_structure_l1t3.cc",
"scalability_structure_l1t3.h",
"scalability_structure_l2t1.cc",
"scalability_structure_l2t1.h",
"scalability_structure_l2t1_key.cc",
"scalability_structure_l2t1_key.h",
"scalability_structure_l2t1h.cc",
"scalability_structure_l2t1h.h",
"scalability_structure_l2t2.cc",
"scalability_structure_l2t2.h",
"scalability_structure_l2t2_key.cc",
"scalability_structure_l2t2_key.h",
"scalability_structure_l2t2_key_shift.cc",
"scalability_structure_l2t2_key_shift.h",
"scalability_structure_l3t1.cc",
"scalability_structure_l3t1.h",
"scalability_structure_l3t3.cc",
"scalability_structure_l3t3.h",
"scalability_structure_s2t1.cc",
"scalability_structure_s2t1.h",
]
deps = [
":scalable_video_controller",
"../../../../api/transport/rtp:dependency_descriptor",
"../../../../common_video/generic_frame_descriptor",
"../../../../rtc_base:checks",
"../../../../rtc_base:logging",
]
absl_deps = [
"//third_party/abseil-cpp/absl/base:core_headers",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
}
rtc_library("libaom_av1_encoder") {
visibility = [ "*" ]
poisonous = [ "software_video_codecs" ]
public = [ "libaom_av1_encoder.h" ]
deps = [
":scalable_video_controller",
"../../../../api/video_codecs:video_codecs_api",
"../../svc:scalable_video_controller",
]
absl_deps = [
"//third_party/abseil-cpp/absl/algorithm:container",
@ -127,28 +66,6 @@ rtc_library("libaom_av1_encoder") {
}
if (rtc_include_tests) {
rtc_library("scalability_structure_tests") {
testonly = true
sources = [
"scalability_structure_l3t3_unittest.cc",
"scalability_structure_test_helpers.cc",
"scalability_structure_test_helpers.h",
"scalability_structure_unittest.cc",
]
deps = [
":scalability_structures",
":scalable_video_controller",
"../..:chain_diff_calculator",
"../..:frame_dependencies_calculator",
"../../../../api/transport/rtp:dependency_descriptor",
"../../../../api/video:video_bitrate_allocation",
"../../../../api/video:video_frame_type",
"../../../../common_video/generic_frame_descriptor",
"../../../../test:test_support",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
rtc_library("video_coding_codecs_av1_tests") {
testonly = true
@ -160,8 +77,6 @@ if (rtc_include_tests) {
deps = [
":libaom_av1_decoder",
":libaom_av1_encoder",
":scalability_structures",
":scalable_video_controller",
"../..:encoded_video_frame_producer",
"../..:video_codec_interface",
"../../../../api:mock_video_encoder",
@ -170,6 +85,8 @@ if (rtc_include_tests) {
"../../../../api/video:video_frame",
"../../../../api/video_codecs:video_codecs_api",
"../../../../test:test_support",
"../../svc:scalability_structures",
"../../svc:scalable_video_controller",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}

4
modules/video_coding/codecs/av1/libaom_av1_encoder.cc
View File

@ -25,10 +25,10 @@
#include "api/video/video_frame.h"
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller_no_layering.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/include/video_error_codes.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
#include "modules/video_coding/svc/scalable_video_controller_no_layering.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "third_party/libaom/source/libaom/aom/aom_codec.h"

2
modules/video_coding/codecs/av1/libaom_av1_encoder.h
View File

@ -14,7 +14,7 @@
#include "absl/base/attributes.h"
#include "api/video_codecs/video_encoder.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
namespace webrtc {

2
modules/video_coding/codecs/av1/libaom_av1_encoder_unittest.cc
View File

@ -16,9 +16,9 @@
#include "absl/types/optional.h"
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
#include "modules/video_coding/codecs/av1/scalability_structure_l1t2.h"
#include "modules/video_coding/codecs/test/encoded_video_frame_producer.h"
#include "modules/video_coding/include/video_error_codes.h"
#include "modules/video_coding/svc/scalability_structure_l1t2.h"
#include "test/gmock.h"
#include "test/gtest.h"

6
modules/video_coding/codecs/av1/libaom_av1_unittest.cc
View File

@ -22,14 +22,14 @@
#include "api/units/time_delta.h"
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
#include "modules/video_coding/codecs/av1/create_scalability_structure.h"
#include "modules/video_coding/codecs/av1/libaom_av1_decoder.h"
#include "modules/video_coding/codecs/av1/libaom_av1_encoder.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller_no_layering.h"
#include "modules/video_coding/codecs/test/encoded_video_frame_producer.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/include/video_error_codes.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 "test/gmock.h"
#include "test/gtest.h"

94
modules/video_coding/svc/BUILD.gn Normal file
View File

@ -0,0 +1,94 @@
# Copyright (c) 2020 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.
import("../../../webrtc.gni")
rtc_source_set("scalable_video_controller") {
sources = [
"scalable_video_controller.h",
"scalable_video_controller_no_layering.cc",
"scalable_video_controller_no_layering.h",
]
deps = [
"../../../api/transport/rtp:dependency_descriptor",
"../../../api/video:video_bitrate_allocation",
"../../../common_video/generic_frame_descriptor",
"../../../rtc_base:checks",
]
absl_deps = [
"//third_party/abseil-cpp/absl/container:inlined_vector",
"//third_party/abseil-cpp/absl/types:optional",
]
}
rtc_source_set("scalability_structures") {
sources = [
"create_scalability_structure.cc",
"create_scalability_structure.h",
"scalability_structure_full_svc.cc",
"scalability_structure_full_svc.h",
"scalability_structure_l1t2.cc",
"scalability_structure_l1t2.h",
"scalability_structure_l1t3.cc",
"scalability_structure_l1t3.h",
"scalability_structure_l2t1.cc",
"scalability_structure_l2t1.h",
"scalability_structure_l2t1_key.cc",
"scalability_structure_l2t1_key.h",
"scalability_structure_l2t1h.cc",
"scalability_structure_l2t1h.h",
"scalability_structure_l2t2.cc",
"scalability_structure_l2t2.h",
"scalability_structure_l2t2_key.cc",
"scalability_structure_l2t2_key.h",
"scalability_structure_l2t2_key_shift.cc",
"scalability_structure_l2t2_key_shift.h",
"scalability_structure_l3t1.cc",
"scalability_structure_l3t1.h",
"scalability_structure_l3t3.cc",
"scalability_structure_l3t3.h",
"scalability_structure_s2t1.cc",
"scalability_structure_s2t1.h",
]
deps = [
":scalable_video_controller",
"../../../api/transport/rtp:dependency_descriptor",
"../../../common_video/generic_frame_descriptor",
"../../../rtc_base:checks",
"../../../rtc_base:logging",
]
absl_deps = [
"//third_party/abseil-cpp/absl/base:core_headers",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
}
if (rtc_include_tests) {
rtc_library("scalability_structure_tests") {
testonly = true
sources = [
"scalability_structure_l3t3_unittest.cc",
"scalability_structure_test_helpers.cc",
"scalability_structure_test_helpers.h",
"scalability_structure_unittest.cc",
]
deps = [
":scalability_structures",
":scalable_video_controller",
"..:chain_diff_calculator",
"..:frame_dependencies_calculator",
"../../../api/transport/rtp:dependency_descriptor",
"../../../api/video:video_bitrate_allocation",
"../../../api/video:video_frame_type",
"../../../common_video/generic_frame_descriptor",
"../../../test:test_support",
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
}

28
modules/video_coding/codecs/av1/create_scalability_structure.cc → modules/video_coding/svc/create_scalability_structure.cc
View File

@ -7,24 +7,24 @@
* 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/codecs/av1/create_scalability_structure.h"
#include "modules/video_coding/svc/create_scalability_structure.h"
#include <memory>
#include "absl/strings/string_view.h"
#include "modules/video_coding/codecs/av1/scalability_structure_l1t2.h"
#include "modules/video_coding/codecs/av1/scalability_structure_l1t3.h"
#include "modules/video_coding/codecs/av1/scalability_structure_l2t1.h"
#include "modules/video_coding/codecs/av1/scalability_structure_l2t1_key.h"
#include "modules/video_coding/codecs/av1/scalability_structure_l2t1h.h"
#include "modules/video_coding/codecs/av1/scalability_structure_l2t2.h"
#include "modules/video_coding/codecs/av1/scalability_structure_l2t2_key.h"
#include "modules/video_coding/codecs/av1/scalability_structure_l2t2_key_shift.h"
#include "modules/video_coding/codecs/av1/scalability_structure_l3t1.h"
#include "modules/video_coding/codecs/av1/scalability_structure_l3t3.h"
#include "modules/video_coding/codecs/av1/scalability_structure_s2t1.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller_no_layering.h"
#include "modules/video_coding/svc/scalability_structure_l1t2.h"
#include "modules/video_coding/svc/scalability_structure_l1t3.h"
#include "modules/video_coding/svc/scalability_structure_l2t1.h"
#include "modules/video_coding/svc/scalability_structure_l2t1_key.h"
#include "modules/video_coding/svc/scalability_structure_l2t1h.h"
#include "modules/video_coding/svc/scalability_structure_l2t2.h"
#include "modules/video_coding/svc/scalability_structure_l2t2_key.h"
#include "modules/video_coding/svc/scalability_structure_l2t2_key_shift.h"
#include "modules/video_coding/svc/scalability_structure_l3t1.h"
#include "modules/video_coding/svc/scalability_structure_l3t3.h"
#include "modules/video_coding/svc/scalability_structure_s2t1.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
#include "modules/video_coding/svc/scalable_video_controller_no_layering.h"
#include "rtc_base/checks.h"
namespace webrtc {

8
modules/video_coding/codecs/av1/create_scalability_structure.h → modules/video_coding/svc/create_scalability_structure.h
View File

@ -7,14 +7,14 @@
* 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_AV1_CREATE_SCALABILITY_STRUCTURE_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_CREATE_SCALABILITY_STRUCTURE_H_
#ifndef MODULES_VIDEO_CODING_SVC_CREATE_SCALABILITY_STRUCTURE_H_
#define MODULES_VIDEO_CODING_SVC_CREATE_SCALABILITY_STRUCTURE_H_
#include <memory>
#include <vector>
#include "absl/strings/string_view.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
namespace webrtc {
@ -26,4 +26,4 @@ std::unique_ptr<ScalableVideoController> CreateScalabilityStructure(
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_CREATE_SCALABILITY_STRUCTURE_H_
#endif // MODULES_VIDEO_CODING_SVC_CREATE_SCALABILITY_STRUCTURE_H_

2
modules/video_coding/codecs/av1/scalability_structure_full_svc.cc → modules/video_coding/svc/scalability_structure_full_svc.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/codecs/av1/scalability_structure_full_svc.h"
#include "modules/video_coding/svc/scalability_structure_full_svc.h"
#include <utility>
#include <vector>

8
modules/video_coding/codecs/av1/scalability_structure_full_svc.h → modules/video_coding/svc/scalability_structure_full_svc.h
View File

@ -7,15 +7,15 @@
* 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_AV1_SCALABILITY_STRUCTURE_FULL_SVC_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_FULL_SVC_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_FULL_SVC_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_FULL_SVC_H_
#include <bitset>
#include <vector>
#include "api/transport/rtp/dependency_descriptor.h"
#include "common_video/generic_frame_descriptor/generic_frame_info.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
namespace webrtc {
@ -70,4 +70,4 @@ class ScalabilityStructureFullSvc : public ScalableVideoController {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_FULL_SVC_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_FULL_SVC_H_

2
modules/video_coding/codecs/av1/scalability_structure_l1t2.cc → modules/video_coding/svc/scalability_structure_l1t2.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/codecs/av1/scalability_structure_l1t2.h"
#include "modules/video_coding/svc/scalability_structure_l1t2.h"
#include <vector>

8
modules/video_coding/codecs/av1/scalability_structure_l1t2.h → modules/video_coding/svc/scalability_structure_l1t2.h
View File

@ -7,11 +7,11 @@
* 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_AV1_SCALABILITY_STRUCTURE_L1T2_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L1T2_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L1T2_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L1T2_H_
#include "api/transport/rtp/dependency_descriptor.h"
#include "modules/video_coding/codecs/av1/scalability_structure_full_svc.h"
#include "modules/video_coding/svc/scalability_structure_full_svc.h"
namespace webrtc {
@ -25,4 +25,4 @@ class ScalabilityStructureL1T2 : public ScalabilityStructureFullSvc {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L1T2_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L1T2_H_

2
modules/video_coding/codecs/av1/scalability_structure_l1t3.cc → modules/video_coding/svc/scalability_structure_l1t3.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/codecs/av1/scalability_structure_l1t3.h"
#include "modules/video_coding/svc/scalability_structure_l1t3.h"
#include <vector>

8
modules/video_coding/codecs/av1/scalability_structure_l1t3.h → modules/video_coding/svc/scalability_structure_l1t3.h
View File

@ -7,11 +7,11 @@
* 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_AV1_SCALABILITY_STRUCTURE_L1T3_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L1T3_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L1T3_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L1T3_H_
#include "api/transport/rtp/dependency_descriptor.h"
#include "modules/video_coding/codecs/av1/scalability_structure_full_svc.h"
#include "modules/video_coding/svc/scalability_structure_full_svc.h"
namespace webrtc {
@ -31,4 +31,4 @@ class ScalabilityStructureL1T3 : public ScalabilityStructureFullSvc {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L1T3_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L1T3_H_

2
modules/video_coding/codecs/av1/scalability_structure_l2t1.cc → modules/video_coding/svc/scalability_structure_l2t1.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/codecs/av1/scalability_structure_l2t1.h"
#include "modules/video_coding/svc/scalability_structure_l2t1.h"
#include <vector>

8
modules/video_coding/codecs/av1/scalability_structure_l2t1.h → modules/video_coding/svc/scalability_structure_l2t1.h
View File

@ -7,11 +7,11 @@
* 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_AV1_SCALABILITY_STRUCTURE_L2T1_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T1_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T1_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T1_H_
#include "api/transport/rtp/dependency_descriptor.h"
#include "modules/video_coding/codecs/av1/scalability_structure_full_svc.h"
#include "modules/video_coding/svc/scalability_structure_full_svc.h"
namespace webrtc {
@ -28,4 +28,4 @@ class ScalabilityStructureL2T1 : public ScalabilityStructureFullSvc {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T1_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T1_H_

2
modules/video_coding/codecs/av1/scalability_structure_l2t1_key.cc → modules/video_coding/svc/scalability_structure_l2t1_key.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/codecs/av1/scalability_structure_l2t1_key.h"
#include "modules/video_coding/svc/scalability_structure_l2t1_key.h"
#include <utility>
#include <vector>

8
modules/video_coding/codecs/av1/scalability_structure_l2t1_key.h → modules/video_coding/svc/scalability_structure_l2t1_key.h
View File

@ -7,14 +7,14 @@
* 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_AV1_SCALABILITY_STRUCTURE_L2T1_KEY_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T1_KEY_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T1_KEY_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T1_KEY_H_
#include <vector>
#include "api/transport/rtp/dependency_descriptor.h"
#include "common_video/generic_frame_descriptor/generic_frame_info.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
namespace webrtc {
@ -39,4 +39,4 @@ class ScalabilityStructureL2T1Key : public ScalableVideoController {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T1_KEY_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T1_KEY_H_

2
modules/video_coding/codecs/av1/scalability_structure_l2t1h.cc → modules/video_coding/svc/scalability_structure_l2t1h.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/codecs/av1/scalability_structure_l2t1h.h"
#include "modules/video_coding/svc/scalability_structure_l2t1h.h"
#include <utility>
#include <vector>

10
modules/video_coding/codecs/av1/scalability_structure_l2t1h.h → modules/video_coding/svc/scalability_structure_l2t1h.h
View File

@ -7,11 +7,11 @@
* 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_AV1_SCALABILITY_STRUCTURE_L2T1H_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T1H_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T1H_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T1H_H_
#include "modules/video_coding/codecs/av1/scalability_structure_l2t1.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/svc/scalability_structure_l2t1.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
namespace webrtc {
@ -24,4 +24,4 @@ class ScalabilityStructureL2T1h : public ScalabilityStructureL2T1 {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T1H_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T1H_H_

2
modules/video_coding/codecs/av1/scalability_structure_l2t2.cc → modules/video_coding/svc/scalability_structure_l2t2.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/codecs/av1/scalability_structure_l2t2.h"
#include "modules/video_coding/svc/scalability_structure_l2t2.h"
#include <vector>

8
modules/video_coding/codecs/av1/scalability_structure_l2t2.h → modules/video_coding/svc/scalability_structure_l2t2.h
View File

@ -7,11 +7,11 @@
* 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_AV1_SCALABILITY_STRUCTURE_L2T2_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T2_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T2_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T2_H_
#include "api/transport/rtp/dependency_descriptor.h"
#include "modules/video_coding/codecs/av1/scalability_structure_full_svc.h"
#include "modules/video_coding/svc/scalability_structure_full_svc.h"
namespace webrtc {
@ -33,4 +33,4 @@ class ScalabilityStructureL2T2 : public ScalabilityStructureFullSvc {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T2_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T2_H_

2
modules/video_coding/codecs/av1/scalability_structure_l2t2_key.cc → modules/video_coding/svc/scalability_structure_l2t2_key.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/codecs/av1/scalability_structure_l2t2_key.h"
#include "modules/video_coding/svc/scalability_structure_l2t2_key.h"
#include <utility>
#include <vector>

8
modules/video_coding/codecs/av1/scalability_structure_l2t2_key.h → modules/video_coding/svc/scalability_structure_l2t2_key.h
View File

@ -7,14 +7,14 @@
* 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_AV1_SCALABILITY_STRUCTURE_L2T2_KEY_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T2_KEY_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T2_KEY_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T2_KEY_H_
#include <vector>
#include "api/transport/rtp/dependency_descriptor.h"
#include "common_video/generic_frame_descriptor/generic_frame_info.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
namespace webrtc {
@ -49,4 +49,4 @@ class ScalabilityStructureL2T2Key : public ScalableVideoController {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T2_KEY_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T2_KEY_H_

2
modules/video_coding/codecs/av1/scalability_structure_l2t2_key_shift.cc → modules/video_coding/svc/scalability_structure_l2t2_key_shift.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/codecs/av1/scalability_structure_l2t2_key_shift.h"
#include "modules/video_coding/svc/scalability_structure_l2t2_key_shift.h"
#include <utility>
#include <vector>

8
modules/video_coding/codecs/av1/scalability_structure_l2t2_key_shift.h → modules/video_coding/svc/scalability_structure_l2t2_key_shift.h
View File

@ -7,14 +7,14 @@
* 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_AV1_SCALABILITY_STRUCTURE_L2T2_KEY_SHIFT_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T2_KEY_SHIFT_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T2_KEY_SHIFT_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T2_KEY_SHIFT_H_
#include <vector>
#include "api/transport/rtp/dependency_descriptor.h"
#include "common_video/generic_frame_descriptor/generic_frame_info.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
namespace webrtc {
@ -49,4 +49,4 @@ class ScalabilityStructureL2T2KeyShift : public ScalableVideoController {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L2T2_KEY_SHIFT_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L2T2_KEY_SHIFT_H_

2
modules/video_coding/codecs/av1/scalability_structure_l3t1.cc → modules/video_coding/svc/scalability_structure_l3t1.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/codecs/av1/scalability_structure_l3t1.h"
#include "modules/video_coding/svc/scalability_structure_l3t1.h"
#include <vector>

8
modules/video_coding/codecs/av1/scalability_structure_l3t1.h → modules/video_coding/svc/scalability_structure_l3t1.h
View File

@ -7,11 +7,11 @@
* 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_AV1_SCALABILITY_STRUCTURE_L3T1_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L3T1_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L3T1_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L3T1_H_
#include "api/transport/rtp/dependency_descriptor.h"
#include "modules/video_coding/codecs/av1/scalability_structure_full_svc.h"
#include "modules/video_coding/svc/scalability_structure_full_svc.h"
namespace webrtc {
@ -31,4 +31,4 @@ class ScalabilityStructureL3T1 : public ScalabilityStructureFullSvc {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L3T1_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L3T1_H_

2
modules/video_coding/codecs/av1/scalability_structure_l3t3.cc → modules/video_coding/svc/scalability_structure_l3t3.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/codecs/av1/scalability_structure_l3t3.h"
#include "modules/video_coding/svc/scalability_structure_l3t3.h"
#include <vector>

8
modules/video_coding/codecs/av1/scalability_structure_l3t3.h → modules/video_coding/svc/scalability_structure_l3t3.h
View File

@ -7,11 +7,11 @@
* 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_AV1_SCALABILITY_STRUCTURE_L3T3_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L3T3_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L3T3_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L3T3_H_
#include "api/transport/rtp/dependency_descriptor.h"
#include "modules/video_coding/codecs/av1/scalability_structure_full_svc.h"
#include "modules/video_coding/svc/scalability_structure_full_svc.h"
namespace webrtc {
@ -26,4 +26,4 @@ class ScalabilityStructureL3T3 : public ScalabilityStructureFullSvc {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_L3T3_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_L3T3_H_

4
modules/video_coding/codecs/av1/scalability_structure_l3t3_unittest.cc → modules/video_coding/svc/scalability_structure_l3t3_unittest.cc
View File

@ -7,9 +7,9 @@
* 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/codecs/av1/scalability_structure_l3t3.h"
#include "modules/video_coding/svc/scalability_structure_l3t3.h"
#include "modules/video_coding/codecs/av1/scalability_structure_test_helpers.h"
#include "modules/video_coding/svc/scalability_structure_test_helpers.h"
#include "test/gmock.h"
#include "test/gtest.h"

2
modules/video_coding/codecs/av1/scalability_structure_s2t1.cc → modules/video_coding/svc/scalability_structure_s2t1.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/codecs/av1/scalability_structure_s2t1.h"
#include "modules/video_coding/svc/scalability_structure_s2t1.h"
#include <utility>
#include <vector>

8
modules/video_coding/codecs/av1/scalability_structure_s2t1.h → modules/video_coding/svc/scalability_structure_s2t1.h
View File

@ -7,14 +7,14 @@
* 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_AV1_SCALABILITY_STRUCTURE_S2T1_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_S2T1_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_S2T1_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_S2T1_H_
#include <vector>
#include "api/transport/rtp/dependency_descriptor.h"
#include "common_video/generic_frame_descriptor/generic_frame_info.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
namespace webrtc {
@ -37,4 +37,4 @@ class ScalabilityStructureS2T1 : public ScalableVideoController {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_S2T1_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_S2T1_H_

4
modules/video_coding/codecs/av1/scalability_structure_test_helpers.cc → modules/video_coding/svc/scalability_structure_test_helpers.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/codecs/av1/scalability_structure_test_helpers.h"
#include "modules/video_coding/svc/scalability_structure_test_helpers.h"
#include <stdint.h>
@ -18,8 +18,8 @@
#include "api/video/video_bitrate_allocation.h"
#include "api/video/video_frame_type.h"
#include "modules/video_coding/chain_diff_calculator.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/frame_dependencies_calculator.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
#include "test/gtest.h"
namespace webrtc {

8
modules/video_coding/codecs/av1/scalability_structure_test_helpers.h → modules/video_coding/svc/scalability_structure_test_helpers.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_CODECS_AV1_SCALABILITY_STRUCTURE_TEST_HELPERS_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_TEST_HELPERS_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_TEST_HELPERS_H_
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_TEST_HELPERS_H_
#include <stdint.h>
@ -18,8 +18,8 @@
#include "api/video/video_bitrate_allocation.h"
#include "common_video/generic_frame_descriptor/generic_frame_info.h"
#include "modules/video_coding/chain_diff_calculator.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/frame_dependencies_calculator.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
namespace webrtc {
@ -49,4 +49,4 @@ class ScalabilityStructureWrapper {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABILITY_STRUCTURE_TEST_HELPERS_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_TEST_HELPERS_H_

6
modules/video_coding/codecs/av1/scalability_structure_unittest.cc → modules/video_coding/svc/scalability_structure_unittest.cc
View File

@ -17,9 +17,9 @@
#include "absl/types/optional.h"
#include "api/transport/rtp/dependency_descriptor.h"
#include "modules/video_coding/codecs/av1/create_scalability_structure.h"
#include "modules/video_coding/codecs/av1/scalability_structure_test_helpers.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/svc/create_scalability_structure.h"
#include "modules/video_coding/svc/scalability_structure_test_helpers.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
#include "test/gmock.h"
#include "test/gtest.h"

6
modules/video_coding/codecs/av1/scalable_video_controller.h → modules/video_coding/svc/scalable_video_controller.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_CODECS_AV1_SCALABLE_VIDEO_CONTROLLER_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABLE_VIDEO_CONTROLLER_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABLE_VIDEO_CONTROLLER_H_
#define MODULES_VIDEO_CODING_SVC_SCALABLE_VIDEO_CONTROLLER_H_
#include <vector>
@ -136,4 +136,4 @@ ScalableVideoController::LayerFrameConfig::ReferenceAndUpdate(int buffer_id) {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABLE_VIDEO_CONTROLLER_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABLE_VIDEO_CONTROLLER_H_

2
modules/video_coding/codecs/av1/scalable_video_controller_no_layering.cc → modules/video_coding/svc/scalable_video_controller_no_layering.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/codecs/av1/scalable_video_controller_no_layering.h"
#include "modules/video_coding/svc/scalable_video_controller_no_layering.h"
#include <utility>
#include <vector>

8
modules/video_coding/codecs/av1/scalable_video_controller_no_layering.h → modules/video_coding/svc/scalable_video_controller_no_layering.h
View File

@ -7,14 +7,14 @@
* 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_AV1_SCALABLE_VIDEO_CONTROLLER_NO_LAYERING_H_
#define MODULES_VIDEO_CODING_CODECS_AV1_SCALABLE_VIDEO_CONTROLLER_NO_LAYERING_H_
#ifndef MODULES_VIDEO_CODING_SVC_SCALABLE_VIDEO_CONTROLLER_NO_LAYERING_H_
#define MODULES_VIDEO_CODING_SVC_SCALABLE_VIDEO_CONTROLLER_NO_LAYERING_H_
#include <vector>
#include "api/transport/rtp/dependency_descriptor.h"
#include "common_video/generic_frame_descriptor/generic_frame_info.h"
#include "modules/video_coding/codecs/av1/scalable_video_controller.h"
#include "modules/video_coding/svc/scalable_video_controller.h"
namespace webrtc {
@ -34,4 +34,4 @@ class ScalableVideoControllerNoLayering : public ScalableVideoController {
} // namespace webrtc
#endif // MODULES_VIDEO_CODING_CODECS_AV1_SCALABLE_VIDEO_CONTROLLER_NO_LAYERING_H_
#endif // MODULES_VIDEO_CODING_SVC_SCALABLE_VIDEO_CONTROLLER_NO_LAYERING_H_