Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support raw/rgba frame format in FFMpegFileWriter #19056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 18, 2020
Merged

Support raw/rgba frame format in FFMpegFileWriter #19056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
755fc9e
Copy logging setup from FFMpegWriter to FFMpegFileWriter.
QuLogic Dec 1, 2020
97a2b36
Support raw/rgba frame format in FFMpegFileWriter.
QuLogic Dec 2, 2020
8922733
Remove unsupported animation frame formats.
QuLogic Dec 16, 2020
6e3864a
TST: Check all supported animation frame formats.
QuLogic Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions lib/matplotlib/animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,15 +628,28 @@ class FFMpegFileWriter(FFMpegBase, FileMovieWriter):
Frames are written to temporary files on disk and then stitched
together at the end.
"""
supported_formats = ['png', 'jpeg', 'ppm', 'tiff', 'sgi', 'bmp',
'pbm', 'raw', 'rgba']
supported_formats = ['png', 'jpeg', 'tiff', 'raw', 'rgba']

def _args(self):
# Returns the command line parameters for subprocess to use
# ffmpeg to create a movie using a collection of temp images
return [self.bin_path(), '-r', str(self.fps),
'-i', self._base_temp_name(),
'-vframes', str(self._frame_counter)] + self.output_args
args = []
# For raw frames, we need to explicitly tell ffmpeg the metadata.
if self.frame_format in {'raw', 'rgba'}:
args += [
'-f', 'image2', '-vcodec', 'rawvideo',
'-video_size', '%dx%d' % self.frame_size,
'-pixel_format', 'rgba',
'-framerate', str(self.fps),
]
args += ['-r', str(self.fps), '-i', self._base_temp_name(),
'-vframes', str(self._frame_counter)]
# Logging is quieted because subprocess.PIPE has limited buffer size.
# If you have a lot of frames in your animation and set logging to
# DEBUG, you will have a buffer overrun.
if _log.getEffectiveLevel() > logging.DEBUG:
args += ['-loglevel', 'error']
return [self.bin_path(), *args, *self.output_args]


# Base class of avconv information. AVConv has identical arguments to FFMpeg.
Expand Down Expand Up @@ -745,8 +758,7 @@ class ImageMagickFileWriter(ImageMagickBase, FileMovieWriter):
together at the end.
"""

supported_formats = ['png', 'jpeg', 'ppm', 'tiff', 'sgi', 'bmp',
'pbm', 'raw', 'rgba']
supported_formats = ['png', 'jpeg', 'tiff', 'raw', 'rgba']

def _args(self):
# Force format: ImageMagick does not recognize 'raw'.
Expand Down
26 changes: 19 additions & 7 deletions lib/matplotlib/tests/test_animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,19 +141,31 @@ def isAvailable(cls):
('html', 'movie.html'),
('null', 'movie.null')
]
WRITER_OUTPUT += [
(writer, Path(output)) for writer, output in WRITER_OUTPUT]


def gen_writers():
for writer, output in WRITER_OUTPUT:
if not animation.writers.is_available(writer):
mark = pytest.mark.skip(
f"writer '{writer}' not available on this system")
yield pytest.param(writer, None, output, marks=[mark])
yield pytest.param(writer, None, Path(output), marks=[mark])
continue

writer_class = animation.writers[writer]
for frame_format in getattr(writer_class, 'supported_formats', [None]):
yield writer, frame_format, output
yield writer, frame_format, Path(output)


# Smoke test for saving animations. In the future, we should probably
# design more sophisticated tests which compare resulting frames a-la
# matplotlib.testing.image_comparison
@pytest.mark.parametrize('writer, output', WRITER_OUTPUT)
@pytest.mark.parametrize('writer, frame_format, output', gen_writers())
@pytest.mark.parametrize('anim', [dict(klass=dict)], indirect=['anim'])
def test_save_animation_smoketest(tmpdir, writer, output, anim):
if not animation.writers.is_available(writer):
pytest.skip("writer '%s' not available on this system" % writer)

def test_save_animation_smoketest(tmpdir, writer, frame_format, output, anim):
if frame_format is not None:
plt.rcParams["animation.frame_format"] = frame_format
anim = animation.FuncAnimation(**anim)
dpi = None
codec = None
Expand Down