Skip to content

Delay resolution of animation extra_args. #16081

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 1 commit into from
Jan 4, 2020
Merged

Delay resolution of animation extra_args. #16081

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions lib/matplotlib/animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,7 @@ def __init__(self, fps=5, codec=None, bitrate=None, extra_args=None,
super().__init__(fps=fps, metadata=metadata)

self.frame_format = 'rgba'

if extra_args is None:
self.extra_args = list(mpl.rcParams[self.args_key])
else:
self.extra_args = extra_args
self.extra_args = extra_args

def _adjust_frame_size(self):
if self.codec == 'h264':
Expand Down Expand Up @@ -583,15 +579,17 @@ class FFMpegBase:
@property
def output_args(self):
args = ['-vcodec', self.codec]
extra_args = (self.extra_args if self.extra_args is not None
else mpl.rcParams[self.args_key])
# For h264, the default format is yuv444p, which is not compatible
# with quicktime (and others). Specifying yuv420p fixes playback on
# iOS, as well as HTML5 video in firefox and safari (on both Win and
# OSX). Also fixes internet explorer. This is as of 2015/10/29.
if self.codec == 'h264' and '-pix_fmt' not in self.extra_args:
if self.codec == 'h264' and '-pix_fmt' not in extra_args:
args.extend(['-pix_fmt', 'yuv420p'])
if self.bitrate > 0:
args.extend(['-b', '%dk' % self.bitrate]) # %dk: bitrate in kbps.
args.extend(self.extra_args)
args.extend(extra_args)
for k, v in self.metadata.items():
args.extend(['-metadata', '%s=%s' % (k, v)])

Expand Down Expand Up @@ -707,7 +705,9 @@ def delay(self):

@property
def output_args(self):
return [*self.extra_args, self.outfile]
extra_args = (self.extra_args if self.extra_args is not None
else mpl.rcParams[self.args_key])
return [*extra_args, self.outfile]

@classmethod
def bin_path(cls):
Expand Down