| Index: webrtc/media/webrtc/fakewebrtcvideoengine.h
|
| diff --git a/talk/media/webrtc/fakewebrtcvideoengine.h b/webrtc/media/webrtc/fakewebrtcvideoengine.h
|
| similarity index 77%
|
| rename from talk/media/webrtc/fakewebrtcvideoengine.h
|
| rename to webrtc/media/webrtc/fakewebrtcvideoengine.h
|
| index e0d4db52f849b4b9e25233a4cf20751b52206419..7fb0bfd88700fcdb512dcd0205bdb3d25b0a95bb 100644
|
| --- a/talk/media/webrtc/fakewebrtcvideoengine.h
|
| +++ b/webrtc/media/webrtc/fakewebrtcvideoengine.h
|
| @@ -1,46 +1,29 @@
|
| /*
|
| - * libjingle
|
| - * Copyright 2010 Google Inc.
|
| + * Copyright 2010 The WebRTC Project Authors. All rights reserved.
|
| *
|
| - * 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.
|
| + * Use of this source code is governed by a BSD-style license
|
| + * that can be found in the LICENSE file in the root of the source
|
| + * tree. An additional intellectual property rights grant can be found
|
| + * in the file PATENTS. All contributing project authors may
|
| + * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#ifndef TALK_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_
|
| -#define TALK_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_
|
| +#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_
|
| +#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_
|
|
|
| #include <map>
|
| #include <set>
|
| #include <vector>
|
|
|
| -#include "talk/media/base/codec.h"
|
| -#include "talk/media/webrtc/fakewebrtccommon.h"
|
| -#include "talk/media/webrtc/webrtcvideodecoderfactory.h"
|
| -#include "talk/media/webrtc/webrtcvideoencoderfactory.h"
|
| #include "webrtc/base/basictypes.h"
|
| #include "webrtc/base/criticalsection.h"
|
| #include "webrtc/base/gunit.h"
|
| #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/modules/video_coding/include/video_error_codes.h"
|
| #include "webrtc/video_decoder.h"
|
| #include "webrtc/video_encoder.h"
|
| @@ -252,4 +235,4 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory {
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_
|
| +#endif // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_
|
|
|