Skip to content

Commit 94b8815

Browse files
OrangeChannelOrangeChannel
authored
Split up __init__.py file into submodules (#45)
Closes #38
1 parent 15e49a5 commit 94b8815

File tree

6 files changed

+500
-447
lines changed

6 files changed

+500
-447
lines changed

‎tests/test_vsutil.py‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import unittest
2+
23
import vapoursynth as vs
4+
35
import vsutil
46

57

@@ -218,25 +220,25 @@ def test_scale_value(self):
218220
self.assertEqual(vsutil.scale_value(255, 8, 16, range_in=1, range=0, scale_offsets=True, chroma=True), 240 << 8)
219221

220222
# int to flt
221-
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=0, range=1, scale_offsets=False, chroma=False), 1/219)
222-
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=1, range=1, scale_offsets=False, chroma=False), 1/255)
223+
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=0, range=1, scale_offsets=False, chroma=False), 1 / 219)
224+
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=1, range=1, scale_offsets=False, chroma=False), 1 / 255)
223225
self.assertEqual(vsutil.scale_value(219, 8, 32, range_in=0, range=1, scale_offsets=False, chroma=False), 1)
224226
self.assertEqual(vsutil.scale_value(255, 8, 32, range_in=1, range=1, scale_offsets=False, chroma=False), 1)
225227

226-
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=0, range=1, scale_offsets=False, chroma=True), 1/224)
227-
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=1, range=1, scale_offsets=False, chroma=True), 1/255)
228+
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=0, range=1, scale_offsets=False, chroma=True), 1 / 224)
229+
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=1, range=1, scale_offsets=False, chroma=True), 1 / 255)
228230
self.assertEqual(vsutil.scale_value(224, 8, 32, range_in=0, range=1, scale_offsets=False, chroma=True), 1)
229231
self.assertEqual(vsutil.scale_value(255, 8, 32, range_in=1, range=1, scale_offsets=False, chroma=True), 1)
230232

231-
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=0, range=1, scale_offsets=True, chroma=False), (1-16)/219)
232-
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=1, range=1, scale_offsets=True, chroma=False), 1/255)
233+
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=0, range=1, scale_offsets=True, chroma=False), (1 - 16) / 219)
234+
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=1, range=1, scale_offsets=True, chroma=False), 1 / 255)
233235
self.assertEqual(vsutil.scale_value(235, 8, 32, range_in=0, range=1, scale_offsets=True, chroma=False), 1)
234236
self.assertEqual(vsutil.scale_value(255, 8, 32, range_in=1, range=1, scale_offsets=True, chroma=False), 1)
235237

236-
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=0, range=1, scale_offsets=True, chroma=True), (1-128)/224)
237-
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=1, range=1, scale_offsets=True, chroma=True), (1-128)/255)
238+
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=0, range=1, scale_offsets=True, chroma=True), (1 - 128) / 224)
239+
self.assertEqual(vsutil.scale_value(1, 8, 32, range_in=1, range=1, scale_offsets=True, chroma=True), (1 - 128) / 255)
238240
self.assertEqual(vsutil.scale_value(240, 8, 32, range_in=0, range=1, scale_offsets=True, chroma=True), 0.5)
239-
self.assertEqual(vsutil.scale_value(255, 8, 32, range_in=1, range=1, scale_offsets=True, chroma=True), (255-128)/255)
241+
self.assertEqual(vsutil.scale_value(255, 8, 32, range_in=1, range=1, scale_offsets=True, chroma=True), (255 - 128) / 255)
240242

241243
# int to int (downsample)
242244
self.assertEqual(vsutil.scale_value(256, 16, 8, range_in=0, range=0, scale_offsets=False, chroma=False), 1)
@@ -247,7 +249,7 @@ def test_scale_value(self):
247249
self.assertEqual(vsutil.scale_value(256, 16, 8, range_in=0, range=0, scale_offsets=False, chroma=True), 1)
248250
self.assertEqual(vsutil.scale_value(257, 16, 8, range_in=1, range=1, scale_offsets=False, chroma=True), 1)
249251
self.assertEqual(vsutil.scale_value(65535, 16, 8, range_in=1, range=0, scale_offsets=False, chroma=True), 224)
250-
self.assertEqual(vsutil.scale_value(224<<8, 16, 8, range_in=0, range=1, scale_offsets=False, chroma=True), 255)
252+
self.assertEqual(vsutil.scale_value(224 << 8, 16, 8, range_in=0, range=1, scale_offsets=False, chroma=True), 255)
251253

252254
self.assertEqual(vsutil.scale_value(256, 16, 8, range_in=0, range=0, scale_offsets=True, chroma=False), 1)
253255
self.assertEqual(vsutil.scale_value(257, 16, 8, range_in=1, range=1, scale_offsets=True, chroma=False), 1)
@@ -260,25 +262,25 @@ def test_scale_value(self):
260262
self.assertEqual(vsutil.scale_value(240 << 8, 16, 8, range_in=0, range=1, scale_offsets=True, chroma=True), 255)
261263

