commit 9bacbf4f7549238dc027256fd52be75e96c6bf8b
author mflodman@webrtc.org <mflodman@webrtc.org> Mon May 27 15:52:38 2013 +0000
committer mflodman@webrtc.org <mflodman@webrtc.org> Mon May 27 15:52:38 2013 +0000
tree e428743f9b42f2a1031db59eebba0bb315b34c6f
parent a960785108b7d82b35363ab7b9ea4237d599f8c9

Adding Mac test renderer, some test refactoring and made cpplint pass.

BUG=1667
TEST=Rendered video in Mac loopback test.
R=pbos@webrtc.org, xians@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1554004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4112 4adac7df-926f-26a2-2b94-8c16560cd09d

video_engine/test/common/video_renderer.cc

diff --git a/video_engine/test/common/video_renderer.cc b/video_engine/test/common/video_renderer.cc
index ee5cd40..1abb35b 100644
--- a/video_engine/test/common/video_renderer.cc
+++ b/video_engine/test/common/video_renderer.cc
@@ -10,19 +10,6 @@
 
 #include "webrtc/video_engine/test/common/video_renderer.h"
 
-#include "webrtc/modules/video_capture/include/video_capture_factory.h"
-#include "webrtc/video_engine/new_include/video_send_stream.h"
-
-#ifdef WEBRTC_TEST_XV
-#include "webrtc/video_engine/test/common/linux/xv_renderer.h"
-#endif  // WEBRTC_TEST_XV
-
-// Platform-specific renderers preferred over NullRenderer
-#ifdef WEBRTC_TEST_GLX
-#include "webrtc/video_engine/test/common/linux/glx_renderer.h"
-#endif  // WEBRTC_TEST_GLX
-
-// TODO(pbos): Mac renderer
 // TODO(pbos): Windows renderer
 // TODO(pbos): Android renderer
 
@@ -34,27 +21,13 @@
                            int time_to_render_ms) OVERRIDE {}
 };
 
-VideoRenderer* VideoRenderer::Create(const char* window_title,
-                                     size_t width,
+VideoRenderer* VideoRenderer::Create(const char* window_title, size_t width,
                                      size_t height) {
-#ifdef WEBRTC_TEST_XV
-  XvRenderer* xv_renderer = XvRenderer::Create(window_title, width, height);
-  if (xv_renderer != NULL) {
-    return xv_renderer;
+  VideoRenderer* renderer = CreatePlatformRenderer(window_title, width, height);
+  if (renderer != NULL) {
+    // TODO(mflodman) Add a warning log.
+    return renderer;
   }
-#endif  // WEBRTC_TEST_XV
-#ifdef WEBRTC_TEST_GLX
-  GlxRenderer* glx_renderer = GlxRenderer::Create(window_title, width, height);
-  if (glx_renderer != NULL) {
-    return glx_renderer;
-  }
-#endif  // WEBRTC_TEST_GLX
-
-  // Avoid initialized-but-not-referenced errors when only building a
-  // NullRenderer
-  (void) width;
-  (void) height;
-
   return new NullRenderer();
 }
 }  // test