Commit graph

5 commits

Author SHA1 Message Date
Patrik Höglund
9923353600 Make ensure webcam script do nothing on linux.
Linux has all hw webcams now, but it's tricky to stop invoking this
script just on Linux, so just make it do nothing for now.

It should be safe to turn on video_capture_tests on linux
after this lands.

Bug: webrtc:9292, webrtc:9636
Change-Id: I6e86716b4c7ca43244596f806ff904b7fdf9201a
Reviewed-on: https://webrtc-review.googlesource.com/94769
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24334}
2018-08-20 06:20:09 +00:00
Oleh Prypin
09ec3cf7c6 Fix logic for camera check. Still run the test if webcam is found
TBR: phoglund@webrtc.org
No-Try: True
Bug: chromium:755660
Change-Id: Iea1ae4a599a644aca18181f68fe155a659163766
Reviewed-on: https://webrtc-review.googlesource.com/77426
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23286}
2018-05-17 14:26:01 +00:00
Oleh Prypin
739b8169ef Reland "Add support for launching webcam software for use in recipes"
This is a reland of cd469a4ce5
With vpython specified

Original change's description:
> Add support for launching webcam software for use in recipes
>
> * Copy ensure_webcam_is_running.py from recipes repo
> * Turn it into a wrapper that can launch another script
>   (fix_python_path is copied from test_env.py as _ForcePythonInterpreter)
> * Support it in mb.py
> * Add it to video_capture_unittests
>
> No-Try: True
> Bug: chromium:755660
> Change-Id: I376724a77e443620724add7818592e9368d02079
> Reviewed-on: https://webrtc-review.googlesource.com/77320
> Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
> Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#23275}

No-Try: True
Bug: chromium:755660
Change-Id: Ibf4fbe3fea4b003a23b12332b3a6078a2db99a8d
Reviewed-on: https://webrtc-review.googlesource.com/77460
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23279}
2018-05-17 11:42:21 +00:00
Oleh Prypin
e62e18fe13 Revert "Add support for launching webcam software for use in recipes"
This reverts commit cd469a4ce5.

Reason for revert: ImportError: No module named psutil

Original change's description:
> Add support for launching webcam software for use in recipes
> 
> * Copy ensure_webcam_is_running.py from recipes repo
> * Turn it into a wrapper that can launch another script
>   (fix_python_path is copied from test_env.py as _ForcePythonInterpreter)
> * Support it in mb.py
> * Add it to video_capture_unittests
> 
> No-Try: True
> Bug: chromium:755660
> Change-Id: I376724a77e443620724add7818592e9368d02079
> Reviewed-on: https://webrtc-review.googlesource.com/77320
> Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
> Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#23275}

TBR=phoglund@webrtc.org,oprypin@webrtc.org

Change-Id: I611e49e1c8d8668fe405e462ec4b83e364c3d6e7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:755660
Reviewed-on: https://webrtc-review.googlesource.com/77440
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23278}
2018-05-17 11:24:01 +00:00
Oleh Prypin
cd469a4ce5 Add support for launching webcam software for use in recipes
* Copy ensure_webcam_is_running.py from recipes repo
* Turn it into a wrapper that can launch another script
  (fix_python_path is copied from test_env.py as _ForcePythonInterpreter)
* Support it in mb.py
* Add it to video_capture_unittests

No-Try: True
Bug: chromium:755660
Change-Id: I376724a77e443620724add7818592e9368d02079
Reviewed-on: https://webrtc-review.googlesource.com/77320
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23275}
2018-05-17 11:13:01 +00:00