tools/telemetry/telemetry/core/video_unittest.py - Issue 668753002: [Telemetry] Migrate bitmap.py from bitmaptools.cc to numpy

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/core/video_unittest.py

Issue 668753002: [Telemetry] Migrate bitmap.py from bitmaptools.cc to numpy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 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/video_unittest.py

diff --git a/tools/telemetry/telemetry/core/video_unittest.py b/tools/telemetry/telemetry/core/video_unittest.py

index f7dc54dd6a4c812508484af11d39c4500b7bff98..08c92deedf7d77af1fbb303410857170f089d27d 100644

--- a/tools/telemetry/telemetry/core/video_unittest.py

+++ b/tools/telemetry/telemetry/core/video_unittest.py

@@ -7,7 +7,7 @@ import os

import unittest

from telemetry import decorators

-from telemetry.core import bitmap

+from telemetry.image_processing import image_util

from telemetry.core import platform

from telemetry.core import util

from telemetry.core import video

@@ -45,6 +45,6 @@ class VideoTest(unittest.TestCase):

for i, timestamp_bitmap in enumerate(video_obj._FramesFromMp4(vid)):

timestamp, bmp = timestamp_bitmap

self.assertEquals(timestamp, expected_timestamps[i])

- expected_bitmap = bitmap.Bitmap.FromPngFile(os.path.join(

+ expected_bitmap = image_util.FromPngFile(os.path.join(

util.GetUnittestDataDir(), 'frame%d.png' % i))

self.assertTrue(expected_bitmap.IsEqual(bmp))

« no previous file with comments | « tools/telemetry/telemetry/core/video.py ('k') | tools/telemetry/telemetry/image_processing/__init__.py » ('j') | no next file with comments »