diff options
| -rwxr-xr-x | talk/libjingle_tests.gyp | 1 | ||||
| -rw-r--r-- | talk/media/base/nullvideorenderer.h | 48 | ||||
| -rw-r--r-- | talk/session/media/channelmanager_unittest.cc | 1 |
3 files changed, 0 insertions, 50 deletions
diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp index f7ffaeee77..684a296754 100755 --- a/talk/libjingle_tests.gyp +++ b/talk/libjingle_tests.gyp @@ -55,7 +55,6 @@ 'media/base/fakevideocapturer.h', 'media/base/fakevideorenderer.h', 'media/base/nullvideoframe.h', - 'media/base/nullvideorenderer.h', 'media/base/testutils.cc', 'media/base/testutils.h', 'media/devices/fakedevicemanager.h', diff --git a/talk/media/base/nullvideorenderer.h b/talk/media/base/nullvideorenderer.h deleted file mode 100644 index 4652c47bf9..0000000000 --- a/talk/media/base/nullvideorenderer.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * libjingle - * Copyright 2004 Google Inc. - * - * 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. - */ - -#ifndef TALK_MEDIA_BASE_NULLVIDEORENDERER_H_ -#define TALK_MEDIA_BASE_NULLVIDEORENDERER_H_ - -#include "talk/media/base/videorenderer.h" - -namespace cricket { - -// Simple implementation for use in tests. -class NullVideoRenderer : public VideoRenderer { - virtual bool SetSize(int width, int height, int reserved) { - return true; - } - // Called when a new frame is available for display. - virtual bool RenderFrame(const VideoFrame *frame) { - return true; - } -}; - -} // namespace cricket - -#endif // TALK_MEDIA_BASE_NULLVIDEORENDERER_H_ diff --git a/talk/session/media/channelmanager_unittest.cc b/talk/session/media/channelmanager_unittest.cc index f02800195a..e57305c489 100644 --- a/talk/session/media/channelmanager_unittest.cc +++ b/talk/session/media/channelmanager_unittest.cc @@ -28,7 +28,6 @@ #include "talk/media/base/fakecapturemanager.h" #include "talk/media/base/fakemediaengine.h" #include "talk/media/base/fakemediaprocessor.h" -#include "talk/media/base/nullvideorenderer.h" #include "talk/media/base/testutils.h" #include "talk/media/devices/fakedevicemanager.h" #include "webrtc/p2p/base/fakesession.h" |