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

Unified Diff: webrtc/media/webrtc/webrtcvoiceengine.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) 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 | « webrtc/media/webrtc/webrtcvoiceengine.h ('k') | webrtc/media/webrtc/webrtcvoiceengine_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/webrtc/webrtcvoiceengine.cc
diff --git a/talk/media/webrtc/webrtcvoiceengine.cc b/webrtc/media/webrtc/webrtcvoiceengine.cc
similarity index 99%
rename from talk/media/webrtc/webrtcvoiceengine.cc
rename to webrtc/media/webrtc/webrtcvoiceengine.cc
index 150042300de48cd572d46854784ba21550602a31..afdc6783ace9434805574425bf6e2ecaa46b9af1 100644
--- a/talk/media/webrtc/webrtcvoiceengine.cc
+++ b/webrtc/media/webrtc/webrtcvoiceengine.cc
@@ -31,19 +31,13 @@
#ifdef HAVE_WEBRTC_VOICE
-#include "talk/media/webrtc/webrtcvoiceengine.h"
+#include "webrtc/media/webrtc/webrtcvoiceengine.h"
#include <algorithm>
#include <cstdio>
#include <string>
#include <vector>
-#include "talk/media/base/audioframe.h"
-#include "talk/media/base/audiorenderer.h"
-#include "talk/media/base/constants.h"
-#include "talk/media/base/streamparams.h"
-#include "talk/media/webrtc/webrtcmediaengine.h"
-#include "talk/media/webrtc/webrtcvoe.h"
#include "webrtc/audio/audio_sink.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/base/base64.h"
@@ -55,6 +49,12 @@
#include "webrtc/base/stringutils.h"
#include "webrtc/call/rtc_event_log.h"
#include "webrtc/common.h"
+#include "webrtc/media/base/audioframe.h"
+#include "webrtc/media/base/audiorenderer.h"
+#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/streamparams.h"
+#include "webrtc/media/webrtc/webrtcmediaengine.h"
+#include "webrtc/media/webrtc/webrtcvoe.h"
#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/system_wrappers/include/field_trial.h"
« no previous file with comments | « webrtc/media/webrtc/webrtcvoiceengine.h ('k') | webrtc/media/webrtc/webrtcvoiceengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698