Revert of Extract bitrate allocation of spatial/temporal layers out of codec impl.

webrtc/common_types.cc

 /*
  *  Copyright (c) 2012 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/base/checks.h"
 #include "webrtc/common_types.h"
 
-#include <limits>
 #include <string.h>
 
 namespace webrtc {
 
 StreamDataCounters::StreamDataCounters() : first_packet_time_ms(-1) {}
 
 RTPHeaderExtension::RTPHeaderExtension()
     : hasTransmissionTimeOffset(false),
       transmissionTimeOffset(0),
       hasAbsoluteSendTime(false),
@@ skipping 28 matching lines @@
       startBitrate(0),
       maxBitrate(0),
       minBitrate(0),
       targetBitrate(0),
       maxFramerate(0),
       qpMax(0),
       numberOfSimulcastStreams(0),
       simulcastStream(),
       spatialLayers(),
       mode(kRealtimeVideo),
-      expect_encode_from_texture(false),
       codecSpecific() {}
 
 VideoCodecVP8* VideoCodec::VP8() {
   RTC_DCHECK_EQ(codecType, kVideoCodecVP8);
   return &codecSpecific.VP8;
 }
 
 const VideoCodecVP8& VideoCodec::VP8() const {
   RTC_DCHECK_EQ(codecType, kVideoCodecVP8);
   return codecSpecific.VP8;
@@ skipping 12 matching lines @@
 VideoCodecH264* VideoCodec::H264() {
   RTC_DCHECK_EQ(codecType, kVideoCodecH264);
   return &codecSpecific.H264;
 }
 
 const VideoCodecH264& VideoCodec::H264() const {
   RTC_DCHECK_EQ(codecType, kVideoCodecH264);
   return codecSpecific.H264;
 }
 
-static const char* kPayloadNameVp8 = "VP8";
-static const char* kPayloadNameVp9 = "VP9";
-static const char* kPayloadNameH264 = "H264";
-static const char* kPayloadNameI420 = "I420";
-static const char* kPayloadNameRED = "RED";
-static const char* kPayloadNameULPFEC = "ULPFEC";
-static const char* kPayloadNameGeneric = "Generic";
-
-rtc::Optional<std::string> CodecTypeToPayloadName(VideoCodecType type) {
-  switch (type) {
-    case kVideoCodecVP8:
-      return rtc::Optional<std::string>(kPayloadNameVp8);
-    case kVideoCodecVP9:
-      return rtc::Optional<std::string>(kPayloadNameVp9);
-    case kVideoCodecH264:
-      return rtc::Optional<std::string>(kPayloadNameH264);
-    case kVideoCodecI420:
-      return rtc::Optional<std::string>(kPayloadNameI420);
-    case kVideoCodecRED:
-      return rtc::Optional<std::string>(kPayloadNameRED);
-    case kVideoCodecULPFEC:
-      return rtc::Optional<std::string>(kPayloadNameULPFEC);
-    case kVideoCodecGeneric:
-      return rtc::Optional<std::string>(kPayloadNameGeneric);
-    default:
-      return rtc::Optional<std::string>();
-  }
-}
-
-rtc::Optional<VideoCodecType> PayloadNameToCodecType(const std::string& name) {
-  if (name == kPayloadNameVp8)
-    return rtc::Optional<VideoCodecType>(kVideoCodecVP8);
-  if (name == kPayloadNameVp9)
-    return rtc::Optional<VideoCodecType>(kVideoCodecVP9);
-  if (name == kPayloadNameH264)
-    return rtc::Optional<VideoCodecType>(kVideoCodecH264);
-  if (name == kPayloadNameI420)
-    return rtc::Optional<VideoCodecType>(kVideoCodecI420);
-  if (name == kPayloadNameRED)
-    return rtc::Optional<VideoCodecType>(kVideoCodecRED);
-  if (name == kPayloadNameULPFEC)
-    return rtc::Optional<VideoCodecType>(kVideoCodecULPFEC);
-  if (name == kPayloadNameGeneric)
-    return rtc::Optional<VideoCodecType>(kVideoCodecGeneric);
-  return rtc::Optional<VideoCodecType>();
-}
-
-const size_t BitrateAllocation::kMaxBitrateBps =
-    std::numeric_limits<size_t>::max();
-
-BitrateAllocation::BitrateAllocation() : sum_(0), bitrates_{} {}
-
-bool BitrateAllocation::SetBitrate(size_t spatial_index,
-                                   size_t temporal_index,
-                                   uint32_t bitrate_bps) {
-  RTC_DCHECK_LT(spatial_index, static_cast<size_t>(kMaxSpatialLayers));
-  RTC_DCHECK_LT(temporal_index, static_cast<size_t>(kMaxTemporalStreams));
-  RTC_DCHECK_LE(bitrates_[spatial_index][temporal_index], sum_);
-  uint64_t new_bitrate_sum_bps = sum_;
-  new_bitrate_sum_bps -= bitrates_[spatial_index][temporal_index];
-  new_bitrate_sum_bps += bitrate_bps;
-  if (new_bitrate_sum_bps > kMaxBitrateBps)
-    return false;
-
-  bitrates_[spatial_index][temporal_index] = bitrate_bps;
-  sum_ = static_cast<uint32_t>(new_bitrate_sum_bps);
-  return true;
-}
-
-uint32_t BitrateAllocation::GetBitrate(size_t spatial_index,
-                                       size_t temporal_index) const {
-  RTC_DCHECK_LT(spatial_index, static_cast<size_t>(kMaxSpatialLayers));
-  RTC_DCHECK_LT(temporal_index, static_cast<size_t>(kMaxTemporalStreams));
-  return bitrates_[spatial_index][temporal_index];
-}
-
-// Get the sum of all the temporal layer for a specific spatial layer.
-uint32_t BitrateAllocation::GetSpatialLayerSum(size_t spatial_index) const {
-  RTC_DCHECK_LT(spatial_index, static_cast<size_t>(kMaxSpatialLayers));
-  uint32_t sum = 0;
-  for (int i = 0; i < kMaxTemporalStreams; ++i)
-    sum += bitrates_[spatial_index][i];
-  return sum;
-}
-
 }  // namespace webrtc