Index: media/cast/cast_defines.h |
diff --git a/media/cast/cast_defines.h b/media/cast/cast_defines.h |
index 944a49d8700b5c26fcb45ac45c2d487055a7c526..aad7ae2b1d8db9facdb6cae58073763733fadfbc 100644 |
--- a/media/cast/cast_defines.h |
+++ b/media/cast/cast_defines.h |
@@ -18,9 +18,9 @@ namespace cast { |
const int64 kDontShowTimeoutMs = 33; |
const float kDefaultCongestionControlBackOff = 0.875f; |
-const uint32 kStartFrameId = GG_UINT32_C(0xffffffff); |
const uint32 kVideoFrequency = 90000; |
const int64 kSkippedFramesCheckPeriodkMs = 10000; |
+const uint32 kStartFrameId = GG_UINT32_C(0xffffffff); |
// Number of skipped frames threshold in fps (as configured) per period above. |
const int kSkippedFramesThreshold = 3; |
@@ -140,69 +140,6 @@ inline base::TimeTicks ConvertNtpToTimeTicks(uint32 ntp_seconds, |
return base::TimeTicks::UnixEpoch() + elapsed_since_unix_epoch; |
} |
-class FrameIdWrapHelper { |
- public: |
- FrameIdWrapHelper() |
- : first_(true), |
- frame_id_wrap_count_(0), |
- range_(kLowRange) {} |
- |
- uint32 MapTo32bitsFrameId(const uint8 over_the_wire_frame_id) { |
- if (first_) { |
- first_ = false; |
- if (over_the_wire_frame_id == 0xff) { |
- // Special case for startup. |
- return kStartFrameId; |
- } |
- } |
- |
- uint32 wrap_count = frame_id_wrap_count_; |
- switch (range_) { |
- case kLowRange: |
- if (over_the_wire_frame_id > kLowRangeThreshold && |
- over_the_wire_frame_id < kHighRangeThreshold) { |
- range_ = kMiddleRange; |
- } |
- if (over_the_wire_frame_id > kHighRangeThreshold) { |
- // Wrap count was incremented in High->Low transition, but this frame |
- // is 'old', actually from before the wrap count got incremented. |
- --wrap_count; |
- } |
- break; |
- case kMiddleRange: |
- if (over_the_wire_frame_id > kHighRangeThreshold) { |
- range_ = kHighRange; |
- } |
- break; |
- case kHighRange: |
- if (over_the_wire_frame_id < kLowRangeThreshold) { |
- // Wrap-around detected. |
- range_ = kLowRange; |
- ++frame_id_wrap_count_; |
- // Frame triggering wrap-around so wrap count should be incremented as |
- // as well to match |frame_id_wrap_count_|. |
- ++wrap_count; |
- } |
- break; |
- } |
- return (wrap_count << 8) + over_the_wire_frame_id; |
- } |
- |
- private: |
- enum Range { |
- kLowRange, |
- kMiddleRange, |
- kHighRange, |
- }; |
- |
- static const uint8 kLowRangeThreshold = 0x0f; |
- static const uint8 kHighRangeThreshold = 0xf0; |
- |
- bool first_; |
- uint32 frame_id_wrap_count_; |
- Range range_; |
-}; |
- |
inline std::string GetAesNonce(uint32 frame_id, const std::string& iv_mask) { |
std::string aes_nonce(kAesBlockSize, 0); |