| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2004 Google Inc. | 3 * Copyright 2004 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #ifndef TALK_SESSION_MEDIA_AUDIOMONITOR_H_ | 28 #ifndef TALK_SESSION_MEDIA_AUDIOMONITOR_H_ |
| 29 #define TALK_SESSION_MEDIA_AUDIOMONITOR_H_ | 29 #define TALK_SESSION_MEDIA_AUDIOMONITOR_H_ |
| 30 | 30 |
| 31 #include <vector> | 31 #include <vector> |
| 32 #include "webrtc/p2p/base/port.h" | |
| 33 #include "webrtc/base/sigslot.h" | 32 #include "webrtc/base/sigslot.h" |
| 34 #include "webrtc/base/thread.h" | 33 #include "webrtc/base/thread.h" |
| 34 #include "webrtc/p2p/base/port.h" |
| 35 | 35 |
| 36 namespace cricket { | 36 namespace cricket { |
| 37 | 37 |
| 38 class VoiceChannel; | 38 class VoiceChannel; |
| 39 | 39 |
| 40 struct AudioInfo { | 40 struct AudioInfo { |
| 41 int input_level; | 41 int input_level; |
| 42 int output_level; | 42 int output_level; |
| 43 typedef std::vector<std::pair<uint32_t, int> > StreamList; | 43 typedef std::vector<std::pair<uint32_t, int> > StreamList; |
| 44 StreamList active_streams; // ssrcs contributing to output_level | 44 StreamList active_streams; // ssrcs contributing to output_level |
| (...skipping 21 matching lines...) Expand all Loading... |
| 66 VoiceChannel* voice_channel_; | 66 VoiceChannel* voice_channel_; |
| 67 rtc::Thread* monitoring_thread_; | 67 rtc::Thread* monitoring_thread_; |
| 68 rtc::CriticalSection crit_; | 68 rtc::CriticalSection crit_; |
| 69 uint32_t rate_; | 69 uint32_t rate_; |
| 70 bool monitoring_; | 70 bool monitoring_; |
| 71 }; | 71 }; |
| 72 | 72 |
| 73 } | 73 } |
| 74 | 74 |
| 75 #endif // TALK_SESSION_MEDIA_AUDIOMONITOR_H_ | 75 #endif // TALK_SESSION_MEDIA_AUDIOMONITOR_H_ |
| OLD | NEW |