diff options
author | John Stebbins <[email protected]> | 2017-06-02 08:51:21 -0700 |
---|---|---|
committer | Bradley Sepos <[email protected]> | 2017-06-13 17:22:11 -0400 |
commit | 16cc03076330b23a0e8744ea125db61a5a2bd2e8 (patch) | |
tree | 9f3f38746c96dc2d70395f7b02e56aa60ae5d9b0 /preset | |
parent | e018cdea0566e22edf72de4b82a6634c791a90bc (diff) |
sync: work-around players with broken edit list support
This adds a preset key AlignAVStart that enables this work-around. When
enabled, blank frames are inserted or frames are dropped to force
alignment of the initial timestamp of every audio and video stream.
Aligning the start times minimizes the impact of broken edit list
support in players.
Closes #763.
Squashed:
sync: improve alignment when passthru audio is present
presets: enable AlignAVStart for General and Gmail presets
LinGui: Improve AlignAVStart tooltip
sync: avoid inserting a black frame < nominal frame duration
sync: fix start alignment when doing p-to-p encoding
sync: add comments
Diffstat (limited to 'preset')
-rw-r--r-- | preset/preset_builtin.json | 25 | ||||
-rw-r--r-- | preset/preset_builtin.list | 2 | ||||
-rw-r--r-- | preset/preset_template.json | 1 |
3 files changed, 27 insertions, 1 deletions
diff --git a/preset/preset_builtin.json b/preset/preset_builtin.json index c29da5493..4c76bfae7 100644 --- a/preset/preset_builtin.json +++ b/preset/preset_builtin.json @@ -2,6 +2,7 @@ { "ChildrenArray": [ { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -105,6 +106,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -208,6 +210,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -311,6 +314,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -414,6 +418,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -517,6 +522,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -620,6 +626,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -723,6 +730,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -826,6 +834,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3" @@ -943,6 +952,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3" @@ -1060,6 +1070,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3" @@ -1177,6 +1188,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3" @@ -1294,6 +1306,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3" @@ -1411,6 +1424,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3" @@ -1528,6 +1542,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3" @@ -1645,6 +1660,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3" @@ -1769,6 +1785,7 @@ { "ChildrenArray": [ { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -1872,6 +1889,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -1975,6 +1993,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -3625,6 +3644,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3", @@ -3745,6 +3765,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3", @@ -3865,6 +3886,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3" @@ -3982,6 +4004,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac", "copy:ac3" @@ -4099,6 +4122,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], @@ -4202,6 +4226,7 @@ "x264UseAdvancedOptions": false }, { + "AlignAVStart": true, "AudioCopyMask": [ "copy:aac" ], diff --git a/preset/preset_builtin.list b/preset/preset_builtin.list index 607780e65..0e1371974 100644 --- a/preset/preset_builtin.list +++ b/preset/preset_builtin.list @@ -1,6 +1,6 @@ <resources> <section name="PresetTemplate"> - <integer name="VersionMajor" value="26" /> + <integer name="VersionMajor" value="27" /> <integer name="VersionMinor" value="0" /> <integer name="VersionMicro" value="0" /> <json name="Preset" file="preset_template.json" /> diff --git a/preset/preset_template.json b/preset/preset_template.json index 9a3f646cc..4e5389230 100644 --- a/preset/preset_template.json +++ b/preset/preset_template.json @@ -1,4 +1,5 @@ { + "AlignAVStart": false, "AudioCopyMask": [ "copy:aac", "copy:ac3", |