generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove platform-specific code from new-API tests.

Browse Source 
We've had problems that seem to manifest in run_tests.mm getting stuck
on exit. For our automated test targets only full_stack.cc was making
use of the platform-specific renderers provided by webrtc_test_common
and since no one currently monitors these the use case is hypothetical.

Readding platform-specific renderers to video_loopback is tracked with
issue 3039, though as far as I'm aware no one's currently using the
video_loopback target.

BUG=2987
R=kjellander@webrtc.org, stefan@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5686 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2014-03-12 13:22:00 +00:00
parent ca8cb95364
commit 95153cc4cd
2 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
webrtc/test/webrtc_test_common.gyp
View File

@ -30,14 +30,6 @@
'flags.h',
'frame_generator_capturer.cc',
'frame_generator_capturer.h',
'gl/gl_renderer.cc',
'gl/gl_renderer.h',
'linux/glx_renderer.cc',
'linux/glx_renderer.h',
'linux/video_renderer_linux.cc',
'mac/run_tests.mm',
'mac/video_renderer_mac.h',
'mac/video_renderer_mac.mm',
'mock_transport.h',
'null_platform_renderer.cc',
'null_transport.cc',
@ -55,35 +47,10 @@
'video_capturer.h',
'video_renderer.cc',
'video_renderer.h',
'win/d3d_renderer.cc',
'win/d3d_renderer.h',
'win/run_loop_win.cc',
],
'conditions': [
['OS=="linux"', {
'sources!': [
'null_platform_renderer.cc',
],
}],
['OS=="mac"', {
'sources!': [
'null_platform_renderer.cc',
'run_tests.cc',
],
}],
['OS!="linux" and OS!="mac"', {
'sources!' : [
'gl/gl_renderer.cc',
'gl/gl_renderer.h',
],
}],
['OS=="win"', {
'sources!': [
'null_platform_renderer.cc',
'run_loop.cc',
],
}],
],
# TODO(pbos): As far as I can tell these are dependencies from
# video_render and they should really not be here. This target provides
# no platform-specific rendering.
'direct_dependent_settings': {
'conditions': [
['OS=="linux"', {
@ -93,9 +60,6 @@
'-lGL',
],
}],
#TODO(pbos) : These dependencies should not have to be here, they
# aren't used by test code directly, only by components
# used by the tests.
['OS=="android"', {
'libraries' : [
'-lGLESv2', '-llog',

1
webrtc/video/full_stack.cc
View File

@ -27,7 +27,6 @@
#include "webrtc/test/direct_transport.h"
#include "webrtc/test/frame_generator_capturer.h"
#include "webrtc/test/statistics.h"
#include "webrtc/test/video_renderer.h"
#include "webrtc/typedefs.h"
DEFINE_int32(seconds, 10, "Seconds to run each clip.");