Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2646)

Unified Diff: build/android/pylib/screenshot.py

Issue 379443002: Change ownership of video file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to head Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/screenshot.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/screenshot.py
diff --git a/build/android/pylib/screenshot.py b/build/android/pylib/screenshot.py
index d2e7c956ce4796dd547cada941cf495f757f2aef..390837292fa5d59532b38ba1d7b74c6d5a6af25c 100644
--- a/build/android/pylib/screenshot.py
+++ b/build/android/pylib/screenshot.py
@@ -24,7 +24,7 @@ class VideoRecorder(object):
default.
rotate: If True, the video will be rotated 90 degrees.
"""
- def __init__(self, device, host_file, megabits_per_second=4, size=None,
+ def __init__(self, device, megabits_per_second=4, size=None,
rotate=False):
# TODO(jbudorick) Remove once telemetry gets switched over.
if isinstance(device, pylib.android_commands.AndroidCommands):
@@ -32,9 +32,6 @@ class VideoRecorder(object):
self._device = device
self._device_file = (
'%s/screen-recording.mp4' % device.GetExternalStoragePath())
- self._host_file = host_file or ('screen-recording-%s.mp4' %
- device.old_interface.GetTimestamp())
- self._host_file = os.path.abspath(self._host_file)
self._recorder = None
self._recorder_pids = None
self._recorder_stdout = None
@@ -53,7 +50,6 @@ class VideoRecorder(object):
def Start(self):
"""Start recording video."""
- self._device.old_interface.EnsureHostDirectory(self._host_file)
self._recorder_stdout = tempfile.mkstemp()[1]
self._recorder = cmd_helper.Popen(
self._args, stdout=open(self._recorder_stdout, 'w'))
@@ -80,12 +76,15 @@ class VideoRecorder(object):
'kill -SIGINT ' + ' '.join(self._recorder_pids))
self._recorder.wait()
- def Pull(self):
+ def Pull(self, host_file):
"""Pull resulting video file from the device.
- Returns:
- Output video file name on the host.
+ Args:
+ host_file: Path to the video file to store on the host.
"""
- self._device.PullFile(self._device_file, self._host_file)
+ host_file_name = host_file or ('screen-recording-%s.mp4' %
+ self._device.old_interface.GetTimestamp())
+ host_file = os.path.abspath(host_file_name)
+ self._device.old_interface.EnsureHostDirectory(self._host_file)
+ self._device.PullFile(self._device_file, host_file_name)
self._device.RunShellCommand('rm -f "%s"' % self._device_file)
- return self._host_file
« no previous file with comments | « no previous file | build/android/screenshot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698