From fc46f24dc51d984395fc84c8b6823fbe96bf2476 Mon Sep 17 00:00:00 2001 From: sergeidanilov Date: Wed, 25 Oct 2023 23:18:49 -0700 Subject: [PATCH] fix pull request lint comments cleaned up implementation and comments --- yt_dlp/postprocessor/ffmpeg.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/yt_dlp/postprocessor/ffmpeg.py b/yt_dlp/postprocessor/ffmpeg.py index 800c14def0..6a7264edd6 100644 --- a/yt_dlp/postprocessor/ffmpeg.py +++ b/yt_dlp/postprocessor/ffmpeg.py @@ -1046,20 +1046,23 @@ def _ffmpeg_args_for_chapter(self, number, chapter, info): destination, ['-ss', str(chapter['start_time']), '-t', str(chapter['end_time'] - chapter['start_time'])]) + # FFmpeg adds metadata about all chapters from parent file to all split m4a files. # This is incorrect since there must be only single chapter in each file after split. # Such behavior confuses players who think multiple chapters present def _set_out_opts(self, ext, chapter_title): + out_opts = [*self.stream_copy_opts()] + out_opts.extend(['-map_metadata', '0']) + # exclude chapters metadata but keep everything else + out_opts.extend(['-map_chapters', '-1']) + if not chapter_title: + return out_opts + # replace global title with chapter specific title in split files if ext == 'm4a': - return [ - *self.stream_copy_opts(), - # For m4a ffmpeg copies all available parent track chapters to split tracks metadata - # And such behavior confuses players - # Wipe parent track metadata from split tracks and fill out only title - '-metadata', 'title={}'.format(chapter_title), - '-map_metadata','-1'] - else: - return self.stream_copy_opts() + out_opts.extend(['-metadata', 'title={}'.format(chapter_title)]) + if ext == 'opus': + out_opts.extend(['-metadata:s', 'title={}'.format(chapter_title)]) + return out_opts @PostProcessor._restrict_to(images=False) def run(self, info): @@ -1075,7 +1078,7 @@ def run(self, info): self.to_screen('Splitting video by chapters; %d chapters found' % len(chapters)) for idx, chapter in enumerate(chapters): destination, opts = self._ffmpeg_args_for_chapter(idx + 1, chapter, info) - out_file_opts = self._set_out_opts(info['ext'], chapter['title']) + out_file_opts = self._set_out_opts(info['ext'], chapter.get('title', '')) self.real_run_ffmpeg([(in_file, opts)], [(destination, out_file_opts)]) if in_file != info['filepath']: self._delete_downloaded_files(in_file, msg=None)