| Index: tools/telemetry/telemetry/core/platform/android_platform_backend.py
|
| diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend.py b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
|
| index 4a13cf4e9c521f59f2b3017dfd86d844b8c3545f..731f56f7a81fbc8bef99271fe23e4bab289ecb41 100644
|
| --- a/tools/telemetry/telemetry/core/platform/android_platform_backend.py
|
| +++ b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
|
| @@ -3,7 +3,6 @@
|
| # found in the LICENSE file.
|
|
|
| import logging
|
| -import tempfile
|
|
|
| from telemetry import decorators
|
| from telemetry.core import exceptions
|
| @@ -58,7 +57,7 @@ class AndroidPlatformBackend(
|
| self._powermonitor = android_temperature_monitor.AndroidTemperatureMonitor(
|
| power_controller, device)
|
| self._video_recorder = None
|
| - self._video_output = None
|
| + self._video = None
|
| if self._no_performance_mode:
|
| logging.warning('CPU governor will not be set!')
|
|
|
| @@ -225,11 +224,10 @@ class AndroidPlatformBackend(
|
| 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.is_video_capture_running:
|
| self._video_recorder.Stop()
|
| self._video_recorder = screenshot.VideoRecorder(
|
| - self._device, self._video_output, megabits_per_second=min_bitrate_mbps)
|
| + self._device, megabits_per_second=min_bitrate_mbps)
|
| self._video_recorder.Start()
|
| util.WaitFor(self._video_recorder.IsStarted, 5)
|
|
|
| @@ -240,10 +238,10 @@ class AndroidPlatformBackend(
|
| def StopVideoCapture(self):
|
| assert self.is_video_capture_running, 'Must start video capture first'
|
| self._video_recorder.Stop()
|
| - self._video_recorder.Pull()
|
| + video_file_obj = self._video_recorder.Pull()
|
| self._video_recorder = None
|
|
|
| - return video.Video(self._video_output)
|
| + return video.Video(video_file_obj)
|
|
|
| def CanMonitorPower(self):
|
| return self._powermonitor.CanMonitorPower()
|
|
|