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

Unified Diff: webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc

Issue 2241243002: Revert of Added new mixer to |check_targets| in .gn and fixed include/depend errors. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@mixer_dir_structure_comments
Patch Set: Created 4 years, 4 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 | « webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc
diff --git a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc
index 48380fc550129a6ea62882fe96941a5148473701..5be76ec4d02df415711fc9fa9a1e504ea86da213 100644
--- a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc
+++ b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.cc
@@ -19,6 +19,7 @@
#include "webrtc/modules/utility/include/audio_frame_operations.h"
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/voice_engine/utility.h"
namespace webrtc {
namespace {
@@ -140,8 +141,6 @@
time_stamp_(0) {
thread_checker_.DetachFromThread();
}
-
-NewAudioConferenceMixerImpl::~NewAudioConferenceMixerImpl() {}
bool NewAudioConferenceMixerImpl::Init() {
crit_.reset(CriticalSectionWrapper::CreateCriticalSection());
« no previous file with comments | « webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698