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

Unified Diff: tools/telemetry/telemetry/core/platform/linux_platform_backend.py

Issue 103723002: [Telemetry] Convert mp4 video to Timestamp+Bitmaps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: bulach+szym comments Created 7 years 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
Index: tools/telemetry/telemetry/core/platform/linux_platform_backend.py
diff --git a/tools/telemetry/telemetry/core/platform/linux_platform_backend.py b/tools/telemetry/telemetry/core/platform/linux_platform_backend.py
index d2b467130d743d5c42d6feb787fa52e0521e01c6..f13f76e03c18fa961b0e8c20c1f65eb3a5d73828 100644
--- a/tools/telemetry/telemetry/core/platform/linux_platform_backend.py
+++ b/tools/telemetry/telemetry/core/platform/linux_platform_backend.py
@@ -43,16 +43,19 @@ class LinuxPlatformBackend(
p.wait()
assert p.returncode == 0, 'Failed to flush system cache'
- def CanRunApplication(self, application):
+ def CanLaunchApplication(self, application):
if application == 'ipfw' and not self._IsIpfwKernelModuleInstalled():
return False
- return super(LinuxPlatformBackend, self).CanRunApplication(application)
+ return super(LinuxPlatformBackend, self).CanLaunchApplication(application)
def InstallApplication(self, application):
- if application != 'ipfw':
+ if application == 'ipfw':
+ self._InstallIpfw()
+ elif application == 'avconv':
+ self._InstallAvconv()
+ else:
raise NotImplementedError(
'Please teach Telemetry how to install ' + application)
- self._InstallIpfw()
def _IsIpfwKernelModuleInstalled(self):
return 'ipfw_mod' in subprocess.Popen(
@@ -73,10 +76,25 @@ class LinuxPlatformBackend(
'http://info.iet.unipi.it/~luigi/dummynet/')
sys.exit(1)
- if changed or not self.CanRunApplication('ipfw'):
+ if changed or not self.CanLaunchApplication('ipfw'):
if not self._IsIpfwKernelModuleInstalled():
subprocess.check_call(['sudo', 'insmod', ipfw_mod])
os.chmod(ipfw_bin, 0755)
subprocess.check_call(['sudo', 'cp', ipfw_bin, '/usr/local/sbin'])
- assert self.CanRunApplication('ipfw'), 'Failed to install ipfw'
+ assert self.CanLaunchApplication('ipfw'), 'Failed to install ipfw'
+
+ def _InstallAvconv(self):
+ telemetry_bin_dir = os.path.join(util.GetTelemetryDir(), 'bin')
+ avconv_bin = os.path.join(telemetry_bin_dir, 'avconv')
+ os.environ['PATH'] += os.pathsep + telemetry_bin_dir
+
+ try:
+ cloud_storage.GetIfChanged(cloud_storage.INTERNAL_BUCKET, avconv_bin)
+ except cloud_storage.CloudStorageError, e:
+ logging.error(e)
+ logging.error('You may proceed by manually installing avconv via:\n'
+ 'sudo apt-get install libav-tools')
+ sys.exit(1)
+
+ assert self.CanLaunchApplication('avconv'), 'Failed to install avconv'

Powered by Google App Engine
This is Rietveld 408576698