| Index: webrtc/media/webrtc/webrtcvideoengine2.cc
|
| diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/webrtc/media/webrtc/webrtcvideoengine2.cc
|
| similarity index 99%
|
| rename from talk/media/webrtc/webrtcvideoengine2.cc
|
| rename to webrtc/media/webrtc/webrtcvideoengine2.cc
|
| index 6f04d9674a15d7fb83afbf80b2e57483fbc2d626..265aa12108fb8a48df1605228ad8f09da0137eb5 100644
|
| --- a/talk/media/webrtc/webrtcvideoengine2.cc
|
| +++ b/webrtc/media/webrtc/webrtcvideoengine2.cc
|
| @@ -26,26 +26,26 @@
|
| */
|
|
|
| #ifdef HAVE_WEBRTC_VIDEO
|
| -#include "talk/media/webrtc/webrtcvideoengine2.h"
|
| +#include "webrtc/media/webrtc/webrtcvideoengine2.h"
|
|
|
| #include <algorithm>
|
| #include <set>
|
| #include <string>
|
|
|
| -#include "talk/media/base/videocapturer.h"
|
| -#include "talk/media/base/videorenderer.h"
|
| -#include "talk/media/webrtc/constants.h"
|
| -#include "talk/media/webrtc/simulcast.h"
|
| -#include "talk/media/webrtc/webrtcmediaengine.h"
|
| -#include "talk/media/webrtc/webrtcvideoencoderfactory.h"
|
| -#include "talk/media/webrtc/webrtcvideoframe.h"
|
| -#include "talk/media/webrtc/webrtcvoiceengine.h"
|
| #include "webrtc/base/buffer.h"
|
| #include "webrtc/base/logging.h"
|
| #include "webrtc/base/stringutils.h"
|
| #include "webrtc/base/timeutils.h"
|
| #include "webrtc/base/trace_event.h"
|
| #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/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"
|
| @@ -334,7 +334,7 @@ static int GetMaxDefaultVideoBitrateKbps(int width, int height) {
|
| }
|
| } // namespace
|
|
|
| -// Constants defined in talk/media/webrtc/constants.h
|
| +// Constants defined in webrtc/media/webrtc/constants.h
|
| // TODO(pbos): Move these to a separate constants.cc file.
|
| const int kMinVideoBitrate = 30;
|
| const int kStartVideoBitrate = 300;
|
|
|