Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Unified Diff: webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc

Issue 2489843002: Revert of Extract bitrate allocation of spatial/temporal layers out of codec impl. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc
diff --git a/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc b/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc
deleted file mode 100644
index cb701f20b62dad41d53c78a7fd61bbecc94b6e7a..0000000000000000000000000000000000000000
--- a/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2016 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.
- */
-
-#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
-
-namespace webrtc {
-
-DefaultVideoBitrateAllocator::DefaultVideoBitrateAllocator(
- const VideoCodec& codec)
- : codec_(codec) {}
-
-DefaultVideoBitrateAllocator::~DefaultVideoBitrateAllocator() {}
-
-BitrateAllocation DefaultVideoBitrateAllocator::GetAllocation(
- uint32_t total_bitrate_bps,
- uint32_t framerate) {
- BitrateAllocation allocation;
- if (total_bitrate_bps == 0)
- return allocation;
-
- if (total_bitrate_bps < codec_.minBitrate * 1000) {
- allocation.SetBitrate(0, 0, codec_.minBitrate * 1000);
- } else if (codec_.maxBitrate > 0 &&
- total_bitrate_bps > codec_.maxBitrate * 1000) {
- allocation.SetBitrate(0, 0, codec_.maxBitrate * 1000);
- } else {
- allocation.SetBitrate(0, 0, total_bitrate_bps);
- }
-
- return allocation;
-}
-
-uint32_t DefaultVideoBitrateAllocator::GetPreferredBitrateBps(
- uint32_t framerate) {
- return GetAllocation(codec_.maxBitrate * 1000, framerate).get_sum_bps();
-}
-
-} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698