summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2019-03-15 17:35:12 -0600
committerJohn Stebbins <[email protected]>2019-04-08 07:44:09 -0600
commit219b2540dc3ae2bb80f634b7df25f228f3a679ed (patch)
treebd06a7b6945343399c08c35f1539538eb1c2f5e1
parentbe581837296bc947df6ffe83dbabde137e92e039 (diff)
libhb: change preset key to VideoColorMatrixCodeOverride
Reserve VideoColorMatrixCode for doing color conversion. VideoColorMatrixCodeOverride sets color flags without transforming video frame colors.
Diffstat
-rw-r--r--libhb/common.c27
-rw-r--r--libhb/common.h8
-rw-r--r--libhb/decavcodec.c44
-rw-r--r--libhb/enc_qsv.c12
-rw-r--r--libhb/encavcodec.c14
-rw-r--r--libhb/encx264.c12
-rw-r--r--libhb/encx265.c12
-rw-r--r--libhb/hb_json.c30
-rw-r--r--libhb/preset.c11
-rw-r--r--libhb/preset_builtin.h158
-rw-r--r--preset/preset_builtin.json154
-rw-r--r--preset/preset_cli_default.json2
-rw-r--r--preset/preset_template.json2
-rw-r--r--test/test.c3
14 files changed, 299 insertions, 190 deletions
diff --git a/libhb/common.c b/libhb/common.c
index 761862911..fa19a9435 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -3791,6 +3791,9 @@ static void job_setup(hb_job_t * job, hb_title_t * title)
job->color_transfer = title->color_transfer;
job->color_matrix = title->color_matrix;
job->color_range = title->color_range;
+ job->color_prim_override = HB_COLR_PRI_UNDEF;
+ job->color_transfer_override = HB_COLR_TRA_UNDEF;
+ job->color_matrix_override = HB_COLR_MAT_UNDEF;
job->mux = HB_MUX_MP4;
@@ -3809,6 +3812,30 @@ static void job_setup(hb_job_t * job, hb_title_t * title)
#endif
}
+int hb_output_color_prim(hb_job_t * job)
+{
+ if (job->color_prim_override != HB_COLR_PRI_UNDEF)
+ return job->color_prim_override;
+ else
+ return job->color_prim;
+}
+
+int hb_output_color_transfer(hb_job_t * job)
+{
+ if (job->color_transfer_override != HB_COLR_TRA_UNDEF)
+ return job->color_transfer_override;
+ else
+ return job->color_transfer;
+}
+
+int hb_output_color_matrix(hb_job_t * job)
+{
+ if (job->color_matrix_override != HB_COLR_MAT_UNDEF)
+ return job->color_matrix_override;
+ else
+ return job->color_matrix;
+}
+
static void job_clean( hb_job_t * job )
{
if (job)
diff --git a/libhb/common.h b/libhb/common.h
index bdbf5c539..92a991e91 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -565,6 +565,10 @@ struct hb_job_s
int color_transfer;
int color_matrix;
int color_range;
+
+ int color_prim_override;
+ int color_transfer_override;
+ int color_matrix_override;
// see https://developer.apple.com/library/content/technotes/tn2162/_index.html
// https://developer.apple.com/library/content/documentation/QuickTime/QTFF/QTFFChap3/qtff3.html#//apple_ref/doc/uid/TP40000939-CH205-125526
// libav pixfmt.h
@@ -1432,6 +1436,10 @@ const char * hb_x264_encopt_name( const char * name );
const char * hb_x265_encopt_name( const char * name );
#endif
+int hb_output_color_prim(hb_job_t * job);
+int hb_output_color_transfer(hb_job_t * job);
+int hb_output_color_matrix(hb_job_t * job);
+
#define HB_NEG_FLOAT_REG "(([-])?(([0-9]+([.,][0-9]+)?)|([.,][0-9]+))"
#define HB_FLOAT_REG "(([0-9]+([.,][0-9]+)?)|([.,][0-9]+))"
#define HB_NEG_INT_REG "(([-]?[0-9]+)"
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index 85237d1d9..da1925303 100644
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -1909,12 +1909,23 @@ static int get_color_prim(int color_primaries, hb_geometry_t geometry, hb_ration
{
case AVCOL_PRI_BT709:
return HB_COLR_PRI_BT709;
+ case AVCOL_PRI_BT470M:
+ return HB_COLR_PRI_BT470M;
case AVCOL_PRI_BT470BG:
return HB_COLR_PRI_EBUTECH;
- case AVCOL_PRI_BT470M:
case AVCOL_PRI_SMPTE170M:
case AVCOL_PRI_SMPTE240M:
return HB_COLR_PRI_SMPTEC;
+ case AVCOL_PRI_FILM:
+ return HB_COLR_PRI_FILM;
+ case AVCOL_PRI_SMPTE428:
+ return HB_COLR_PRI_SMPTE428;
+ case AVCOL_PRI_SMPTE431:
+ return HB_COLR_PRI_SMPTE431;
+ case AVCOL_PRI_SMPTE432:
+ return HB_COLR_PRI_SMPTE432;
+ case AVCOL_PRI_JEDEC_P22:
+ return HB_COLR_PRI_JEDEC_P22;
case AVCOL_PRI_BT2020:
return HB_COLR_PRI_BT2020;
default:
@@ -1937,6 +1948,24 @@ static int get_color_transfer(int color_trc)
{
switch (color_trc)
{
+ case AVCOL_TRC_GAMMA22:
+ return HB_COLR_TRA_GAMMA22;
+ case AVCOL_TRC_GAMMA28:
+ return HB_COLR_TRA_GAMMA28;
+ case AVCOL_TRC_SMPTE170M:
+ return HB_COLR_TRA_SMPTE170M;
+ case AVCOL_TRC_LINEAR:
+ return HB_COLR_TRA_LINEAR;
+ case AVCOL_TRC_LOG:
+ return HB_COLR_TRA_LOG;
+ case AVCOL_TRC_LOG_SQRT:
+ return HB_COLR_TRA_LOG_SQRT;
+ case AVCOL_TRC_IEC61966_2_4:
+ return HB_COLR_TRA_IEC61966_2_4;
+ case AVCOL_TRC_BT1361_ECG:
+ return HB_COLR_TRA_BT1361_ECG;
+ case AVCOL_TRC_IEC61966_2_1:
+ return HB_COLR_TRA_IEC61966_2_1;
case AVCOL_TRC_SMPTE240M:
return HB_COLR_TRA_SMPTE240M;
case AVCOL_TRC_SMPTEST2084:
@@ -1957,19 +1986,30 @@ static int get_color_matrix(int colorspace, hb_geometry_t geometry)
{
switch (colorspace)
{
+ case AVCOL_SPC_RGB:
+ return HB_COLR_MAT_RGB;
case AVCOL_SPC_BT709:
return HB_COLR_MAT_BT709;
case AVCOL_SPC_FCC:
+ return HB_COLR_MAT_FCC;
case AVCOL_SPC_BT470BG:
+ return HB_COLR_MAT_BT470BG;
case AVCOL_SPC_SMPTE170M:
- case AVCOL_SPC_RGB: // libswscale rgb2yuv
return HB_COLR_MAT_SMPTE170M;
case AVCOL_SPC_SMPTE240M:
return HB_COLR_MAT_SMPTE240M;
+ case AVCOL_SPC_YCGCO:
+ return HB_COLR_MAT_YCGCO;
case AVCOL_SPC_BT2020_NCL:
return HB_COLR_MAT_BT2020_NCL;
case AVCOL_SPC_BT2020_CL:
return HB_COLR_MAT_BT2020_CL;
+ case AVCOL_SPC_CHROMA_DERIVED_NCL:
+ return HB_COLR_MAT_CD_NCL;
+ case AVCOL_SPC_CHROMA_DERIVED_CL:
+ return HB_COLR_MAT_CD_CL;
+ case AVCOL_SPC_ICTCP:
+ return HB_COLR_MAT_ICTCP;
default:
{
if ((geometry.width >= 1280 || geometry.height >= 720)||
diff --git a/libhb/enc_qsv.c b/libhb/enc_qsv.c
index 53b87eb3b..1ad8223ff 100644
--- a/libhb/enc_qsv.c
+++ b/libhb/enc_qsv.c
@@ -714,9 +714,9 @@ int encqsvInit(hb_work_object_t *w, hb_job_t *job)
pv->param.videoParam->AsyncDepth = job->qsv.async_depth;
// set and enable colorimetry (video signal information)
- pv->param.videoSignalInfo.ColourPrimaries = job->color_prim;
- pv->param.videoSignalInfo.TransferCharacteristics = job->color_transfer;
- pv->param.videoSignalInfo.MatrixCoefficients = job->color_matrix;
+ pv->param.videoSignalInfo.ColourPrimaries = hb_output_color_prim(job);
+ pv->param.videoSignalInfo.TransferCharacteristics = hb_output_color_transfer(job);
+ pv->param.videoSignalInfo.MatrixCoefficients = hb_output_color_matrix(job);
pv->param.videoSignalInfo.ColourDescriptionPresent = 1;
// parse user-specified encoder options, if present
@@ -764,9 +764,9 @@ int encqsvInit(hb_work_object_t *w, hb_job_t *job)
// reload colorimetry in case values were set in encoder_options
if (pv->param.videoSignalInfo.ColourDescriptionPresent)
{
- job->color_prim = pv->param.videoSignalInfo.ColourPrimaries;
- job->color_transfer = pv->param.videoSignalInfo.TransferCharacteristics;
- job->color_matrix = pv->param.videoSignalInfo.MatrixCoefficients;
+ job->color_prim_override = pv->param.videoSignalInfo.ColourPrimaries;
+ job->color_transfer_override = pv->param.videoSignalInfo.TransferCharacteristics;
+ job->color_matrix_override = pv->param.videoSignalInfo.MatrixCoefficients;
}
// sanitize values that may exceed the Media SDK variable size
diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
index d0bafe610..4c723c9c9 100644
--- a/libhb/encavcodec.c
+++ b/libhb/encavcodec.c
@@ -419,9 +419,9 @@ int encavcodecInit( hb_work_object_t * w, hb_job_t * job )
job->par.num, job->par.den );
// set colorimetry
- context->color_primaries = job->color_prim;
- context->color_trc = job->color_transfer;
- context->colorspace = job->color_matrix;
+ context->color_primaries = hb_output_color_prim(job);
+ context->color_trc = hb_output_color_transfer(job);
+ context->colorspace = hb_output_color_matrix(job);
if (!job->inline_parameter_sets)
{
@@ -626,6 +626,14 @@ int encavcodecInit( hb_work_object_t * w, hb_job_t * job )
goto done;
}
+ /*
+ * Reload colorimetry settings in case custom
+ * values were set in the encoder_options string.
+ */
+ job->color_prim_override = context->color_primaries;
+ job->color_transfer_override = context->color_trc;
+ job->color_matrix_override = context->colorspace;
+
if (job->pass_id == HB_PASS_ENCODE_1ST &&
context->stats_out != NULL)
{
diff --git a/libhb/encx264.c b/libhb/encx264.c
index 16c3e7f16..e4d8deac2 100644
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -389,9 +389,9 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
/* set up the VUI color model & gamma to match what the COLR atom
* set in muxmp4.c says. See libhb/muxmp4.c for notes. */
- param.vui.i_colorprim = job->color_prim;
- param.vui.i_transfer = job->color_transfer;
- param.vui.i_colmatrix = job->color_matrix;
+ param.vui.i_colorprim = hb_output_color_prim(job);
+ param.vui.i_transfer = hb_output_color_transfer(job);
+ param.vui.i_colmatrix = hb_output_color_matrix(job);
/* place job->encoder_options in an hb_dict_t for convenience */
hb_dict_t * x264_opts = NULL;
@@ -425,9 +425,9 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
/* Reload colorimetry settings in case custom values were set
* in the encoder_options string */
- job->color_prim = param.vui.i_colorprim;
- job->color_transfer = param.vui.i_transfer;
- job->color_matrix = param.vui.i_colmatrix;
+ job->color_prim_override = param.vui.i_colorprim;
+ job->color_transfer_override = param.vui.i_transfer;
+ job->color_matrix_override = param.vui.i_colmatrix;
/* For 25 fps sources, HandBrake's explicit keyints will match the x264 defaults:
* min-keyint 25 (same as auto), keyint 250. */
diff --git a/libhb/encx265.c b/libhb/encx265.c
index 9bf0c21ea..5e6600819 100644
--- a/libhb/encx265.c
+++ b/libhb/encx265.c
@@ -155,9 +155,9 @@ int encx265Init(hb_work_object_t *w, hb_job_t *job)
* flags, if any, should be set in the x265_param struct).
*/
char colorprim[11], transfer[11], colormatrix[11];
- snprintf(colorprim, sizeof(colorprim), "%d", job->color_prim);
- snprintf(transfer, sizeof(transfer), "%d", job->color_transfer);
- snprintf(colormatrix, sizeof(colormatrix), "%d", job->color_matrix);
+ snprintf(colorprim, sizeof(colorprim), "%d", hb_output_color_prim(job));
+ snprintf(transfer, sizeof(transfer), "%d", hb_output_color_transfer(job));
+ snprintf(colormatrix, sizeof(colormatrix), "%d", hb_output_color_matrix(job));
if (param_parse(pv, param, "colorprim", colorprim) ||
param_parse(pv, param, "transfer", transfer) ||
@@ -190,9 +190,9 @@ int encx265Init(hb_work_object_t *w, hb_job_t *job)
* Reload colorimetry settings in case custom
* values were set in the encoder_options string.
*/
- job->color_prim = param->vui.colorPrimaries;
- job->color_transfer = param->vui.transferCharacteristics;
- job->color_matrix = param->vui.matrixCoeffs;
+ job->color_prim_override = param->vui.colorPrimaries;
+ job->color_transfer_override = param->vui.transferCharacteristics;
+ job->color_matrix_override = param->vui.matrixCoeffs;
/*
* Settings which can't be overridden in the encodeer_options string
diff --git a/libhb/hb_json.c b/libhb/hb_json.c
index ce93444d9..bdf1ed080 100644
--- a/libhb/hb_json.c
+++ b/libhb/hb_json.c
@@ -657,6 +657,21 @@ hb_dict_t* hb_job_to_dict( const hb_job_t * job )
hb_value_int(job->color_transfer));
hb_dict_set(video_dict, "ColorMatrix",
hb_value_int(job->color_matrix));
+ if (job->color_prim_override != HB_COLR_PRI_UNDEF)
+ {
+ hb_dict_set(video_dict, "ColorPrimariesOverride",
+ hb_value_int(job->color_prim_override));
+ }
+ if (job->color_transfer_override != HB_COLR_TRA_UNDEF)
+ {
+ hb_dict_set(video_dict, "ColorTransferOverride",
+ hb_value_int(job->color_transfer_override));
+ }
+ if (job->color_matrix_override != HB_COLR_MAT_UNDEF)
+ {
+ hb_dict_set(video_dict, "ColorMatrixOverride",
+ hb_value_int(job->color_matrix_override));
+ }
if (job->vquality > HB_INVALID_VIDEO_QUALITY)
{
@@ -1010,12 +1025,16 @@ hb_job_t* hb_dict_to_job( hb_handle_t * h, hb_dict_t *dict )
// PAR {Num, Den}
"s?{s:i, s:i},"
// Video {Codec, Quality, Bitrate, Preset, Tune, Profile, Level, Options
- // TwoPass, Turbo, ColorFormat, ColorRange, ColorPrimaries,
- // ColorTransfer, ColorMatrix,
- // QSV {Decode, AsyncDepth}}
+ // TwoPass, Turbo,
+ // ColorFormat, ColorRange,
+ // ColorPrimaries, ColorTransfer, ColorMatrix,
+ // ColorPrimariesOverride, ColorTransferOverride, ColorMatrixOverride,
+ // QSV {Decode, AsyncDepth}}
"s:{s:o, s?f, s?i, s?s, s?s, s?s, s?s, s?s,"
- " s?b, s?b, s?i, s?i, s?i,"
+ " s?b, s?b,"
" s?i, s?i,"
+ " s?i, s?i, s?i,"
+ " s?i, s?i, s?i,"
" s?{s?b, s?i}},"
// Audio {CopyMask, FallbackEncoder, AudioList}
"s?{s?o, s?o, s?o},"
@@ -1064,6 +1083,9 @@ hb_job_t* hb_dict_to_job( hb_handle_t * h, hb_dict_t *dict )
"ColorPrimaries", unpack_i(&job->color_prim),
"ColorTransfer", unpack_i(&job->color_transfer),
"ColorMatrix", unpack_i(&job->color_matrix),
+ "ColorPrimariesOverride", unpack_i(&job->color_prim_override),
+ "ColorTransferOverride", unpack_i(&job->color_transfer_override),
+ "ColorMatrixOverride", unpack_i(&job->color_matrix_override),
"QSV",
"Decode", unpack_b(&job->qsv.decode),
"AsyncDepth", unpack_i(&job->qsv.async_depth),
diff --git a/libhb/preset.c b/libhb/preset.c
index 89f7db30d..644eac209 100644
--- a/libhb/preset.c
+++ b/libhb/preset.c
@@ -1644,7 +1644,7 @@ int hb_preset_apply_video(const hb_dict_t *preset, hb_dict_t *job_dict)
video_dict = hb_dict_get(job_dict, "Video");
hb_dict_set(video_dict, "Encoder", hb_value_string(encoder->short_name));
- color_matrix_code = hb_value_get_int(hb_dict_get(preset, "VideoColorMatrixCode"));
+ color_matrix_code = hb_value_get_int(hb_dict_get(preset, "VideoColorMatrixCodeOveride"));
if (color_matrix_code != 0)
{
int color_prim, color_transfer, color_matrix;
@@ -1678,9 +1678,12 @@ int hb_preset_apply_video(const hb_dict_t *preset, hb_dict_t *job_dict)
break;
}
- hb_dict_set(video_dict, "ColorPrimaries", hb_value_int(color_prim));
- hb_dict_set(video_dict, "ColorTransfer", hb_value_int(color_transfer));
- hb_dict_set(video_dict, "ColorMatrix", hb_value_int(color_matrix));
+ hb_dict_set(video_dict, "ColorPrimariesOverride",
+ hb_value_int(color_prim));
+ hb_dict_set(video_dict, "ColorTransferOverride",
+ hb_value_int(color_transfer));
+ hb_dict_set(video_dict, "ColorMatrixOverride",
+ hb_value_int(color_matrix));
}
hb_dict_set(video_dict, "Encoder", hb_value_dup(vcodec_value));
diff --git a/libhb/preset_builtin.h b/libhb/preset_builtin.h
index bd69f6dd5..da0fc7c87 100644
--- a/libhb/preset_builtin.h
+++ b/libhb/preset_builtin.h
@@ -88,7 +88,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 4000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -193,7 +193,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 2000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -298,7 +298,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1200, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"25\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -403,7 +403,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -508,7 +508,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -613,7 +613,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 3000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -718,7 +718,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1800, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"25\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -823,7 +823,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -942,7 +942,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 9000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -1061,7 +1061,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 4500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -1180,7 +1180,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 2700, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"25\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -1299,7 +1299,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 2250, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -1418,7 +1418,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 15000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -1537,7 +1537,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 7500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -1656,7 +1656,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 4500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"25\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -1775,7 +1775,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 3750, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -1887,7 +1887,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 900, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -1992,7 +1992,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -2097,7 +2097,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 250, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -2202,7 +2202,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 18000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -2307,7 +2307,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 12000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -2412,7 +2412,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 9000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -2517,7 +2517,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 4500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -2622,7 +2622,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 2500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -2734,7 +2734,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -2839,7 +2839,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 3000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -2944,7 +2944,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1800, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"25\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -3049,7 +3049,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -3168,7 +3168,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 8000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x265\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -3287,7 +3287,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -3406,7 +3406,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -3525,7 +3525,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 3000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -3644,7 +3644,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 2500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -3749,7 +3749,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 350, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -3868,7 +3868,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 8000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x265\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -3987,7 +3987,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -4106,7 +4106,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -4225,7 +4225,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 8000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x265\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -4344,7 +4344,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -4449,7 +4449,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 3000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -4568,7 +4568,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -4673,7 +4673,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 3000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -4778,7 +4778,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 2250, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -4900,7 +4900,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 8000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x265\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -5019,7 +5019,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -5138,7 +5138,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 3000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -5243,7 +5243,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1800, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"25\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -5348,7 +5348,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -5453,7 +5453,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -5558,7 +5558,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 3000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -5663,7 +5663,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1750, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -5768,7 +5768,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1250, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -5887,7 +5887,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -6006,7 +6006,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -6118,7 +6118,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 8000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x265\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -6223,7 +6223,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 2500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x265\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -6328,7 +6328,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 2000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x265\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -6433,7 +6433,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1200, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x265\", \n"
" \"VideoFramerate\": \"25\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -6538,7 +6538,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x265\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -6643,7 +6643,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 12000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -6748,7 +6748,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -6853,7 +6853,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 3000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -6958,7 +6958,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1800, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"25\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -7063,7 +7063,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -7166,7 +7166,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 8000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"vp9\", \n"
" \"VideoFramerate\": \"60\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -7269,7 +7269,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 4500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"vp9\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -7372,7 +7372,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 2500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"vp9\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -7475,7 +7475,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"vp9\", \n"
" \"VideoFramerate\": \"25\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -7578,7 +7578,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1250, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"vp9\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -7681,7 +7681,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"vp8\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -7784,7 +7784,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 3000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"vp8\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -7887,7 +7887,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1800, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"vp8\", \n"
" \"VideoFramerate\": \"25\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -7990,7 +7990,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 1500, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"vp8\", \n"
" \"VideoFramerate\": \"30\", \n"
" \"VideoFramerateMode\": \"pfr\", \n"
@@ -8102,7 +8102,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 120000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"auto\", \n"
" \"VideoFramerateMode\": \"cfr\", \n"
@@ -8207,7 +8207,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 60000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"auto\", \n"
" \"VideoFramerateMode\": \"cfr\", \n"
@@ -8312,7 +8312,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 30000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"auto\", \n"
" \"VideoFramerateMode\": \"cfr\", \n"
@@ -8417,7 +8417,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 1, \n"
" \"VideoAvgBitrate\": 15000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"auto\", \n"
" \"VideoFramerateMode\": \"cfr\", \n"
@@ -8536,7 +8536,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 0, \n"
" \"VideoAvgBitrate\": 6000, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"auto\", \n"
" \"VideoFramerateMode\": \"vfr\", \n"
@@ -8657,7 +8657,7 @@ const char hb_builtin_presets_json[] =
" \"UsesPictureFilters\": true, \n"
" \"UsesPictureSettings\": 2, \n"
" \"VideoAvgBitrate\": 1800, \n"
-" \"VideoColorMatrixCode\": 0, \n"
+" \"VideoColorMatrixCodeOverride\": 0, \n"
" \"VideoEncoder\": \"x264\", \n"
" \"VideoFramerate\": \"auto\", \n"
" \"VideoFramerateMode\": \"vfr\", \n"
diff --git a/preset/preset_builtin.json b/preset/preset_builtin.json
index 96af01e6a..030f5d74c 100644
--- a/preset/preset_builtin.json
+++ b/preset/preset_builtin.json
@@ -89,7 +89,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 4000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -197,7 +197,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 2000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -305,7 +305,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1200,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "25",
"VideoFramerateMode": "pfr",
@@ -413,7 +413,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -521,7 +521,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -629,7 +629,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 3000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -737,7 +737,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1800,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "25",
"VideoFramerateMode": "pfr",
@@ -845,7 +845,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -967,7 +967,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 9000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -1089,7 +1089,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 4500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -1211,7 +1211,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 2700,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "25",
"VideoFramerateMode": "pfr",
@@ -1333,7 +1333,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 2250,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -1455,7 +1455,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 15000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -1577,7 +1577,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 7500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -1699,7 +1699,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 4500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "25",
"VideoFramerateMode": "pfr",
@@ -1821,7 +1821,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 3750,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -1936,7 +1936,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 900,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -2044,7 +2044,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -2152,7 +2152,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 250,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -2260,7 +2260,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 18000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -2368,7 +2368,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 12000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -2476,7 +2476,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 9000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -2584,7 +2584,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 4500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -2692,7 +2692,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 2500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -2807,7 +2807,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -2915,7 +2915,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 3000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -3023,7 +3023,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1800,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "25",
"VideoFramerateMode": "pfr",
@@ -3131,7 +3131,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -3253,7 +3253,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 8000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x265",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -3375,7 +3375,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -3497,7 +3497,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -3619,7 +3619,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 3000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -3741,7 +3741,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 2500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -3849,7 +3849,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 350,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -3971,7 +3971,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 8000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x265",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -4093,7 +4093,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -4215,7 +4215,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -4337,7 +4337,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 8000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x265",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -4459,7 +4459,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -4567,7 +4567,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 3000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -4689,7 +4689,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -4797,7 +4797,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 3000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -4905,7 +4905,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 2250,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -5030,7 +5030,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 8000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x265",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -5152,7 +5152,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -5274,7 +5274,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 3000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -5382,7 +5382,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1800,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "25",
"VideoFramerateMode": "pfr",
@@ -5490,7 +5490,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -5598,7 +5598,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -5706,7 +5706,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 3000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -5814,7 +5814,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1750,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -5922,7 +5922,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1250,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -6044,7 +6044,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -6166,7 +6166,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -6281,7 +6281,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 8000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x265",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -6389,7 +6389,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 2500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x265",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -6497,7 +6497,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 2000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x265",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -6605,7 +6605,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1200,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x265",
"VideoFramerate": "25",
"VideoFramerateMode": "pfr",
@@ -6713,7 +6713,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x265",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -6821,7 +6821,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 12000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -6929,7 +6929,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -7037,7 +7037,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 3000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -7145,7 +7145,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1800,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "25",
"VideoFramerateMode": "pfr",
@@ -7253,7 +7253,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -7360,7 +7360,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 8000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "vp9",
"VideoFramerate": "60",
"VideoFramerateMode": "pfr",
@@ -7467,7 +7467,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 4500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "vp9",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -7574,7 +7574,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 2500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "vp9",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -7681,7 +7681,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "vp9",
"VideoFramerate": "25",
"VideoFramerateMode": "pfr",
@@ -7788,7 +7788,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1250,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "vp9",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -7895,7 +7895,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "vp8",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -8002,7 +8002,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 3000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "vp8",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -8109,7 +8109,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1800,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "vp8",
"VideoFramerate": "25",
"VideoFramerateMode": "pfr",
@@ -8216,7 +8216,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1500,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "vp8",
"VideoFramerate": "30",
"VideoFramerateMode": "pfr",
@@ -8331,7 +8331,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 120000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "auto",
"VideoFramerateMode": "cfr",
@@ -8439,7 +8439,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 60000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "auto",
"VideoFramerateMode": "cfr",
@@ -8547,7 +8547,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 30000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "auto",
"VideoFramerateMode": "cfr",
@@ -8655,7 +8655,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 15000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "auto",
"VideoFramerateMode": "cfr",
diff --git a/preset/preset_cli_default.json b/preset/preset_cli_default.json
index 76c0b28cd..3d05c1902 100644
--- a/preset/preset_cli_default.json
+++ b/preset/preset_cli_default.json
@@ -94,7 +94,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 6000,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "auto",
"VideoFramerateMode": "vfr",
diff --git a/preset/preset_template.json b/preset/preset_template.json
index f93c68141..179ca261f 100644
--- a/preset/preset_template.json
+++ b/preset/preset_template.json
@@ -94,7 +94,7 @@
],
"SubtitleTrackSelectionBehavior": "none",
"VideoAvgBitrate": 1800,
- "VideoColorMatrixCode": 0,
+ "VideoColorMatrixCodeOverride": 0,
"VideoEncoder": "x264",
"VideoFramerate": "auto",
"VideoFramerateMode": "vfr",
diff --git a/test/test.c b/test/test.c
index a55987588..c2b02cc84 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1660,6 +1660,7 @@ static void ShowHelp()
" (default: set by preset, typically 2)\n"
" -M, --color-matrix <string>\n"
" Set the color space signaled by the output:\n"
+" Overrides color signalling with no conversion.\n"
" 2020\n"
" 709\n"
" 601\n"
@@ -4118,7 +4119,7 @@ static hb_dict_t * PreparePreset(const char *preset_name)
}
if (color_matrix_code > 0)
{
- hb_dict_set(preset, "VideoColorMatrixCode",
+ hb_dict_set(preset, "VideoColorMatrixCodeOverride",
hb_value_int(color_matrix_code));
}
#ifdef USE_QSV
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 04:13:52 +0000