Javanaut
/
ffx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nightl Scenario 4 inc

Browse Source
click-textual
Maveno 11 months ago
parent 2abda01fe6
commit efb4fbfc95
17 changed files with 271 additions and 218 deletions
Show Stats Download Patch File Download Diff File

134
bin/ffx.py
Unescape Escape View File

@ -10,6 +10,7 @@ from ffx.tmdb_controller import TmdbController
from ffx.database import databaseContext from ffx.database import databaseContext
from ffx.media_descriptor import MediaDescriptor
from ffx.track_descriptor import TrackDescriptor from ffx.track_descriptor import TrackDescriptor
from ffx.track_type import TrackType from ffx.track_type import TrackType
from ffx.video_encoder import VideoEncoder from ffx.video_encoder import VideoEncoder
@ -209,6 +210,49 @@ def shows(ctx):
app.run() app.run()
def checkUniqueDispositions(context, mediaDescriptor: MediaDescriptor):
# Check for multiple default or forced dispositions if not set by user input or database requirements
#
# Query user for the correct sub indices, then configure flags in track descriptors associated with media descriptor accordingly.
# The correct tokens should then be created by
if len([v for v in mediaDescriptor.getVideoTracks() if v.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one default video stream detected and no prompt set')
defaultVideoTrackSubIndex = click.prompt("More than one default video stream detected! Please select stream", type=int)
mediaDescriptor.setDefaultSubTrack(TrackType.VIDEO, defaultVideoTrackSubIndex)
if len([v for v in mediaDescriptor.getVideoTracks() if v.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one forced video stream detected and no prompt set')
forcedVideoTrackSubIndex = click.prompt("More than one forced video stream detected! Please select stream", type=int)
mediaDescriptor.setForcedSubTrack(TrackType.VIDEO, forcedVideoTrackSubIndex)
if len([a for a in mediaDescriptor.getAudioTracks() if a.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one default audio stream detected and no prompt set')
defaultAudioTrackSubIndex = click.prompt("More than one default audio stream detected! Please select stream", type=int)
mediaDescriptor.setDefaultSubTrack(TrackType.AUDIO, defaultAudioTrackSubIndex)
if len([a for a in mediaDescriptor.getAudioTracks() if a.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one forced audio stream detected and no prompt set')
forcedAudioTrackSubIndex = click.prompt("More than one forced audio stream detected! Please select stream", type=int)
mediaDescriptor.setForcedSubTrack(TrackType.AUDIO, forcedAudioTrackSubIndex)
if len([s for s in mediaDescriptor.getSubtitleTracks() if s.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one default subtitle stream detected and no prompt set')
defaultSubtitleTrackSubIndex = click.prompt("More than one default subtitle stream detected! Please select stream", type=int)
mediaDescriptor.setDefaultSubTrack(TrackType.SUBTITLE, defaultSubtitleTrackSubIndex)
if len([s for s in mediaDescriptor.getSubtitleTracks() if s.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one forced subtitle stream detected and no prompt set')
forcedSubtitleTrackSubIndex = click.prompt("More than one forced subtitle stream detected! Please select stream", type=int)
mediaDescriptor.setForcedSubTrack(TrackType.SUBTITLE, forcedSubtitleTrackSubIndex)
@ffx.command() @ffx.command()
@click.pass_context @click.pass_context
@ -221,37 +265,38 @@ def shows(ctx):
@click.option('-q', '--quality', type=str, default=FfxController.DEFAULT_QUALITY, help=f"Quality settings to be used with VP9 encoder (default: {FfxController.DEFAULT_QUALITY})") @click.option('-q', '--quality', type=str, default=FfxController.DEFAULT_QUALITY, help=f"Quality settings to be used with VP9 encoder (default: {FfxController.DEFAULT_QUALITY})")
@click.option('-p', '--preset', type=str, default=FfxController.DEFAULT_AV1_PRESET, help=f"Quality preset to be used with AV1 encoder (default: {FfxController.DEFAULT_AV1_PRESET})") @click.option('-p', '--preset', type=str, default=FfxController.DEFAULT_AV1_PRESET, help=f"Quality preset to be used with AV1 encoder (default: {FfxController.DEFAULT_AV1_PRESET})")
@click.option('-a', '--stereo-bitrate', type=int, default=FfxController.DEFAULT_STEREO_BANDWIDTH, help=f"Bitrate in kbit/s to be used to encode stereo audio streams (default: {FfxController.DEFAULT_STEREO_BANDWIDTH})") @click.option('-s', '--stereo-bitrate', type=int, default=FfxController.DEFAULT_STEREO_BANDWIDTH, help=f"Bitrate in kbit/s to be used to encode stereo audio streams (default: {FfxController.DEFAULT_STEREO_BANDWIDTH})")
@click.option('-ac3', '--ac3-bitrate', type=int, default=FfxController.DEFAULT_AC3_BANDWIDTH, help=f"Bitrate in kbit/s to be used to encode 5.1 audio streams (default: {FfxController.DEFAULT_AC3_BANDWIDTH})") @click.option('--ac3', type=int, default=FfxController.DEFAULT_AC3_BANDWIDTH, help=f"Bitrate in kbit/s to be used to encode 5.1 audio streams (default: {FfxController.DEFAULT_AC3_BANDWIDTH})")
@click.option('-dts', '--dts-bitrate', type=int, default=FfxController.DEFAULT_DTS_BANDWIDTH, help=f"Bitrate in kbit/s to be used to encode 6.1 audio streams (default: {FfxController.DEFAULT_DTS_BANDWIDTH})") @click.option('--dts', type=int, default=FfxController.DEFAULT_DTS_BANDWIDTH, help=f"Bitrate in kbit/s to be used to encode 6.1 audio streams (default: {FfxController.DEFAULT_DTS_BANDWIDTH})")
@click.option('-sd', '--subtitle-directory', type=str, default='', help='Load subtitles from here') @click.option('--subtitle-directory', type=str, default='', help='Load subtitles from here')
@click.option('-sp', '--subtitle-prefix', type=str, default='', help='Subtitle filename prefix') @click.option('--subtitle-prefix', type=str, default='', help='Subtitle filename prefix')
@click.option('-as', '--audio-language', type=str, multiple=True, help='Audio stream language(s)') @click.option('--audio-language', type=str, multiple=True, help='Audio stream language(s)')
@click.option('-at', '--audio-title', type=str, multiple=True, help='Audio stream title(s)') @click.option('--audio-title', type=str, multiple=True, help='Audio stream title(s)')
@click.option('-da', '--default-audio', type=int, default=-1, help='Index of default audio stream') @click.option('--default-audio', type=int, default=-1, help='Index of default audio stream')
@click.option('-da', '--forced-audio', type=int, default=-1, help='Index of forced audio stream') @click.option('--forced-audio', type=int, default=-1, help='Index of forced audio stream')
@click.option('-ss', '--subtitle-language', type=str, multiple=True, help='Subtitle stream language(s)') @click.option('--subtitle-language', type=str, multiple=True, help='Subtitle stream language(s)')
@click.option('-st', '--subtitle-title', type=str, multiple=True, help='Subtitle stream title(s)') @click.option('--subtitle-title', type=str, multiple=True, help='Subtitle stream title(s)')
@click.option('-ds', '--default-subtitle', type=int, default=-1, help='Index of default subtitle stream') @click.option('--default-subtitle', type=int, default=-1, help='Index of default subtitle stream')
@click.option('-fs', '--forced-subtitle', type=int, default=-1, help='Index of forced subtitle stream') # (including default audio stream tag) @click.option('--forced-subtitle', type=int, default=-1, help='Index of forced subtitle stream') # (including default audio stream tag)
@click.option("--crop", is_flag=False, flag_value="default", default="none") @click.option("--crop", is_flag=False, flag_value="default", default="none")
@click.option("-o", "--output-directory", type=str, default='') @click.option("--output-directory", type=str, default='')
@click.option("-d", "--denoise", is_flag=True, default=False) @click.option("--denoise", is_flag=True, default=False)
@click.option("-t", "--no-tmdb", is_flag=True, default=False) @click.option("--no-tmdb", is_flag=True, default=False)
@click.option("-j", "--no-jellyfin", is_flag=True, default=False) @click.option("--no-jellyfin", is_flag=True, default=False)
@click.option("-np", "--no-pattern", is_flag=True, default=False) @click.option("--no-pattern", is_flag=True, default=False)
@click.option("--dont-pass-dispositions", is_flag=True, default=False)
@click.option("--no-prompt", is_flag=True, default=False) @click.option("--no-prompt", is_flag=True, default=False)
def convert(ctx, def convert(ctx,
@ -261,8 +306,8 @@ def convert(ctx,
quality, quality,
preset, preset,
stereo_bitrate, stereo_bitrate,
ac3_bitrate, ac3,
dts_bitrate, dts,
subtitle_directory, subtitle_directory,
subtitle_prefix, subtitle_prefix,
@ -283,6 +328,7 @@ def convert(ctx,
no_tmdb, no_tmdb,
no_jellyfin, no_jellyfin,
no_pattern, no_pattern,
dont_pass_dispositions,
no_prompt): no_prompt):
"""Batch conversion of audiovideo files in format suitable for web playback, e.g. jellyfin """Batch conversion of audiovideo files in format suitable for web playback, e.g. jellyfin
@ -317,8 +363,8 @@ def convert(ctx,
context['bitrates'] = {} context['bitrates'] = {}
context['bitrates']['stereo'] = str(stereo_bitrate) if str(stereo_bitrate).endswith('k') else f"{stereo_bitrate}k" context['bitrates']['stereo'] = str(stereo_bitrate) if str(stereo_bitrate).endswith('k') else f"{stereo_bitrate}k"
context['bitrates']['ac3'] = str(ac3_bitrate) if str(ac3_bitrate).endswith('k') else f"{ac3_bitrate}k" context['bitrates']['ac3'] = str(ac3) if str(ac3).endswith('k') else f"{ac3}k"
context['bitrates']['dts'] = str(dts_bitrate) if str(dts_bitrate).endswith('k') else f"{dts_bitrate}k" context['bitrates']['dts'] = str(dts) if str(dts).endswith('k') else f"{dts}k"
if ctx.obj['verbosity'] > 0: if ctx.obj['verbosity'] > 0:
click.echo(f"Stereo bitrate: {context['bitrates']['stereo']}") click.echo(f"Stereo bitrate: {context['bitrates']['stereo']}")
@ -375,46 +421,7 @@ def convert(ctx,
# fileBasename = currentShowDescriptor.getFilenamePrefix() # fileBasename = currentShowDescriptor.getFilenamePrefix()
# Check for multiple default or forced dispositions if not set by user input or database requirements checkUniqueDispositions(context, sourceMediaDescriptor)
#
# Query user for the correct sub indices, then configure flags in track descriptors associated with media descriptor accordingly.
# The correct tokens should then be created by
if len([v for v in sourceMediaDescriptor.getVideoTracks() if v.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one default video stream detected and no prompt set')
defaultVideoTrackSubIndex = click.prompt("More than one default video stream detected! Please select stream", type=int)
sourceMediaDescriptor.setDefaultSubTrack(TrackType.VIDEO, defaultVideoTrackSubIndex)
if len([v for v in sourceMediaDescriptor.getVideoTracks() if v.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one forced video stream detected and no prompt set')
forcedVideoTrackSubIndex = click.prompt("More than one forced video stream detected! Please select stream", type=int)
sourceMediaDescriptor.setForcedSubTrack(TrackType.VIDEO, forcedVideoTrackSubIndex)
if len([a for a in sourceMediaDescriptor.getAudioTracks() if a.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one default audio stream detected and no prompt set')
defaultAudioTrackSubIndex = click.prompt("More than one default audio stream detected! Please select stream", type=int)
sourceMediaDescriptor.setDefaultSubTrack(TrackType.AUDIO, defaultAudioTrackSubIndex)
if len([a for a in sourceMediaDescriptor.getAudioTracks() if a.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one forced audio stream detected and no prompt set')
forcedAudioTrackSubIndex = click.prompt("More than one forced audio stream detected! Please select stream", type=int)
sourceMediaDescriptor.setForcedSubTrack(TrackType.AUDIO, forcedAudioTrackSubIndex)
if len([s for s in sourceMediaDescriptor.getSubtitleTracks() if s.getDispositionFlag(TrackDisposition.DEFAULT)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one default subtitle stream detected and no prompt set')
defaultSubtitleTrackSubIndex = click.prompt("More than one default subtitle stream detected! Please select stream", type=int)
sourceMediaDescriptor.setDefaultSubTrack(TrackType.SUBTITLE, defaultSubtitleTrackSubIndex)
if len([s for s in sourceMediaDescriptor.getSubtitleTracks() if s.getDispositionFlag(TrackDisposition.FORCED)]) > 1:
if context['no_prompt']:
raise click.ClickException('More than one forced subtitle stream detected and no prompt set')
forcedSubtitleTrackSubIndex = click.prompt("More than one forced subtitle stream detected! Please select stream", type=int)
sourceMediaDescriptor.setForcedSubTrack(TrackType.SUBTITLE, forcedSubtitleTrackSubIndex)
if context['import_subtitles']: if context['import_subtitles']:
sourceMediaDescriptor.importSubtitles(context['subtitle_directory'], sourceMediaDescriptor.importSubtitles(context['subtitle_directory'],
@ -435,6 +442,9 @@ def convert(ctx,
targetMediaDescriptor = currentPattern.getMediaDescriptor(ctx.obj) targetMediaDescriptor = currentPattern.getMediaDescriptor(ctx.obj)
checkUniqueDispositions(context, targetMediaDescriptor)
currentShowDescriptor = currentPattern.getShowDescriptor(ctx.obj) currentShowDescriptor = currentPattern.getShowDescriptor(ctx.obj)

13
bin/ffx/ffx_controller.py
Unescape Escape View File

@ -8,7 +8,7 @@ from ffx.audio_layout import AudioLayout
from ffx.track_type import TrackType from ffx.track_type import TrackType
from ffx.video_encoder import VideoEncoder from ffx.video_encoder import VideoEncoder
from ffx.process import executeProcess from ffx.process import executeProcess
from ffx.track_disposition import TrackDisposition
class FfxController(): class FfxController():
@ -172,15 +172,15 @@ class FfxController():
# -disposition:s:0 default -disposition:s:1 0 # -disposition:s:0 default -disposition:s:1 0
def generateDispositionTokens(self): def generateDispositionTokens(self):
# sourceTrackDescriptors = [] if self.__sourceMediaDescriptor is None else self.__sourceMediaDescriptor.getAllTrackDescriptors()
targetTrackDescriptors = self.__targetMediaDescriptor.getAllTrackDescriptors() targetTrackDescriptors = self.__targetMediaDescriptor.getAllTrackDescriptors()
sourceTrackDescriptors = [] if self.__sourceMediaDescriptor is None else self.__sourceMediaDescriptor.getAllTrackDescriptors()
dispositionTokens = [] dispositionTokens = []
for trackIndex in range(len(targetTrackDescriptors)): for trackIndex in range(len(targetTrackDescriptors)):
td = targetTrackDescriptors[trackIndex] td = targetTrackDescriptors[trackIndex]
#sd = sourceTrackDescriptors[trackIndex]
#HINT: No dispositions for pgs subtitle tracks that have no external file source #HINT: No dispositions for pgs subtitle tracks that have no external file source
if (td.getExternalSourceFilePath() if (td.getExternalSourceFilePath()
@ -188,7 +188,12 @@ class FfxController():
subIndex = td.getSubIndex() subIndex = td.getSubIndex()
streamIndicator = td.getType().indicator() streamIndicator = td.getType().indicator()
dispositionSet = td.getDispositionSet()
sourceDispositionSet = sourceTrackDescriptors[trackIndex].getDispositionSet() if sourceTrackDescriptors else set()
sourceDispositionSet.discard(TrackDisposition.DEFAULT)
dispositionSet = td.getDispositionSet() | sourceDispositionSet
if dispositionSet: if dispositionSet:
dispositionTokens += [f"-disposition:{streamIndicator}:{subIndex}", '+'.join([d.label() for d in dispositionSet])] dispositionTokens += [f"-disposition:{streamIndicator}:{subIndex}", '+'.join([d.label() for d in dispositionSet])]

14
bin/ffx/test/disposition_combinator_2_0.py
Unescape Escape View File

@ -26,9 +26,11 @@ class DispositionCombinator20(DispositionCombinator2):
subtrack0 = set() subtrack0 = set()
subtrack1 = set() subtrack1 = set()
#NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
# so some checks for preserved dispositions are omitted for now
if self.__createPresets: if self.__createPresets:
subtrack0.add(TrackDisposition.COMMENT) subtrack0.add(TrackDisposition.FORCED) # COMMENT
subtrack1.add(TrackDisposition.DESCRIPTIONS) # subtrack1.add(TrackDisposition.DESCRIPTIONS) # DESCRIPTIONS
return (subtrack0, return (subtrack0,
subtrack1) subtrack1)
@ -45,13 +47,13 @@ class DispositionCombinator20(DispositionCombinator2):
# source subIndex 0 # source subIndex 0
assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT) assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.FORCED)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set 'forced' disposition"
# source subIndex 1 # source subIndex 1
assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DESCRIPTIONS) # assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DESCRIPTIONS)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved descriptions disposition" # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved set 'descriptions' disposition"
else: else:

24
bin/ffx/test/disposition_combinator_2_1.py
Unescape Escape View File

@ -28,9 +28,11 @@ class DispositionCombinator21(DispositionCombinator2):
subtrack0 = set([TrackDisposition.DEFAULT]) subtrack0 = set([TrackDisposition.DEFAULT])
subtrack1 = set() subtrack1 = set()
#NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
# so some checks for preserved dispositions are omitted for now
if self.__createPresets: if self.__createPresets:
subtrack0.add(TrackDisposition.COMMENT) # subtrack0.add(TrackDisposition.COMMENT) # COMMENT
subtrack1.add(TrackDisposition.DESCRIPTIONS) subtrack1.add(TrackDisposition.FORCED) # DESCRIPTIONS
return (subtrack0, return (subtrack0,
subtrack1) subtrack1)
@ -49,13 +51,13 @@ class DispositionCombinator21(DispositionCombinator2):
# source subIndex 1 # source subIndex 1
assert not (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert not (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT) assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.FORCED)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set 'forced' disposition"
# source subIndex 0 # source subIndex 0
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition"
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED) # assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.COMMENT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition" # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved set 'comment' disposition"
else: else:
@ -67,13 +69,13 @@ class DispositionCombinator21(DispositionCombinator2):
# source subIndex 0 # source subIndex 0
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not set default disposition"
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT) # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition" # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set 'comment' disposition"
# source subIndex 1 # source subIndex 1
assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert not (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DESCRIPTIONS) assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.FORCED)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved descriptions disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved set 'forced' disposition"
else: else:

22
bin/ffx/test/disposition_combinator_2_2.py
Unescape Escape View File

@ -28,9 +28,11 @@ class DispositionCombinator22(DispositionCombinator2):
subtrack0 = set() subtrack0 = set()
subtrack1 = set([TrackDisposition.DEFAULT]) subtrack1 = set([TrackDisposition.DEFAULT])
#NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
# so some checks for preserved dispositions are omitted for now
if self.__createPresets: if self.__createPresets:
subtrack0.add(TrackDisposition.COMMENT) subtrack0.add(TrackDisposition.FORCED) # COMMENT
subtrack1.add(TrackDisposition.DESCRIPTIONS) # subtrack1.add(TrackDisposition.DESCRIPTIONS) # DESCRIPTIONS
return (subtrack0, return (subtrack0,
subtrack1) subtrack1)
@ -45,16 +47,16 @@ class DispositionCombinator22(DispositionCombinator2):
raise KeyError("assertObj does not contain key 'tracks'") raise KeyError("assertObj does not contain key 'tracks'")
trackDescriptors = assertObj['tracks'] trackDescriptors = assertObj['tracks']
# source subIndex 1 # source subIndex 0
assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT) assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.FORCED)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set 'descriptions' disposition"
# source subIndex 0 # source subIndex 1
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition"
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED) # assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DESCRIPTIONS)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition" # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved 'forced' disposition"
else: else:
@ -63,10 +65,10 @@ class DispositionCombinator22(DispositionCombinator2):
raise KeyError("assertObj does not contain key 'tracks'") raise KeyError("assertObj does not contain key 'tracks'")
trackDescriptors = assertObj['tracks'] trackDescriptors = assertObj['tracks']
# source subIndex 1 # source subIndex 0
assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
# source subIndex 0 # source subIndex 1
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition"

6
bin/ffx/test/disposition_combinator_2_3 .py
Unescape Escape View File

@ -24,9 +24,11 @@ class DispositionCombinator23(DispositionCombinator2):
subtrack0 = set([TrackDisposition.DEFAULT]) subtrack0 = set([TrackDisposition.DEFAULT])
subtrack1 = set([TrackDisposition.DEFAULT]) subtrack1 = set([TrackDisposition.DEFAULT])
#NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
# so some checks for preserved dispositions are omitted for now
if self.__createPresets: if self.__createPresets:
subtrack0.add(TrackDisposition.COMMENT) # subtrack0.add(TrackDisposition.COMMENT) # COMMENT
subtrack1.add(TrackDisposition.DESCRIPTIONS) subtrack1.add(TrackDisposition.FORCED) # DESCRIPTIONS
return (subtrack0, return (subtrack0,
subtrack1) subtrack1)

18
bin/ffx/test/disposition_combinator_3_0.py
Unescape Escape View File

@ -25,10 +25,12 @@ class DispositionCombinator30(DispositionCombinator3):
subtrack1 = set() subtrack1 = set()
subtrack2 = set() subtrack2 = set()
#NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
# so some checks for preserved dispositions are omitted for now
if self.__createPresets: if self.__createPresets:
subtrack0.add(TrackDisposition.COMMENT) subtrack0.add(TrackDisposition.FORCED) # COMMENT
subtrack1.add(TrackDisposition.DESCRIPTIONS) # subtrack1.add(TrackDisposition.DESCRIPTIONS) # DESCRIPTIONS
subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # HEARING_IMPAIRED
return (subtrack0, return (subtrack0,
subtrack1, subtrack1,
@ -49,20 +51,20 @@ class DispositionCombinator30(DispositionCombinator3):
# source subIndex 0 # source subIndex 0
assert not (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert not (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT) assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.FORCED)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved default disposition"
# source subIndex 1 # source subIndex 1
assert not (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert not (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DESCRIPTIONS) # assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DESCRIPTIONS)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition" # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition"
# source subIndex 2 # source subIndex 2
assert not (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT) assert not (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has set default disposition" ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has set default disposition"
assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED) # assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved default disposition" # ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved default disposition"
else: else:

28
bin/ffx/test/disposition_combinator_3_1.py
Unescape Escape View File

@ -30,10 +30,12 @@ class DispositionCombinator31(DispositionCombinator3):
subtrack1 = set() subtrack1 = set()
subtrack2 = set() subtrack2 = set()
#NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
# so some checks for preserved dispositions are omitted for now
if self.__createPresets: if self.__createPresets:
subtrack0.add(TrackDisposition.COMMENT) # subtrack0.add(TrackDisposition.COMMENT) # COMMENT
subtrack1.add(TrackDisposition.DESCRIPTIONS) subtrack1.add(TrackDisposition.FORCED) # DESCRIPTIONS
subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # HEARING_IMPAIRED
return (subtrack0, return (subtrack0,
subtrack1, subtrack1,
@ -55,20 +57,20 @@ class DispositionCombinator31(DispositionCombinator3):
# source subIndex 1 # source subIndex 1
assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.DESCRIPTIONS) assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.FORCED)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved descriptions disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved descriptions disposition"
# source subIndex 2 # source subIndex 2
assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED) # assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition" # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition"
# source subIndex 0 # source subIndex 0
assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT) assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition" ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.COMMENT) # assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.COMMENT)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved set default disposition" # ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved set default disposition"
else: else:
def f(assertObj: dict): def f(assertObj: dict):
@ -81,20 +83,20 @@ class DispositionCombinator31(DispositionCombinator3):
# source subIndex 0 # source subIndex 0
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not set default disposition"
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT) # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved default disposition" # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved default disposition"
# source subIndex 1 # source subIndex 1
assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DESCRIPTIONS) assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.FORCED)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition"
# source subIndex 2 # source subIndex 2
assert (not trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has set default disposition" ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has set default disposition"
assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED) # assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved default disposition" # ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved default disposition"
else: else:

28
bin/ffx/test/disposition_combinator_3_2.py
Unescape Escape View File

@ -30,10 +30,12 @@ class DispositionCombinator32(DispositionCombinator3):
subtrack1 = set([TrackDisposition.DEFAULT]) subtrack1 = set([TrackDisposition.DEFAULT])
subtrack2 = set() subtrack2 = set()
#NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
# so some checks for preserved dispositions are omitted for now
if self.__createPresets: if self.__createPresets:
subtrack0.add(TrackDisposition.COMMENT) # subtrack0.add(TrackDisposition.COMMENT) # COMMENT
subtrack1.add(TrackDisposition.DESCRIPTIONS) # subtrack1.add(TrackDisposition.DESCRIPTIONS) # DESCRIPTIONS
subtrack2.add(TrackDisposition.HEARING_IMPAIRED) subtrack2.add(TrackDisposition.FORCED) # HEARING_IMPAIRED
return (subtrack0, return (subtrack0,
subtrack1, subtrack1,
@ -53,18 +55,18 @@ class DispositionCombinator32(DispositionCombinator3):
# source subIndex 0 # source subIndex 0
assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT) # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition" # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition"
# source subIndex 2 # source subIndex 2
assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED) assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.FORCED)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition"
# source subIndex 1 # source subIndex 1
assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT) assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition" ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DESCRIPTIONS) # assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DESCRIPTIONS)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved descriptions disposition" # ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved descriptions disposition"
else: else:
@ -76,17 +78,17 @@ class DispositionCombinator32(DispositionCombinator3):
# source subIndex 0 # source subIndex 0
assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT) # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition" # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition"
# source subIndex 1 # source subIndex 1
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not set default disposition"
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DESCRIPTIONS) # assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DESCRIPTIONS)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved descriptions disposition" # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved descriptions disposition"
# source subIndex 2 # source subIndex 2
assert (not trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has set default disposition" ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has set default disposition"
assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED) assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.FORCED)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved default disposition" ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved default disposition"
else: else:

28
bin/ffx/test/disposition_combinator_3_3.py
Unescape Escape View File

@ -30,10 +30,12 @@ class DispositionCombinator33(DispositionCombinator3):
subtrack1 = set() subtrack1 = set()
subtrack2 = set([TrackDisposition.DEFAULT]) subtrack2 = set([TrackDisposition.DEFAULT])
#NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
# so some checks for preserved dispositions are omitted for now
if self.__createPresets: if self.__createPresets:
subtrack0.add(TrackDisposition.COMMENT) # subtrack0.add(TrackDisposition.COMMENT) # COMMENT
subtrack1.add(TrackDisposition.DESCRIPTIONS) subtrack1.add(TrackDisposition.FORCED) # DESCRIPTIONS
subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # HEARING_IMPAIRED
return (subtrack0, return (subtrack0,
subtrack1, subtrack1,
@ -53,17 +55,17 @@ class DispositionCombinator33(DispositionCombinator3):
# source subIndex 0 # source subIndex 0
assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT) # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition" # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition"
# source subIndex 2 # source subIndex 2
assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED) # assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition" # ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved default disposition"
# source subIndex 1 # source subIndex 1
assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT) assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition" ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DESCRIPTIONS) assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.FORCED)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved descriptions disposition" ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved descriptions disposition"
else: else:
@ -76,18 +78,18 @@ class DispositionCombinator33(DispositionCombinator3):
# source subIndex 0 # source subIndex 0
assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[0].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition" ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has set default disposition"
assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT) # assert (trackDescriptors[0].getDispositionFlag(TrackDisposition.COMMENT)
), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition" # ), f"Stream #0 index={trackDescriptors[0].getIndex()} [{trackDescriptors[0].getType().label()}:{trackDescriptors[0].getSubIndex()}] has not preserved set default disposition"
# source subIndex 1 # source subIndex 1
assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT) assert (not trackDescriptors[1].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has set default disposition"
assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.DESCRIPTIONS) assert (trackDescriptors[1].getDispositionFlag(TrackDisposition.FORCED)
), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved descriptions disposition" ), f"Stream #1 index={trackDescriptors[1].getIndex()} [{trackDescriptors[1].getType().label()}:{trackDescriptors[1].getSubIndex()}] has not preserved descriptions disposition"
# source subIndex 2 # source subIndex 2
assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT) assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.DEFAULT)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition" ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not set default disposition"
assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED) # assert (trackDescriptors[2].getDispositionFlag(TrackDisposition.HEARING_IMPAIRED)
), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved default disposition" # ), f"Stream #2 index={trackDescriptors[2].getIndex()} [{trackDescriptors[2].getType().label()}:{trackDescriptors[2].getSubIndex()}] has not preserved default disposition"
else: else:

8
bin/ffx/test/disposition_combinator_3_4.py
Unescape Escape View File

@ -25,10 +25,12 @@ class DispositionCombinator34(DispositionCombinator3):
subtrack1 = set() subtrack1 = set()
subtrack2 = set([TrackDisposition.DEFAULT]) subtrack2 = set([TrackDisposition.DEFAULT])
#NOTE: Current ffmpeg version will not set most of the dispositions on arbitrary tracks
# so some checks for preserved dispositions are omitted for now
if self.__createPresets: if self.__createPresets:
subtrack0.add(TrackDisposition.COMMENT) subtrack0.add(TrackDisposition.FORCED) # COMMENT
subtrack1.add(TrackDisposition.DESCRIPTIONS) # subtrack1.add(TrackDisposition.DESCRIPTIONS) # DESCRIPTIONS
subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # subtrack2.add(TrackDisposition.HEARING_IMPAIRED) # HEARING_IMPAIRED
return (subtrack0, return (subtrack0,
subtrack1, subtrack1,

2
bin/ffx/test/indicator_combinator.py
Unescape Escape View File

@ -2,7 +2,7 @@ class IndicatorCombinator():
IDENTIFIER = 'indicator' IDENTIFIER = 'indicator'
MAX_SEASON = 3 MAX_SEASON = 2
MAX_EPISODE = 3 MAX_EPISODE = 3
def __init__(self, context = None): def __init__(self, context = None):

2
bin/ffx/test/scenario_1.py
Unescape Escape View File

@ -171,10 +171,12 @@ class Scenario1(Scenario):
if assertSelector == 'I': if assertSelector == 'I':
assertFunc() assertFunc()
self._context['test_passed_counter'] += 1
self._reportLogger.info(f"{variantLabel}: Test passed") self._reportLogger.info(f"{variantLabel}: Test passed")
except AssertionError as ae: except AssertionError as ae:
self._context['test_failed_counter'] += 1
self._reportLogger.error(f"{variantLabel}: Test FAILED ({ae})") self._reportLogger.error(f"{variantLabel}: Test FAILED ({ae})")

2
bin/ffx/test/scenario_2.py
Unescape Escape View File

@ -146,10 +146,12 @@ class Scenario2(Scenario):
assertFunc() assertFunc()
self._context['test_passed_counter'] += 1
self._reportLogger.info(f"{variantLabel}: Test passed") self._reportLogger.info(f"{variantLabel}: Test passed")
except AssertionError as ae: except AssertionError as ae:
self._context['test_failed_counter'] += 1
self._reportLogger.error(f"{variantLabel}: Test FAILED ({ae})") self._reportLogger.error(f"{variantLabel}: Test FAILED ({ae})")

50
bin/ffx/test/scenario_4.py
Unescape Escape View File

@ -52,10 +52,6 @@ class Scenario4(Scenario):
self.__ic = IndicatorCombinator(context = context) self.__ic = IndicatorCombinator(context = context)
self.__sc = ShowController(context = context)
self.__pc = PatternController(context = context)
self.__mc = MediaController(context = context)
self.__tc = TmdbController() self.__tc = TmdbController()
@ -75,6 +71,11 @@ class Scenario4(Scenario):
self._logger.debug(f"Creating test db with path {self.__testDbFilePath}") self._logger.debug(f"Creating test db with path {self.__testDbFilePath}")
self._context['database'] = databaseContext(databasePath=self.__testDbFilePath) self._context['database'] = databaseContext(databasePath=self.__testDbFilePath)
self.__sc = ShowController(context = self._context)
self.__pc = PatternController(context = self._context)
self.__mc = MediaController(context = self._context)
def prepareTestDatabase(self, sourceMediaDescriptor: MediaDescriptor): def prepareTestDatabase(self, sourceMediaDescriptor: MediaDescriptor):
if not self._context['database'] is None: if not self._context['database'] is None:
@ -143,18 +144,16 @@ class Scenario4(Scenario):
if self._context['test_variant'] and variantIdentifier != self._context['test_variant']: if self._context['test_variant'] and variantIdentifier != self._context['test_variant']:
return return
for l in sourceMediaDescriptor.getConfiguration(label = 'sourceMediaDescriptor'): for l in presetMediaDescriptor.getConfiguration(label = 'presetMediaDescriptor'):
self._logger.debug(l) self._logger.debug(l)
for l in presetMediaDescriptor.getConfiguration(label = 'presetMediaDescriptor'): for l in sourceMediaDescriptor.getConfiguration(label = 'sourceMediaDescriptor'):
self._logger.debug(l) self._logger.debug(l)
self._logger.debug(f"Running Job: {variantLabel}") self._logger.debug(f"Running Job: {variantLabel}")
# Phase 1: Setup source files # Phase 1: Setup source files
self.clearTestDirectory() self.clearTestDirectory()
self.createEmptyTestDatabase()
self.prepareTestDatabase(sourceMediaDescriptor)
testFileList = [] testFileList = []
for indicatorObj in [y for y in self.__ic.getYield() if y['indicator']]: for indicatorObj in [y for y in self.__ic.getYield() if y['indicator']]:
@ -178,7 +177,8 @@ class Scenario4(Scenario):
# Phase 2: Prepare database # Phase 2: Prepare database
self.createEmptyTestDatabase()
self.prepareTestDatabase(sourceMediaDescriptor)
# Phase 3: Run ffx # Phase 3: Run ffx
@ -191,8 +191,8 @@ class Scenario4(Scenario):
commandSequence += ['--no-prompt'] commandSequence += ['--no-prompt']
# if not testContext['use_jellyfin']: if not testContext['use_jellyfin']:
# commandSequence += ['--no-jellyfin'] commandSequence += ['--no-jellyfin']
self._logger.debug(f"{variantLabel}: Test sequence: {commandSequence}") self._logger.debug(f"{variantLabel}: Test sequence: {commandSequence}")
@ -213,8 +213,16 @@ class Scenario4(Scenario):
try: try:
assert not (bool(rc) # assert not (bool(rc)
), f"Process failed" # ), f"Process failed"
jobFailed = bool(rc)
self._logger.debug(f"{variantLabel}: Should fail: {shouldFail} / actually failed: {jobFailed}")
assert (jobFailed == shouldFail
), f"Process {'failed' if jobFailed else 'did not fail'}"
if not jobFailed:
for tfo in testFileList: for tfo in testFileList:
@ -257,12 +265,12 @@ class Scenario4(Scenario):
assertFunc = assertFuncList[assertIndex] assertFunc = assertFuncList[assertIndex]
assertVariant = variantList[assertIndex] assertVariant = variantList[assertIndex]
# if assertSelector == 'M': if assertSelector == 'M':
# assertFunc() assertFunc()
# for variantIndex in range(len(assertVariant)): for variantIndex in range(len(assertVariant)):
# assert (assertVariant[variantIndex].lower() == rmd.getType().indicator() assert (assertVariant[variantIndex].lower() == rmt[variantIndex].getType().indicator()
# ), f"Stream #{variantIndex} is not of type {rmd.getType().label()}" ), f"Stream #{variantIndex} is not of type {rmt[variantIndex].getType().label()}"
#
if assertSelector == 'AD' or assertSelector == 'AT': if assertSelector == 'AD' or assertSelector == 'AT':
assertFunc({'tracks': rmd.getAudioTracks()}) assertFunc({'tracks': rmd.getAudioTracks()})
@ -274,13 +282,15 @@ class Scenario4(Scenario):
assertFunc() assertFunc()
self._context['test_passed_counter'] += 1
self._reportLogger.info(f"{variantLabel}: Test passed") self._reportLogger.info(f"{variantLabel}: Test passed")
except AssertionError as ae: except AssertionError as ae:
self._context['test_failed_counter'] += 1
self._reportLogger.error(f"{variantLabel}: Test FAILED ({ae})") self._reportLogger.error(f"{variantLabel}: Test FAILED ({ae})")
exit() # exit()
def run(self): def run(self):

38
bin/ffx/track_disposition.py
Unescape Escape View File

@ -5,25 +5,25 @@ from enum import Enum
class TrackDisposition(Enum): class TrackDisposition(Enum):
DEFAULT = {"name": "default", "index": 0, "indicator": "DE"} DEFAULT = {"name": "default", "index": 0, "indicator": "DEF"}
FORCED = {"name": "forced", "index": 1, "indicator": "FO"} FORCED = {"name": "forced", "index": 1, "indicator": "FOR"}
DUB = {"name": "dub", "index": 2, "indicator": "DB"} DUB = {"name": "dub", "index": 2, "indicator": "DUB"}
ORIGINAL = {"name": "original", "index": 3, "indicator": "OG"} ORIGINAL = {"name": "original", "index": 3, "indicator": "ORG"}
COMMENT = {"name": "comment", "index": 4, "indicator": "CM"} COMMENT = {"name": "comment", "index": 4, "indicator": "COM"}
LYRICS = {"name": "lyrics", "index": 5, "indicator": "LY"} LYRICS = {"name": "lyrics", "index": 5, "indicator": "LYR"}
KARAOKE = {"name": "karaoke", "index": 6, "indicator": "KA"} KARAOKE = {"name": "karaoke", "index": 6, "indicator": "KAR"}
HEARING_IMPAIRED = {"name": "hearing_impaired", "index": 7, "indicator": "HI"} HEARING_IMPAIRED = {"name": "hearing_impaired", "index": 7, "indicator": "HIM"}
VISUAL_IMPAIRED = {"name": "visual_impaired", "index": 8, "indicator": "VI"} VISUAL_IMPAIRED = {"name": "visual_impaired", "index": 8, "indicator": "VIM"}
CLEAN_EFFECTS = {"name": "clean_effects", "index": 9, "indicator": "CE"} CLEAN_EFFECTS = {"name": "clean_effects", "index": 9, "indicator": "CLE"}
ATTACHED_PIC = {"name": "attached_pic", "index": 10, "indicator": "AP"} ATTACHED_PIC = {"name": "attached_pic", "index": 10, "indicator": "ATP"}
TIMED_THUMBNAILS = {"name": "timed_thumbnails", "index": 11, "indicator": "TT"} TIMED_THUMBNAILS = {"name": "timed_thumbnails", "index": 11, "indicator": "TTH"}
NON_DIEGETICS = {"name": "non_diegetic", "index": 12, "indicator": "ND"} NON_DIEGETICS = {"name": "non_diegetic", "index": 12, "indicator": "NOD"}
CAPTIONS = {"name": "captions", "index": 13, "indicator": "CA"} CAPTIONS = {"name": "captions", "index": 13, "indicator": "CAP"}
DESCRIPTIONS = {"name": "descriptions", "index": 14, "indicator": "DS"} DESCRIPTIONS = {"name": "descriptions", "index": 14, "indicator": "DES"}
METADATA = {"name": "metadata", "index": 15, "indicator": "MD"} METADATA = {"name": "metadata", "index": 15, "indicator": "MED"}
DEPENDENT = {"name": "dependent", "index": 16, "indicator": "DP"} DEPENDENT = {"name": "dependent", "index": 16, "indicator": "DEP"}
STILL_IMAGE = {"name": "still_image", "index": 17, "indicator": "SI"} STILL_IMAGE = {"name": "still_image", "index": 17, "indicator": "STI"}
def label(self): def label(self):

6
bin/ffx_tests.py
Unescape Escape View File

@ -81,6 +81,8 @@ def run(ctx, scenario, variant):
"""Run ffx test sequences""" """Run ffx test sequences"""
ctx.obj['logger'].info('Starting FFX test runs') ctx.obj['logger'].info('Starting FFX test runs')
ctx.obj['test_passed_counter'] = 0
ctx.obj['test_failed_counter'] = 0
ctx.obj['test_variant'] = variant ctx.obj['test_variant'] = variant
@ -100,6 +102,10 @@ def run(ctx, scenario, variant):
except TMDB_API_KEY_NOT_PRESENT_EXCEPTION: except TMDB_API_KEY_NOT_PRESENT_EXCEPTION:
ctx.obj['logger'].info(f"TMDB_API_KEY not set: Skipping {SCEN.__class__.__name__}") ctx.obj['logger'].info(f"TMDB_API_KEY not set: Skipping {SCEN.__class__.__name__}")
ctx.obj['logger'].info(f"\n{ctx.obj['test_passed_counter']} tests passed")
ctx.obj['logger'].info(f"{ctx.obj['test_failed_counter']} test failed")
ctx.obj['logger'].info('\nDone.')
@ffx.command() @ffx.command()
@click.pass_context @click.pass_context

Write Preview
Loading…
Cancel
Save