262264
# flt to int
263-
self.assertEqual(vsutil.scale_value(1/219, 32, 8, range_in=1, range=0, scale_offsets=False, chroma=False), 1)
264-
self.assertEqual(vsutil.scale_value(1/255, 32, 8, range_in=1, range=1, scale_offsets=False, chroma=False), 1)
265+
self.assertEqual(vsutil.scale_value(1 / 219, 32, 8, range_in=1, range=0, scale_offsets=False, chroma=False), 1)
266+
self.assertEqual(vsutil.scale_value(1 / 255, 32, 8, range_in=1, range=1, scale_offsets=False, chroma=False), 1)
265267
self.assertEqual(vsutil.scale_value(1, 32, 8, range_in=1, range=0, scale_offsets=False, chroma=False), 219)
266268
self.assertEqual(vsutil.scale_value(1, 32, 8, range_in=1, range=1, scale_offsets=False, chroma=False), 255)
267269

268-
self.assertEqual(vsutil.scale_value(1/224, 32, 8, range_in=1, range=0, scale_offsets=False, chroma=True), 1)
269-
self.assertEqual(vsutil.scale_value(1/255, 32, 8, range_in=1, range=1, scale_offsets=False, chroma=True), 1)
270+
self.assertEqual(vsutil.scale_value(1 / 224, 32, 8, range_in=1, range=0, scale_offsets=False, chroma=True), 1)
271+
self.assertEqual(vsutil.scale_value(1 / 255, 32, 8, range_in=1, range=1, scale_offsets=False, chroma=True), 1)
270272
self.assertEqual(vsutil.scale_value(1, 32, 8, range_in=1, range=0, scale_offsets=False, chroma=True), 224)
271273
self.assertEqual(vsutil.scale_value(1, 32, 8, range_in=1, range=1, scale_offsets=False, chroma=True), 255)
272274

273-
self.assertEqual(vsutil.scale_value((1-16)/219, 32, 8, range_in=1, range=0, scale_offsets=True, chroma=False), 1)
274-
self.assertEqual(vsutil.scale_value(1/255, 32, 8, range_in=1, range=1, scale_offsets=True, chroma=False), 1)
275+
self.assertEqual(vsutil.scale_value((1 - 16) / 219, 32, 8, range_in=1, range=0, scale_offsets=True, chroma=False), 1)
276+
self.assertEqual(vsutil.scale_value(1 / 255, 32, 8, range_in=1, range=1, scale_offsets=True, chroma=False), 1)
275277
self.assertEqual(vsutil.scale_value(1, 32, 8, range_in=1, range=0, scale_offsets=True, chroma=False), 235)
276278
self.assertEqual(vsutil.scale_value(1, 32, 8, range_in=1, range=1, scale_offsets=True, chroma=False), 255)
277279

278-
self.assertEqual(vsutil.scale_value((1-128)/224, 32, 8, range_in=1, range=0, scale_offsets=True, chroma=True), 1)
279-
self.assertEqual(vsutil.scale_value((1-128)/255, 32, 8, range_in=1, range=1, scale_offsets=True, chroma=True), 1)
280+
self.assertEqual(vsutil.scale_value((1 - 128) / 224, 32, 8, range_in=1, range=0, scale_offsets=True, chroma=True), 1)
281+
self.assertEqual(vsutil.scale_value((1 - 128) / 255, 32, 8, range_in=1, range=1, scale_offsets=True, chroma=True), 1)
280282
self.assertEqual(vsutil.scale_value(0.5, 32, 8, range_in=1, range=0, scale_offsets=True, chroma=True), 240)
281-
self.assertEqual(vsutil.scale_value((255-128)/255, 32, 8, range_in=1, range=1, scale_offsets=True, chroma=True), 255)
283+
self.assertEqual(vsutil.scale_value((255 - 128) / 255, 32, 8, range_in=1, range=1, scale_offsets=True, chroma=True), 255)
282284

283285
def test_depth(self):
284286
with self.assertRaisesRegex(ValueError, 'sample_type must be in'):
@@ -319,39 +321,39 @@ def test_depth(self):
319321
self.assert_same_format(vsutil.depth(l_float_16_clip, 16, sample_type=vs.INTEGER), l_int_16_clip)
320322

321323
def test_readable_enums(self):
322-
self.assertEqual(vsutil._readable_enums(vsutil.Range), '<vsutil.Range.LIMITED: 0>, <vsutil.Range.FULL: 1>')
324+
self.assertEqual(vsutil.types._readable_enums(vsutil.Range), '<vsutil.types.Range.LIMITED: 0>, <vsutil.types.Range.FULL: 1>')
323325

