Changed unsigned longs into uint64_t to be a bit more portable.
Merge branch 'master' into fake_camera
Conflicts:
src/video_engine/main/test/AutoTest/source/vie_autotest_base.cc
Removed unnecessary use of WebRTC types. Fixed style issues.
Fixed style issues. Added comments where needed.
(After review) Made the standard base test not mirror the render stream since that is assumed to be tested in the render module. Renamed functions accordingly.
Fixed merge errors.
Merge branch 'master' into fake_camera
Conflicts:
src/video_engine/main/interface/vie_capture.h
src/video_engine/main/test/AutoTest/automated/vie_standard_integration_test.cc
src/video_engine/main/test/AutoTest/interface/vie_autotest.h
src/video_engine/main/test/AutoTest/interface/vie_autotest_defines.h
src/video_engine/main/test/AutoTest/source/vie_autotest_base.cc
src/video_engine/main/test/AutoTest/source/vie_autotest_linux.cc
src/video_engine/main/test/AutoTest/vie_auto_test.gypi
Merge branch 'extended_tests' into fake_camera
Conflicts:
src/video_engine/main/test/AutoTest/automated/vie_standard_integration_test.cc
src/video_engine/main/test/AutoTest/interface/vie_autotest.h
src/video_engine/main/test/AutoTest/source/vie_autotest_base.cc
src/video_engine/main/test/AutoTest/source/vie_autotest_linux.cc
src/video_engine/main/test/AutoTest/vie_auto_test.gypi
More updates after review.
Updates after review.
Added new automated test. - Added a new mode to the vie_auto_test binary. It is now possible to pass --automated to it to make it run noninteractively. - To be precise, it will run everything that has been rewritten as GUnit tests, which currently is one "test suite" in the binary.
Added comments to the new test.
- Fixed a bug which caused test error messages to not get shown.
- Added extended and API tests.
- Abstracted out an integration test base class since all integration
tests set up the exact same way.
- The ViETest::TestError static method will now assert using GTest
asserts if we are running in GTest mode. This gets rid of the hard
asserts that get run otherwise. The hard asserts are still in when using
"classic" mode. TestError will use neither GUnit nor hard asserts if
VIE_ASSERT_ERROR is not defined.
- Formatted vie_autotest_defines.h according to Google style rules.
- Extracted a method for finding a capture device on the system. This
removes a fair bit of logic from the huge test method (mostly straight
statements remain there now).
Rebase from svn.
- Whitespace fixes after review.
Fixed presubmit warning.
- Fixed cpplint.py warnings.
Fixed merge error.
Merge branch 'extended_tests' into fake_camera
Conflicts:
src/video_engine/main/test/AutoTest/automated/vie_extended_integration_test.cc
src/video_engine/main/test/AutoTest/automated/vie_standard_integration_test.cc
src/video_engine/main/test/AutoTest/helpers/vie_window_creator.cc
src/video_engine/main/test/AutoTest/interface/vie_autotest.h
src/video_engine/main/test/AutoTest/source/vie_autotest_base.cc
src/video_engine/main/test/AutoTest/source/vie_autotest_linux.cc
src/video_engine/main/test/AutoTest/vie_auto_test.gypi
More updates after review.
Updates after review.
Added new automated test. - Added a new mode to the vie_auto_test binary. It is now possible to pass --automated to it to make it run noninteractively. - To be precise, it will run everything that has been rewritten as GUnit tests, which currently is one "test suite" in the binary.
Added comments to the new test.
- Fixed a bug which caused test error messages to not get shown.
- Added extended and API tests.
- Abstracted out an integration test base class since all integration
tests set up the exact same way.
- The ViETest::TestError static method will now assert using GTest
asserts if we are running in GTest mode. This gets rid of the hard
asserts that get run otherwise. The hard asserts are still in when using
"classic" mode. TestError will use neither GUnit nor hard asserts if
VIE_ASSERT_ERROR is not defined.
- Formatted vie_autotest_defines.h according to Google style rules.
- Extracted a method for finding a capture device on the system. This
removes a fair bit of logic from the huge test method (mostly straight
statements remain there now).
Rebase from svn.
- Whitespace fixes after review.
Fixed presubmit warning.
- Fixed cpplint.py warnings.
Fixed merge error.
Fixed cpplint.py warnings.
Merge branch 'extended_tests' into fake_camera
Conflicts:
src/video_engine/main/test/AutoTest/automated/vie_api_integration_test.cc
src/video_engine/main/test/AutoTest/automated/vie_extended_integration_test.cc
src/video_engine/main/test/AutoTest/automated/vie_integration_test_base.cc
src/video_engine/main/test/AutoTest/automated/vie_standard_integration_test.cc
src/video_engine/main/test/AutoTest/helpers/vie_window_creator.cc
src/video_engine/main/test/AutoTest/interface/vie_autotest.h
src/video_engine/main/test/AutoTest/source/vie_autotest_base.cc
src/video_engine/main/test/AutoTest/source/vie_autotest_linux.cc
src/video_engine/main/test/AutoTest/source/vie_autotest_main.cc
src/video_engine/main/test/AutoTest/vie_auto_test.gypi
Revert "Revert "- Whitespace fixes after review.""
This reverts commit 3da2a148814e8dea78f73d3feeb32dce690dc2d4.
Revert "- Whitespace fixes after review."
This reverts commit fac670ca313580fb883191ae919091a2637ad0af.
- Whitespace fixes after review.
- Wrote a "file capture device" which is a kind of fake capture device. It reads a YUV file from disk and pretends that it is what the "camera" is seeing. This makes is possible to run tests based on video input without having an actual physical camera. This is good because physical cameras are quite unreliable. - Rewrote the standard mirrored preview loopback test so it can use the new file capture device. The old "classic" test is preserved. I tried to minimize duplication between the classic test case and the new one, which turned out to be quite painful. - There are some rough edges left in in the code. Suggested improvements is to get rid of the error counting mechanism since the code seems to assume that TestError invocations cause hard asserts anyway. The code will segfault for certain errors if the hard asserts doesn't happen, which means the error counting mechanism is unnecessary. This, by the way, could be a problem for the new test since it doesn't cause hard asserts. - Fixed comments for the thread wrapper and the external capture device interface.
- Extracted a method for finding a capture device on the system. This removes a fair bit of logic from the huge test method (mostly straight statements remain there now).
- The ViETest::TestError static method will now assert using GTest asserts if we are running in GTest mode. This gets rid of the hard asserts that get run otherwise. The hard asserts are still in when using "classic" mode. TestError will use neither GUnit nor hard asserts if VIE_ASSERT_ERROR is not defined. - Formatted vie_autotest_defines.h according to Google style rules.
- Added extended and API tests. - Abstracted out an integration test base class since all integration tests set up the exact same way.
- Fixed a bug which caused test error messages to not get shown.
Added comments to the new test.
- Added a new mode to the vie_auto_test binary. It is now possible to pass --automated to it to make it run noninteractively. - To be precise, it will run everything that has been rewritten as GUnit tests, which currently is one "test suite" in the binary.
- Fixed cpplint.py warnings.
Fixed presubmit warning.
- Whitespace fixes after review.
Rebase from svn.
- Extracted a method for finding a capture device on the system. This removes a fair bit of logic from the huge test method (mostly straight statements remain there now).
- The ViETest::TestError static method will now assert using GTest asserts if we are running in GTest mode. This gets rid of the hard asserts that get run otherwise. The hard asserts are still in when using "classic" mode. TestError will use neither GUnit nor hard asserts if VIE_ASSERT_ERROR is not defined. - Formatted vie_autotest_defines.h according to Google style rules.
- Added extended and API tests. - Abstracted out an integration test base class since all integration tests set up the exact same way.
- Fixed a bug which caused test error messages to not get shown.
Added comments to the new test.
- Added a new mode to the vie_auto_test binary. It is now possible to pass --automated to it to make it run noninteractively. - To be precise, it will run everything that has been rewritten as GUnit tests, which currently is one "test suite" in the binary.
BUG=
TEST=
Review URL: http://webrtc-codereview.appspot.com/247004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@803 4adac7df-926f-26a2-2b94-8c16560cd09d
0a9c318c9f