summaryrefslogtreecommitdiffstats
path: root/preset
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2017-11-09 13:43:53 -0800
committerGitHub <[email protected]>2017-11-09 13:43:53 -0800
commit65597ee7f4bfa11838d815fceb6bc6dd24150c1f (patch)
treed044e1fb014797b4526508d4d423194079d746a5 /preset
parent86d6345771e3b2fb22255620aa91cf77fdf15f10 (diff)
Add adaptive streaming support (#972)
"Adaptive streaming" allows changing video parameters mid-stream at IDR boundaries. Such changes require new SPS and PPS NALs at the IDR. MP4 supports this with 'avc3' and 'hev1' sample entry types.
Diffstat (limited to 'preset')
-rw-r--r--preset/preset_builtin.json70
-rw-r--r--preset/preset_builtin.list2
-rw-r--r--preset/preset_template.json1
3 files changed, 72 insertions, 1 deletions
diff --git a/preset/preset_builtin.json b/preset/preset_builtin.json
index a964acd0d..ed3412ff8 100644
--- a/preset/preset_builtin.json
+++ b/preset/preset_builtin.json
@@ -33,6 +33,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -137,6 +138,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -241,6 +243,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -345,6 +348,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -449,6 +453,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -553,6 +558,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -657,6 +663,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -761,6 +768,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -879,6 +887,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -997,6 +1006,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -1115,6 +1125,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -1233,6 +1244,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -1351,6 +1363,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -1469,6 +1482,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -1587,6 +1601,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -1705,6 +1720,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -1816,6 +1832,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": true,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -1920,6 +1937,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": true,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -2024,6 +2042,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": true,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -2128,6 +2147,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": true,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -2232,6 +2252,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": true,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -2336,6 +2357,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": true,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -2440,6 +2462,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": true,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -2544,6 +2567,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": true,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -2654,6 +2678,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -2757,6 +2782,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -2860,6 +2886,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -2963,6 +2990,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -3080,6 +3108,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -3197,6 +3226,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -3314,6 +3344,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -3431,6 +3462,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -3534,6 +3566,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": true,
"PictureAutoCrop": true,
@@ -3651,6 +3684,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": true,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -3768,6 +3802,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -3885,6 +3920,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -3988,6 +4024,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -4091,6 +4128,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -4212,6 +4250,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -4333,6 +4372,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -4451,6 +4491,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -4569,6 +4610,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -4673,6 +4715,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -4777,6 +4820,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -4880,6 +4924,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -4983,6 +5028,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -5086,6 +5132,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -5189,6 +5236,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -5306,6 +5354,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -5423,6 +5472,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -5533,6 +5583,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -5636,6 +5687,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -5739,6 +5791,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -5842,6 +5895,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -5945,6 +5999,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -6048,6 +6103,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -6151,6 +6207,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -6254,6 +6311,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -6356,6 +6414,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -6458,6 +6517,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -6560,6 +6620,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -6662,6 +6723,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -6764,6 +6826,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -6866,6 +6929,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -6968,6 +7032,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -7070,6 +7135,7 @@
"FileFormat": "mkv",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
@@ -7181,6 +7247,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": false,
@@ -7285,6 +7352,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": false,
@@ -7389,6 +7457,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": false,
@@ -7493,6 +7562,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": false,
diff --git a/preset/preset_builtin.list b/preset/preset_builtin.list
index 74d159ec7..bdc86e943 100644
--- a/preset/preset_builtin.list
+++ b/preset/preset_builtin.list
@@ -1,6 +1,6 @@
<resources>
<section name="PresetTemplate">
- <integer name="VersionMajor" value="30" />
+ <integer name="VersionMajor" value="31" />
<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 4e5389230..ae96e2172 100644
--- a/preset/preset_template.json
+++ b/preset/preset_template.json
@@ -38,6 +38,7 @@
"FileFormat": "mp4",
"Folder": false,
"FolderOpen": false,
+ "InlineParameterSets": false,
"Mp4HttpOptimize": false,
"Mp4iPodCompatible": false,
"PictureAutoCrop": true,
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 03:01:55 +0000