summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
Diffstat (limited to 'libhb')
-rw-r--r--libhb/common.h5
-rw-r--r--libhb/encx264.c8
-rw-r--r--libhb/encx265.c2
-rw-r--r--libhb/hb_json.c12
-rw-r--r--libhb/muxavformat.c17
-rw-r--r--libhb/preset.c3
-rw-r--r--libhb/preset_builtin.h73
-rw-r--r--libhb/work.c4
8 files changed, 115 insertions, 9 deletions
diff --git a/libhb/common.h b/libhb/common.h
index 2b8467d82..7e0a6f31b 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -614,6 +614,11 @@ struct hb_job_s
int mux;
char * file;
+ int inline_parameter_sets;
+ // Put h.264/h.265 SPS and PPS
+ // inline in the stream. This
+ // is necessary when constructing
+ // adaptive streaming dash files.
int align_av_start; // align A/V stream start times.
// This is used to work around mp4
// players that do not support edit
diff --git a/libhb/encx264.c b/libhb/encx264.c
index 1d2fd997e..ce7879ec7 100644
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -718,10 +718,14 @@ static hb_buffer_t *nal_encode( hb_work_object_t *w, x264_picture_t *pic_out,
*/
case NAL_SPS:
case NAL_PPS:
- continue;
+ if (!job->inline_parameter_sets)
+ {
+ continue;
+ }
+ break;
- case NAL_SLICE:
case NAL_SLICE_IDR:
+ case NAL_SLICE:
case NAL_SEI:
default:
break;
diff --git a/libhb/encx265.c b/libhb/encx265.c
index de1a99c9a..ec7b7d574 100644
--- a/libhb/encx265.c
+++ b/libhb/encx265.c
@@ -228,7 +228,7 @@ int encx265Init(hb_work_object_t *w, hb_job_t *job)
* Settings which can't be overriden in the encodeer_options string
* (muxer-specific settings, resolution, ratecontrol, etc.).
*/
- param->bRepeatHeaders = 0;
+ param->bRepeatHeaders = job->inline_parameter_sets;
param->sourceWidth = job->width;
param->sourceHeight = job->height;
diff --git a/libhb/hb_json.c b/libhb/hb_json.c
index 615458b31..c267bf86d 100644
--- a/libhb/hb_json.c
+++ b/libhb/hb_json.c
@@ -525,8 +525,9 @@ hb_dict_t* hb_job_to_dict( const hb_job_t * job )
"{"
// SequenceID
"s:o,"
- // Destination {Mux, AlignAVStart, ChapterMarkers, ChapterList}
- "s:{s:o, s:o, s:o, s:[]},"
+ // Destination {Mux, InlineParameterSets, AlignAVStart,
+ // ChapterMarkers, ChapterList}
+ "s:{s:o, s:o, s:o, s:o, s:[]},"
// Source {Path, Title, Angle}
"s:{s:o, s:o, s:o,},"
// PAR {Num, Den}
@@ -545,6 +546,7 @@ hb_dict_t* hb_job_to_dict( const hb_job_t * job )
"SequenceID", hb_value_int(job->sequence_id),
"Destination",
"Mux", hb_value_int(job->mux),
+ "InlineParameterSets", hb_value_bool(job->inline_parameter_sets),
"AlignAVStart", hb_value_bool(job->align_av_start),
"ChapterMarkers", hb_value_bool(job->chapter_markers),
"ChapterList",
@@ -986,9 +988,10 @@ hb_job_t* hb_dict_to_job( hb_handle_t * h, hb_dict_t *dict )
"{"
// SequenceID
"s:i,"
- // Destination {File, Mux, ChapterMarkers, ChapterList,
+ // Destination {File, Mux, InlineParameterSets, AlignAVStart,
+ // ChapterMarkers, ChapterList,
// Mp4Options {Mp4Optimize, IpodAtom}}
- "s:{s?s, s:o, s?b, s:b, s?o s?{s?b, s?b}},"
+ "s:{s?s, s:o, s?b, s?b, s:b, s?o s?{s?b, s?b}},"
// Source {Angle, Range {Type, Start, End, SeekPoints}}
"s:{s?i, s?{s:s, s?I, s?I, s?I}},"
// PAR {Num, Den}
@@ -1013,6 +1016,7 @@ hb_job_t* hb_dict_to_job( hb_handle_t * h, hb_dict_t *dict )
"Destination",
"File", unpack_s(&destfile),
"Mux", unpack_o(&mux),
+ "InlineParameterSets", unpack_b(&job->inline_parameter_sets),
"AlignAVStart", unpack_b(&job->align_av_start),
"ChapterMarkers", unpack_b(&job->chapter_markers),
"ChapterList", unpack_o(&chapter_list),
diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
index f011c0cee..f85336dfe 100644
--- a/libhb/muxavformat.c
+++ b/libhb/muxavformat.c
@@ -215,6 +215,14 @@ static int avformatInit( hb_mux_object_t * m )
case HB_VCODEC_X264_10BIT:
case HB_VCODEC_QSV_H264:
track->st->codecpar->codec_id = AV_CODEC_ID_H264;
+ if (job->mux == HB_MUX_AV_MP4 && job->inline_parameter_sets)
+ {
+ track->st->codecpar->codec_tag = MKTAG('a','v','c','3');
+ }
+ else
+ {
+ track->st->codecpar->codec_tag = MKTAG('a','v','c','1');
+ }
/* Taken from x264 muxers.c */
priv_size = 5 + 1 + 2 + job->config.h264.sps_length + 1 + 2 +
@@ -332,7 +340,14 @@ static int avformatInit( hb_mux_object_t * m )
case HB_VCODEC_QSV_H265:
case HB_VCODEC_QSV_H265_10BIT:
track->st->codecpar->codec_id = AV_CODEC_ID_HEVC;
- track->st->codecpar->codec_tag = MKTAG('h','v','c','1');
+ if (job->mux == HB_MUX_AV_MP4 && job->inline_parameter_sets)
+ {
+ track->st->codecpar->codec_tag = MKTAG('h','e','v','1');
+ }
+ else
+ {
+ track->st->codecpar->codec_tag = MKTAG('h','v','c','1');
+ }
if (job->config.h265.headers_length > 0)
{
diff --git a/libhb/preset.c b/libhb/preset.c
index 4693fca2a..8aecdccff 100644
--- a/libhb/preset.c
+++ b/libhb/preset.c
@@ -1722,6 +1722,9 @@ int hb_preset_apply_mux(const hb_dict_t *preset, hb_dict_t *job_dict)
hb_dict_set(dest_dict, "AlignAVStart",
hb_value_xform(hb_dict_get(preset, "AlignAVStart"),
HB_VALUE_TYPE_BOOL));
+ hb_dict_set(dest_dict, "InlineParameterSets",
+ hb_value_xform(hb_dict_get(preset, "InlineParameterSets"),
+ HB_VALUE_TYPE_BOOL));
if (mux & HB_MUX_MASK_MP4)
{
hb_dict_t *mp4_dict = hb_dict_init();
diff --git a/libhb/preset_builtin.h b/libhb/preset_builtin.h
index 20c1f71fb..fee3ec03a 100644
--- a/libhb/preset_builtin.h
+++ b/libhb/preset_builtin.h
@@ -33,6 +33,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -134,6 +135,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -235,6 +237,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -336,6 +339,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -437,6 +441,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -538,6 +543,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -639,6 +645,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -740,6 +747,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -855,6 +863,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -970,6 +979,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -1085,6 +1095,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -1200,6 +1211,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -1315,6 +1327,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -1430,6 +1443,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -1545,6 +1559,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -1660,6 +1675,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -1768,6 +1784,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": true, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -1869,6 +1886,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": true, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -1970,6 +1988,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": true, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -2071,6 +2090,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": true, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -2172,6 +2192,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": true, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -2273,6 +2294,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": true, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -2374,6 +2396,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": true, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -2475,6 +2498,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": true, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -2582,6 +2606,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -2682,6 +2707,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -2782,6 +2808,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -2882,6 +2909,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -2996,6 +3024,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -3110,6 +3139,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -3224,6 +3254,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -3338,6 +3369,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -3438,6 +3470,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": true, \n"
" \"PictureAutoCrop\": true, \n"
@@ -3552,6 +3585,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": true, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -3666,6 +3700,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -3780,6 +3815,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -3880,6 +3916,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -3980,6 +4017,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -4098,6 +4136,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -4216,6 +4255,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -4331,6 +4371,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -4446,6 +4487,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -4547,6 +4589,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -4648,6 +4691,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -4748,6 +4792,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -4848,6 +4893,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -4948,6 +4994,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -5048,6 +5095,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -5162,6 +5210,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -5276,6 +5325,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -5383,6 +5433,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -5483,6 +5534,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -5583,6 +5635,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -5683,6 +5736,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -5783,6 +5837,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -5883,6 +5938,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -5983,6 +6039,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -6083,6 +6140,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -6181,6 +6239,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -6279,6 +6338,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -6377,6 +6437,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -6475,6 +6536,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -6573,6 +6635,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -6671,6 +6734,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -6769,6 +6833,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -6867,6 +6932,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mkv\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -6975,6 +7041,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": false, \n"
@@ -7076,6 +7143,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": false, \n"
@@ -7177,6 +7245,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": false, \n"
@@ -7278,6 +7347,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": false, \n"
@@ -8256,6 +8326,7 @@ const char hb_builtin_presets_json[] =
" \"FileFormat\": \"mp4\", \n"
" \"Folder\": false, \n"
" \"FolderOpen\": false, \n"
+" \"InlineParameterSets\": false, \n"
" \"Mp4HttpOptimize\": false, \n"
" \"Mp4iPodCompatible\": false, \n"
" \"PictureAutoCrop\": true, \n"
@@ -8327,7 +8398,7 @@ const char hb_builtin_presets_json[] =
" \"x264Option\": \"\", \n"
" \"x264UseAdvancedOptions\": false\n"
" }, \n"
-" \"VersionMajor\": 30, \n"
+" \"VersionMajor\": 31, \n"
" \"VersionMicro\": 0, \n"
" \"VersionMinor\": 0\n"
" }\n"
diff --git a/libhb/work.c b/libhb/work.c
index a35cc76cf..402d1bec4 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -354,6 +354,10 @@ void hb_display_job_info(hb_job_t *job)
break;
}
+ if (job->inline_parameter_sets)
+ {
+ hb_log(" + optimized for adaptive streaming (inline parameter sets)");
+ }
if( job->chapter_markers )
{
hb_log( " + chapter markers" );