From 5ad129741cbf6c5e7789f41028798a90de2b34df Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Fri, 12 Feb 2016 06:39:40 +0100 Subject: [PATCH] Rename webrtc/media/webrtc -> webrtc/media/engine BUG=webrtc:5420 NOTRY=True R=pthatcher@google.com, pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/1684163002 . Cr-Commit-Position: refs/heads/master@{#11591} --- talk/session/media/channelmanager_unittest.cc | 2 +- webrtc/api/androidvideocapturer.cc | 2 +- webrtc/api/java/jni/androidmediadecoder_jni.h | 2 +- webrtc/api/java/jni/androidmediaencoder_jni.h | 2 +- webrtc/api/java/jni/peerconnection_jni.cc | 4 +- webrtc/api/peerconnection_unittest.cc | 2 +- webrtc/api/peerconnectionfactory.cc | 6 +-- webrtc/api/peerconnectionfactory_unittest.cc | 4 +- webrtc/api/remotevideocapturer_unittest.cc | 2 +- webrtc/api/videosource_unittest.cc | 2 +- webrtc/api/videotrack_unittest.cc | 2 +- webrtc/api/videotrackrenderers.cc | 2 +- webrtc/api/webrtcsession_unittest.cc | 2 +- webrtc/media/base/fakevideocapturer.h | 2 +- webrtc/media/base/mediaengine.cc | 2 +- webrtc/media/base/videocapturer.cc | 4 +- webrtc/media/base/videoengine_unittest.h | 2 +- webrtc/media/devices/devicemanager.cc | 2 +- webrtc/media/{webrtc => engine}/constants.h | 6 +-- .../{webrtc => engine}/fakewebrtccall.cc | 2 +- .../media/{webrtc => engine}/fakewebrtccall.h | 4 +- .../{webrtc => engine}/fakewebrtccommon.h | 6 +-- .../{webrtc => engine}/fakewebrtcdeviceinfo.h | 8 ++-- .../{webrtc => engine}/fakewebrtcvcmfactory.h | 10 ++--- .../fakewebrtcvideocapturemodule.h | 10 ++--- .../fakewebrtcvideoengine.h | 12 ++--- .../fakewebrtcvoiceengine.h | 10 ++--- .../nullwebrtcvideoengine.h | 6 +-- .../nullwebrtcvideoengine_unittest.cc | 4 +- webrtc/media/{webrtc => engine}/simulcast.cc | 2 +- webrtc/media/{webrtc => engine}/simulcast.h | 6 +-- .../{webrtc => engine}/simulcast_unittest.cc | 2 +- .../media/{webrtc => engine}/webrtccommon.h | 6 +-- .../{webrtc => engine}/webrtcmediaengine.cc | 8 ++-- .../{webrtc => engine}/webrtcmediaengine.h | 6 +-- .../webrtcmediaengine_unittest.cc | 2 +- .../{webrtc => engine}/webrtcvideocapturer.cc | 6 +-- .../{webrtc => engine}/webrtcvideocapturer.h | 8 ++-- .../webrtcvideocapturer_unittest.cc | 4 +- .../webrtcvideocapturerfactory.cc | 4 +- .../webrtcvideocapturerfactory.h | 6 +-- .../webrtcvideochannelfactory.h | 6 +-- .../webrtcvideodecoderfactory.h | 6 +-- .../webrtcvideoencoderfactory.h | 6 +-- .../{webrtc => engine}/webrtcvideoengine2.cc | 16 +++---- .../{webrtc => engine}/webrtcvideoengine2.h | 12 ++--- .../webrtcvideoengine2_unittest.cc | 12 ++--- .../{webrtc => engine}/webrtcvideoframe.cc | 2 +- .../{webrtc => engine}/webrtcvideoframe.h | 6 +-- .../webrtcvideoframe_unittest.cc | 2 +- .../webrtcvideoframefactory.cc | 4 +- .../webrtcvideoframefactory.h | 6 +-- .../webrtcvideoframefactory_unittest.cc | 4 +- webrtc/media/{webrtc => engine}/webrtcvoe.h | 8 ++-- .../{webrtc => engine}/webrtcvoiceengine.cc | 6 +-- .../{webrtc => engine}/webrtcvoiceengine.h | 10 ++--- .../webrtcvoiceengine_unittest.cc | 6 +-- webrtc/media/media.gyp | 44 +++++++++---------- webrtc/media/media_tests.gypi | 34 +++++++------- 59 files changed, 187 insertions(+), 187 deletions(-) rename webrtc/media/{webrtc => engine}/constants.h (84%) rename webrtc/media/{webrtc => engine}/fakewebrtccall.cc (99%) rename webrtc/media/{webrtc => engine}/fakewebrtccall.h (98%) rename webrtc/media/{webrtc => engine}/fakewebrtccommon.h (88%) rename webrtc/media/{webrtc => engine}/fakewebrtcdeviceinfo.h (94%) rename webrtc/media/{webrtc => engine}/fakewebrtcvcmfactory.h (84%) rename webrtc/media/{webrtc => engine}/fakewebrtcvideocapturemodule.h (92%) rename webrtc/media/{webrtc => engine}/fakewebrtcvideoengine.h (95%) rename webrtc/media/{webrtc => engine}/fakewebrtcvoiceengine.h (99%) rename webrtc/media/{webrtc => engine}/nullwebrtcvideoengine.h (89%) rename webrtc/media/{webrtc => engine}/nullwebrtcvideoengine_unittest.cc (92%) rename webrtc/media/{webrtc => engine}/simulcast.cc (99%) rename webrtc/media/{webrtc => engine}/simulcast.h (93%) rename webrtc/media/{webrtc => engine}/simulcast_unittest.cc (97%) rename webrtc/media/{webrtc => engine}/webrtccommon.h (94%) rename webrtc/media/{webrtc => engine}/webrtcmediaengine.cc (95%) rename webrtc/media/{webrtc => engine}/webrtcmediaengine.h (91%) rename webrtc/media/{webrtc => engine}/webrtcmediaengine_unittest.cc (99%) rename webrtc/media/{webrtc => engine}/webrtcvideocapturer.cc (98%) rename webrtc/media/{webrtc => engine}/webrtcvideocapturer.h (94%) rename webrtc/media/{webrtc => engine}/webrtcvideocapturer_unittest.cc (98%) rename webrtc/media/{webrtc => engine}/webrtcvideocapturerfactory.cc (87%) rename webrtc/media/{webrtc => engine}/webrtcvideocapturerfactory.h (81%) rename webrtc/media/{webrtc => engine}/webrtcvideochannelfactory.h (81%) rename webrtc/media/{webrtc => engine}/webrtcvideodecoderfactory.h (84%) rename webrtc/media/{webrtc => engine}/webrtcvideoencoderfactory.h (91%) rename webrtc/media/{webrtc => engine}/webrtcvideoengine2.cc (99%) rename webrtc/media/{webrtc => engine}/webrtcvideoengine2.h (98%) rename webrtc/media/{webrtc => engine}/webrtcvideoengine2_unittest.cc (99%) rename webrtc/media/{webrtc => engine}/webrtcvideoframe.cc (99%) rename webrtc/media/{webrtc => engine}/webrtcvideoframe.h (96%) rename webrtc/media/{webrtc => engine}/webrtcvideoframe_unittest.cc (99%) rename webrtc/media/{webrtc => engine}/webrtcvideoframefactory.cc (89%) rename webrtc/media/{webrtc => engine}/webrtcvideoframefactory.h (83%) rename webrtc/media/{webrtc => engine}/webrtcvideoframefactory_unittest.cc (97%) rename webrtc/media/{webrtc => engine}/webrtcvoe.h (95%) rename webrtc/media/{webrtc => engine}/webrtcvoiceengine.cc (99%) rename webrtc/media/{webrtc => engine}/webrtcvoiceengine.h (97%) rename webrtc/media/{webrtc => engine}/webrtcvoiceengine_unittest.cc (99%) diff --git a/talk/session/media/channelmanager_unittest.cc b/talk/session/media/channelmanager_unittest.cc index 98497a34b4..8137436ea9 100644 --- a/talk/session/media/channelmanager_unittest.cc +++ b/talk/session/media/channelmanager_unittest.cc @@ -34,7 +34,7 @@ #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/fakevideocapturer.h" #include "webrtc/media/base/testutils.h" -#include "webrtc/media/webrtc/fakewebrtccall.h" +#include "webrtc/media/engine/fakewebrtccall.h" #include "webrtc/p2p/base/faketransportcontroller.h" namespace cricket { diff --git a/webrtc/api/androidvideocapturer.cc b/webrtc/api/androidvideocapturer.cc index bab1402eda..4311fd7a2e 100644 --- a/webrtc/api/androidvideocapturer.cc +++ b/webrtc/api/androidvideocapturer.cc @@ -14,7 +14,7 @@ #include "webrtc/base/common.h" #include "webrtc/base/json.h" #include "webrtc/base/timeutils.h" -#include "webrtc/media/webrtc/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframe.h" namespace webrtc { diff --git a/webrtc/api/java/jni/androidmediadecoder_jni.h b/webrtc/api/java/jni/androidmediadecoder_jni.h index 73df2ab57c..8ee23bec0a 100644 --- a/webrtc/api/java/jni/androidmediadecoder_jni.h +++ b/webrtc/api/java/jni/androidmediadecoder_jni.h @@ -12,7 +12,7 @@ #define WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_ #include "webrtc/api/java/jni/eglbase_jni.h" -#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" +#include "webrtc/media/engine/webrtcvideodecoderfactory.h" namespace webrtc_jni { diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.h b/webrtc/api/java/jni/androidmediaencoder_jni.h index d7908b4dfa..c0b5f028bd 100644 --- a/webrtc/api/java/jni/androidmediaencoder_jni.h +++ b/webrtc/api/java/jni/androidmediaencoder_jni.h @@ -14,7 +14,7 @@ #include #include "webrtc/api/java/jni/eglbase_jni.h" -#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" +#include "webrtc/media/engine/webrtcvideoencoderfactory.h" namespace webrtc_jni { diff --git a/webrtc/api/java/jni/peerconnection_jni.cc b/webrtc/api/java/jni/peerconnection_jni.cc index a19e79a624..3997805ef9 100644 --- a/webrtc/api/java/jni/peerconnection_jni.cc +++ b/webrtc/api/java/jni/peerconnection_jni.cc @@ -68,8 +68,8 @@ #include "webrtc/media/base/videocapturer.h" #include "webrtc/media/base/videorenderer.h" #include "webrtc/media/devices/videorendererfactory.h" -#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" -#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" +#include "webrtc/media/engine/webrtcvideodecoderfactory.h" +#include "webrtc/media/engine/webrtcvideoencoderfactory.h" #include "webrtc/modules/video_render/video_render_internal.h" #include "webrtc/system_wrappers/include/field_trial_default.h" #include "webrtc/system_wrappers/include/logcat_trace_context.h" diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc index b4d6c55de5..9cb0faf5a3 100644 --- a/webrtc/api/peerconnection_unittest.cc +++ b/webrtc/api/peerconnection_unittest.cc @@ -38,7 +38,7 @@ #include "webrtc/base/sslstreamadapter.h" #include "webrtc/base/thread.h" #include "webrtc/base/virtualsocketserver.h" -#include "webrtc/media/webrtc/fakewebrtcvideoengine.h" +#include "webrtc/media/engine/fakewebrtcvideoengine.h" #include "webrtc/p2p/base/constants.h" #include "webrtc/p2p/base/sessiondescription.h" #include "webrtc/p2p/client/fakeportallocator.h" diff --git a/webrtc/api/peerconnectionfactory.cc b/webrtc/api/peerconnectionfactory.cc index 175b607ca8..c3dec666f5 100644 --- a/webrtc/api/peerconnectionfactory.cc +++ b/webrtc/api/peerconnectionfactory.cc @@ -24,9 +24,9 @@ #include "webrtc/api/videosourceproxy.h" #include "webrtc/api/videotrack.h" #include "webrtc/base/bind.h" -#include "webrtc/media/webrtc/webrtcmediaengine.h" -#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" -#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" +#include "webrtc/media/engine/webrtcmediaengine.h" +#include "webrtc/media/engine/webrtcvideodecoderfactory.h" +#include "webrtc/media/engine/webrtcvideoencoderfactory.h" #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/p2p/base/basicpacketsocketfactory.h" #include "webrtc/p2p/client/basicportallocator.h" diff --git a/webrtc/api/peerconnectionfactory_unittest.cc b/webrtc/api/peerconnectionfactory_unittest.cc index 2a0e9c035b..b874f95a79 100644 --- a/webrtc/api/peerconnectionfactory_unittest.cc +++ b/webrtc/api/peerconnectionfactory_unittest.cc @@ -23,8 +23,8 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread.h" #include "webrtc/media/base/fakevideocapturer.h" -#include "webrtc/media/webrtc/webrtccommon.h" -#include "webrtc/media/webrtc/webrtcvoe.h" +#include "webrtc/media/engine/webrtccommon.h" +#include "webrtc/media/engine/webrtcvoe.h" #include "webrtc/p2p/client/fakeportallocator.h" using webrtc::DataChannelInterface; diff --git a/webrtc/api/remotevideocapturer_unittest.cc b/webrtc/api/remotevideocapturer_unittest.cc index 5d9672dbe9..c31272c4d6 100644 --- a/webrtc/api/remotevideocapturer_unittest.cc +++ b/webrtc/api/remotevideocapturer_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/api/remotevideocapturer.h" #include "webrtc/base/gunit.h" -#include "webrtc/media/webrtc/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframe.h" using cricket::CaptureState; using cricket::VideoCapturer; diff --git a/webrtc/api/videosource_unittest.cc b/webrtc/api/videosource_unittest.cc index 8742529970..d8ca1a5787 100644 --- a/webrtc/api/videosource_unittest.cc +++ b/webrtc/api/videosource_unittest.cc @@ -19,7 +19,7 @@ #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/fakevideocapturer.h" #include "webrtc/media/base/fakevideorenderer.h" -#include "webrtc/media/webrtc/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframe.h" using webrtc::FakeConstraints; using webrtc::VideoSource; diff --git a/webrtc/api/videotrack_unittest.cc b/webrtc/api/videotrack_unittest.cc index d45186363b..face9f90b4 100644 --- a/webrtc/api/videotrack_unittest.cc +++ b/webrtc/api/videotrack_unittest.cc @@ -18,7 +18,7 @@ #include "webrtc/base/gunit.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/media/base/fakemediaengine.h" -#include "webrtc/media/webrtc/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframe.h" using webrtc::FakeVideoTrackRenderer; using webrtc::VideoSource; diff --git a/webrtc/api/videotrackrenderers.cc b/webrtc/api/videotrackrenderers.cc index a76becdbfa..4800d3b5c8 100644 --- a/webrtc/api/videotrackrenderers.cc +++ b/webrtc/api/videotrackrenderers.cc @@ -9,7 +9,7 @@ */ #include "webrtc/api/videotrackrenderers.h" -#include "webrtc/media/webrtc/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframe.h" namespace webrtc { diff --git a/webrtc/api/webrtcsession_unittest.cc b/webrtc/api/webrtcsession_unittest.cc index 8bbcb58dd8..56699baafa 100644 --- a/webrtc/api/webrtcsession_unittest.cc +++ b/webrtc/api/webrtcsession_unittest.cc @@ -42,7 +42,7 @@ #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/fakevideorenderer.h" #include "webrtc/media/base/mediachannel.h" -#include "webrtc/media/webrtc/fakewebrtccall.h" +#include "webrtc/media/engine/fakewebrtccall.h" #include "webrtc/p2p/base/stunserver.h" #include "webrtc/p2p/base/teststunserver.h" #include "webrtc/p2p/base/testturnserver.h" diff --git a/webrtc/media/base/fakevideocapturer.h b/webrtc/media/base/fakevideocapturer.h index f4690806ff..0a30469bfc 100644 --- a/webrtc/media/base/fakevideocapturer.h +++ b/webrtc/media/base/fakevideocapturer.h @@ -20,7 +20,7 @@ #include "webrtc/media/base/videocommon.h" #include "webrtc/media/base/videoframe.h" #ifdef HAVE_WEBRTC_VIDEO -#include "webrtc/media/webrtc/webrtcvideoframefactory.h" +#include "webrtc/media/engine/webrtcvideoframefactory.h" #endif namespace cricket { diff --git a/webrtc/media/base/mediaengine.cc b/webrtc/media/base/mediaengine.cc index 78e2c577e1..df17ee7839 100644 --- a/webrtc/media/base/mediaengine.cc +++ b/webrtc/media/base/mediaengine.cc @@ -13,7 +13,7 @@ #if !defined(DISABLE_MEDIA_ENGINE_FACTORY) #if defined(HAVE_WEBRTC_VOICE) && defined(HAVE_WEBRTC_VIDEO) -#include "webrtc/media/webrtc/webrtcmediaengine.h" +#include "webrtc/media/engine/webrtcmediaengine.h" #endif // HAVE_WEBRTC_VOICE && HAVE_WEBRTC_VIDEO #ifdef HAVE_CONFIG_H diff --git a/webrtc/media/base/videocapturer.cc b/webrtc/media/base/videocapturer.cc index df78ed4695..5b0590480b 100644 --- a/webrtc/media/base/videocapturer.cc +++ b/webrtc/media/base/videocapturer.cc @@ -21,8 +21,8 @@ #include "webrtc/media/base/videoframefactory.h" #if defined(HAVE_WEBRTC_VIDEO) -#include "webrtc/media/webrtc/webrtcvideoframe.h" -#include "webrtc/media/webrtc/webrtcvideoframefactory.h" +#include "webrtc/media/engine/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframefactory.h" #endif // HAVE_WEBRTC_VIDEO namespace cricket { diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h index a81fde99aa..2541c4acd3 100644 --- a/webrtc/media/base/videoengine_unittest.h +++ b/webrtc/media/base/videoengine_unittest.h @@ -23,7 +23,7 @@ #include "webrtc/media/base/fakevideorenderer.h" #include "webrtc/media/base/mediachannel.h" #include "webrtc/media/base/streamparams.h" -#include "webrtc/media/webrtc/fakewebrtccall.h" +#include "webrtc/media/engine/fakewebrtccall.h" #define EXPECT_FRAME_WAIT(c, w, h, t) \ EXPECT_EQ_WAIT((c), renderer_.num_rendered_frames(), (t)); \ diff --git a/webrtc/media/devices/devicemanager.cc b/webrtc/media/devices/devicemanager.cc index 439d3ffc28..9fca67cec7 100644 --- a/webrtc/media/devices/devicemanager.cc +++ b/webrtc/media/devices/devicemanager.cc @@ -23,7 +23,7 @@ #include "webrtc/media/devices/deviceinfo.h" #ifdef HAVE_WEBRTC_VIDEO -#include "webrtc/media/webrtc/webrtcvideocapturerfactory.h" +#include "webrtc/media/engine/webrtcvideocapturerfactory.h" #endif // HAVE_WEBRTC_VIDEO namespace { diff --git a/webrtc/media/webrtc/constants.h b/webrtc/media/engine/constants.h similarity index 84% rename from webrtc/media/webrtc/constants.h rename to webrtc/media/engine/constants.h index 3e86a2ebde..68a2bc61b8 100644 --- a/webrtc/media/webrtc/constants.h +++ b/webrtc/media/engine/constants.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_CONSTANTS_H_ -#define WEBRTC_MEDIA_WEBRTC_CONSTANTS_H_ +#ifndef WEBRTC_MEDIA_ENGINE_CONSTANTS_H_ +#define WEBRTC_MEDIA_ENGINE_CONSTANTS_H_ namespace cricket { @@ -24,4 +24,4 @@ extern const int kMaxVideoBitrate; } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_CONSTANTS_H_ +#endif // WEBRTC_MEDIA_ENGINE_CONSTANTS_H_ diff --git a/webrtc/media/webrtc/fakewebrtccall.cc b/webrtc/media/engine/fakewebrtccall.cc similarity index 99% rename from webrtc/media/webrtc/fakewebrtccall.cc rename to webrtc/media/engine/fakewebrtccall.cc index c952715ca8..59eb230aa0 100644 --- a/webrtc/media/webrtc/fakewebrtccall.cc +++ b/webrtc/media/engine/fakewebrtccall.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/webrtc/fakewebrtccall.h" +#include "webrtc/media/engine/fakewebrtccall.h" #include #include diff --git a/webrtc/media/webrtc/fakewebrtccall.h b/webrtc/media/engine/fakewebrtccall.h similarity index 98% rename from webrtc/media/webrtc/fakewebrtccall.h rename to webrtc/media/engine/fakewebrtccall.h index 92e8ad8e4f..8966987032 100644 --- a/webrtc/media/webrtc/fakewebrtccall.h +++ b/webrtc/media/engine/fakewebrtccall.h @@ -17,8 +17,8 @@ // webrtc::VideoSendStream // webrtc::VideoReceiveStream -#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCCALL_H_ -#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCCALL_H_ +#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCALL_H_ +#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCALL_H_ #include diff --git a/webrtc/media/webrtc/fakewebrtccommon.h b/webrtc/media/engine/fakewebrtccommon.h similarity index 88% rename from webrtc/media/webrtc/fakewebrtccommon.h rename to webrtc/media/engine/fakewebrtccommon.h index d016b5d93c..5c13c1bc52 100644 --- a/webrtc/media/webrtc/fakewebrtccommon.h +++ b/webrtc/media/engine/fakewebrtccommon.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCCOMMON_H_ -#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCCOMMON_H_ +#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCOMMON_H_ +#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCOMMON_H_ #include "webrtc/base/common.h" @@ -39,4 +39,4 @@ namespace cricket { #define WEBRTC_VOID_FUNC(method, args) void method args override } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCCOMMON_H_ +#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCOMMON_H_ diff --git a/webrtc/media/webrtc/fakewebrtcdeviceinfo.h b/webrtc/media/engine/fakewebrtcdeviceinfo.h similarity index 94% rename from webrtc/media/webrtc/fakewebrtcdeviceinfo.h rename to webrtc/media/engine/fakewebrtcdeviceinfo.h index 84030b71e5..0e34001135 100644 --- a/webrtc/media/webrtc/fakewebrtcdeviceinfo.h +++ b/webrtc/media/engine/fakewebrtcdeviceinfo.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCDEVICEINFO_H_ -#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCDEVICEINFO_H_ +#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_ +#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_ #include #include "webrtc/base/stringutils.h" -#include "webrtc/media/webrtc/webrtcvideocapturer.h" +#include "webrtc/media/engine/webrtcvideocapturer.h" // Fake class for mocking out webrtc::VideoCaptureModule::DeviceInfo. class FakeWebRtcDeviceInfo : public webrtc::VideoCaptureModule::DeviceInfo { @@ -105,4 +105,4 @@ class FakeWebRtcDeviceInfo : public webrtc::VideoCaptureModule::DeviceInfo { std::vector devices_; }; -#endif // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCDEVICEINFO_H_ +#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_ diff --git a/webrtc/media/webrtc/fakewebrtcvcmfactory.h b/webrtc/media/engine/fakewebrtcvcmfactory.h similarity index 84% rename from webrtc/media/webrtc/fakewebrtcvcmfactory.h rename to webrtc/media/engine/fakewebrtcvcmfactory.h index cc58b71191..f8dbf43dfc 100644 --- a/webrtc/media/webrtc/fakewebrtcvcmfactory.h +++ b/webrtc/media/engine/fakewebrtcvcmfactory.h @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVCMFACTORY_H_ -#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVCMFACTORY_H_ +#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ +#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ #include -#include "webrtc/media/webrtc/fakewebrtcvideocapturemodule.h" -#include "webrtc/media/webrtc/webrtcvideocapturer.h" +#include "webrtc/media/engine/fakewebrtcvideocapturemodule.h" +#include "webrtc/media/engine/webrtcvideocapturer.h" // Factory class to allow the fakes above to be injected into // WebRtcVideoCapturer. @@ -45,4 +45,4 @@ FakeWebRtcVideoCaptureModule::~FakeWebRtcVideoCaptureModule() { factory_->OnDestroyed(this); } -#endif // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVCMFACTORY_H_ +#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_ diff --git a/webrtc/media/webrtc/fakewebrtcvideocapturemodule.h b/webrtc/media/engine/fakewebrtcvideocapturemodule.h similarity index 92% rename from webrtc/media/webrtc/fakewebrtcvideocapturemodule.h rename to webrtc/media/engine/fakewebrtcvideocapturemodule.h index 784f2c4f10..8c63d2b6e1 100644 --- a/webrtc/media/webrtc/fakewebrtcvideocapturemodule.h +++ b/webrtc/media/engine/fakewebrtcvideocapturemodule.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ -#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ +#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ +#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ #include #include "webrtc/media/base/testutils.h" -#include "webrtc/media/webrtc/fakewebrtcdeviceinfo.h" -#include "webrtc/media/webrtc/webrtcvideocapturer.h" +#include "webrtc/media/engine/fakewebrtcdeviceinfo.h" +#include "webrtc/media/engine/webrtcvideocapturer.h" class FakeWebRtcVcmFactory; @@ -119,4 +119,4 @@ class FakeWebRtcVideoCaptureModule : public webrtc::VideoCaptureModule { int delay_; }; -#endif // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ +#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_ diff --git a/webrtc/media/webrtc/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h similarity index 95% rename from webrtc/media/webrtc/fakewebrtcvideoengine.h rename to webrtc/media/engine/fakewebrtcvideoengine.h index 92dc794fbc..d93431e263 100644 --- a/webrtc/media/webrtc/fakewebrtcvideoengine.h +++ b/webrtc/media/engine/fakewebrtcvideoengine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_ -#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_ +#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ +#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ #include #include @@ -21,9 +21,9 @@ #include "webrtc/base/stringutils.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/media/base/codec.h" -#include "webrtc/media/webrtc/fakewebrtccommon.h" -#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" -#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" +#include "webrtc/media/engine/fakewebrtccommon.h" +#include "webrtc/media/engine/webrtcvideodecoderfactory.h" +#include "webrtc/media/engine/webrtcvideoencoderfactory.h" #include "webrtc/modules/video_coding/include/video_error_codes.h" #include "webrtc/video_decoder.h" #include "webrtc/video_encoder.h" @@ -233,4 +233,4 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_ +#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_ diff --git a/webrtc/media/webrtc/fakewebrtcvoiceengine.h b/webrtc/media/engine/fakewebrtcvoiceengine.h similarity index 99% rename from webrtc/media/webrtc/fakewebrtcvoiceengine.h rename to webrtc/media/engine/fakewebrtcvoiceengine.h index 9fd923f4af..941dfef3b2 100644 --- a/webrtc/media/webrtc/fakewebrtcvoiceengine.h +++ b/webrtc/media/engine/fakewebrtcvoiceengine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVOICEENGINE_H_ -#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVOICEENGINE_H_ +#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ +#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ #include #include @@ -22,8 +22,8 @@ #include "webrtc/config.h" #include "webrtc/media/base/codec.h" #include "webrtc/media/base/rtputils.h" -#include "webrtc/media/webrtc/fakewebrtccommon.h" -#include "webrtc/media/webrtc/webrtcvoe.h" +#include "webrtc/media/engine/fakewebrtccommon.h" +#include "webrtc/media/engine/webrtcvoe.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" @@ -805,4 +805,4 @@ class FakeWebRtcVoiceEngine } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVOICEENGINE_H_ +#endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ diff --git a/webrtc/media/webrtc/nullwebrtcvideoengine.h b/webrtc/media/engine/nullwebrtcvideoengine.h similarity index 89% rename from webrtc/media/webrtc/nullwebrtcvideoengine.h rename to webrtc/media/engine/nullwebrtcvideoengine.h index 29feef129e..488f02159d 100644 --- a/webrtc/media/webrtc/nullwebrtcvideoengine.h +++ b/webrtc/media/engine/nullwebrtcvideoengine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_NULLWEBRTCVIDEOENGINE_H_ -#define WEBRTC_MEDIA_WEBRTC_NULLWEBRTCVIDEOENGINE_H_ +#ifndef WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ +#define WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ #include @@ -61,4 +61,4 @@ class NullWebRtcVideoEngine { } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_NULLWEBRTCVIDEOENGINE_H_ +#endif // WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_ diff --git a/webrtc/media/webrtc/nullwebrtcvideoengine_unittest.cc b/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc similarity index 92% rename from webrtc/media/webrtc/nullwebrtcvideoengine_unittest.cc rename to webrtc/media/engine/nullwebrtcvideoengine_unittest.cc index 08125e5d4c..cf5f5076e0 100644 --- a/webrtc/media/webrtc/nullwebrtcvideoengine_unittest.cc +++ b/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc @@ -10,8 +10,8 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/media/webrtc/nullwebrtcvideoengine.h" -#include "webrtc/media/webrtc/webrtcvoiceengine.h" +#include "webrtc/media/engine/nullwebrtcvideoengine.h" +#include "webrtc/media/engine/webrtcvoiceengine.h" namespace cricket { diff --git a/webrtc/media/webrtc/simulcast.cc b/webrtc/media/engine/simulcast.cc similarity index 99% rename from webrtc/media/webrtc/simulcast.cc rename to webrtc/media/engine/simulcast.cc index 8a3598f09f..cbcf245efd 100644 --- a/webrtc/media/webrtc/simulcast.cc +++ b/webrtc/media/engine/simulcast.cc @@ -14,7 +14,7 @@ #include "webrtc/base/common.h" #include "webrtc/base/logging.h" #include "webrtc/media/base/streamparams.h" -#include "webrtc/media/webrtc/simulcast.h" +#include "webrtc/media/engine/simulcast.h" #include "webrtc/system_wrappers/include/field_trial.h" namespace cricket { diff --git a/webrtc/media/webrtc/simulcast.h b/webrtc/media/engine/simulcast.h similarity index 93% rename from webrtc/media/webrtc/simulcast.h rename to webrtc/media/engine/simulcast.h index 08ad0c92ad..20be4c487e 100644 --- a/webrtc/media/webrtc/simulcast.h +++ b/webrtc/media/engine/simulcast.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_SIMULCAST_H_ -#define WEBRTC_MEDIA_WEBRTC_SIMULCAST_H_ +#ifndef WEBRTC_MEDIA_ENGINE_SIMULCAST_H_ +#define WEBRTC_MEDIA_ENGINE_SIMULCAST_H_ #include @@ -54,4 +54,4 @@ std::vector GetSimulcastConfig(size_t max_streams, } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_SIMULCAST_H_ +#endif // WEBRTC_MEDIA_ENGINE_SIMULCAST_H_ diff --git a/webrtc/media/webrtc/simulcast_unittest.cc b/webrtc/media/engine/simulcast_unittest.cc similarity index 97% rename from webrtc/media/webrtc/simulcast_unittest.cc rename to webrtc/media/engine/simulcast_unittest.cc index 499fe7a110..f01fdcbade 100644 --- a/webrtc/media/webrtc/simulcast_unittest.cc +++ b/webrtc/media/engine/simulcast_unittest.cc @@ -11,7 +11,7 @@ #include #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/media/webrtc/simulcast.h" +#include "webrtc/media/engine/simulcast.h" namespace cricket { diff --git a/webrtc/media/webrtc/webrtccommon.h b/webrtc/media/engine/webrtccommon.h similarity index 94% rename from webrtc/media/webrtc/webrtccommon.h rename to webrtc/media/engine/webrtccommon.h index f9f5715b0c..21fc1924ef 100644 --- a/webrtc/media/webrtc/webrtccommon.h +++ b/webrtc/media/engine/webrtccommon.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCCOMMON_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCCOMMON_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_ #include "webrtc/common_types.h" @@ -55,4 +55,4 @@ namespace cricket { } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCCOMMON_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_ diff --git a/webrtc/media/webrtc/webrtcmediaengine.cc b/webrtc/media/engine/webrtcmediaengine.cc similarity index 95% rename from webrtc/media/webrtc/webrtcmediaengine.cc rename to webrtc/media/engine/webrtcmediaengine.cc index b82c49719f..0643de6d4d 100644 --- a/webrtc/media/webrtc/webrtcmediaengine.cc +++ b/webrtc/media/engine/webrtcmediaengine.cc @@ -8,16 +8,16 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/webrtc/webrtcmediaengine.h" +#include "webrtc/media/engine/webrtcmediaengine.h" #include #ifdef HAVE_WEBRTC_VIDEO -#include "webrtc/media/webrtc/webrtcvideoengine2.h" +#include "webrtc/media/engine/webrtcvideoengine2.h" #else -#include "webrtc/media/webrtc/nullwebrtcvideoengine.h" +#include "webrtc/media/engine/nullwebrtcvideoengine.h" #endif -#include "webrtc/media/webrtc/webrtcvoiceengine.h" +#include "webrtc/media/engine/webrtcvoiceengine.h" namespace cricket { diff --git a/webrtc/media/webrtc/webrtcmediaengine.h b/webrtc/media/engine/webrtcmediaengine.h similarity index 91% rename from webrtc/media/webrtc/webrtcmediaengine.h rename to webrtc/media/engine/webrtcmediaengine.h index 6ad6fbc451..19b7d222f2 100644 --- a/webrtc/media/webrtc/webrtcmediaengine.h +++ b/webrtc/media/engine/webrtcmediaengine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCMEDIAENGINE_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCMEDIAENGINE_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ #include #include @@ -50,4 +50,4 @@ std::vector FilterRtpExtensions( } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCMEDIAENGINE_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_ diff --git a/webrtc/media/webrtc/webrtcmediaengine_unittest.cc b/webrtc/media/engine/webrtcmediaengine_unittest.cc similarity index 99% rename from webrtc/media/webrtc/webrtcmediaengine_unittest.cc rename to webrtc/media/engine/webrtcmediaengine_unittest.cc index d3403006ef..be93d7ded8 100644 --- a/webrtc/media/webrtc/webrtcmediaengine_unittest.cc +++ b/webrtc/media/engine/webrtcmediaengine_unittest.cc @@ -10,7 +10,7 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/media/webrtc/webrtcmediaengine.h" +#include "webrtc/media/engine/webrtcmediaengine.h" namespace cricket { namespace { diff --git a/webrtc/media/webrtc/webrtcvideocapturer.cc b/webrtc/media/engine/webrtcvideocapturer.cc similarity index 98% rename from webrtc/media/webrtc/webrtcvideocapturer.cc rename to webrtc/media/engine/webrtcvideocapturer.cc index c5eb1adadc..6dc5a11859 100644 --- a/webrtc/media/webrtc/webrtcvideocapturer.cc +++ b/webrtc/media/engine/webrtcvideocapturer.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/webrtc/webrtcvideocapturer.h" +#include "webrtc/media/engine/webrtcvideocapturer.h" #ifdef HAVE_CONFIG_H #include @@ -23,8 +23,8 @@ #include "webrtc/base/safe_conversions.h" #include "webrtc/base/thread.h" #include "webrtc/base/timeutils.h" -#include "webrtc/media/webrtc/webrtcvideoframe.h" -#include "webrtc/media/webrtc/webrtcvideoframefactory.h" +#include "webrtc/media/engine/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframefactory.h" #include "webrtc/base/win32.h" // Need this to #include the impl files. #include "webrtc/modules/video_capture/video_capture_factory.h" diff --git a/webrtc/media/webrtc/webrtcvideocapturer.h b/webrtc/media/engine/webrtcvideocapturer.h similarity index 94% rename from webrtc/media/webrtc/webrtcvideocapturer.h rename to webrtc/media/engine/webrtcvideocapturer.h index ef4dea48a1..db9161b32b 100644 --- a/webrtc/media/webrtc/webrtcvideocapturer.h +++ b/webrtc/media/engine/webrtcvideocapturer.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_ #ifdef HAVE_WEBRTC_VIDEO @@ -21,7 +21,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/media/base/videocapturer.h" -#include "webrtc/media/webrtc/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframe.h" #include "webrtc/modules/video_capture/video_capture.h" namespace cricket { @@ -96,4 +96,4 @@ struct WebRtcCapturedFrame : public CapturedFrame { } // namespace cricket #endif // HAVE_WEBRTC_VIDEO -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_ diff --git a/webrtc/media/webrtc/webrtcvideocapturer_unittest.cc b/webrtc/media/engine/webrtcvideocapturer_unittest.cc similarity index 98% rename from webrtc/media/webrtc/webrtcvideocapturer_unittest.cc rename to webrtc/media/engine/webrtcvideocapturer_unittest.cc index f776dff396..6d88bcc8ec 100644 --- a/webrtc/media/webrtc/webrtcvideocapturer_unittest.cc +++ b/webrtc/media/engine/webrtcvideocapturer_unittest.cc @@ -18,8 +18,8 @@ #include "webrtc/base/thread.h" #include "webrtc/media/base/testutils.h" #include "webrtc/media/base/videocommon.h" -#include "webrtc/media/webrtc/fakewebrtcvcmfactory.h" -#include "webrtc/media/webrtc/webrtcvideocapturer.h" +#include "webrtc/media/engine/fakewebrtcvcmfactory.h" +#include "webrtc/media/engine/webrtcvideocapturer.h" using cricket::VideoFormat; diff --git a/webrtc/media/webrtc/webrtcvideocapturerfactory.cc b/webrtc/media/engine/webrtcvideocapturerfactory.cc similarity index 87% rename from webrtc/media/webrtc/webrtcvideocapturerfactory.cc rename to webrtc/media/engine/webrtcvideocapturerfactory.cc index 151cf50f6a..5c1349f05e 100644 --- a/webrtc/media/webrtc/webrtcvideocapturerfactory.cc +++ b/webrtc/media/engine/webrtcvideocapturerfactory.cc @@ -9,8 +9,8 @@ */ #include "webrtc/base/scoped_ptr.h" -#include "webrtc/media/webrtc/webrtcvideocapturer.h" -#include "webrtc/media/webrtc/webrtcvideocapturerfactory.h" +#include "webrtc/media/engine/webrtcvideocapturer.h" +#include "webrtc/media/engine/webrtcvideocapturerfactory.h" namespace cricket { diff --git a/webrtc/media/webrtc/webrtcvideocapturerfactory.h b/webrtc/media/engine/webrtcvideocapturerfactory.h similarity index 81% rename from webrtc/media/webrtc/webrtcvideocapturerfactory.h rename to webrtc/media/engine/webrtcvideocapturerfactory.h index 28c6f7ae6f..128ef9d80d 100644 --- a/webrtc/media/webrtc/webrtcvideocapturerfactory.h +++ b/webrtc/media/engine/webrtcvideocapturerfactory.h @@ -9,8 +9,8 @@ */ // TODO(pthatcher): Rename file to match class name. -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_ #include "webrtc/media/base/videocapturerfactory.h" @@ -24,4 +24,4 @@ class WebRtcVideoDeviceCapturerFactory : public VideoDeviceCapturerFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_ diff --git a/webrtc/media/webrtc/webrtcvideochannelfactory.h b/webrtc/media/engine/webrtcvideochannelfactory.h similarity index 81% rename from webrtc/media/webrtc/webrtcvideochannelfactory.h rename to webrtc/media/engine/webrtcvideochannelfactory.h index e48fbb796c..06498beadd 100644 --- a/webrtc/media/webrtc/webrtcvideochannelfactory.h +++ b/webrtc/media/engine/webrtcvideochannelfactory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCHANNELFACTORY_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCHANNELFACTORY_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCHANNELFACTORY_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCHANNELFACTORY_H_ namespace cricket { class VoiceMediaChannel; @@ -24,4 +24,4 @@ class WebRtcVideoChannelFactory { }; } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCHANNELFACTORY_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCHANNELFACTORY_H_ diff --git a/webrtc/media/webrtc/webrtcvideodecoderfactory.h b/webrtc/media/engine/webrtcvideodecoderfactory.h similarity index 84% rename from webrtc/media/webrtc/webrtcvideodecoderfactory.h rename to webrtc/media/engine/webrtcvideodecoderfactory.h index 51ca7c73ee..c739096ac5 100644 --- a/webrtc/media/webrtc/webrtcvideodecoderfactory.h +++ b/webrtc/media/engine/webrtcvideodecoderfactory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEODECODERFACTORY_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEODECODERFACTORY_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ #include "webrtc/base/refcount.h" #include "webrtc/common_types.h" @@ -33,4 +33,4 @@ class WebRtcVideoDecoderFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEODECODERFACTORY_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_ diff --git a/webrtc/media/webrtc/webrtcvideoencoderfactory.h b/webrtc/media/engine/webrtcvideoencoderfactory.h similarity index 91% rename from webrtc/media/webrtc/webrtcvideoencoderfactory.h rename to webrtc/media/engine/webrtcvideoencoderfactory.h index 400ecd07d8..e57a314352 100644 --- a/webrtc/media/webrtc/webrtcvideoencoderfactory.h +++ b/webrtc/media/engine/webrtcvideoencoderfactory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENCODERFACTORY_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENCODERFACTORY_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ #include "webrtc/base/refcount.h" #include "webrtc/common_types.h" @@ -60,4 +60,4 @@ class WebRtcVideoEncoderFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENCODERFACTORY_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_ diff --git a/webrtc/media/webrtc/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc similarity index 99% rename from webrtc/media/webrtc/webrtcvideoengine2.cc rename to webrtc/media/engine/webrtcvideoengine2.cc index 0a7a27bb47..f747da997b 100644 --- a/webrtc/media/webrtc/webrtcvideoengine2.cc +++ b/webrtc/media/engine/webrtcvideoengine2.cc @@ -9,7 +9,7 @@ */ #ifdef HAVE_WEBRTC_VIDEO -#include "webrtc/media/webrtc/webrtcvideoengine2.h" +#include "webrtc/media/engine/webrtcvideoengine2.h" #include #include @@ -23,12 +23,12 @@ #include "webrtc/call.h" #include "webrtc/media/base/videocapturer.h" #include "webrtc/media/base/videorenderer.h" -#include "webrtc/media/webrtc/constants.h" -#include "webrtc/media/webrtc/simulcast.h" -#include "webrtc/media/webrtc/webrtcmediaengine.h" -#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" -#include "webrtc/media/webrtc/webrtcvideoframe.h" -#include "webrtc/media/webrtc/webrtcvoiceengine.h" +#include "webrtc/media/engine/constants.h" +#include "webrtc/media/engine/simulcast.h" +#include "webrtc/media/engine/webrtcmediaengine.h" +#include "webrtc/media/engine/webrtcvideoencoderfactory.h" +#include "webrtc/media/engine/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvoiceengine.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h" #include "webrtc/system_wrappers/include/field_trial.h" @@ -317,7 +317,7 @@ static int GetMaxDefaultVideoBitrateKbps(int width, int height) { } } // namespace -// Constants defined in webrtc/media/webrtc/constants.h +// Constants defined in webrtc/media/engine/constants.h // TODO(pbos): Move these to a separate constants.cc file. const int kMinVideoBitrate = 30; const int kStartVideoBitrate = 300; diff --git a/webrtc/media/webrtc/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h similarity index 98% rename from webrtc/media/webrtc/webrtcvideoengine2.h rename to webrtc/media/engine/webrtcvideoengine2.h index 27eec863ed..40485eeb17 100644 --- a/webrtc/media/webrtc/webrtcvideoengine2.h +++ b/webrtc/media/engine/webrtcvideoengine2.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ #include #include @@ -22,9 +22,9 @@ #include "webrtc/media/base/videosinkinterface.h" #include "webrtc/call.h" #include "webrtc/media/base/mediaengine.h" -#include "webrtc/media/webrtc/webrtcvideochannelfactory.h" -#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" -#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" +#include "webrtc/media/engine/webrtcvideochannelfactory.h" +#include "webrtc/media/engine/webrtcvideodecoderfactory.h" +#include "webrtc/media/engine/webrtcvideoencoderfactory.h" #include "webrtc/transport.h" #include "webrtc/video_frame.h" #include "webrtc/video_receive_stream.h" @@ -512,4 +512,4 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ diff --git a/webrtc/media/webrtc/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc similarity index 99% rename from webrtc/media/webrtc/webrtcvideoengine2_unittest.cc rename to webrtc/media/engine/webrtcvideoengine2_unittest.cc index f12cc65124..c229342689 100644 --- a/webrtc/media/webrtc/webrtcvideoengine2_unittest.cc +++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc @@ -19,12 +19,12 @@ #include "webrtc/base/stringutils.h" #include "webrtc/media/base/testutils.h" #include "webrtc/media/base/videoengine_unittest.h" -#include "webrtc/media/webrtc/fakewebrtccall.h" -#include "webrtc/media/webrtc/fakewebrtcvideoengine.h" -#include "webrtc/media/webrtc/simulcast.h" -#include "webrtc/media/webrtc/webrtcvideochannelfactory.h" -#include "webrtc/media/webrtc/webrtcvideoengine2.h" -#include "webrtc/media/webrtc/webrtcvoiceengine.h" +#include "webrtc/media/engine/fakewebrtccall.h" +#include "webrtc/media/engine/fakewebrtcvideoengine.h" +#include "webrtc/media/engine/simulcast.h" +#include "webrtc/media/engine/webrtcvideochannelfactory.h" +#include "webrtc/media/engine/webrtcvideoengine2.h" +#include "webrtc/media/engine/webrtcvoiceengine.h" #include "webrtc/test/field_trial.h" #include "webrtc/video_encoder.h" diff --git a/webrtc/media/webrtc/webrtcvideoframe.cc b/webrtc/media/engine/webrtcvideoframe.cc similarity index 99% rename from webrtc/media/webrtc/webrtcvideoframe.cc rename to webrtc/media/engine/webrtcvideoframe.cc index 20161baf46..61a561f47a 100644 --- a/webrtc/media/webrtc/webrtcvideoframe.cc +++ b/webrtc/media/engine/webrtcvideoframe.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/media/webrtc/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframe.h" #include "libyuv/convert.h" #include "webrtc/base/logging.h" diff --git a/webrtc/media/webrtc/webrtcvideoframe.h b/webrtc/media/engine/webrtcvideoframe.h similarity index 96% rename from webrtc/media/webrtc/webrtcvideoframe.h rename to webrtc/media/engine/webrtcvideoframe.h index c00477c3d9..404b6941a0 100644 --- a/webrtc/media/webrtc/webrtcvideoframe.h +++ b/webrtc/media/engine/webrtcvideoframe.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_ #include "webrtc/base/buffer.h" #include "webrtc/base/refcount.h" @@ -118,4 +118,4 @@ class WebRtcVideoFrame : public VideoFrame { } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_ diff --git a/webrtc/media/webrtc/webrtcvideoframe_unittest.cc b/webrtc/media/engine/webrtcvideoframe_unittest.cc similarity index 99% rename from webrtc/media/webrtc/webrtcvideoframe_unittest.cc rename to webrtc/media/engine/webrtcvideoframe_unittest.cc index 215a4846d7..c162b32ccd 100644 --- a/webrtc/media/webrtc/webrtcvideoframe_unittest.cc +++ b/webrtc/media/engine/webrtcvideoframe_unittest.cc @@ -11,7 +11,7 @@ #include #include "webrtc/media/base/videoframe_unittest.h" -#include "webrtc/media/webrtc/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframe.h" #include "webrtc/test/fake_texture_frame.h" namespace { diff --git a/webrtc/media/webrtc/webrtcvideoframefactory.cc b/webrtc/media/engine/webrtcvideoframefactory.cc similarity index 89% rename from webrtc/media/webrtc/webrtcvideoframefactory.cc rename to webrtc/media/engine/webrtcvideoframefactory.cc index 9a60d03bb8..d7f7b16a56 100644 --- a/webrtc/media/webrtc/webrtcvideoframefactory.cc +++ b/webrtc/media/engine/webrtcvideoframefactory.cc @@ -9,8 +9,8 @@ */ #include "webrtc/base/logging.h" -#include "webrtc/media/webrtc/webrtcvideoframe.h" -#include "webrtc/media/webrtc/webrtcvideoframefactory.h" +#include "webrtc/media/engine/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframefactory.h" namespace cricket { diff --git a/webrtc/media/webrtc/webrtcvideoframefactory.h b/webrtc/media/engine/webrtcvideoframefactory.h similarity index 83% rename from webrtc/media/webrtc/webrtcvideoframefactory.h rename to webrtc/media/engine/webrtcvideoframefactory.h index e296ddb03f..c1569969fb 100644 --- a/webrtc/media/webrtc/webrtcvideoframefactory.h +++ b/webrtc/media/engine/webrtcvideoframefactory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAMEFACTORY_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAMEFACTORY_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAMEFACTORY_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAMEFACTORY_H_ #include "webrtc/media/base/videoframefactory.h" @@ -27,4 +27,4 @@ class WebRtcVideoFrameFactory : public VideoFrameFactory { } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAMEFACTORY_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAMEFACTORY_H_ diff --git a/webrtc/media/webrtc/webrtcvideoframefactory_unittest.cc b/webrtc/media/engine/webrtcvideoframefactory_unittest.cc similarity index 97% rename from webrtc/media/webrtc/webrtcvideoframefactory_unittest.cc rename to webrtc/media/engine/webrtcvideoframefactory_unittest.cc index 12b04fc6b8..cbf7d5f9b6 100644 --- a/webrtc/media/webrtc/webrtcvideoframefactory_unittest.cc +++ b/webrtc/media/engine/webrtcvideoframefactory_unittest.cc @@ -11,8 +11,8 @@ #include #include "webrtc/media/base/videoframe_unittest.h" -#include "webrtc/media/webrtc/webrtcvideoframe.h" -#include "webrtc/media/webrtc/webrtcvideoframefactory.h" +#include "webrtc/media/engine/webrtcvideoframe.h" +#include "webrtc/media/engine/webrtcvideoframefactory.h" class WebRtcVideoFrameFactoryTest : public VideoFrameTest { diff --git a/webrtc/media/webrtc/webrtcvoe.h b/webrtc/media/engine/webrtcvoe.h similarity index 95% rename from webrtc/media/webrtc/webrtcvoe.h rename to webrtc/media/engine/webrtcvoe.h index f23cc07974..25ac5cc2d4 100644 --- a/webrtc/media/webrtc/webrtcvoe.h +++ b/webrtc/media/engine/webrtcvoe.h @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVOE_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCVOE_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_ #include "webrtc/base/common.h" -#include "webrtc/media/webrtc/webrtccommon.h" +#include "webrtc/media/engine/webrtccommon.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_device/include/audio_device.h" @@ -116,4 +116,4 @@ class VoEWrapper { }; } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVOE_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_ diff --git a/webrtc/media/webrtc/webrtcvoiceengine.cc b/webrtc/media/engine/webrtcvoiceengine.cc similarity index 99% rename from webrtc/media/webrtc/webrtcvoiceengine.cc rename to webrtc/media/engine/webrtcvoiceengine.cc index 82aa12ef06..c4e92c0024 100644 --- a/webrtc/media/webrtc/webrtcvoiceengine.cc +++ b/webrtc/media/engine/webrtcvoiceengine.cc @@ -14,7 +14,7 @@ #ifdef HAVE_WEBRTC_VOICE -#include "webrtc/media/webrtc/webrtcvoiceengine.h" +#include "webrtc/media/engine/webrtcvoiceengine.h" #include #include @@ -36,8 +36,8 @@ #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/media/engine/webrtcmediaengine.h" +#include "webrtc/media/engine/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" diff --git a/webrtc/media/webrtc/webrtcvoiceengine.h b/webrtc/media/engine/webrtcvoiceengine.h similarity index 97% rename from webrtc/media/webrtc/webrtcvoiceengine.h rename to webrtc/media/engine/webrtcvoiceengine.h index fb88e49e6f..75d71f67c3 100644 --- a/webrtc/media/webrtc/webrtcvoiceengine.h +++ b/webrtc/media/engine/webrtcvoiceengine.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVOICEENGINE_H_ -#define WEBRTC_MEDIA_WEBRTC_WEBRTCVOICEENGINE_H_ +#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ +#define WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ #include #include @@ -25,8 +25,8 @@ #include "webrtc/common.h" #include "webrtc/config.h" #include "webrtc/media/base/rtputils.h" -#include "webrtc/media/webrtc/webrtccommon.h" -#include "webrtc/media/webrtc/webrtcvoe.h" +#include "webrtc/media/engine/webrtccommon.h" +#include "webrtc/media/engine/webrtcvoe.h" namespace cricket { @@ -272,4 +272,4 @@ class WebRtcVoiceMediaChannel final : public VoiceMediaChannel, }; } // namespace cricket -#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVOICEENGINE_H_ +#endif // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_ diff --git a/webrtc/media/webrtc/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc similarity index 99% rename from webrtc/media/webrtc/webrtcvoiceengine_unittest.cc rename to webrtc/media/engine/webrtcvoiceengine_unittest.cc index a5acee8d93..15ac43d2e5 100644 --- a/webrtc/media/webrtc/webrtcvoiceengine_unittest.cc +++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc @@ -19,9 +19,9 @@ #include "webrtc/media/base/fakemediaengine.h" #include "webrtc/media/base/fakenetworkinterface.h" #include "webrtc/media/base/fakertp.h" -#include "webrtc/media/webrtc/fakewebrtccall.h" -#include "webrtc/media/webrtc/fakewebrtcvoiceengine.h" -#include "webrtc/media/webrtc/webrtcvoiceengine.h" +#include "webrtc/media/engine/fakewebrtccall.h" +#include "webrtc/media/engine/fakewebrtcvoiceengine.h" +#include "webrtc/media/engine/webrtcvoiceengine.h" using cricket::kRtpAudioLevelHeaderExtension; using cricket::kRtpAbsoluteSenderTimeHeaderExtension; diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp index 7a2ab1c892..5c460f8de7 100644 --- a/webrtc/media/media.gyp +++ b/webrtc/media/media.gyp @@ -81,30 +81,30 @@ 'devices/devicemanager.h', 'devices/dummydevicemanager.h', 'devices/videorendererfactory.h', + 'engine/nullwebrtcvideoengine.h', + 'engine/simulcast.cc', + 'engine/simulcast.h', + 'engine/webrtccommon.h', + 'engine/webrtcmediaengine.cc', + 'engine/webrtcmediaengine.h', + 'engine/webrtcmediaengine.cc', + 'engine/webrtcvideocapturer.cc', + 'engine/webrtcvideocapturer.h', + 'engine/webrtcvideocapturerfactory.h', + 'engine/webrtcvideocapturerfactory.cc', + 'engine/webrtcvideodecoderfactory.h', + 'engine/webrtcvideoencoderfactory.h', + 'engine/webrtcvideoengine2.cc', + 'engine/webrtcvideoengine2.h', + 'engine/webrtcvideoframe.cc', + 'engine/webrtcvideoframe.h', + 'engine/webrtcvideoframefactory.cc', + 'engine/webrtcvideoframefactory.h', + 'engine/webrtcvoe.h', + 'engine/webrtcvoiceengine.cc', + 'engine/webrtcvoiceengine.h', 'sctp/sctpdataengine.cc', 'sctp/sctpdataengine.h', - 'webrtc/nullwebrtcvideoengine.h', - 'webrtc/simulcast.cc', - 'webrtc/simulcast.h', - 'webrtc/webrtccommon.h', - 'webrtc/webrtcmediaengine.cc', - 'webrtc/webrtcmediaengine.h', - 'webrtc/webrtcmediaengine.cc', - 'webrtc/webrtcvideocapturer.cc', - 'webrtc/webrtcvideocapturer.h', - 'webrtc/webrtcvideocapturerfactory.h', - 'webrtc/webrtcvideocapturerfactory.cc', - 'webrtc/webrtcvideodecoderfactory.h', - 'webrtc/webrtcvideoencoderfactory.h', - 'webrtc/webrtcvideoengine2.cc', - 'webrtc/webrtcvideoengine2.h', - 'webrtc/webrtcvideoframe.cc', - 'webrtc/webrtcvideoframe.h', - 'webrtc/webrtcvideoframefactory.cc', - 'webrtc/webrtcvideoframefactory.h', - 'webrtc/webrtcvoe.h', - 'webrtc/webrtcvoiceengine.cc', - 'webrtc/webrtcvoiceengine.h', ], # TODO(kjellander): Make the code compile without disabling these flags. # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 diff --git a/webrtc/media/media_tests.gypi b/webrtc/media/media_tests.gypi index 4d03068fa2..49131c5aa2 100644 --- a/webrtc/media/media_tests.gypi +++ b/webrtc/media/media_tests.gypi @@ -53,14 +53,14 @@ 'base/testutils.cc', 'base/testutils.h', 'devices/fakedevicemanager.h', - 'webrtc/fakewebrtccall.cc', - 'webrtc/fakewebrtccall.h', - 'webrtc/fakewebrtccommon.h', - 'webrtc/fakewebrtcdeviceinfo.h', - 'webrtc/fakewebrtcvcmfactory.h', - 'webrtc/fakewebrtcvideocapturemodule.h', - 'webrtc/fakewebrtcvideoengine.h', - 'webrtc/fakewebrtcvoiceengine.h', + 'engine/fakewebrtccall.cc', + 'engine/fakewebrtccall.h', + 'engine/fakewebrtccommon.h', + 'engine/fakewebrtcdeviceinfo.h', + 'engine/fakewebrtcvcmfactory.h', + 'engine/fakewebrtcvideocapturemodule.h', + 'engine/fakewebrtcvideoengine.h', + 'engine/fakewebrtcvoiceengine.h', ], # TODO(kjellander): Make the code compile without disabling these flags. # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 @@ -90,18 +90,18 @@ 'base/videoengine_unittest.h', 'base/videoframe_unittest.h', 'devices/dummydevicemanager_unittest.cc', - 'sctp/sctpdataengine_unittest.cc', - 'webrtc/nullwebrtcvideoengine_unittest.cc', - 'webrtc/simulcast_unittest.cc', - 'webrtc/webrtcmediaengine_unittest.cc', - 'webrtc/webrtcvideocapturer_unittest.cc', - 'webrtc/webrtcvideoframe_unittest.cc', - 'webrtc/webrtcvideoframefactory_unittest.cc', + 'engine/nullwebrtcvideoengine_unittest.cc', + 'engine/simulcast_unittest.cc', + 'engine/webrtcmediaengine_unittest.cc', + 'engine/webrtcvideocapturer_unittest.cc', + 'engine/webrtcvideoframe_unittest.cc', + 'engine/webrtcvideoframefactory_unittest.cc', # Disabled because some tests fail. # TODO(ronghuawu): Reenable these tests. # 'devices/devicemanager_unittest.cc', - 'webrtc/webrtcvideoengine2_unittest.cc', - 'webrtc/webrtcvoiceengine_unittest.cc', + 'engine/webrtcvideoengine2_unittest.cc', + 'engine/webrtcvoiceengine_unittest.cc', + 'sctp/sctpdataengine_unittest.cc', ], # TODO(kjellander): Make the code compile without disabling these flags. # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307