OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #include "webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h" | 11 #include "webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h" |
12 | 12 |
13 #include "webrtc/base/checks.h" | 13 #include "webrtc/base/checks.h" |
14 | 14 |
15 namespace voetest { | 15 namespace voetest { |
16 | 16 |
17 void LoudestFilter::RemoveTimeoutStreams(uint32_t time_ms) { | 17 void LoudestFilter::RemoveTimeoutStreams(int64_t time_ms) { |
18 auto it = stream_levels_.begin(); | 18 auto it = stream_levels_.begin(); |
19 while (it != stream_levels_.end()) { | 19 while (it != stream_levels_.end()) { |
20 if (rtc::TimeDiff(time_ms, it->second.last_time_ms) > | 20 if (rtc::TimeDiff(time_ms, it->second.last_time_ms) > kStreamTimeOutMs) { |
21 kStreamTimeOutMs) { | |
22 stream_levels_.erase(it++); | 21 stream_levels_.erase(it++); |
23 } else { | 22 } else { |
24 ++it; | 23 ++it; |
25 } | 24 } |
26 } | 25 } |
27 } | 26 } |
28 | 27 |
29 unsigned int LoudestFilter::FindQuietestStream() { | 28 unsigned int LoudestFilter::FindQuietestStream() { |
30 int quietest_level = kInvalidAudioLevel; | 29 int quietest_level = kInvalidAudioLevel; |
31 unsigned int quietest_ssrc = 0; | 30 unsigned int quietest_ssrc = 0; |
32 for (auto stream : stream_levels_) { | 31 for (auto stream : stream_levels_) { |
33 // A smaller value if audio level corresponds to a louder sound. | 32 // A smaller value if audio level corresponds to a louder sound. |
34 if (quietest_level == kInvalidAudioLevel || | 33 if (quietest_level == kInvalidAudioLevel || |
35 stream.second.audio_level > quietest_level) { | 34 stream.second.audio_level > quietest_level) { |
36 quietest_level = stream.second.audio_level; | 35 quietest_level = stream.second.audio_level; |
37 quietest_ssrc = stream.first; | 36 quietest_ssrc = stream.first; |
38 } | 37 } |
39 } | 38 } |
40 return quietest_ssrc; | 39 return quietest_ssrc; |
41 } | 40 } |
42 | 41 |
43 bool LoudestFilter::ForwardThisPacket(const webrtc::RTPHeader& rtp_header) { | 42 bool LoudestFilter::ForwardThisPacket(const webrtc::RTPHeader& rtp_header) { |
44 uint32_t time_now_ms = rtc::Time(); | 43 int64_t time_now_ms = rtc::TimeMillis(); |
45 RemoveTimeoutStreams(time_now_ms); | 44 RemoveTimeoutStreams(time_now_ms); |
46 | 45 |
47 int source_ssrc = rtp_header.ssrc; | 46 int source_ssrc = rtp_header.ssrc; |
48 int audio_level = rtp_header.extension.hasAudioLevel ? | 47 int audio_level = rtp_header.extension.hasAudioLevel ? |
49 rtp_header.extension.audioLevel : kInvalidAudioLevel; | 48 rtp_header.extension.audioLevel : kInvalidAudioLevel; |
50 | 49 |
51 if (audio_level == kInvalidAudioLevel) { | 50 if (audio_level == kInvalidAudioLevel) { |
52 // Always forward streams with unknown audio level, and don't keep their | 51 // Always forward streams with unknown audio level, and don't keep their |
53 // states. | 52 // states. |
54 return true; | 53 return true; |
(...skipping 18 matching lines...) Expand all Loading... |
73 if (audio_level < stream_levels_[quietest_ssrc].audio_level) { | 72 if (audio_level < stream_levels_[quietest_ssrc].audio_level) { |
74 stream_levels_.erase(quietest_ssrc); | 73 stream_levels_.erase(quietest_ssrc); |
75 stream_levels_[source_ssrc].Set(audio_level, time_now_ms); | 74 stream_levels_[source_ssrc].Set(audio_level, time_now_ms); |
76 return true; | 75 return true; |
77 } | 76 } |
78 return false; | 77 return false; |
79 } | 78 } |
80 | 79 |
81 } // namespace voetest | 80 } // namespace voetest |
82 | 81 |
OLD | NEW |