Reason for revert: Seems to be causing flakiness in perf test: FullStackTest.ScreenshareSlidesVP8_2TL_LossyNet Original issue's description: > Reland of Issue 2434073003: Extract bitrate allocation ... > > This is a reland of https://codereview.webrtc.org/2434073003/ including > some fixes for failing test cases. > > Original description: > > Extract bitrate allocation of spatial/temporal layers out of codec impl. > > This CL makes a number of intervowen changes: > > * Add BitrateAllocation struct, that contains a codec independent view > of how the target bitrate is distributed over spatial and temporal > layers. > > * Adds the BitrateAllocator interface, which takes a bitrate and frame > rate and produces a BitrateAllocation. > > * A default (non layered) implementation is added, and > SimulcastRateAllocator is extended to fully handle VP8 allocation. > This includes capturing TemporalLayer instances created by the > encoder. > > * ViEEncoder now owns both the bitrate allocator and the temporal layer > factories for VP8. This allows allocation to happen fully outside of > the encoder implementation. > > This refactoring will make it possible for ViEEncoder to signal the > full picture of target bitrates to the RTCP module. > > BUG=webrtc:6301 > > Committed: https://crrev.com/647bf43dcb2fd16fccf276bd94dc4400728bb405 > Cr-Commit-Position: refs/heads/master@{#15023} TBR=mflodman@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6301 Review-Url: https://codereview.webrtc.org/2491393002 Cr-Commit-Position: refs/heads/master@{#15026}
138 lines
3.6 KiB
Plaintext
138 lines
3.6 KiB
Plaintext
# Copyright (c) 2014 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("../build/webrtc.gni")
|
|
|
|
config("common_video_config") {
|
|
include_dirs = [
|
|
"include",
|
|
"libyuv/include",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("common_video") {
|
|
sources = [
|
|
"bitrate_adjuster.cc",
|
|
"h264/h264_bitstream_parser.cc",
|
|
"h264/h264_bitstream_parser.h",
|
|
"h264/h264_common.cc",
|
|
"h264/h264_common.h",
|
|
"h264/pps_parser.cc",
|
|
"h264/pps_parser.h",
|
|
"h264/profile_level_id.cc",
|
|
"h264/profile_level_id.h",
|
|
"h264/sps_parser.cc",
|
|
"h264/sps_parser.h",
|
|
"h264/sps_vui_rewriter.cc",
|
|
"h264/sps_vui_rewriter.h",
|
|
"i420_buffer_pool.cc",
|
|
"include/bitrate_adjuster.h",
|
|
"include/frame_callback.h",
|
|
"include/i420_buffer_pool.h",
|
|
"include/incoming_video_stream.h",
|
|
"include/video_frame_buffer.h",
|
|
"incoming_video_stream.cc",
|
|
"libyuv/include/webrtc_libyuv.h",
|
|
"libyuv/webrtc_libyuv.cc",
|
|
"video_frame.cc",
|
|
"video_frame_buffer.cc",
|
|
"video_render_frames.cc",
|
|
"video_render_frames.h",
|
|
]
|
|
|
|
include_dirs = [ "../modules/interface" ]
|
|
|
|
public_configs = [ ":common_video_config" ]
|
|
|
|
if (!build_with_chromium && is_clang) {
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
}
|
|
|
|
deps = [
|
|
"..:webrtc_common",
|
|
"../base:rtc_task_queue",
|
|
"../system_wrappers",
|
|
]
|
|
|
|
if (rtc_build_libyuv) {
|
|
deps += [ "$rtc_libyuv_dir" ]
|
|
public_deps = [
|
|
"$rtc_libyuv_dir",
|
|
]
|
|
} else {
|
|
# Need to add a directory normally exported by libyuv.
|
|
include_dirs += [ "$rtc_libyuv_dir/include" ]
|
|
}
|
|
|
|
if (is_ios || is_mac) {
|
|
sources += [
|
|
"corevideo_frame_buffer.cc",
|
|
"include/corevideo_frame_buffer.h",
|
|
]
|
|
libs = [ "CoreVideo.framework" ]
|
|
}
|
|
}
|
|
|
|
if (rtc_include_tests) {
|
|
common_video_resources = [ "//resources/foreman_cif.yuv" ]
|
|
|
|
if (is_ios) {
|
|
bundle_data("common_video_unittests_bundle_data") {
|
|
testonly = true
|
|
sources = common_video_resources
|
|
outputs = [
|
|
"{{bundle_resources_dir}}/{{source_file_part}}",
|
|
]
|
|
}
|
|
}
|
|
|
|
rtc_test("common_video_unittests") {
|
|
testonly = true
|
|
|
|
sources = [
|
|
"bitrate_adjuster_unittest.cc",
|
|
"h264/h264_bitstream_parser_unittest.cc",
|
|
"h264/pps_parser_unittest.cc",
|
|
"h264/profile_level_id_unittest.cc",
|
|
"h264/sps_parser_unittest.cc",
|
|
"h264/sps_vui_rewriter_unittest.cc",
|
|
"i420_buffer_pool_unittest.cc",
|
|
"i420_video_frame_unittest.cc",
|
|
"libyuv/libyuv_unittest.cc",
|
|
]
|
|
|
|
# TODO(jschuh): Bug 1348: fix this warning.
|
|
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
|
|
|
if (!build_with_chromium && is_clang) {
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
}
|
|
|
|
deps = [
|
|
":common_video",
|
|
"../system_wrappers:system_wrappers",
|
|
"../test:test_support_main",
|
|
"../test:video_test_common",
|
|
"//testing/gmock",
|
|
"//testing/gtest",
|
|
]
|
|
|
|
data = common_video_resources
|
|
if (is_android) {
|
|
deps += [ "//testing/android/native_test:native_test_support" ]
|
|
shard_timeout = 900
|
|
}
|
|
|
|
if (is_ios) {
|
|
deps += [ ":common_video_unittests_bundle_data" ]
|
|
}
|
|
}
|
|
}
|