diff --git a/test/test_InfoExtractor.py b/test/test_InfoExtractor.py index 54f35ef55..77cf205ae 100644 --- a/test/test_InfoExtractor.py +++ b/test/test_InfoExtractor.py @@ -1381,6 +1381,175 @@ def test_parse_mpd_formats(self): }, ], }, + ), ( + # Clear Key with CENC default_KID + 'clearkey_cenc', + 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd', # mpd_url + 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/', # mpd_base_url + [{ + 'manifest_url': 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd', + 'ext': 'mp4', + 'format_id': '1', + 'format_note': 'DASH video', + 'protocol': 'http_dash_segments', + 'acodec': 'none', + 'vcodec': 'avc1.64001f', + 'tbr': 389.802, + 'width': 512, + 'height': 288, + 'dash_cenc': { + 'laurl': 'https://drm-clearkey-testvectors.axtest.net/AcquireLicense', + 'key_ids': ['9eb4050de44b4802932e27d75083e266'], + }, + }, { + 'manifest_url': 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd', + 'ext': 'mp4', + 'format_id': '2', + 'format_note': 'DASH video', + 'protocol': 'http_dash_segments', + 'acodec': 'none', + 'vcodec': 'avc1.64001f', + 'tbr': 764.935, + 'width': 640, + 'height': 360, + 'dash_cenc': { + 'laurl': 'https://drm-clearkey-testvectors.axtest.net/AcquireLicense', + 'key_ids': ['9eb4050de44b4802932e27d75083e266'], + }, + }, { + 'manifest_url': 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd', + 'ext': 'mp4', + 'format_id': '3', + 'format_note': 'DASH video', + 'protocol': 'http_dash_segments', + 'acodec': 'none', + 'vcodec': 'avc1.640028', + 'tbr': 1120.439, + 'width': 852, + 'height': 480, + 'dash_cenc': { + 'laurl': 'https://drm-clearkey-testvectors.axtest.net/AcquireLicense', + 'key_ids': ['9eb4050de44b4802932e27d75083e266'], + }, + }, { + 'manifest_url': 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd', + 'ext': 'mp4', + 'format_id': '4', + 'format_note': 'DASH video', + 'protocol': 'http_dash_segments', + 'acodec': 'none', + 'vcodec': 'avc1.640032', + 'tbr': 1945.258, + 'width': 1280, + 'height': 720, + 'dash_cenc': { + 'laurl': 'https://drm-clearkey-testvectors.axtest.net/AcquireLicense', + 'key_ids': ['9eb4050de44b4802932e27d75083e266'], + }, + }, { + 'manifest_url': 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd', + 'ext': 'mp4', + 'format_id': '5', + 'format_note': 'DASH video', + 'protocol': 'http_dash_segments', + 'acodec': 'none', + 'vcodec': 'avc1.640033', + 'tbr': 2726.377, + 'width': 1920, + 'height': 1080, + 'dash_cenc': { + 'laurl': 'https://drm-clearkey-testvectors.axtest.net/AcquireLicense', + 'key_ids': ['9eb4050de44b4802932e27d75083e266'], + }, + }], + {}, + ), ( + # default CENC KID overridden via W3C PSSH box, no license server in manifest + 'w3c_pssh', + 'https://unknown/manifest.mpd', # mpd_url + 'https://unknown/', # mpd_base_url + [{ + 'manifest_url': 'https://unknown/manifest.mpd', + 'ext': 'mp4', + 'format_id': '1', + 'format_note': 'DASH video', + 'protocol': 'http_dash_segments', + 'acodec': 'none', + 'vcodec': 'avc1.64001f', + 'tbr': 389.802, + 'width': 512, + 'height': 288, + 'dash_cenc': { + 'key_ids': ['43215678123412341234123412341234'], + }, + 'has_drm': True, + }], + {}, + ), ( + # DASH SEA with AES-128-CBC + 'dash_sea', + 'https://unknown/manifest.mpd', # mpd_url + 'https://unknown/', # mpd_base_url + [{ + 'manifest_url': 'https://unknown/manifest.mpd', + 'ext': 'm4a', + 'format_id': '5_A_aac_eng_2_127999_2_1_1', + 'format_note': 'DASH audio', + 'protocol': 'http_dash_segments', + 'acodec': 'mp4a.40.2', + 'vcodec': 'none', + 'tbr': 127.999, + 'hls_aes': { + 'uri': 'https://zavideoplatform.keydelivery.eastus.media.azure.net/?kid=9280864f-064e-48c0-97e0-f2bcb1d8d012', + 'iv': '0x7BD31E102B0CE9CCD39691782533656C', + }, + }, { + 'manifest_url': 'https://unknown/manifest.mpd', + 'ext': 'mp4', + 'format_id': '1_V_video_3', + 'format_note': 'DASH video', + 'protocol': 'http_dash_segments', + 'acodec': 'none', + 'vcodec': 'avc1.64001F', + 'tbr': 258.591, + 'width': 960, + 'height': 540, + 'hls_aes': { + 'uri': 'https://zavideoplatform.keydelivery.eastus.media.azure.net/?kid=9280864f-064e-48c0-97e0-f2bcb1d8d012', + 'iv': '0x7BD31E102B0CE9CCD39691782533656C', + }, + }, { + 'manifest_url': 'https://unknown/manifest.mpd', + 'ext': 'mp4', + 'format_id': '1_V_video_2', + 'format_note': 'DASH video', + 'protocol': 'http_dash_segments', + 'acodec': 'none', + 'vcodec': 'avc1.64001F', + 'tbr': 422.519, + 'width': 1280, + 'height': 720, + 'hls_aes': { + 'uri': 'https://zavideoplatform.keydelivery.eastus.media.azure.net/?kid=9280864f-064e-48c0-97e0-f2bcb1d8d012', + 'iv': '0x7BD31E102B0CE9CCD39691782533656C', + }, + }, { + 'manifest_url': 'https://unknown/manifest.mpd', + 'ext': 'mp4', + 'format_id': '1_V_video_1', + 'format_note': 'DASH video', + 'protocol': 'http_dash_segments', + 'acodec': 'none', + 'vcodec': 'avc1.640028', + 'tbr': 628.102, + 'width': 1920, + 'height': 1080, + 'hls_aes': { + 'uri': 'https://zavideoplatform.keydelivery.eastus.media.azure.net/?kid=9280864f-064e-48c0-97e0-f2bcb1d8d012', + 'iv': '0x7BD31E102B0CE9CCD39691782533656C', + }, + }], + {}, ), ] diff --git a/test/testdata/mpd/clearkey_cenc.mpd b/test/testdata/mpd/clearkey_cenc.mpd new file mode 100644 index 000000000..40f212383 --- /dev/null +++ b/test/testdata/mpd/clearkey_cenc.mpd @@ -0,0 +1,29 @@ + + + + + + + + https://drm-clearkey-testvectors.axtest.net/AcquireLicense + + + + + + + + + + + diff --git a/test/testdata/mpd/dash_sea.mpd b/test/testdata/mpd/dash_sea.mpd new file mode 100644 index 000000000..0eeb9798d --- /dev/null +++ b/test/testdata/mpd/dash_sea.mpd @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/testdata/mpd/w3c_pssh.mpd b/test/testdata/mpd/w3c_pssh.mpd new file mode 100644 index 000000000..d72cd866c --- /dev/null +++ b/test/testdata/mpd/w3c_pssh.mpd @@ -0,0 +1,13 @@ + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAFDIVZ4EjQSNBI0EjQSNBI0AAAAAA== + + + + + + + diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py index 8790b326b..c8961f4e3 100644 --- a/yt_dlp/YoutubeDL.py +++ b/yt_dlp/YoutubeDL.py @@ -56,6 +56,7 @@ from .plugins import directories as plugin_directories, load_all_plugins from .postprocessor import ( EmbedThumbnailPP, + FFmpegCENCDecryptPP, FFmpegFixupDuplicateMoovPP, FFmpegFixupDurationPP, FFmpegFixupM3u8PP, @@ -3407,6 +3408,8 @@ def existing_video_file(*filepaths): self.report_error(f'{msg}. Aborting') return + decrypter = FFmpegCENCDecryptPP(self) + info_dict.setdefault('__files_to_cenc_decrypt', []) if info_dict.get('requested_formats') is not None: old_ext = info_dict['ext'] if self.params.get('merge_output_format') is None: @@ -3487,8 +3490,12 @@ def correct_ext(filename, ext=new_ext): downloaded.append(fname) partial_success, real_download = self.dl(fname, new_info) info_dict['__real_download'] = info_dict['__real_download'] or real_download + if new_info.get('dash_cenc', {}).get('key'): + info_dict['__files_to_cenc_decrypt'].append((fname, new_info['dash_cenc']['key'])) success = success and partial_success + if downloaded and info_dict['__files_to_cenc_decrypt'] and decrypter.available: + info_dict['__postprocessors'].append(decrypter) if downloaded and merger.available and not self.params.get('allow_unplayable_formats'): info_dict['__postprocessors'].append(merger) info_dict['__files_to_merge'] = downloaded @@ -3505,6 +3512,9 @@ def correct_ext(filename, ext=new_ext): # So we should try to resume the download success, real_download = self.dl(temp_filename, info_dict) info_dict['__real_download'] = real_download + if info_dict.get('dash_cenc', {}).get('key') and decrypter.available: + info_dict['__postprocessors'].append(decrypter) + info_dict['__files_to_cenc_decrypt'] = [(temp_filename, info_dict['dash_cenc']['key'])] else: self.report_file_already_downloaded(dl_filename) diff --git a/yt_dlp/downloader/dash.py b/yt_dlp/downloader/dash.py index afc79b6ca..f1826333a 100644 --- a/yt_dlp/downloader/dash.py +++ b/yt_dlp/downloader/dash.py @@ -1,9 +1,14 @@ +import base64 +import binascii +import json import time import urllib.parse from . import get_suitable_downloader from .fragment import FragmentFD -from ..utils import update_url_query, urljoin +from ..networking import Request +from ..networking.exceptions import RequestError +from ..utils import remove_start, traverse_obj, update_url_query, urljoin class DashSegmentsFD(FragmentFD): @@ -49,6 +54,25 @@ def real_download(self, filename, info_dict): if extra_param_to_segment_url: extra_query = urllib.parse.parse_qs(extra_param_to_segment_url) + hls_aes = fmt.get('hls_aes', {}) + if hls_aes: + decrypt_info = {'METHOD', 'AES-128'} + key = hls_aes.get('key') + if key: + key = binascii.unhexlify(remove_start(key, '0x')) + assert len(key) in (16, 24, 32), 'Invalid length for HLS AES-128 key' + decrypt_info['KEY'] = key + iv = hls_aes.get('iv') + if iv: + iv = binascii.unhexlify(remove_start(iv, '0x').zfill(32)) + decrypt_info['IV'] = iv + uri = hls_aes.get('uri') + if uri: + if extra_query: + uri = update_url_query(uri, extra_query) + decrypt_info['URI'] = uri + ctx['decrypt_info'] = decrypt_info + fragments_to_download = self._get_fragments(fmt, ctx, extra_query) if real_downloader: @@ -60,6 +84,12 @@ def real_download(self, filename, info_dict): args.append([ctx, fragments_to_download, fmt]) + cenc_key = traverse_obj(info_dict, ('dash_cenc', 'key')) + cenc_key_ids = traverse_obj(info_dict, ('dash_cenc', 'key_ids')) + clearkey_laurl = traverse_obj(info_dict, ('dash_cenc', 'laurl')) + if not cenc_key and cenc_key_ids and clearkey_laurl: + self._get_clearkey_cenc(info_dict, clearkey_laurl, cenc_key_ids) + return self.download_and_append_fragments_multiple(*args, is_fatal=lambda idx: idx == 0) def _resolve_fragments(self, fragments, ctx): @@ -87,4 +117,35 @@ def _get_fragments(self, fmt, ctx, extra_query): 'fragment_count': fragment.get('fragment_count'), 'index': i, 'url': fragment_url, + 'decrypt_info': ctx.get('decrypt_info', {'METHOD': 'NONE'}), } + + def _get_clearkey_cenc(self, info_dict, laurl, key_ids): + dash_cenc = info_dict.get('dash_cenc', {}) + payload = json.dumps({ + 'kids': [ + base64.urlsafe_b64encode(bytes.fromhex(k)).decode().rstrip('=') + for k in key_ids + ], + 'type': 'temporary', + }).encode() + try: + response = self.ydl.urlopen(Request( + laurl, data=payload, headers={'Content-Type': 'application/json'})) + data = json.loads(response.read()) + except (RequestError, json.JSONDecodeError) as err: + self.report_error(f'Failed to retrieve key from Clear Key license server: {err}') + return + keys = data.get('keys', []) + if len(keys) > 1: + self.report_warning('Clear Key license server returned multiple keys but only single key CENC is supported') + for key in keys: + k = key.get('k') + if k: + try: + dash_cenc.update({'key': base64.urlsafe_b64decode(f'{k}==').hex()}) + info_dict['dash_cenc'] = dash_cenc + return + except (ValueError, binascii.Error): + pass + self.report_error('Clear key license server did not return any valid CENC keys') diff --git a/yt_dlp/extractor/common.py b/yt_dlp/extractor/common.py index b816d788f..cba127c92 100644 --- a/yt_dlp/extractor/common.py +++ b/yt_dlp/extractor/common.py @@ -13,12 +13,14 @@ import os import random import re +import struct import subprocess import sys import time import types import urllib.parse import urllib.request +import uuid import xml.etree.ElementTree from ..compat import ( @@ -251,7 +253,9 @@ class InfoExtractor: * hls_aes A dictionary of HLS AES-128 decryption information used by the native HLS downloader to override the values in the media playlist when an '#EXT-X-KEY' tag - is present in the playlist: + is present in the playlist. Used by the native DASH downloader + when DASH-SEA with AES-128-CBC content protection is present + in the manifest.: * uri The URI from which the key will be downloaded * key The key (as hex) used to decrypt fragments. If `key` is given, any key URI will be ignored @@ -263,6 +267,16 @@ class InfoExtractor: * ffmpeg_args_out Extra arguments for ffmpeg downloader (output) * is_dash_periods Whether the format is a result of merging multiple DASH periods. + * dash_cenc A dictionary of DASH CENC decryption information + used by the native DASH downloader when MPEG CENC content protection + is present in the manifest. + * laurl The Clear Key license server URL from which + CENC keys will be downloaded. + * key_ids List of key IDs (as hex) to request from the ClearKey + license server. + * key The CENC key (as hex) used to decrypt fragments. + If `key` is given, any license server URL and + key IDs will be ignored. RTMP formats can also have the additional fields: page_url, app, play_path, tc_url, flash_version, rtmp_live, rtmp_conn, rtmp_protocol, rtmp_real_time @@ -2685,7 +2699,11 @@ def _merge_mpd_periods(self, periods): assert 'is_dash_periods' not in f, 'format already processed' f['is_dash_periods'] = True format_key = tuple(v for k, v in f.items() if k not in ( - ('format_id', 'fragments', 'manifest_stream_number'))) + ('format_id', 'fragments', 'manifest_stream_number', 'dash_cenc', 'hls_aes'))) + for k in ('dash_cenc', 'hls_aes'): + if k in f: + format_key = format_key + tuple( + tuple(v) if isinstance(v, list) else v for v in f[k].values()) if format_key not in formats: formats[format_key] = f elif 'fragments' in f: @@ -2719,8 +2737,16 @@ def _parse_mpd_periods(self, mpd_doc, mpd_id=None, mpd_base_url='', mpd_url=None def _add_ns(path): return self._xpath_ns(path, namespace) - def is_drm_protected(element): - return element.find(_add_ns('ContentProtection')) is not None + def extract_drm_info(element): + info = {} + has_drm = False + for cp_e in element.findall(_add_ns('ContentProtection')): + has_drm = True + self._extract_mpd_content_protection_info(cp_e, info) + cenc_info = info.get('dash_cenc', {}) + if has_drm and not ('hls_aes' in info or cenc_info.get('key') or (cenc_info.get('laurl') and cenc_info.get('key_ids'))): + info['has_drm'] = True + return info def extract_multisegment_info(element, ms_parent_info): ms_info = ms_parent_info.copy() @@ -2794,6 +2820,7 @@ def extract_Initialization(source): 'timescale': 1, }) for adaptation_set in period.findall(_add_ns('AdaptationSet')): + adaptation_set_drm_info = extract_drm_info(adaptation_set) adaption_set_ms_info = extract_multisegment_info(adaptation_set, period_ms_info) for representation in adaptation_set.findall(_add_ns('Representation')): representation_attrib = adaptation_set.attrib.copy() @@ -2880,8 +2907,8 @@ def extract_Initialization(source): 'acodec': 'none', 'vcodec': 'none', } - if is_drm_protected(adaptation_set) or is_drm_protected(representation): - f['has_drm'] = True + f.update(adaptation_set_drm_info) + f.update(extract_drm_info(representation)) representation_ms_info = extract_multisegment_info(representation, adaption_set_ms_info) def prepare_template(template_name, identifiers): @@ -3042,6 +3069,86 @@ def add_segment_url(): period_entry['subtitles'][lang or 'und'].append(f) yield period_entry + def _extract_mpd_content_protection_info(self, cp_e, info): + """ + Extract supported DASH-CENC parameters for an MPD ContentProtection element. + + Called multiple times per extracted format in an MPD (once per ContentProtection element + within AdaptationSet and Representation elements). Subclasses may override this method + when necessary (such as when the Clear Key license server URL is provided separately + from the manifest or when an extractor needs to process the optional data section in W3C + PSSH boxes). + + Note that after all ContentProtection elements have been handled, the `has_drm` flag + will be set for any format that does not meet one or more of these conditions: + + * `dash_cenc` is set and both `laurl` and `key_ids` are set (indicating the native + DASH downloader should use the specified Clear Key server URL to retreive the + CENC key for this format). + * `dash_cenc` is set and `key` is set (indicating the native DASH downloader should + use the specified CENC key for this format). + * `hls_aes` is set (indicating the native DASH downloader should use DASH SEA + AES-128-CBC decryption for this format). + + References: + 1. DASH-IF Content Protection Identifiers + https://dashif.org/identifiers/content_protection/ + 2. DASH-IF Content Protection Guidelines + https://dashif.org/docs/IOP-Guidelines/DASH-IF-IOP-Part6-v5.0.0.pdf + 3. W3C "cenc" Initialization Data Format + https://w3c.github.io/encrypted-media/format-registry/initdata/cenc.html + """ + scheme_id = cp_e.get('schemeIdUri') + cenc_info = info.get('dash_cenc', {}) + if scheme_id == 'urn:mpeg:dash:mp4protection:2011': + if cp_e.get('value') == 'cenc': + # ISO/IEC 23009-1 MPEG Common Encryption (CENC) + if not cenc_info.get('key_ids'): + try: + default_kid = uuid.UUID(cp_e.get('{urn:mpeg:cenc:2013}default_KID')).hex + cenc_info['key_ids'] = [default_kid] + except (ValueError, TypeError): + pass + elif scheme_id == 'urn:uuid:e2719d58-a985-b3c9-781a-b030af78d30e': + # Clear Key DASH-IF + for tag, ns in itertools.product( + ('Laurl', 'laurl'), + ('https://dashif.org/CPS', 'http://dashif.org/guidelines/clearKey'), + ): + url_e = cp_e.find(self._xpath_ns(tag, ns)) + if url_e is not None: + cenc_info['laurl'] = url_e.text + break + elif scheme_id == 'urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b': + # W3C Common System ID + pssh_e = cp_e.find(self._xpath_ns('pssh', 'urn:mpeg:cenc:2013')) + if pssh_e is not None: + # W3C PSSH box (may contain Clear Key KIDs but can also be used + # to store KIDs for other DRM systems) + try: + pssh_box = base64.b64decode(pssh_e.text) + kid_count, = struct.unpack('!L', pssh_box[28:32]) + kids = [] + for i in range(kid_count): + kid = pssh_box[32 + i * 16:32 + (i + 1) * 16] + kids.append(kid.hex()) + cenc_info['key_ids'] = kids + except (ValueError, TypeError, struct.error): + pass + elif scheme_id == 'urn:mpeg:dash:sea:2012': + # ISO/IEC 23009-4 DASH Segment Encryption and Authentication (AES-128-CBC) + sea_ns = 'urn:mpeg:dash:schema:sea:2012' + se_e = cp_e.find(self._xpath_ns('SegmentEncryption', sea_ns)) + ks_e = cp_e.find(self._xpath_ns('KeySystem', sea_ns)) + crypto_e = cp_e.find(self._xpath_ns('CryptoPeriod', sea_ns)) + if (se_e is not None and se_e.get('schemeIdUri') == 'urn:mpeg:dash:sea:aes128-cbc:2013' + and ks_e is not None and ks_e.get('keySystemUri') == 'urn:mpeg:dash:sea:keysys:http:2013' + and crypto_e is not None and crypto_e.get('keyUriTemplate') and crypto_e.get('IV') + ): + info['hls_aes'] = {'uri': crypto_e.get('keyUriTemplate'), 'iv': crypto_e.get('IV')} + if cenc_info: + info['dash_cenc'] = cenc_info + def _extract_ism_formats(self, *args, **kwargs): fmts, subs = self._extract_ism_formats_and_subtitles(*args, **kwargs) if subs: diff --git a/yt_dlp/postprocessor/__init__.py b/yt_dlp/postprocessor/__init__.py index 20e8b14b2..7ed402aac 100644 --- a/yt_dlp/postprocessor/__init__.py +++ b/yt_dlp/postprocessor/__init__.py @@ -8,6 +8,7 @@ FFmpegCopyStreamPP, FFmpegEmbedSubtitlePP, FFmpegExtractAudioPP, + FFmpegCENCDecryptPP, FFmpegFixupDuplicateMoovPP, FFmpegFixupDurationPP, FFmpegFixupM3u8PP, diff --git a/yt_dlp/postprocessor/ffmpeg.py b/yt_dlp/postprocessor/ffmpeg.py index e59e9832b..d678735c1 100644 --- a/yt_dlp/postprocessor/ffmpeg.py +++ b/yt_dlp/postprocessor/ffmpeg.py @@ -330,7 +330,7 @@ def run_ffmpeg_multiple_files(self, input_paths, out_path, opts, **kwargs): [(path, []) for path in input_paths], [(out_path, opts)], **kwargs) - def real_run_ffmpeg(self, input_path_opts, output_path_opts, *, expected_retcodes=(0,)): + def real_run_ffmpeg(self, input_path_opts, output_path_opts, *, prepend_opts=None, expected_retcodes=(0,)): self.check_version() oldest_mtime = min( @@ -341,6 +341,9 @@ def real_run_ffmpeg(self, input_path_opts, output_path_opts, *, expected_retcode if self.basename == 'ffmpeg': cmd += [encodeArgument('-loglevel'), encodeArgument('repeat+info')] + if prepend_opts: + cmd += prepend_opts + def make_args(file, args, name, number): keys = [f'_{name}{number}', f'_{name}'] if name == 'o': @@ -856,12 +859,23 @@ def can_merge(self): return True +class FFmpegCENCDecryptPP(FFmpegPostProcessor): + @PostProcessor._restrict_to(images=False) + def run(self, info): + for filename, key in info.get('__files_to_cenc_decrypt', []): + temp_filename = prepend_extension(filename, 'temp') + self.to_screen(f'Decrypting "{filename}"') + self.run_ffmpeg(filename, temp_filename, self.stream_copy_opts(), prepend_opts=['-decryption_key', key]) + os.replace(temp_filename, filename) + return [], info + + class FFmpegFixupPostProcessor(FFmpegPostProcessor): - def _fixup(self, msg, filename, options): + def _fixup(self, msg, filename, options, prepend_opts=None): temp_filename = prepend_extension(filename, 'temp') self.to_screen(f'{msg} of "{filename}"') - self.run_ffmpeg(filename, temp_filename, options) + self.run_ffmpeg(filename, temp_filename, options, prepend_opts=prepend_opts) os.replace(temp_filename, filename) @@ -933,7 +947,11 @@ class FFmpegCopyStreamPP(FFmpegFixupPostProcessor): @PostProcessor._restrict_to(images=False) def run(self, info): - self._fixup(self.MESSAGE, info['filepath'], self.stream_copy_opts()) + self._fixup( + self.MESSAGE, + info['filepath'], + self.stream_copy_opts(), + ) return [], info