administration/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-15 05:33:05 +00:00
Code Issues Projects Releases Wiki Activity

[pp/FFmpegMetadata] Use metadata stream specifier for info.json

Browse Source 
The old stream index specifiers would indiscriminately select any JSON
attachment, which made stuff like embedding live chat json data risky if
not impossible.

Also adds `-copy_unknown` as JSON data is "unknown" according to FFmpeg
(since it has no codec id) and thus would otherwise be rejected by
default.
This commit is contained in:
Riteo 2024-05-21 02:07:23 +02:00
parent a0d9967f68
commit 339828d777
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
yt_dlp/postprocessor/ffmpeg.py
View File

@ -805,15 +805,19 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
write_json_file(self._downloader.sanitize_info(info, self.get_param('clean_infojson', True)), infofn) write_json_file(self._downloader.sanitize_info(info, self.get_param('clean_infojson', True)), infofn)
info['infojson_filename'] = infofn info['infojson_filename'] = infofn
old_stream, new_stream = self.get_stream_number(info['filepath'], ('tags', 'mimetype'), 'application/json') escaped_name = self._ffmpeg_filename_argument(infofn)
if old_stream is not None:
yield ('-map', f'-0:{old_stream}')
new_stream -= 1
yield ( yield (
'-attach', self._ffmpeg_filename_argument(infofn), # In order to override any old info.json reliably we need to
f'-metadata:s:{new_stream}', 'mimetype=application/json', # instruct FFmpeg to consider valid tracks without a codec id, like
f'-metadata:s:{new_stream}', 'filename=info.json', # JSON attachments.
'-copy_unknown',
# This map operation allows us to actually replace any previous
# info.json data.
'-map', '-0:m:filename:info.json?',
'-attach', escaped_name,
f'-metadata:s:m:filename:{escaped_name}', 'mimetype=application/json',
f'-metadata:s:m:filename:{escaped_name}', 'filename=info.json',
) )