summaryrefslogtreecommitdiffstats
path: root/libhb/hb_json.c
diff options
context:
space:
mode:
authorDamiano Galassi <[email protected]>2021-01-25 09:34:23 +0100
committerDamiano Galassi <[email protected]>2021-01-25 09:34:23 +0100
commit818dbfe932eb2c6c484bd09fee04c5748963a1be (patch)
tree13dcd86d190ab72ca2c047a93142c63b283603fd /libhb/hb_json.c
parentc543768a0874e7d896d9815c7a204c0c28d6b0f8 (diff)
libhb: revert part of the previous colormatrix override commit.
Diffstat (limited to 'libhb/hb_json.c')
-rw-r--r--libhb/hb_json.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/libhb/hb_json.c b/libhb/hb_json.c
index 829b7fb01..3a40205a6 100644
--- a/libhb/hb_json.c
+++ b/libhb/hb_json.c
@@ -672,6 +672,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)
{
@@ -1044,11 +1059,13 @@ hb_job_t* hb_dict_to_job( hb_handle_t * h, hb_dict_t *dict )
// 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?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},"
@@ -1096,6 +1113,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),