324326
def test_resolve_enum(self):
325-
self.assertEqual(vsutil._resolve_enum(vsutil.Range, None, 'test'), None)
326-
self.assertEqual(vsutil._resolve_enum(vs.SampleType, 0, 'test', 'vapoursynth'), vs.SampleType(0))
327+
self.assertEqual(vsutil.types._resolve_enum(vsutil.Range, None, 'test'), None)
328+
self.assertEqual(vsutil.types._resolve_enum(vs.SampleType, 0, 'test', 'vapoursynth'), vs.SampleType(0))
327329

328330
with self.assertRaisesRegex(ValueError, 'vapoursynth.ColorFamily'):
329-
vsutil._resolve_enum(vs.ColorFamily, 2, 'test', 'vapoursynth')
331+
vsutil.types._resolve_enum(vs.ColorFamily, 2, 'test', 'vapoursynth')
330332

331333
def test_should_dither(self):
332334
# --- True ---
333335
# Range conversion
334-
self.assertTrue(vsutil._should_dither(1, 1, in_range=vsutil.Range.LIMITED, out_range=vsutil.Range.FULL))
336+
self.assertTrue(vsutil.clips._should_dither(1, 1, in_range=vsutil.Range.LIMITED, out_range=vsutil.Range.FULL))
335337
# Float to int
336-
self.assertTrue(vsutil._should_dither(1, 1, in_sample_type=vs.FLOAT))
338+
self.assertTrue(vsutil.clips._should_dither(1, 1, in_sample_type=vs.FLOAT))
337339
# Upsampling full range 10 -> 12
338-
self.assertTrue(vsutil._should_dither(10, 12, in_range=vsutil.Range.FULL, out_range=vsutil.Range.FULL))
340+
self.assertTrue(vsutil.clips._should_dither(10, 12, in_range=vsutil.Range.FULL, out_range=vsutil.Range.FULL))
339341
# Downsampling
340-
self.assertTrue(vsutil._should_dither(10, 8, in_sample_type=vs.INTEGER))
341-
self.assertTrue(vsutil._should_dither(10, 8, in_sample_type=vs.INTEGER, in_range=vsutil.Range.FULL, out_range=vsutil.Range.FULL))
342-
self.assertTrue(vsutil._should_dither(10, 8, in_sample_type=vs.INTEGER, in_range=vsutil.Range.LIMITED, out_range=vsutil.Range.LIMITED))
342+
self.assertTrue(vsutil.clips._should_dither(10, 8, in_sample_type=vs.INTEGER))
343+
self.assertTrue(vsutil.clips._should_dither(10, 8, in_sample_type=vs.INTEGER, in_range=vsutil.Range.FULL, out_range=vsutil.Range.FULL))
344+
self.assertTrue(vsutil.clips._should_dither(10, 8, in_sample_type=vs.INTEGER, in_range=vsutil.Range.LIMITED, out_range=vsutil.Range.LIMITED))
343345

344346
# --- False ---
345347
# Int to int
346-
self.assertFalse(vsutil._should_dither(8, 8, in_sample_type=vs.INTEGER))
348+
self.assertFalse(vsutil.clips._should_dither(8, 8, in_sample_type=vs.INTEGER))
347349
# Upsampling full range 8 -> 16
348-
self.assertFalse(vsutil._should_dither(8, 16, in_range=vsutil.Range.FULL, out_range=vsutil.Range.FULL))
350+
self.assertFalse(vsutil.clips._should_dither(8, 16, in_range=vsutil.Range.FULL, out_range=vsutil.Range.FULL))
349351
# Upsampling
350-
self.assertFalse(vsutil._should_dither(8, 16, in_sample_type=vs.INTEGER))
351-
self.assertFalse(vsutil._should_dither(8, 16, in_sample_type=vs.INTEGER, in_range=vsutil.Range.LIMITED, out_range=vsutil.Range.LIMITED))
352+
self.assertFalse(vsutil.clips._should_dither(8, 16, in_sample_type=vs.INTEGER))
353+
self.assertFalse(vsutil.clips._should_dither(8, 16, in_sample_type=vs.INTEGER, in_range=vsutil.Range.LIMITED, out_range=vsutil.Range.LIMITED))
352354
# Float output
353-
self.assertFalse(vsutil._should_dither(32, 32, in_sample_type=vs.INTEGER))
354-
self.assertFalse(vsutil._should_dither(32, 16, in_sample_type=vs.INTEGER, out_sample_type=vs.FLOAT))
355+
self.assertFalse(vsutil.clips._should_dither(32, 32, in_sample_type=vs.INTEGER))
356+
self.assertFalse(vsutil.clips._should_dither(32, 16, in_sample_type=vs.INTEGER, out_sample_type=vs.FLOAT))
355357

356358
def test_decorators(self):
357359
with self.assertRaisesRegex(ValueError, 'Variable-format'):

0 commit comments

Comments
 (0)