summaryrefslogtreecommitdiffstats
path: root/tools/telemetry
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-16 18:51:18 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-16 18:51:18 +0000
commit3d0da818d4af9660123337036ef38e85a1c02636 (patch)
tree97bf470ee7f0095b3d7e68cf5019a9e5999c8557 /tools/telemetry
parent5423aa35fd02664ab7f66a3e3448ae9eec5799fe (diff)
downloadchromium_src-3d0da818d4af9660123337036ef38e85a1c02636.zip
chromium_src-3d0da818d4af9660123337036ef38e85a1c02636.tar.gz
chromium_src-3d0da818d4af9660123337036ef38e85a1c02636.tar.bz2
[telemetry] Stop existing capture in StartVideoCapture and restart.
If a measurement fails, the previous capture is running, so close it instead of failing over again. Review URL: https://codereview.chromium.org/113903003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry')
-rw-r--r--tools/telemetry/telemetry/core/platform/android_platform_backend.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend.py b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
index a0f8229..1d1d857 100644
--- a/tools/telemetry/telemetry/core/platform/android_platform_backend.py
+++ b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
@@ -184,12 +184,13 @@ class AndroidPlatformBackend(
return self.GetOSVersionName() >= 'K'
def StartVideoCapture(self, min_bitrate_mbps):
- assert not self._video_recorder, 'Already started video capture'
min_bitrate_mbps = max(min_bitrate_mbps, 0.1)
if min_bitrate_mbps > 100:
raise ValueError('Android video capture cannot capture at %dmbps. '
'Max capture rate is 100mbps.' % min_bitrate_mbps)
self._video_output = tempfile.mkstemp()[1]
+ if self._video_recorder:
+ self._video_recorder.Stop()
self._video_recorder = screenshot.VideoRecorder(
self._adb, self._video_output, megabits_per_second=min_bitrate_mbps)
self._video_recorder.Start()