Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-01-23 19:15:56 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-01-23 19:16:17 +0300
commit9770d071ff4306ccec940d1f44169297bb3f5747 (patch)
treeca306ce55675d534bfbf22b1ea279209d085d525 /tests/python/ffmpeg_tests.py
parent7a9e4e41a924a1dacb120263ca7181fe69b6a397 (diff)
Fix T54834: VSE can't import OGG Theora video
Diffstat (limited to 'tests/python/ffmpeg_tests.py')
-rwxr-xr-xtests/python/ffmpeg_tests.py29
1 files changed, 24 insertions, 5 deletions
diff --git a/tests/python/ffmpeg_tests.py b/tests/python/ffmpeg_tests.py
index 3d38ebd5edc..d6e7127c35a 100755
--- a/tests/python/ffmpeg_tests.py
+++ b/tests/python/ffmpeg_tests.py
@@ -42,15 +42,29 @@ class AbstractFFmpegSequencerTest(AbstractFFmpegTest):
"bpy.context.scene.sequence_editor_create(); " \
"strip = bpy.context.scene.sequence_editor.sequences.new_movie(" \
"'test_movie', %r, channel=1, frame_start=1); " \
- "print(f'fps:{strip.fps}')" % movie.as_posix()
+ "print(f'fps:{strip.fps}'); " \
+ "print(f'duration:{strip.frame_final_duration}'); " % movie.as_posix()
- def get_movie_file_fps(self, filename: pathlib.Path) -> float:
+ def get_movie_file_field(self, filename: pathlib.Path, field: str) -> str:
script = self.get_script_for_file(filename)
output = self.run_blender('', script)
+ prefix = field + ":"
for line in output.splitlines():
- if line.startswith('fps:'):
- return float(line.split(':')[1])
- return 0.0
+ if line.startswith(prefix):
+ return line.split(':')[1]
+ return ""
+
+ def get_movie_file_field_float(self, filename: pathlib.Path, field: str) -> float:
+ return float(self.get_movie_file_field(filename, field))
+
+ def get_movie_file_field_int(self, filename: pathlib.Path, field: str) -> float:
+ return int(self.get_movie_file_field(filename, field))
+
+ def get_movie_file_fps(self, filename: pathlib.Path) -> float:
+ return self.get_movie_file_field_float(filename, "fps")
+
+ def get_movie_file_duration(self, filename: pathlib.Path) -> float:
+ return self.get_movie_file_field_int(filename, "duration")
class FPSDetectionTest(AbstractFFmpegSequencerTest):
@@ -72,6 +86,11 @@ class FPSDetectionTest(AbstractFFmpegSequencerTest):
1.0,
places=2)
+ def test_T54834(self):
+ self.assertEqual(
+ self.get_movie_file_duration('T54834.ogg'),
+ 50)
+
if __name__ == '__main__':
parser = argparse.ArgumentParser()