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

Unified Diff: talk/session/media/audiomonitor.h

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Last rebase Created 4 years, 10 months 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
« no previous file with comments | « talk/libjingle_tests.gyp ('k') | talk/session/media/audiomonitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/session/media/audiomonitor.h
diff --git a/talk/session/media/audiomonitor.h b/talk/session/media/audiomonitor.h
deleted file mode 100644
index 7d96066f6709b0e4380028e64fa1cd9da0ec7426..0000000000000000000000000000000000000000
--- a/talk/session/media/audiomonitor.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * libjingle
- * Copyright 2004 Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TALK_SESSION_MEDIA_AUDIOMONITOR_H_
-#define TALK_SESSION_MEDIA_AUDIOMONITOR_H_
-
-#include <vector>
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/p2p/base/port.h"
-
-namespace cricket {
-
-class VoiceChannel;
-
-struct AudioInfo {
- int input_level;
- int output_level;
- typedef std::vector<std::pair<uint32_t, int> > StreamList;
- StreamList active_streams; // ssrcs contributing to output_level
-};
-
-class AudioMonitor : public rtc::MessageHandler,
- public sigslot::has_slots<> {
- public:
- AudioMonitor(VoiceChannel* voice_channel, rtc::Thread *monitor_thread);
- ~AudioMonitor();
-
- void Start(int cms);
- void Stop();
-
- VoiceChannel* voice_channel();
- rtc::Thread *monitor_thread();
-
- sigslot::signal2<AudioMonitor*, const AudioInfo&> SignalUpdate;
-
- protected:
- void OnMessage(rtc::Message *message);
- void PollVoiceChannel();
-
- AudioInfo audio_info_;
- VoiceChannel* voice_channel_;
- rtc::Thread* monitoring_thread_;
- rtc::CriticalSection crit_;
- uint32_t rate_;
- bool monitoring_;
-};
-
-}
-
-#endif // TALK_SESSION_MEDIA_AUDIOMONITOR_H_
« no previous file with comments | « talk/libjingle_tests.gyp ('k') | talk/session/media/audiomonitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698